From 83d8de60d3199e50b699ff4066593459cced2ca1 Mon Sep 17 00:00:00 2001 From: kyligence-git Date: Mon, 6 Nov 2023 23:02:50 +0000 Subject: [PATCH 1/2] [GLUTEN-1632][CH]Daily Update Clickhouse Version (20231107) --- cpp-ch/clickhouse.version | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version index 1401af417426..2329076dc0b6 100644 --- 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/20231107 +CH_COMMIT=e7c5d95b670 From c3c7b1c5cf38d1f12e03fdbdaf6f3ba8128dacb9 Mon Sep 17 00:00:00 2001 From: Chang Chen Date: Tue, 7 Nov 2023 18:32:04 +0800 Subject: [PATCH 2/2] Reopen ignore [uts](https://github.com/oap-project/gluten/pull/3530/commits) due to [fix](https://github.com/ClickHouse/ClickHouse/pull/56286) --- .../execution/GlutenClickHouseTPCHParquetSuite.scala | 2 +- .../glutenproject/utils/clickhouse/ClickHouseTestSettings.scala | 2 -- .../glutenproject/utils/clickhouse/ClickHouseTestSettings.scala | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHParquetSuite.scala b/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHParquetSuite.scala index 2602ec452f42..b8cfc8141443 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHParquetSuite.scala +++ b/backends-clickhouse/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/gluten-ut/spark32/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseTestSettings.scala b/gluten-ut/spark32/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseTestSettings.scala index 52f475af8b97..3efe82eae11f 100644 --- a/gluten-ut/spark32/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseTestSettings.scala +++ b/gluten-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/gluten-ut/spark33/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseTestSettings.scala b/gluten-ut/spark33/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseTestSettings.scala index a2a747c4a183..38678b2ad0d5 100644 --- a/gluten-ut/spark33/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseTestSettings.scala +++ b/gluten-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")