Change size_t to uint64_t for storing sub-block-minmax info and fix u…

…pdate function to read 8 bytes instead of 4.
ornladios · Oct 7, 2020 · ce36fa3 · ce36fa3
1 parent 9ea6100
commit ce36fa3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/source/adios2/toolkit/format/bp/BPBase.tcc b/source/adios2/toolkit/format/bp/BPBase.tcc
@@ -301,7 +301,8 @@ inline void BPBase::ParseCharacteristics(const std::vector<char> &buffer,
                         helper::ReadValue<uint8_t>(buffer, position,
                                                    isLittleEndian));
                 characteristics.Statistics.SubBlockInfo.SubBlockSize =
-                    helper::ReadValue<size_t>(buffer, position, isLittleEndian);
+                    static_cast<size_t>(helper::ReadValue<uint64_t>(
+                        buffer, position, isLittleEndian));
 
                 characteristics.Statistics.SubBlockInfo.Div.resize(
                     dimensionsSize);

diff --git a/source/adios2/toolkit/format/bp/BPSerializer.tcc b/source/adios2/toolkit/format/bp/BPSerializer.tcc
@@ -167,7 +167,7 @@ void BPSerializer::UpdateIndexOffsetsCharacteristics(size_t &currentPosition,
             currentPosition += 2 * sizeof(T); // block min/max
             if (M > 1)
             {
-                currentPosition += 1 + 4; // method, blockSize
+                currentPosition += 1 + 8; // method (byte), blockSize (uint64_t)
                 currentPosition +=
                     dimensionsSize * sizeof(uint16_t); // N-dim division
                 currentPosition += 2 * M * sizeof(T);  // M * min/max

diff --git a/source/adios2/toolkit/format/bp/bp4/BP4Serializer.tcc b/source/adios2/toolkit/format/bp/bp4/BP4Serializer.tcc
@@ -620,8 +620,9 @@ void BP4Serializer::PutBoundsRecord(const bool singleValue,
                 uint8_t method =
                     static_cast<uint8_t>(stats.SubBlockInfo.DivisionMethod);
                 helper::InsertToBuffer(buffer, &method);
-                helper::InsertToBuffer(buffer,
-                                       &stats.SubBlockInfo.SubBlockSize);
+                uint64_t subBlockSize =
+                    static_cast<uint64_t>(stats.SubBlockInfo.SubBlockSize);
+                helper::InsertToBuffer(buffer, &subBlockSize);
 
                 const uint16_t N =
                     static_cast<uint16_t>(stats.SubBlockInfo.Div.size());
@@ -673,8 +674,9 @@ void BP4Serializer::PutBoundsRecord(const bool singleValue,
                 uint8_t method =
                     static_cast<uint8_t>(stats.SubBlockInfo.DivisionMethod);
                 helper::CopyToBuffer(buffer, position, &method);
-                helper::CopyToBuffer(buffer, position,
-                                     &stats.SubBlockInfo.SubBlockSize);
+                uint64_t subBlockSize =
+                    static_cast<uint64_t>(stats.SubBlockInfo.SubBlockSize);
+                helper::CopyToBuffer(buffer, position, &subBlockSize);
 
                 const uint16_t N =
                     static_cast<uint16_t>(stats.SubBlockInfo.Div.size());