Prevent creation of sparse map for empty typed columns

man-group · Feb 15, 2024 · 5684779 · 5684779
1 parent 0d0c31e
commit 5684779
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/cpp/arcticdb/codec/codec-inl.hpp b/cpp/arcticdb/codec/codec-inl.hpp
@@ -131,6 +131,7 @@ std::size_t decode_ndarray(
  }
 
  if(field.sparse_map_bytes()) {
+ util::check(!is_empty_type(type_desc_tag.data_type()), "Empty typed columns should not have sparse map");
  util::check_magic<util::BitMagicStart>(data_in);
  const auto bitmap_size = field.sparse_map_bytes() - util::combined_bit_magic_delimiters_size();
  bv = util::deserialize_bytes_to_bitmap(data_in, bitmap_size);

diff --git a/cpp/arcticdb/codec/codec.cpp b/cpp/arcticdb/codec/codec.cpp
@@ -514,7 +514,8 @@ void encode_sparse_map(
  Buffer& out,
  std::ptrdiff_t& pos
 ) {
- if (column_data.bit_vector() != nullptr && column_data.bit_vector()->count() > 0) {
+ if (column_data.bit_vector() != nullptr && column_data.bit_vector()->count() > 0) {
+ util::check(!is_empty_type(column_data.type().data_type()), "Empty typed columns should not have sparse maps");
  ARCTICDB_DEBUG(log::codec(), "Sparse map count = {} pos = {}", column_data.bit_vector()->count(), pos);
  const size_t sparse_bm_bytes = encode_bitmap(*column_data.bit_vector(), out, pos);
  util::variant_match(variant_field, [&](auto field) {

diff --git a/cpp/arcticdb/column_store/column.cpp b/cpp/arcticdb/column_store/column.cpp
@@ -323,6 +323,9 @@ void Column::default_initialize_rows(size_t start_pos, size_t num_rows, bool ens
 }
 
 void Column::set_row_data(size_t row_id) {
+ if (is_empty_type(type_.data_type())) {
+ return;
+ }
  last_logical_row_ = row_id;
  const auto last_stored_row = row_count() - 1;
  if(sparse_map_) {
@@ -592,10 +595,7 @@ std::shared_ptr<Column> Column::truncate(const std::shared_ptr<Column>& column,
  auto buffer = ::arcticdb::truncate(column->data_.buffer(), start_byte, end_byte);
  auto res = std::make_shared<Column>(column->type(), column->allow_sparse_, std::move(buffer));
  if (column->is_sparse()) {
- util::BitMagic output_sparse_map = is_empty_type(column->type().data_type())
- ? util::BitMagic{}
- : truncate_sparse_map(column->sparse_map(), start_row, end_row);
- res->set_sparse_map(std::move(output_sparse_map));
+ res->set_sparse_map(truncate_sparse_map(column->sparse_map(), start_row, end_row));
  }
  res->set_row_data(end_row - (start_row + 1));
  return res;