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 dc397eb434 [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250124)
(#8604)
dc397eb434 is described below
commit dc397eb434e0c6d67ee22cf0bd842f5326a85c1d
Author: Kyligence Git <[email protected]>
AuthorDate: Fri Jan 24 01:23:24 2025 -0600
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20250124) (#8604)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250124)
* Update UT due to https://github.com/ClickHouse/ClickHouse/pull/74659
* Fix Rebase issue due to
https://github.com/ClickHouse/ClickHouse/pull/73654
---------
Co-authored-by: kyligence-git <[email protected]>
Co-authored-by: Chang Chen <[email protected]>
---
.../GlutenClickHouseExcelFormatSuite.scala | 22 +++-------------------
cpp-ch/clickhouse.version | 4 ++--
2 files changed, 5 insertions(+), 21 deletions(-)
diff --git
a/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseExcelFormatSuite.scala
b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseExcelFormatSuite.scala
index 0d8326ebae..e760c21519 100644
---
a/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseExcelFormatSuite.scala
+++
b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseExcelFormatSuite.scala
@@ -18,9 +18,8 @@ package org.apache.gluten.execution
import org.apache.gluten.backendsapi.clickhouse.{CHConf, RuntimeSettings}
import org.apache.gluten.config.GlutenConfig
-import org.apache.gluten.exception.GlutenException
-import org.apache.spark.{SparkConf, SparkException}
+import org.apache.spark.SparkConf
import org.apache.spark.sql.{functions, DataFrame, Row}
import org.apache.spark.sql.execution.LocalTableScanExec
import org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanHelper
@@ -1487,7 +1486,7 @@ class GlutenClickHouseExcelFormatSuite
// TODO: pass spark configuration to FileFormatWriter in Spark 3.3 and 3.2
testWithSpecifiedSparkVersion(
- "write failed if set wrong snappy compression codec level",
+ "write succeed even if set wrong snappy compression codec level",
Some("3.5")) {
// TODO: remove duplicated test codes
val tablePath = s"$HDFS_URL_ENDPOINT/$SPARK_DIR_NAME/failed_test/"
@@ -1513,22 +1512,7 @@ class GlutenClickHouseExcelFormatSuite
(GlutenConfig.NATIVE_WRITER_ENABLED.key, "true"),
(RuntimeSettings.OUTPUT_FORMAT_COMPRESSION_LEVEL.key, "3")
) {
- val sparkError = intercept[SparkException] {
- testFileFormatBase(tablePath, format, sql, df => {})
- }
-
- // throw at org.apache.spark.sql.execution.CHColumnarWriteFilesRDD
- val causeOuter = sparkError.getCause
- assert(causeOuter.isInstanceOf[SparkException])
- assert(causeOuter.getMessage.contains("Task failed while writing rows to
output path: hdfs"))
-
- // throw at the writing file
- val causeInner = causeOuter.getCause
- assert(causeInner.isInstanceOf[GlutenException])
- assert(
- causeInner.getMessage.contains(
- "Invalid: Codec 'snappy' doesn't support setting a compression
level"))
+ testFileFormatBase(tablePath, format, sql, df => {})
}
-
}
}
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index 1e3aebc271..c7b830751d 100644
--- a/cpp-ch/clickhouse.version
+++ b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20250121
-CH_COMMIT=e5ecd10bf24
+CH_BRANCH=rebase_ch/20250124
+CH_COMMIT=6d716e92afe
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
