This is an automated email from the ASF dual-hosted git repository.
changchen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new b19cbd1311 [GLUTEN-1632][CH]Daily Update Clickhouse Version (20241106)
(#7824)
b19cbd1311 is described below
commit b19cbd1311e7fe8c96d85ccfb8d47b82ed0479a1
Author: Kyligence Git <[email protected]>
AuthorDate: Wed Nov 6 01:20:11 2024 -0600
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20241106) (#7824)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20241106)
* Fix build due to https://github.com/ClickHouse/ClickHouse/pull/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]>
---
.../execution/GlutenClickHouseWholeStageTransformerSuite.scala | 1 +
cpp-ch/clickhouse.version | 4 ++--
cpp-ch/local-engine/Storages/MergeTree/SparkStorageMergeTree.cpp | 7 +++++--
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git
a/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseWholeStageTransformerSuite.scala
b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseWholeStageTransformerSuite.scala
index 272323c487..5c6f669198 100644
---
a/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseWholeStageTransformerSuite.scala
+++
b/backends-clickhouse/src/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
index a4dd7eb5f2..1a089bdae0 100644
--- 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
\ No newline at end of file
+CH_BRANCH=rebase_ch/20241106
+CH_COMMIT=32ca18ed214
\ No newline at end of file
diff --git a/cpp-ch/local-engine/Storages/MergeTree/SparkStorageMergeTree.cpp
b/cpp-ch/local-engine/Storages/MergeTree/SparkStorageMergeTree.cpp
index 15da00fbee..d44873196b 100644
--- 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();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
