[GLUTEN-1632][CH]Daily Update Clickhouse Version (20241106) (#7824)

* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20241106) * Fix build due to ClickHouse/ClickHouse#70806 * set 'tmp_path' related to spark version for avoiding conflict --------- Co-authored-by: kyligence-git <[email protected]> Co-authored-by: Chang Chen <[email protected]>
apache · Nov 6, 2024 · b19cbd1 · b19cbd1
1 parent 49e1ca5
commit b19cbd1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/...c/test/scala/org/apache/gluten/execution/GlutenClickHouseWholeStageTransformerSuite.scala b/...c/test/scala/org/apache/gluten/execution/GlutenClickHouseWholeStageTransformerSuite.scala
@@ -83,6 +83,7 @@ class GlutenClickHouseWholeStageTransformerSuite extends WholeStageTransformerSu
       .set("spark.sql.warehouse.dir", warehouse)
       .setCHConfig("user_defined_path", "/tmp/user_defined")
       .setCHConfig("path", UTSystemParameters.diskOutputDataPath)
+      .setCHConfig("tmp_path", s"/tmp/libch/$SPARK_DIR_NAME")
     if (UTSystemParameters.testMergeTreeOnObjectStorage) {
       conf
         .set("spark.hadoop.fs.s3a.access.key", S3_ACCESS_KEY)

diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
 CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20241105
-CH_COMMIT=500e1e35c0b
+CH_BRANCH=rebase_ch/20241106
+CH_COMMIT=32ca18ed214
diff --git a/cpp-ch/local-engine/Storages/MergeTree/SparkStorageMergeTree.cpp b/cpp-ch/local-engine/Storages/MergeTree/SparkStorageMergeTree.cpp
@@ -224,7 +224,10 @@ MergeTreeData::LoadPartResult SparkStorageMergeTree::loadDataPart(
 
     try
     {
-        res.part = getDataPartBuilder(part_name, single_disk_volume, part_name).withPartInfo(part_info).withPartFormatFromDisk().build();
+        res.part = getDataPartBuilder(part_name, single_disk_volume, part_name, getContext()->getReadSettings())
+                       .withPartInfo(part_info)
+                       .withPartFormatFromDisk()
+                       .build();
     }
     catch (...)
     {
@@ -439,7 +442,7 @@ MergeTreeDataWriter::TemporaryPart SparkMergeTreeDataWriter::writeTempPart(
 
     VolumePtr volume = data.getStoragePolicy()->getVolume(0);
     VolumePtr data_part_volume = std::make_shared<SingleDiskVolume>(volume->getName(), volume->getDisk(), volume->max_data_part_size);
-    auto new_data_part = data.getDataPartBuilder(part_dir, data_part_volume, part_dir)
+    auto new_data_part = data.getDataPartBuilder(part_dir, data_part_volume, part_dir, context->getReadSettings())
                              .withPartFormat(data.choosePartFormat(expected_size, block.rows()))
                              .withPartInfo(new_part_info)
                              .build();