mirror/oatpp-postgresql
2
0
Fork 0
mirror of https://github.com/oatpp/oatpp-postgresql.git synced 2024-11-21 01:05:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clean up float8 serializer

Browse Source
This commit is contained in:
Don Smyth 2021-01-04 16:28:19 -08:00
parent 9916f6678b
commit 9a5126010a
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/oatpp-postgresql/mapping/PgArray.hpp
View File

@ -11,7 +11,7 @@
struct PgElem {
v_int32 size; // size of each element value (bytes)
v_uint8 value[1]; // Beginning of value array -- dynamically sized
v_uint8 value[]; // Beginning of value array -- dynamically sized
};
// after https://stackoverflow.com/questions/4016412/postgresqls-libpq-encoding-for-binary-transport-of-array-data
@ -29,7 +29,7 @@ struct PgArrayHeader {
// Layout of Postgres array in memory
struct PgArray {
PgArrayHeader header;
PgElem elem[1]; // Beginning of (size, value) elements
PgElem elem[]; // Beginning of (size, value) elements
};
#endif // oatpp_postgresql_mapping_PgArray_hpp

12
src/oatpp-postgresql/mapping/Serializer.cpp
View File

@ -400,7 +400,7 @@ void Serializer::serializeArray(const Serializer* _this, OutputData& outData, co
auto v = polymorph.staticCast<oatpp::Vector<Float64>>();
// get size of header + vector size * sizeof each element (size + data)
auto dataSize = sizeof(PgArrayHeader) + v->size() * sizeof(PgElem);
auto dataSize = sizeof(PgArrayHeader) + v->size() * (sizeof(PgElem) + sizeof(v_float64));
outData.dataBuffer.reset(new char[dataSize]);
outData.dataSize = dataSize;
outData.dataFormat = 1;
@ -418,12 +418,16 @@ void Serializer::serializeArray(const Serializer* _this, OutputData& outData, co
pgArray->header.index = 0;
// stuff in the elements in network order
auto *elemBuff = reinterpret_cast<p_uint8>(pgArray->elem);
for (int i=0; i < v->size(); i++) {
pgArray->elem[i].size = htonl(sizeof(v_float64));
*reinterpret_cast<p_uint32>(elemBuff) = htonl(sizeof(v_float64));
elemBuff += sizeof(v_int32);
v_float64 fValue = v->at(i);
auto pVal = reinterpret_cast<p_int64>(&fValue);
pgArray->elem[i].value[0] = htonl(*pVal >> 32);
pgArray->elem[i].value[1] = htonl(*pVal & 0xFFFFFFFF);
*reinterpret_cast<p_uint32>(elemBuff) = htonl(*pVal >> 32);
elemBuff += sizeof(v_int32);
*reinterpret_cast<p_uint32>(elemBuff) = htonl(*pVal & 0xFFFFFFFF);
elemBuff += sizeof(v_int32);
}
} else{
serNull(outData);