Merge branch 'bugfix/antalya-25.8/filimonov_wipes_my_snot' into frontport/antalya-25.8/iceberg_features

Author: ianton-ru

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;

src/Storages/ObjectStorage/StorageObjectStorageCluster.cpp

@@ -873,4 +873,11 @@ void StorageObjectStorageCluster::onActionLockRemove(StorageActionBlockType acti
     IStorageCluster::onActionLockRemove(action_type);
 }
 
+bool StorageObjectStorageCluster::prefersLargeBlocks() const
+{
+    if (pure_storage)
+        return pure_storage->prefersLargeBlocks();
+    return IStorageCluster::prefersLargeBlocks();
+}
+
 }

src/Storages/ObjectStorage/StorageObjectStorageCluster.h

@@ -122,6 +122,8 @@ class StorageObjectStorageCluster : public IStorageCluster
 
     void onActionLockRemove(StorageActionBlockType action_type) override;
 
+    bool prefersLargeBlocks() const override;
+
 private:
     void updateQueryToSendIfNeeded(
         ASTPtr & query,