Skip to content

Commit 31bc8df

Browse files
committed
Check buffer emptiness
1 parent 3dc6a96 commit 31bc8df

File tree

3 files changed

+3
-20
lines changed

3 files changed

+3
-20
lines changed

include/sparrow_ipc/deserialize_primitive_array.hpp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,7 @@ namespace sparrow_ipc
4343

4444
if (compression)
4545
{
46-
// TODO Handle buffers emptiness thoroughly / which is and which is not allowed...
47-
// Validity buffers can be empty
48-
if (validity_buffer_span.empty())
49-
{
50-
buffers.push_back(validity_buffer_span);
51-
}
52-
else
53-
{
54-
buffers.push_back(utils::get_decompressed_buffer(validity_buffer_span, compression));
55-
}
46+
buffers.push_back(utils::get_decompressed_buffer(validity_buffer_span, compression));
5647
buffers.push_back(utils::get_decompressed_buffer(data_buffer_span, compression));
5748
}
5849
else

include/sparrow_ipc/deserialize_variable_size_binary_array.hpp

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,7 @@ namespace sparrow_ipc
4141

4242
if (compression)
4343
{
44-
// Validity buffers can be empty
45-
if (validity_buffer_span.empty())
46-
{
47-
buffers.push_back(validity_buffer_span);
48-
}
49-
else
50-
{
51-
buffers.push_back(utils::get_decompressed_buffer(validity_buffer_span, compression));
52-
}
44+
buffers.push_back(utils::get_decompressed_buffer(validity_buffer_span, compression));
5345
buffers.push_back(utils::get_decompressed_buffer(offset_buffer_span, compression));
5446
buffers.push_back(utils::get_decompressed_buffer(data_buffer_span, compression));
5547
}

src/deserialize_utils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ namespace sparrow_ipc::utils
6464
const org::apache::arrow::flatbuf::BodyCompression* compression
6565
)
6666
{
67-
if (compression)
67+
if (compression && !buffer_span.empty())
6868
{
6969
return decompress(sparrow_ipc::details::from_fb_compression_type(compression->codec()), buffer_span);
7070
}

0 commit comments

Comments
 (0)