Fix build due to ClickHouse/ClickHouse#66144

apache · Jul 18, 2024 · 58eadc7 · 58eadc7
1 parent 0e9fd82
commit 58eadc7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/cpp-ch/local-engine/Operator/DefaultHashAggregateResult.cpp b/cpp-ch/local-engine/Operator/DefaultHashAggregateResult.cpp
@@ -116,18 +116,18 @@ class DefaultHashAggrgateResultTransform : public DB::IProcessor
             has_input = true;
             output_chunk = DB::Chunk(result_cols, 1);
             auto info = std::make_shared<DB::AggregatedChunkInfo>();
-            output_chunk.setChunkInfo(info);
+            output_chunk.getChunkInfos().add(std::move(info));
             return Status::Ready;
         }
 
         input.setNeeded();
         if (input.hasData())
         {
             output_chunk = input.pull(true);
-            if (!output_chunk.hasChunkInfo())
+            if (output_chunk.getChunkInfos().empty())
             {
                 auto info = std::make_shared<DB::AggregatedChunkInfo>();
-                output_chunk.setChunkInfo(info);
+                output_chunk.getChunkInfos().add(std::move(info));
             }
             has_input = true;
             return Status::Ready;

diff --git a/cpp-ch/local-engine/Storages/Mergetree/SparkMergeTreeWriter.cpp b/cpp-ch/local-engine/Storages/Mergetree/SparkMergeTreeWriter.cpp
@@ -121,12 +121,11 @@ void SparkMergeTreeWriter::write(const DB::Block & block)
         checkAndMerge();
 }
 
-bool SparkMergeTreeWriter::chunkToPart(Chunk && chunk)
+bool SparkMergeTreeWriter::chunkToPart(Chunk && plan_chunk)
 {
-    if (chunk.hasChunkInfo())
+    if (Chunk result_chunk = DB::Squashing::squash(std::move(plan_chunk)))
     {
-        Chunk squash_chunk = DB::Squashing::squash(std::move(chunk));
-        Block result = header.cloneWithColumns(squash_chunk.getColumns());
+        auto result = squashing->getHeader().cloneWithColumns(result_chunk.detachColumns());
         return blockToPart(result);
     }
     return false;

diff --git a/cpp-ch/local-engine/Storages/Mergetree/SparkMergeTreeWriter.h b/cpp-ch/local-engine/Storages/Mergetree/SparkMergeTreeWriter.h
@@ -77,7 +77,7 @@ class SparkMergeTreeWriter
     void saveMetadata();
     void commitPartToRemoteStorageIfNeeded();
     void finalizeMerge();
-    bool chunkToPart(Chunk && chunk);
+    bool chunkToPart(Chunk && plan_chunk);
     bool blockToPart(Block & block);
     bool useLocalStorage() const;
 

diff --git a/cpp-ch/local-engine/Storages/SourceFromJavaIter.cpp b/cpp-ch/local-engine/Storages/SourceFromJavaIter.cpp
@@ -109,13 +109,13 @@ DB::Chunk SourceFromJavaIter::generate()
             auto info = std::make_shared<DB::AggregatedChunkInfo>();
             info->is_overflows = data->info.is_overflows;
             info->bucket_num = data->info.bucket_num;
-            result.setChunkInfo(info);
+            result.getChunkInfos().add(std::move(info));
         }
         else
         {
             result = BlockUtil::buildRowCountChunk(rows);
             auto info = std::make_shared<DB::AggregatedChunkInfo>();
-            result.setChunkInfo(info);
+            result.getChunkInfos().add(std::move(info));
         }
     }
     return result;