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 c23d28db7 [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240606)
(#5999)
c23d28db7 is described below
commit c23d28db779622fb2186002cc89e06fa5e24e5f4
Author: Kyligence Git <[email protected]>
AuthorDate: Thu Jun 6 02:41:03 2024 -0500
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20240606) (#5999)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240606)
1. Fix UT due to https://github.com/ClickHouse/ClickHouse/pull/63723
2. Fix UT in Debug mode
3. Reopen UT
---------
Co-authored-by: kyligence-git <[email protected]>
Co-authored-by: Chang Chen <[email protected]>
---
.../sql/gluten/compatibility/GlutenFunctionSuite.scala | 12 ++++--------
cpp-ch/clickhouse.version | 4 ++--
cpp-ch/local-engine/tests/gtest_ch_functions.cpp | 14 ++++++++++----
cpp-ch/local-engine/tests/gtest_parquet_columnindex.cpp | 4 +++-
4 files changed, 19 insertions(+), 15 deletions(-)
diff --git
a/backends-clickhouse/src/test/scala/org/apache/spark/sql/gluten/compatibility/GlutenFunctionSuite.scala
b/backends-clickhouse/src/test/scala/org/apache/spark/sql/gluten/compatibility/GlutenFunctionSuite.scala
index d0e13b496..aaee82412 100644
---
a/backends-clickhouse/src/test/scala/org/apache/spark/sql/gluten/compatibility/GlutenFunctionSuite.scala
+++
b/backends-clickhouse/src/test/scala/org/apache/spark/sql/gluten/compatibility/GlutenFunctionSuite.scala
@@ -46,8 +46,7 @@ class GlutenFunctionSuite
| , left(`101`, 0)
| , left(`101`, -1) -- error
| from parquet.`$testPath/left`
- |""".stripMargin,
- ignore = true
+ |""".stripMargin
),
TestCase(
"trim",
@@ -56,8 +55,7 @@ class GlutenFunctionSuite
| , trim(LEADING `100` from `99`) -- error
| , trim(TRAILING `100` from `99`) -- error
| from parquet.`$testPath/left`
- |""".stripMargin,
- ignore = true
+ |""".stripMargin
),
TestCase(
"date_format 1",
@@ -72,8 +70,7 @@ class GlutenFunctionSuite
| , date_format(`0`, 'm')
| , date_format(`0`, 's')
| from parquet.`$testPath/date_format/date`
- |""".stripMargin,
- ignore = true
+ |""".stripMargin
),
TestCase(
"date_format 2",
@@ -88,8 +85,7 @@ class GlutenFunctionSuite
| , date_format(`4`, 'm')
| , date_format(`4`, 's')
| from parquet.`$testPath/date_format/timestamp`
- |""".stripMargin,
- ignore = true
+ |""".stripMargin
)
)
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index c1baa6037..d98ce9f88 100644
--- a/cpp-ch/clickhouse.version
+++ b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20240527
-CH_COMMIT=1388dcb5b0bbb630af259280f4287e3342ca6237
+CH_BRANCH=rebase_ch/20240606
+CH_COMMIT=fed1c01e169
diff --git a/cpp-ch/local-engine/tests/gtest_ch_functions.cpp
b/cpp-ch/local-engine/tests/gtest_ch_functions.cpp
index 943826287..613beb9b8 100644
--- a/cpp-ch/local-engine/tests/gtest_ch_functions.cpp
+++ b/cpp-ch/local-engine/tests/gtest_ch_functions.cpp
@@ -79,10 +79,12 @@ TEST(TestFunction, In)
set->insertFromBlock(col1_set_block.getColumnsWithTypeAndName());
set->finishInsert();
auto future_set = std::make_shared<FutureSetFromStorage>(std::move(set));
- auto arg = ColumnSet::create(1, future_set);
+ //TODO: WHY? after https://github.com/ClickHouse/ClickHouse/pull/63723 we
need pass 4 instead of 1
+ auto arg = ColumnSet::create(4, future_set);
ColumnsWithTypeAndName columns
- = {ColumnWithTypeAndName(std::move(column1), type0, "string0"),
ColumnWithTypeAndName(std::move(arg), type_set, "__set")};
+ = {ColumnWithTypeAndName(std::move(column1), type0, "string0"),
+ ColumnWithTypeAndName(std::move(arg), type_set, "__set")};
Block block(columns);
std::cerr << "input:\n";
debug::headBlock(block);
@@ -121,7 +123,9 @@ TEST(TestFunction, NotIn1)
set->insertFromBlock(col1_set_block.getColumnsWithTypeAndName());
set->finishInsert();
auto future_set = std::make_shared<FutureSetFromStorage>(std::move(set));
- auto arg = ColumnSet::create(1,future_set);
+
+ //TODO: WHY? after https://github.com/ClickHouse/ClickHouse/pull/63723 we
need pass 4 instead of 1
+ auto arg = ColumnSet::create(4,future_set);
ColumnsWithTypeAndName columns
= {ColumnWithTypeAndName(std::move(column1), type0, "string0"),
ColumnWithTypeAndName(std::move(arg), type_set, "__set")};
@@ -162,7 +166,9 @@ TEST(TestFunction, NotIn2)
set->insertFromBlock(col1_set_block.getColumnsWithTypeAndName());
set->finishInsert();
auto future_set = std::make_shared<FutureSetFromStorage>(std::move(set));
- auto arg = ColumnSet::create(1,future_set);
+
+ //TODO: WHY? after https://github.com/ClickHouse/ClickHouse/pull/63723 we
need pass 4 instead of 1
+ auto arg = ColumnSet::create(4,future_set);
ColumnsWithTypeAndName columns
= {ColumnWithTypeAndName(std::move(column1), type0, "string0"),
ColumnWithTypeAndName(std::move(arg), type_set, "__set")};
diff --git a/cpp-ch/local-engine/tests/gtest_parquet_columnindex.cpp
b/cpp-ch/local-engine/tests/gtest_parquet_columnindex.cpp
index ea3bd41e4..532244029 100644
--- a/cpp-ch/local-engine/tests/gtest_parquet_columnindex.cpp
+++ b/cpp-ch/local-engine/tests/gtest_parquet_columnindex.cpp
@@ -604,13 +604,15 @@ TEST(ColumnIndex, DecimalField)
ASSERT_EQ(actual, expected);
- /// Eexception test
+ /// Eexception test, only in relase release node
+#ifdef NDEBUG
Field unsupport = DecimalField<Decimal256>(Int256(300000000), 4);
EXPECT_THROW(to_parquet.as(unsupport, desc), DB::Exception);
const parquet::ColumnDescriptor error
= PNB::optional(parquet::Type::FIXED_LEN_BYTE_ARRAY).asDecimal(38,
4).with_length(18).descriptor("column1");
EXPECT_THROW(to_parquet.as(value, error), DB::Exception);
+#endif
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
