[GLUTEN-1632][CH]Daily Update Clickhouse Version (20241213) (#8224)

* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20241213) * Fix build due to ClickHouse/ClickHouse#71095 --------- Co-authored-by: kyligence-git <[email protected]> Co-authored-by: Chang Chen <[email protected]>
apache · Dec 13, 2024 · 96170bf · 96170bf
1 parent 67b6831
commit 96170bf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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;
 }