From 2d3275d31e3e78f291cb005e7bafae5b58406362 Mon Sep 17 00:00:00 2001 From: kyligence-git Date: Mon, 20 Jan 2025 23:08:39 +0000 Subject: [PATCH 1/5] [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250121) --- 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 dfeb3287e387..1e3aebc27161 100644 --- a/cpp-ch/clickhouse.version +++ b/cpp-ch/clickhouse.version @@ -1,3 +1,3 @@ CH_ORG=Kyligence -CH_BRANCH=rebase_ch/20250116 -CH_COMMIT=a260339b40c +CH_BRANCH=rebase_ch/20250121 +CH_COMMIT=e5ecd10bf24 From a5f7babeaf9105deddfcdc8a4914aca0c11d7ee6 Mon Sep 17 00:00:00 2001 From: Chang Chen Date: Tue, 21 Jan 2025 10:34:10 +0800 Subject: [PATCH 2/5] Fix build due to https://github.com/ClickHouse/ClickHouse/pull/74085 --- cpp-ch/local-engine/Parser/ExpressionParser.cpp | 2 +- cpp-ch/local-engine/Parser/RelParsers/MergeTreeRelParser.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp-ch/local-engine/Parser/ExpressionParser.cpp b/cpp-ch/local-engine/Parser/ExpressionParser.cpp index a50590aaf778..238e36e28840 100644 --- a/cpp-ch/local-engine/Parser/ExpressionParser.cpp +++ b/cpp-ch/local-engine/Parser/ExpressionParser.cpp @@ -479,7 +479,7 @@ ExpressionParser::NodeRawConstPtr ExpressionParser::parseExpression(ActionsDAG & PreparedSets prepared_sets; FutureSet::Hash emptyKey; - auto future_set = prepared_sets.addFromTuple(emptyKey, {elem_block}, context->queryContext()->getSettingsRef()); + auto future_set = prepared_sets.addFromTuple(emptyKey, nullptr, {elem_block}, context->queryContext()->getSettingsRef()); auto arg = DB::ColumnSet::create(1, std::move(future_set)); args.emplace_back(&actions_dag.addColumn(DB::ColumnWithTypeAndName(std::move(arg), std::make_shared(), name))); diff --git a/cpp-ch/local-engine/Parser/RelParsers/MergeTreeRelParser.cpp b/cpp-ch/local-engine/Parser/RelParsers/MergeTreeRelParser.cpp index 1c7a043449ae..c355c5d81304 100644 --- a/cpp-ch/local-engine/Parser/RelParsers/MergeTreeRelParser.cpp +++ b/cpp-ch/local-engine/Parser/RelParsers/MergeTreeRelParser.cpp @@ -154,7 +154,7 @@ DB::QueryPlanPtr MergeTreeRelParser::parseReadRel( context->getSettingsRef()[Setting::max_block_size], 1); - auto * source_step_with_filter = static_cast(read_step.get()); + auto * source_step_with_filter = static_cast(read_step.get()); if (const auto & storage_prewhere_info = query_info->prewhere_info) { source_step_with_filter->addFilter(storage_prewhere_info->prewhere_actions.clone(), storage_prewhere_info->prewhere_column_name); From 12d079bd0c621d54af70bb95557d81b299aa9c16 Mon Sep 17 00:00:00 2001 From: Chang Chen Date: Tue, 21 Jan 2025 10:36:44 +0800 Subject: [PATCH 3/5] Fix build due to https://github.com/ClickHouse/ClickHouse/pull/74727 --- cpp-ch/local-engine/Functions/SparkFunctionTrim.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cpp-ch/local-engine/Functions/SparkFunctionTrim.cpp b/cpp-ch/local-engine/Functions/SparkFunctionTrim.cpp index fbbd944c0e6d..ec247dd12dca 100644 --- a/cpp-ch/local-engine/Functions/SparkFunctionTrim.cpp +++ b/cpp-ch/local-engine/Functions/SparkFunctionTrim.cpp @@ -14,6 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include +#include +#include #include #include #include @@ -21,9 +24,6 @@ #include #include -#include -#include - using namespace DB; namespace DB From 420b187b6dfd0e1188ee4fc35f241c4a53d16e59 Mon Sep 17 00:00:00 2001 From: Chang Chen Date: Tue, 21 Jan 2025 10:52:05 +0800 Subject: [PATCH 4/5] Fix gtest build due to https://github.com/ClickHouse/ClickHouse/pull/74085 --- cpp-ch/local-engine/tests/gtest_ch_functions.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cpp-ch/local-engine/tests/gtest_ch_functions.cpp b/cpp-ch/local-engine/tests/gtest_ch_functions.cpp index fc094515a64a..a442c4039fbd 100644 --- a/cpp-ch/local-engine/tests/gtest_ch_functions.cpp +++ b/cpp-ch/local-engine/tests/gtest_ch_functions.cpp @@ -80,7 +80,7 @@ TEST(TestFunction, In) set->insertFromBlock(col1_set_block.getColumnsWithTypeAndName()); set->finishInsert(); PreparedSets::Hash empty; - auto future_set = std::make_shared(empty, std::move(set), std::nullopt); + auto future_set = std::make_shared(empty, nullptr, std::move(set), std::nullopt); //TODO: WHY? after https://github.com/ClickHouse/ClickHouse/pull/63723 we need pass 4 instead of 1 auto arg = ColumnSet::create(4, future_set); @@ -124,7 +124,7 @@ TEST(TestFunction, NotIn1) set->insertFromBlock(col1_set_block.getColumnsWithTypeAndName()); set->finishInsert(); PreparedSets::Hash empty; - auto future_set = std::make_shared(empty, std::move(set), std::nullopt); + auto future_set = std::make_shared(empty, nullptr, std::move(set), std::nullopt); //TODO: WHY? after https://github.com/ClickHouse/ClickHouse/pull/63723 we need pass 4 instead of 1 auto arg = ColumnSet::create(4, future_set); @@ -168,7 +168,7 @@ TEST(TestFunction, NotIn2) set->insertFromBlock(col1_set_block.getColumnsWithTypeAndName()); set->finishInsert(); PreparedSets::Hash empty; - auto future_set = std::make_shared(empty, std::move(set), std::nullopt); + auto future_set = std::make_shared(empty, nullptr, std::move(set), std::nullopt); //TODO: WHY? after https://github.com/ClickHouse/ClickHouse/pull/63723 we need pass 4 instead of 1 auto arg = ColumnSet::create(4, future_set); From 55ce1beacf9f9f2b658c977838916d54177d09e4 Mon Sep 17 00:00:00 2001 From: Chang Chen Date: Tue, 21 Jan 2025 10:53:54 +0800 Subject: [PATCH 5/5] Fix Gtest failed due to https://github.com/apache/incubator-gluten/pull/8321 --- cpp-ch/local-engine/tests/gtest_local_engine.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cpp-ch/local-engine/tests/gtest_local_engine.cpp b/cpp-ch/local-engine/tests/gtest_local_engine.cpp index 97d80942081b..585713788da5 100644 --- a/cpp-ch/local-engine/tests/gtest_local_engine.cpp +++ b/cpp-ch/local-engine/tests/gtest_local_engine.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -100,9 +99,6 @@ int main(int argc, char ** argv) [&](const SparkConfigs::ConfigMap & spark_conf_map) { BackendInitializerUtil::initBackend(spark_conf_map); }, true); - auto & factory = FormatFactory::instance(); - DB::registerOutputFormatParquet(factory); - SCOPE_EXIT({ BackendFinalizerUtil::finalizeGlobally(); }); ::testing::InitGoogleTest(&argc, argv);