[GLUTEN-1632][CH]Daily Update Clickhouse Version (20231108) (#3640)

* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20231108) * Reopen ignore [uts](https://github.com/oap-project/gluten/pull/3530/commits) due to [fix](ClickHouse/ClickHouse#56286) --------- Co-authored-by: kyligence-git <[email protected]> Co-authored-by: Chang Chen <[email protected]>
apache · Nov 8, 2023 · 1080543 · 1080543
1 parent 2b9891b
commit 1080543
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/...ickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHParquetSuite.scala b/...ickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHParquetSuite.scala
@@ -1206,7 +1206,7 @@ class GlutenClickHouseTPCHParquetSuite extends GlutenClickHouseTPCHAbstractSuite
     }
   }
 
-  ignore("test 'cast null value' -- due to https://github.com/ClickHouse/ClickHouse/pull/55146") {
+  test("test 'cast null value'") {
     val sql = "select cast(x as double), cast(x as float), cast(x as string), cast(x as binary)," +
       "cast(x as long), cast(x as int), cast(x as short), cast(x as byte), cast(x as boolean)," +
       "cast(x as date), cast(x as timestamp), cast(x as decimal(10, 2)) from " +

diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
 CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20231103
-CH_COMMIT=d3d4e86f42f
+CH_BRANCH=rebase_ch/20231108
+CH_COMMIT=4aefea4773e
diff --git a/...-ut/spark32/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseTestSettings.scala b/...-ut/spark32/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseTestSettings.scala
@@ -574,8 +574,6 @@ class ClickHouseTestSettings extends BackendTestSettings {
     .exclude("SPARK-34727: cast from float II")
     .exclude("SPARK-35720: cast invalid string input to timestamp without time zone")
     .exclude("Cast should output null for invalid strings when ANSI is not enabled.")
-    .exclude("data type casting II")
-    .exclude("SPARK-36286: invalid string cast to timestamp")
   enableSuite[GlutenCastSuiteWithAnsiModeOn]
     .exclude("null cast")
     .exclude("cast string to date")

diff --git a/...-ut/spark33/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseTestSettings.scala b/...-ut/spark33/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseTestSettings.scala
@@ -614,8 +614,6 @@ class ClickHouseTestSettings extends BackendTestSettings {
     .exclude("SPARK-36924: Cast YearMonthIntervalType to IntegralType")
     .exclude("SPARK-36924: Cast IntegralType to YearMonthIntervalType")
     .exclude("Cast should output null for invalid strings when ANSI is not enabled.")
-    .exclude("data type casting II")
-    .exclude("SPARK-36286: invalid string cast to timestamp")
   enableSuite[GlutenCastSuiteWithAnsiModeOn]
     .exclude("null cast")
     .exclude("cast string to date")