Skip to content

Fix optimizer and return back KQP peephole type check. #842

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
Tony-Romanov merged 7 commits into from
Jan 29, 2024
Merged

Fix optimizer and return back KQP peephole type check. #842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
24635f5
Fix optimizer and return back KQP peephole type check.
Tony-Romanov Jan 3, 2024
cb555e9
A little fix.
Tony-Romanov Jan 4, 2024
37f8d9b
Merge branch 'ydb-platform:main' into kqp_peephole_typecheck
Tony-Romanov Jan 10, 2024
85fb2b0
Merge branch 'ydb-platform:main' into kqp_peephole_typecheck
Tony-Romanov Jan 19, 2024
8139335
Merge branch 'ydb-platform:main' into kqp_peephole_typecheck
Tony-Romanov Jan 24, 2024
137559b
Merge branch 'ydb-platform:main' into kqp_peephole_typecheck
Tony-Romanov Jan 27, 2024
8c21193
Canonize test.
Tony-Romanov Jan 28, 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
10 changes: 3 additions & 7 deletions ydb/core/kqp/opt/peephole/kqp_opt_peephole.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,7 @@ TStatus ReplaceNonDetFunctionsWithParams(TExprNode::TPtr& input, TExprContext& c
class TKqpPeepholeTransformer : public TOptimizeTransformerBase {
public:
TKqpPeepholeTransformer(TTypeAnnotationContext& typesCtx)
: TOptimizeTransformerBase(nullptr, NYql::NLog::EComponent::ProviderKqp, {})
, TypesCtx(typesCtx)
: TOptimizeTransformerBase(&typesCtx, NYql::NLog::EComponent::ProviderKqp, {})
{
#define HNDL(name) "KqpPeephole-"#name, Hndl(&TKqpPeepholeTransformer::name)
AddHandler(0, &TDqReplicate::Match, HNDL(RewriteReplicate));
Expand Down Expand Up @@ -134,13 +133,13 @@ class TKqpPeepholeTransformer : public TOptimizeTransformerBase {
}

TMaybeNode<TExprBase> BuildWideReadTable(TExprBase node, TExprContext& ctx) {
TExprBase output = KqpBuildWideReadTable(node, ctx, TypesCtx);
TExprBase output = KqpBuildWideReadTable(node, ctx, *Types);
DumpAppliedRule("BuildWideReadTable", node.Ptr(), output.Ptr(), ctx);
return output;
}

TMaybeNode<TExprBase> RewriteLength(TExprBase node, TExprContext& ctx) {
TExprBase output = DqPeepholeRewriteLength(node, ctx, TypesCtx);
TExprBase output = DqPeepholeRewriteLength(node, ctx, *Types);
DumpAppliedRule("RewriteLength", node.Ptr(), output.Ptr(), ctx);
return output;
}
Expand All @@ -150,9 +149,6 @@ class TKqpPeepholeTransformer : public TOptimizeTransformerBase {
DumpAppliedRule("RewriteKqpWriteConstraint", node.Ptr(), output.Ptr(), ctx);
return output;
}

private:
TTypeAnnotationContext& TypesCtx;
};

struct TKqpPeepholePipelineConfigurator : IPipelineConfigurator {
Expand Down
10 changes: 5 additions & 5 deletions ydb/library/yql/dq/opt/dq_opt_peephole.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,18 +511,18 @@ NNodes::TExprBase DqPeepholeRewriteJoinDict(const NNodes::TExprBase& node, TExpr
rightKeySelector = BuildDictKeySelector(ctx, joinDict.Pos(), rightKeys, keyTypeItems, castKeyRight);
}

auto streamToDict = [&ctx](const TExprBase& input, const TExprNode::TPtr& keySelector) {
const auto streamToDict = [&ctx](const TExprBase& input, const TExprNode::TPtr& keySelector) {
return Build<TCoSqueezeToDict>(ctx, input.Pos())
.Stream(input)
.Stream(TCoIterator::Match(input.Raw()) ? TExprBase(ctx.RenameNode(input.Ref(), TCoToFlow::CallableName())) : input)
.KeySelector(keySelector)
.PayloadSelector()
.Args({"item"})
.Body("item")
.Build()
.Settings()
.Add<TCoAtom>().Build("Hashed")
.Add<TCoAtom>().Build("Many")
.Add<TCoAtom>().Build("Compact")
.Add<TCoAtom>().Build("Hashed", TNodeFlags::Default)
.Add<TCoAtom>().Build("Many", TNodeFlags::Default)
.Add<TCoAtom>().Build("Compact", TNodeFlags::Default)
.Build()
.Done();
};
Expand Down
9 changes: 2 additions & 7 deletions .../canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_14.plan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,23 +70,18 @@
"PlanNodeType": "Connection",
"Plans": [
{
"Node Type": "FullJoin (JoinDict)-ConstantExpr",
"Node Type": "FullJoin (JoinDict)",
"Operators": [
{
"Inputs": [
{
"ExternalPlanNodeId": 4
},
{
"InternalOperatorId": 1
"Other": "ConstantExpression"
}
],
"Name": "FullJoin (JoinDict)"
},
{
"Inputs": [],
"Iterator": "[{id: 1}]",
"Name": "Iterator"
}
],
"PlanNodeId": 5,
Expand Down