You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gluten.apache.org by "rui-mo (via GitHub)" <gi...@apache.org> on 2025/11/27 13:33:10 UTC
[PR] [GLUTEN-8782][VL] Add correct suffix to the name of merge_extract companion function [incubator-gluten]
rui-mo opened a new pull request, #11210:
URL: https://github.com/apache/incubator-gluten/pull/11210
<!--
Thank you for submitting a pull request! Here are some tips:
1. For first-time contributors, please read our contributing guide:
https://github.com/apache/incubator-gluten/blob/main/CONTRIBUTING.md
2. If necessary, create a GitHub issue for discussion beforehand to avoid duplicate work.
3. If the PR is specific to a single backend, include [VL] or [CH] in the PR title to indicate the
Velox or ClickHouse backend, respectively.
4. If the PR is not ready for review, please mark it as a draft.
-->
## What changes are proposed in this pull request?
Add correct suffix to the name of merge_extract companion function, so we no longer need the change made to Velox https://github.com/IBM/velox/commit/b8da5d0d33fbf177e79fe5df9e7e43809d562a21.
<!--
Provide a clear and concise description of the changes introduced in this PR.
Ensure the PR description aligns with the code changes, especially after updates.
If applicable, include "Fixes #<GitHub_Issue_ID>" to automatically close the corresponding issue
when the PR is merged.
-->
## How was this patch tested?
<!--
Describe how the changes were tested, if applicable.
Include new tests to validate the functionality, if necessary.
For UI-related changes, attach screenshots to demonstrate the updates.
-->
under test
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org
Re: [PR] [GLUTEN-8782][VL] Add correct suffix to the name of merge_extract companion function [incubator-gluten]
Posted by "zhouyuan (via GitHub)" <gi...@apache.org>.
zhouyuan merged PR #11210:
URL: https://github.com/apache/incubator-gluten/pull/11210
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org
Re: [PR] [GLUTEN-8782][VL] Add correct suffix to the name of merge_extract companion function [incubator-gluten]
Posted by "rui-mo (via GitHub)" <gi...@apache.org>.
rui-mo commented on code in PR #11210:
URL: https://github.com/apache/incubator-gluten/pull/11210#discussion_r2571091407
##########
cpp/velox/substrait/SubstraitToVeloxPlan.cc:
##########
@@ -231,15 +267,29 @@ core::AggregationNode::Step SubstraitToVeloxPlanConverter::toAggregationFunction
std::string SubstraitToVeloxPlanConverter::toAggregationFunctionName(
const std::string& baseName,
- const core::AggregationNode::Step& step) {
+ const core::AggregationNode::Step& step,
+ const TypePtr& resultType) {
std::string suffix;
switch (step) {
case core::AggregationNode::Step::kPartial:
suffix = "_partial";
break;
- case core::AggregationNode::Step::kFinal:
- suffix = "_merge_extract";
- break;
+ case core::AggregationNode::Step::kFinal: {
+ auto functionName = baseName + "_merge_extract";
+ auto signatures = exec::getAggregateFunctionSignatures(functionName);
+ if (signatures.has_value() && signatures.value().size() > 0) {
+ // The merge_extract function is registered without suffix.
Review Comment:
This comment is true only when the condition is met, so I assume keeping it here is more appropriate. Thanks.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org
Re: [PR] [GLUTEN-8782][VL] Add correct suffix to the name of merge_extract companion function [incubator-gluten]
Posted by "xinghuayu007 (via GitHub)" <gi...@apache.org>.
xinghuayu007 commented on code in PR #11210:
URL: https://github.com/apache/incubator-gluten/pull/11210#discussion_r2570299322
##########
cpp/velox/substrait/SubstraitToVeloxPlan.cc:
##########
@@ -231,15 +267,29 @@ core::AggregationNode::Step SubstraitToVeloxPlanConverter::toAggregationFunction
std::string SubstraitToVeloxPlanConverter::toAggregationFunctionName(
const std::string& baseName,
- const core::AggregationNode::Step& step) {
+ const core::AggregationNode::Step& step,
+ const TypePtr& resultType) {
std::string suffix;
switch (step) {
case core::AggregationNode::Step::kPartial:
suffix = "_partial";
break;
- case core::AggregationNode::Step::kFinal:
- suffix = "_merge_extract";
- break;
+ case core::AggregationNode::Step::kFinal: {
+ auto functionName = baseName + "_merge_extract";
+ auto signatures = exec::getAggregateFunctionSignatures(functionName);
+ if (signatures.has_value() && signatures.value().size() > 0) {
+ // The merge_extract function is registered without suffix.
Review Comment:
nit: Put the comment on line 280.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org
Re: [PR] [GLUTEN-8782][VL] Add correct suffix to the name of merge_extract companion function [incubator-gluten]
Posted by "xinghuayu007 (via GitHub)" <gi...@apache.org>.
xinghuayu007 commented on PR #11210:
URL: https://github.com/apache/incubator-gluten/pull/11210#issuecomment-3587716501
+1
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org
Re: [PR] [GLUTEN-8782][VL] Add correct suffix to the name of merge_extract companion function [incubator-gluten]
Posted by "zhouyuan (via GitHub)" <gi...@apache.org>.
zhouyuan commented on code in PR #11210:
URL: https://github.com/apache/incubator-gluten/pull/11210#discussion_r2571868780
##########
ep/build-velox/src/get-velox.sh:
##########
@@ -18,8 +18,8 @@ set -exu
CURRENT_DIR=$(cd "$(dirname "$BASH_SOURCE")"; pwd)
VELOX_REPO=https://github.com/IBM/velox.git
-VELOX_BRANCH=dft-2025_11_26
-VELOX_ENHANCED_BRANCH=ibm-2025_11_26
+VELOX_BRANCH=dft-2025_11_26_fix
+VELOX_ENHANCED_BRANCH=ibm-2025_11_26_fix
Review Comment:
Cc: @FelixYBW
removed one commit from original OAP patches
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org