Merge pull request redpanda-data#23957 from mmaslankaprv/fix-manifest…

…-entry-value iceberg/manifest_entry: fixed manifest entry avro serialization
IoannisRP · Oct 30, 2024 · 29c5d6b · 29c5d6b
2 parents 8211880 + f7fed79
commit 29c5d6b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/v/iceberg/manifest_entry_type.cc b/src/v/iceberg/manifest_entry_type.cc
@@ -46,12 +46,6 @@ struct_type data_file_type(partition_key_type partition_type) {
       field_required::no,
       map_type::create(
         121, int_type(), 122, field_required::yes, long_type())));
-    r2_type.fields.emplace_back(nested_field::create(
-      111,
-      "distinct_counts",
-      field_required::no,
-      map_type::create(
-        123, int_type(), 124, field_required::yes, long_type())));
     r2_type.fields.emplace_back(nested_field::create(
       137,
       "nan_value_counts",

diff --git a/src/v/iceberg/manifest_entry_values.cc b/src/v/iceberg/manifest_entry_values.cc
@@ -174,16 +174,25 @@ std::unique_ptr<struct_value> data_file_to_value(const data_file& file) {
       long_value(static_cast<int64_t>(file.file_size_bytes)));
 
     // TODO: serialize the rest of the optional fields.
+    // column_sizes
     ret->fields.emplace_back(std::nullopt);
+    // value_counts
     ret->fields.emplace_back(std::nullopt);
+    // null_value_counts
     ret->fields.emplace_back(std::nullopt);
+    // nan_value_counts
     ret->fields.emplace_back(std::nullopt);
+    // lower_bounds
     ret->fields.emplace_back(std::nullopt);
+    // upper_bounds
     ret->fields.emplace_back(std::nullopt);
+    // key_metadata
     ret->fields.emplace_back(std::nullopt);
+    // split_offsets
     ret->fields.emplace_back(std::nullopt);
+    // equality_ids
     ret->fields.emplace_back(std::nullopt);
-    ret->fields.emplace_back(std::nullopt);
+    // sort_order_id
     ret->fields.emplace_back(std::nullopt);
     return ret;
 }