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

Jump to bottom

Add smj support #97

Merged
merged 2 commits into from
Dec 14, 2022
Merged

Add smj support #97

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd4d488
add smj support
JkSelf Dec 14, 2022
598f99d
resolve comments
JkSelf Dec 14, 2022
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
36 changes: 26 additions & 10 deletions velox/substrait/SubstraitToVeloxPlan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,16 +276,32 @@ core::PlanNodePtr SubstraitVeloxPlanConverter::toVeloxPlan(
exprConverter_->toVeloxExpr(sJoin.post_join_filter(), inputRowType);
}

// Create join node
return std::make_shared<core::HashJoinNode>(
nextPlanNodeId(),
joinType,
leftKeys,
rightKeys,
filter,
leftNode,
rightNode,
getJoinOutputType(leftNode, rightNode, joinType));
if (sJoin.has_advanced_extension() &&
configSetInOptimization(
sJoin.advanced_extension(), "isSMJ=")) {
// Create MergeJoinNode node
return std::make_shared<core::MergeJoinNode>(
nextPlanNodeId(),
joinType,
leftKeys,
rightKeys,
filter,
leftNode,
rightNode,
getJoinOutputType(leftNode, rightNode, joinType));

} else {
// Create HashJoinNode node
return std::make_shared<core::HashJoinNode>(
nextPlanNodeId(),
joinType,
leftKeys,
rightKeys,
filter,
leftNode,
rightNode,
getJoinOutputType(leftNode, rightNode, joinType));
}
}

core::PlanNodePtr SubstraitVeloxPlanConverter::toVeloxPlan(
Expand Down
35 changes: 35 additions & 0 deletions velox/substrait/SubstraitToVeloxPlanValidator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,30 @@
#include "TypeUtils.h"
#include "velox/expression/SignatureBinder.h"

#include <google/protobuf/wrappers.pb.h>

namespace facebook::velox::substrait {

/// @brief Return whether a config is set as true in AdvancedExtension
/// optimization.
/// @param extension Substrait advanced extension.
/// @param config the key string of a config.
/// @return Whether the config is set as true.
bool configSetInOptimization(
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about moving this function into SubstraitParser so we can reuse here and there?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved to SubstraitParser

const ::substrait::extensions::AdvancedExtension& extension,
const std::string& config) {
if (extension.has_optimization()) {
google::protobuf::StringValue msg;
extension.optimization().UnpackTo(&msg);
std::size_t pos = msg.value().find(config);
if ((pos != std::string::npos) &&
(msg.value().substr(pos + config.size(), 1) == "1")) {
return true;
}
}
return false;
}

bool SubstraitToVeloxPlanValidator::validateInputTypes(
const ::substrait::extensions::AdvancedExtension& extension,
std::vector<TypePtr>& types) {
Expand Down Expand Up @@ -429,6 +451,19 @@ bool SubstraitToVeloxPlanValidator::validate(
return false;
}

if (sJoin.has_advanced_extension() &&
configSetInOptimization(
sJoin.advanced_extension(), "isSMJ=")) {
switch (sJoin.type()) {
case ::substrait::JoinRel_JoinType_JOIN_TYPE_INNER:
case ::substrait::JoinRel_JoinType_JOIN_TYPE_LEFT:
break;
default:
std::cout << "Sort merge join only support inner and left join"
<< std::endl;
return false;
}
}
switch (sJoin.type()) {
case ::substrait::JoinRel_JoinType_JOIN_TYPE_INNER:
case ::substrait::JoinRel_JoinType_JOIN_TYPE_OUTER:
Expand Down