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

Preserve original join node #2372

Merged
merged 2 commits into from
Mar 1, 2024
Merged

Preserve original join node #2372

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf8b8a4
Preserve original join node
resetius Mar 1, 2024
d65d969
Add missing stats
resetius Mar 1, 2024
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
21 changes: 11 additions & 10 deletions ydb/library/yql/dq/opt/dq_opt_join_cost_based.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,20 +315,20 @@ std::shared_ptr<TJoinOptimizerNodeInternal> PickBestJoin(std::shared_ptr<IBaseOp
/**
* Iterate over all join algorithms and pick the best join that is applicable
*/
std::shared_ptr<TJoinOptimizerNode> PickBestNonReorderabeJoin(std::shared_ptr<IBaseOptimizerNode> left,
std::shared_ptr<IBaseOptimizerNode> right,
const std::set<std::pair<TJoinColumn, TJoinColumn>>& leftJoinConditions,
const TVector<TString>& leftJoinKeys,
const TVector<TString>& rightJoinKeys,
EJoinKind joinKind,
std::shared_ptr<TJoinOptimizerNode> PickBestNonReorderabeJoin(const std::shared_ptr<TJoinOptimizerNode>& node,
IProviderContext& ctx) {

EJoinAlgoType bestJoinAlgo;
bool bestJoinValid = false;
double bestJoinCost;
const auto& left = node->LeftArg;
const auto& right = node->RightArg;
const auto& joinConditions = node->JoinConditions;
const auto& leftJoinKeys = node->LeftJoinKeys;
const auto& rightJoinKeys = node->RightJoinKeys;

for ( auto joinAlgo : AllJoinAlgos ) {
if (ctx.IsJoinApplicable(left, right, leftJoinConditions, leftJoinKeys, rightJoinKeys, joinAlgo)){
if (ctx.IsJoinApplicable(left, right, joinConditions, leftJoinKeys, rightJoinKeys, joinAlgo)){
auto cost = ComputeJoinStats(*right->Stats, *left->Stats, rightJoinKeys, leftJoinKeys, joinAlgo, ctx).Cost;
if (bestJoinValid) {
if (cost < bestJoinCost) {
Expand All @@ -344,7 +344,9 @@ std::shared_ptr<TJoinOptimizerNode> PickBestNonReorderabeJoin(std::shared_ptr<IB
}

Y_ENSURE(bestJoinValid,"No join was chosen!");
return MakeJoin(left, right, leftJoinConditions, leftJoinKeys, rightJoinKeys, joinKind, bestJoinAlgo, true, ctx);
node->Stats = std::make_shared<TOptimizerStatistics>(ComputeJoinStats(*left->Stats, *right->Stats, leftJoinKeys, rightJoinKeys, bestJoinAlgo, ctx));
node->JoinAlgo = bestJoinAlgo;
return node;
}

struct pair_hash {
Expand Down Expand Up @@ -1185,8 +1187,7 @@ void ComputeStatistics(const std::shared_ptr<TJoinOptimizerNode>& join, IProvide
*/
std::shared_ptr<TJoinOptimizerNode> OptimizeSubtree(const std::shared_ptr<TJoinOptimizerNode>& joinTree, ui32 maxDPccpDPTableSize, IProviderContext& ctx) {
if (!joinTree->IsReorderable) {
return PickBestNonReorderabeJoin(joinTree->LeftArg, joinTree->RightArg, joinTree->JoinConditions,
joinTree->LeftJoinKeys, joinTree->RightJoinKeys, joinTree->JoinType, ctx);
return PickBestNonReorderabeJoin(joinTree, ctx);
}

TVector<std::shared_ptr<IBaseOptimizerNode>> rels;
Expand Down
Loading