From 9c9fdff79de27a6ccbd04b1a8f669a1030edc65a Mon Sep 17 00:00:00 2001 From: kyligence-git Date: Thu, 12 Dec 2024 23:03:01 +0000 Subject: [PATCH 1/2] [GLUTEN-1632][CH]Daily Update Clickhouse Version (20241213) --- 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 bee7ea2b9592..25365de439cc 100644 --- a/cpp-ch/clickhouse.version +++ b/cpp-ch/clickhouse.version @@ -1,3 +1,3 @@ CH_ORG=Kyligence -CH_BRANCH=rebase_ch/20241212 -CH_COMMIT=4ee47b57d8a +CH_BRANCH=rebase_ch/20241213 +CH_COMMIT=8539932ca13 From 4fc4a2166aa2d2b83bcdc81b39b7d67c323bcdf6 Mon Sep 17 00:00:00 2001 From: Chang Chen Date: Fri, 13 Dec 2024 09:16:40 +0800 Subject: [PATCH 2/2] Fix build due to https://github.com/ClickHouse/ClickHouse/pull/71095 --- .../local-engine/Storages/MergeTree/SparkMergeTreeMeta.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cpp-ch/local-engine/Storages/MergeTree/SparkMergeTreeMeta.cpp b/cpp-ch/local-engine/Storages/MergeTree/SparkMergeTreeMeta.cpp index 199bd455085d..fae8f3ecef9e 100644 --- a/cpp-ch/local-engine/Storages/MergeTree/SparkMergeTreeMeta.cpp +++ b/cpp-ch/local-engine/Storages/MergeTree/SparkMergeTreeMeta.cpp @@ -115,14 +115,14 @@ doBuildMetadata(const DB::NamesAndTypesList & columns, const ContextPtr & contex setSecondaryIndex(columns, context, table, metadata); metadata->partition_key.expression_list_ast = std::make_shared(); - metadata->sorting_key = KeyDescription::parse(table.order_by_key, metadata->getColumns(), context); + metadata->sorting_key = KeyDescription::parse(table.order_by_key, metadata->getColumns(), context, true); if (table.primary_key.empty()) if (table.order_by_key != MergeTreeTable::TUPLE) - metadata->primary_key = KeyDescription::parse(table.order_by_key, metadata->getColumns(), context); + metadata->primary_key = KeyDescription::parse(table.order_by_key, metadata->getColumns(), context, true); else metadata->primary_key.expression = std::make_shared(ActionsDAG{}); else - metadata->primary_key = KeyDescription::parse(table.primary_key, metadata->getColumns(), context); + metadata->primary_key = KeyDescription::parse(table.primary_key, metadata->getColumns(), context, true); return metadata; }