Merge pull request #1076 from Altinity/bugfix/antalya-25.8/filimonov_wipes_my_snot

25.8 Antalya: Fixes for #1069

Author: zvonand

src/Storages/ObjectStorage/DataLakes/IDataLakeMetadata.cpp

@@ -141,9 +141,9 @@ void DataFileMetaInfo::serialize(WriteBuffer & out) const
         size_t field_mask = 0;
         if (column.second.rows_count.has_value())
             field_mask |= FIELD_MASK_ROWS;
-        if (column.second.rows_count.has_value())
+        if (column.second.nulls_count.has_value())
             field_mask |= FIELD_MASK_NULLS;
-        if (column.second.rows_count.has_value())
+        if (column.second.hyperrectangle.has_value())
             field_mask |= FIELD_MASK_RECT;
         writeIntBinary(field_mask, out);
 

src/Storages/ObjectStorage/DataLakes/Iceberg/ManifestFile.h

@@ -1,6 +1,23 @@
 #pragma once
 
 #include "config.h"
+#include <Core/Range.h>
+#include <Core/Types.h>
+
+#include <optional>
+
+namespace DB::Iceberg
+{
+
+struct ColumnInfo
+{
+    std::optional<Int64> rows_count;
+    std::optional<Int64> bytes_size;
+    std::optional<Int64> nulls_count;
+    std::optional<DB::Range> hyperrectangle;
+};
+
+}
 
 #if USE_AVRO
 
@@ -38,14 +55,6 @@ enum class ManifestFileContentType
 
 String FileContentTypeToString(FileContentType type);
 
-struct ColumnInfo
-{
-    std::optional<Int64> rows_count;
-    std::optional<Int64> bytes_size;
-    std::optional<Int64> nulls_count;
-    std::optional<DB::Range> hyperrectangle;
-};
-
 struct PartitionSpecsEntry
 {
     Int32 source_id;