You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gluten.apache.org by ch...@apache.org on 2024/12/13 08:15:23 UTC
(incubator-gluten) branch main updated: [GLUTEN-1632][CH]Daily Update Clickhouse Version (20241213) (#8224)
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 96170bf0b2 [GLUTEN-1632][CH]Daily Update Clickhouse Version (20241213) (#8224)
96170bf0b2 is described below
commit 96170bf0b247af539983c42b61e41d8ea344a8d4
Author: Kyligence Git <we...@kyligence.io>
AuthorDate: Fri Dec 13 02:15:19 2024 -0600
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20241213) (#8224)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20241213)
* Fix build due to https://github.com/ClickHouse/ClickHouse/pull/71095
---------
Co-authored-by: kyligence-git <gl...@kyligence.io>
Co-authored-by: Chang Chen <ba...@gmail.com>
---
cpp-ch/clickhouse.version | 4 ++--
cpp-ch/local-engine/Storages/MergeTree/SparkMergeTreeMeta.cpp | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index bee7ea2b95..25365de439 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
diff --git a/cpp-ch/local-engine/Storages/MergeTree/SparkMergeTreeMeta.cpp b/cpp-ch/local-engine/Storages/MergeTree/SparkMergeTreeMeta.cpp
index 199bd45508..fae8f3ecef 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<ASTExpressionList>();
- 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<ExpressionActions>(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;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org