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 7a772e8e9c [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250308)
(#8936)
7a772e8e9c is described below
commit 7a772e8e9c41ea9f3009bf568347af194aa5dc7e
Author: Kyligence Git <[email protected]>
AuthorDate: Sat Mar 8 02:17:10 2025 -0600
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20250308) (#8936)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250308)
* Fix Build due to https://github.com/ClickHouse/ClickHouse/pull/77269
---------
Co-authored-by: kyligence-git <[email protected]>
Co-authored-by: Chang Chen <[email protected]>
---
cpp-ch/clickhouse.version | 4 ++--
cpp-ch/local-engine/Parser/RelParsers/GroupLimitRelParser.cpp | 2 +-
cpp-ch/local-engine/Parser/RelParsers/SortRelParser.cpp | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index a1c1af0fa9..02b769a0e6 100644
--- a/cpp-ch/clickhouse.version
+++ b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20250307
-CH_COMMIT=d1baac63fcb
+CH_BRANCH=rebase_ch/20250308
+CH_COMMIT=66d2ceec2aa
diff --git a/cpp-ch/local-engine/Parser/RelParsers/GroupLimitRelParser.cpp
b/cpp-ch/local-engine/Parser/RelParsers/GroupLimitRelParser.cpp
index b43c8064b3..6359959ebc 100644
--- a/cpp-ch/local-engine/Parser/RelParsers/GroupLimitRelParser.cpp
+++ b/cpp-ch/local-engine/Parser/RelParsers/GroupLimitRelParser.cpp
@@ -414,7 +414,7 @@ void
AggregateGroupLimitRelParser::addSortStep(DB::QueryPlan & plan)
auto sort_descr = parseSortFields(header, win_rel_def->sorts());
full_sort_descr.insert(full_sort_descr.end(), sort_descr.begin(),
sort_descr.end());
- DB::SortingStep::Settings settings(*getContext());
+ DB::SortingStep::Settings settings(getContext()->getSettingsRef());
auto config = MemoryConfig::loadFromContext(getContext());
double spill_mem_ratio = config.spill_mem_ratio;
settings.worth_external_sort = [spill_mem_ratio]() -> bool { return
currentThreadGroupMemoryUsageRatio() > spill_mem_ratio; };
diff --git a/cpp-ch/local-engine/Parser/RelParsers/SortRelParser.cpp
b/cpp-ch/local-engine/Parser/RelParsers/SortRelParser.cpp
index 5b26ee06ac..a86f6d38e9 100644
--- a/cpp-ch/local-engine/Parser/RelParsers/SortRelParser.cpp
+++ b/cpp-ch/local-engine/Parser/RelParsers/SortRelParser.cpp
@@ -43,7 +43,7 @@ SortRelParser::parse(DB::QueryPlanPtr query_plan, const
substrait::Rel & rel, st
size_t limit = parseLimit(rel_stack_);
const auto & sort_rel = rel.sort();
auto sort_descr = parseSortFields(query_plan->getCurrentHeader(),
sort_rel.sorts());
- SortingStep::Settings settings(*getContext());
+ SortingStep::Settings settings(getContext()->getSettingsRef());
auto config = MemoryConfig::loadFromContext(getContext());
double spill_mem_ratio = config.spill_mem_ratio;
settings.worth_external_sort = [spill_mem_ratio]() -> bool { return
currentThreadGroupMemoryUsageRatio() > spill_mem_ratio; };
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
