Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GLUTEN-1632][CH]Daily Update Clickhouse Version (20240606) #5999

Merged
merged 3 commits into from
Jun 6, 2024
Merged

[GLUTEN-1632][CH]Daily Update Clickhouse Version (20240606) #5999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35dd1a2
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20240606)
Jun 6, 2024
8c6433e
1. Fix UT due to https://github.com/ClickHouse/ClickHouse/pull/63723
baibaichen Jun 6, 2024
2154812
Reopen UT
baibaichen Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions ...khouse/src/test/scala/org/apache/spark/sql/gluten/compatibility/GlutenFunctionSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ class GlutenFunctionSuite
| , left(`101`, 0)
| , left(`101`, -1) -- error
| from parquet.`$testPath/left`
|""".stripMargin,
ignore = true
|""".stripMargin
),
TestCase(
"trim",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -88,8 +85,7 @@ class GlutenFunctionSuite
| , date_format(`4`, 'm')
| , date_format(`4`, 's')
| from parquet.`$testPath/date_format/timestamp`
|""".stripMargin,
ignore = true
|""".stripMargin
)
)

Expand Down
4 changes: 2 additions & 2 deletions cpp-ch/clickhouse.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
CH_BRANCH=rebase_ch/20240527
CH_COMMIT=1388dcb5b0bbb630af259280f4287e3342ca6237
CH_BRANCH=rebase_ch/20240606
CH_COMMIT=fed1c01e169
14 changes: 10 additions & 4 deletions cpp-ch/local-engine/tests/gtest_ch_functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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")};
Expand Down Expand Up @@ -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")};
Expand Down
4 changes: 3 additions & 1 deletion cpp-ch/local-engine/tests/gtest_parquet_columnindex.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}


Expand Down
Loading