Skip to content

[GLUTEN-6887][VL] Daily Update Velox Version (2026_01_19) #11443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marin-ma merged 3 commits into from
Jan 19, 2026
Merged

[GLUTEN-6887][VL] Daily Update Velox Version (2026_01_19) #11443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc0d1ab
[GLUTEN-6887][VL] Daily Update Velox Version (dft-2026_01_19)
Jan 19, 2026
26dc904
fix
marin-ma Jan 19, 2026
85469a0
fix style
marin-ma Jan 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions cpp/velox/substrait/SubstraitToVeloxPlan.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ core::PlanNodePtr SubstraitToVeloxPlanConverter::toVeloxPlan(const ::substrait::

// Get the grouping expressions.
VELOX_CHECK(
aggRel.groupings().size() <= 1, "At most one grouping is supported, but got {}.", aggRel.groupings().size());
aggRel.groupings().size() <= 1, "At most one grouping is supported, but got {}.", aggRel.groupings().size());
if (aggRel.groupings().size() == 1) {
for (const auto& groupingExpr : aggRel.groupings()[0].grouping_expressions()) {
// Velox's groupings are limited to be Field.
Expand Down Expand Up @@ -504,7 +504,6 @@ core::PlanNodePtr SubstraitToVeloxPlanConverter::toVeloxPlan(const ::substrait::
aggregates.emplace_back(core::AggregationNode::Aggregate{aggExpr, rawInputTypes, mask, {}, {}});
}

bool ignoreNullKeys = false;
std::vector<core::FieldAccessTypedExprPtr> preGroupingExprs;
if (aggRel.has_advanced_extension() &&
SubstraitParser::configSetInOptimization(aggRel.advanced_extension(), "isStreaming=")) {
Expand All @@ -526,7 +525,8 @@ core::PlanNodePtr SubstraitToVeloxPlanConverter::toVeloxPlan(const ::substrait::
preGroupingExprs,
aggOutNames,
aggregates,
ignoreNullKeys,
/*ignoreNullKeys=*/false,
/*noGroupsSpanBatches=*/false,
childNode);

if (aggRel.has_common()) {
Expand Down Expand Up @@ -904,10 +904,9 @@ core::PlanNodePtr SubstraitToVeloxPlanConverter::toVeloxPlan(const ::substrait::
(std::dynamic_pointer_cast<const core::ProjectNode>(childNode) != nullptr ||
std::dynamic_pointer_cast<const ValueStreamNode>(childNode) != nullptr)
#ifdef GLUTEN_ENABLE_GPU
|| std::dynamic_pointer_cast<const CudfValueStreamNode>(childNode) != nullptr
|| std::dynamic_pointer_cast<const CudfValueStreamNode>(childNode) != nullptr
#endif
&&
childNode->outputType()->size() > requiredChildOutput.size(),
&& childNode->outputType()->size() > requiredChildOutput.size(),
"injectedProject is true, but the ProjectNode or ValueStreamNode (in case of projection fallback)"
" is missing or does not have the corresponding projection field");

Expand Down Expand Up @@ -1653,9 +1652,13 @@ bool SubstraitToVeloxPlanConverter::checkTypeExtension(const ::substrait::Plan&
}

#ifdef GLUTEN_ENABLE_GPU
template core::PlanNodePtr SubstraitToVeloxPlanConverter::constructValueStreamNode<CudfValueStreamNode>(const ::substrait::ReadRel& sRead, int32_t streamIdx);
template core::PlanNodePtr SubstraitToVeloxPlanConverter::constructValueStreamNode<CudfValueStreamNode>(
const ::substrait::ReadRel& sRead,
int32_t streamIdx);
#endif

template core::PlanNodePtr SubstraitToVeloxPlanConverter::constructValueStreamNode<ValueStreamNode>(const ::substrait::ReadRel& sRead, int32_t streamIdx);
template core::PlanNodePtr SubstraitToVeloxPlanConverter::constructValueStreamNode<ValueStreamNode>(
const ::substrait::ReadRel& sRead,
int32_t streamIdx);

} // namespace gluten
4 changes: 2 additions & 2 deletions ep/build-velox/src/get-velox.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ set -exu

CURRENT_DIR=$(cd "$(dirname "$BASH_SOURCE")"; pwd)
VELOX_REPO=https://github.com/IBM/velox.git
VELOX_BRANCH=dft-2026_01_16
VELOX_ENHANCED_BRANCH=ibm-2026_01_16
VELOX_BRANCH=dft-2026_01_19
VELOX_ENHANCED_BRANCH=ibm-2026_01_19
VELOX_HOME=""
RUN_SETUP_SCRIPT=ON
ENABLE_ENHANCED_FEATURES=OFF
Expand Down