Revert "[GLUTEN-1632][CH]Daily Update Clickhouse Version (20240718) (a…

…pache#6491)" This reverts commit 0c81db9.
yma11 · Jul 19, 2024 · b8f11be · b8f11be
1 parent 65175ac
commit b8f11be
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
@@ -1,4 +1,4 @@
 CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20240718
-CH_COMMIT=7f849f9ccf1
+CH_BRANCH=rebase_ch/20240711
+CH_COMMIT=6632e76fd32940940749b53335ccc4843f3f2638
 
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.getChunkInfos().add(std::move(info));
+            output_chunk.setChunkInfo(info);
             return Status::Ready;
         }
 
         input.setNeeded();
         if (input.hasData())
         {
             output_chunk = input.pull(true);
-            if (output_chunk.getChunkInfos().empty())
+            if (!output_chunk.hasChunkInfo())
             {
                 auto info = std::make_shared<DB::AggregatedChunkInfo>();
-                output_chunk.getChunkInfos().add(std::move(info));
+                output_chunk.setChunkInfo(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,11 +121,12 @@ void SparkMergeTreeWriter::write(const DB::Block & block)
         checkAndMerge();
 }
 
-bool SparkMergeTreeWriter::chunkToPart(Chunk && plan_chunk)
+bool SparkMergeTreeWriter::chunkToPart(Chunk && chunk)
 {
-    if (Chunk result_chunk = DB::Squashing::squash(std::move(plan_chunk)))
+    if (chunk.hasChunkInfo())
     {
-        auto result = squashing->getHeader().cloneWithColumns(result_chunk.detachColumns());
+        Chunk squash_chunk = DB::Squashing::squash(std::move(chunk));
+        Block result = header.cloneWithColumns(squash_chunk.getColumns());
         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 && plan_chunk);
+    bool chunkToPart(Chunk && 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.getChunkInfos().add(std::move(info));
+            result.setChunkInfo(info);
         }
         else
         {
             result = BlockUtil::buildRowCountChunk(rows);
             auto info = std::make_shared<DB::AggregatedChunkInfo>();
-            result.getChunkInfos().add(std::move(info));
+            result.setChunkInfo(info);
         }
     }
     return result;