[GLUTEN-1632][CH]Daily Update Clickhouse Version (20240705) (#6338)

kyligence-git · kyligence-git · baibaichen · web-flow · commit 4a674e5e8ab7 · 2024-07-05T15:22:52.000+08:00
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240705) * Fix build due to ClickHouse/ClickHouse#61601 --------- Co-authored-by: kyligence-git <gluten@kyligence.io> Co-authored-by: Chang Chen <baibaichen@gmail.com>
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
@@ -1,4 +1,4 @@
 CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20240704
-CH_COMMIT=f617655ccea
+CH_BRANCH=rebase_ch/20240705
+CH_COMMIT=531a87ed802
 
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;
diff --git a/cpp-ch/local-engine/tests/gtest_parser.cpp b/cpp-ch/local-engine/tests/gtest_parser.cpp
@@ -101,7 +101,8 @@ TEST(LocalExecutor, StorageObjectStorageSink)
 
     /// 2. Create Chunk
     /// 3. comsume
-    sink.consume(testChunk());
+    Chunk data = testChunk();
+    sink.consume(data);
     sink.onFinish();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -116,18 +116,18 @@ class DefaultHashAggrgateResultTransform : public DB::IProcessor`
`116`	`116`	`has_input = true;`
`117`	`117`	`output_chunk = DB::Chunk(result_cols, 1);`
`118`	`118`	`auto info = std::make_shared<DB::AggregatedChunkInfo>();`
`119`		`- output_chunk.setChunkInfo(info);`
	`119`	`+ output_chunk.getChunkInfos().add(std::move(info));`
`120`	`120`	`return Status::Ready;`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`input.setNeeded();`
`124`	`124`	`if (input.hasData())`
`125`	`125`	`{`
`126`	`126`	`output_chunk = input.pull(true);`
`127`		`- if (!output_chunk.hasChunkInfo())`
	`127`	`+ if (output_chunk.getChunkInfos().empty())`
`128`	`128`	`{`
`129`	`129`	`auto info = std::make_shared<DB::AggregatedChunkInfo>();`
`130`		`- output_chunk.setChunkInfo(info);`
	`130`	`+ output_chunk.getChunkInfos().add(std::move(info));`
`131`	`131`	`}`
`132`	`132`	`has_input = true;`
`133`	`133`	`return Status::Ready;`
Original file line number	Diff line number	Diff line change
`@@ -121,12 +121,11 @@ void SparkMergeTreeWriter::write(const DB::Block & block)`
`121`	`121`	`checkAndMerge();`
`122`	`122`	`}`
`123`	`123`
`124`		`-bool SparkMergeTreeWriter::chunkToPart(Chunk && chunk)`
	`124`	`+bool SparkMergeTreeWriter::chunkToPart(Chunk && plan_chunk)`
`125`	`125`	`{`
`126`		`- if (chunk.hasChunkInfo())`
	`126`	`+ if (Chunk result_chunk = DB::Squashing::squash(std::move(plan_chunk)))`
`127`	`127`	`{`
`128`		`- Chunk squash_chunk = DB::Squashing::squash(std::move(chunk));`
`129`		`- Block result = header.cloneWithColumns(squash_chunk.getColumns());`
	`128`	`+ auto result = squashing->getHeader().cloneWithColumns(result_chunk.detachColumns());`
`130`	`129`	`return blockToPart(result);`
`131`	`130`	`}`
`132`	`131`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -109,13 +109,13 @@ DB::Chunk SourceFromJavaIter::generate()`
`109`	`109`	`auto info = std::make_shared<DB::AggregatedChunkInfo>();`
`110`	`110`	`info->is_overflows = data->info.is_overflows;`
`111`	`111`	`info->bucket_num = data->info.bucket_num;`
`112`		`- result.setChunkInfo(info);`
	`112`	`+ result.getChunkInfos().add(std::move(info));`
`113`	`113`	`}`
`114`	`114`	`else`
`115`	`115`	`{`
`116`	`116`	`result = BlockUtil::buildRowCountChunk(rows);`
`117`	`117`	`auto info = std::make_shared<DB::AggregatedChunkInfo>();`
`118`		`- result.setChunkInfo(info);`
	`118`	`+ result.getChunkInfos().add(std::move(info));`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`	`return result;`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,8 @@ TEST(LocalExecutor, StorageObjectStorageSink)`
`101`	`101`
`102`	`102`	`/// 2. Create Chunk`
`103`	`103`	`/// 3. comsume`
`104`		`- sink.consume(testChunk());`
	`104`	`+ Chunk data = testChunk();`
	`105`	`+ sink.consume(data);`
`105`	`106`	`sink.onFinish();`
`106`	`107`	`}`
`107`	`108`