Skip to content
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

[WIP] Verify rebased velox #3606

Closed
wants to merge 3 commits into from
Closed

[WIP] Verify rebased velox #3606

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
5b7fa06
Change velox branch
PHILO-HE Nov 3, 2023
addc587
Port PR 3593
PHILO-HE Nov 3, 2023
24c2a60
Fix compile cpp failure
PHILO-HE Nov 5, 2023
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
11 changes: 5 additions & 6 deletions cpp/velox/substrait/SubstraitParser.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,18 +237,17 @@ std::string SubstraitParser::findVeloxFunction(
std::string SubstraitParser::mapToVeloxFunction(const std::string& substraitFunction, bool isDecimal) {
auto it = substraitVeloxFunctionMap_.find(substraitFunction);
if (isDecimal) {
if (substraitFunction == "round" || substraitFunction == "lt" || substraitFunction == "lte" ||
substraitFunction == "gt" || substraitFunction == "gte") {
return "decimal_" + substraitFunction;
if (substraitFunction == "lt" || substraitFunction == "lte" || substraitFunction == "gt" ||
substraitFunction == "gte" || substraitFunction == "equal") {
return "decimal_" + it->second;
}
if (substraitFunction == "equal") {
return "decimal_eq";
if (substraitFunction == "round") {
return "decimal_round";
}
}
if (it != substraitVeloxFunctionMap_.end()) {
return it->second;
}

// If not finding the mapping from Substrait function name to Velox function
// name, the original Substrait function name will be used.
return substraitFunction;
Expand Down
2 changes: 1 addition & 1 deletion cpp/velox/substrait/SubstraitToVeloxPlan.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1116,7 +1116,7 @@ void SubstraitToVeloxPlanConverter::extractJoinKeys(
if (funcName == "and") {
expressions.push_back(&args[0].value());
expressions.push_back(&args[1].value());
} else if (funcName == "eq" || funcName == "equalto" || funcName == "decimal_eq") {
} else if (funcName == "eq" || funcName == "equalto" || funcName == "decimal_equalto") {
VELOX_CHECK(std::all_of(args.cbegin(), args.cend(), [](const ::substrait::FunctionArgument& arg) {
return arg.value().has_selection();
}));
Expand Down
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 @@ -16,8 +16,8 @@

set -exu

VELOX_REPO=https://github.com/oap-project/velox.git
VELOX_BRANCH=update
VELOX_REPO=https://github.com/PHILO-HE/velox.git
VELOX_BRANCH=update-11-03
VELOX_HOME=""

#Set on run gluten on HDFS
Expand Down
Loading