Skip to content

YQL-17250: Fix operation name at fallback message #1194

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
mxkovalev merged 1 commit into from
Jan 23, 2024
Merged

YQL-17250: Fix operation name at fallback message #1194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions ydb/library/yql/providers/yt/provider/yql_yt_datasink_exec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ class TYtDataSinkExecTransformer : public TExecTransformerBase {
if (markFinished && !TYtDqProcessWrite::Match(input.Get())) {
with_lock(state->StatisticsMutex) {
state->HybridStatistics[input->Content()].Entries.emplace_back(TString{"YtExecution"}, 0, 0, 0, 0, 1);
state->Statistics[Max<ui32>()].Entries.emplace_back(TString{"YtExecution"}, 0, 0, 0, 0, 1);
}
}
auto outSection = TYtOutputOpBase(input).Output();
Expand Down
31 changes: 11 additions & 20 deletions ydb/library/yql/providers/yt/provider/yql_yt_dq_hybrid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,6 @@ class TYtDqHybridTransformer : public TOptimizeTransformerBase {
flow = node->IsCallable(TCoToFlow::CallableName()) && node->Head().IsCallable(TYtTableContent::CallableName());
return false;
})) {
TExprNode::TListType flags;
flags.emplace_back(ctx.NewAtom(fill.Pos(), "FallbackOnError", TNodeFlags::Default));
flags.emplace_back(ctx.NewAtom(fill.Pos(), "FallbackOpYtFill", TNodeFlags::Default));

return Build<TYtTryFirst>(ctx, fill.Pos())
.First<TYtDqProcessWrite>()
.World(fill.World())
Expand All @@ -156,7 +152,7 @@ class TYtDqHybridTransformer : public TOptimizeTransformerBase {
.Build()
.ColumnHints().Build()
.Build()
.Flags().Add(std::move(flags)).Build()
.Flags().Add(GetHybridFlags(fill, ctx)).Build()
.Build()
.Second<TYtFill>()
.InitFrom(fill)
Expand Down Expand Up @@ -234,10 +230,6 @@ class TYtDqHybridTransformer : public TOptimizeTransformerBase {
auto settings = NYql::AddSetting(sort.Settings().Ref(), EYtSettingType::NoDq, {}, ctx);
auto operation = ctx.ChangeChild(sort.Ref(), TYtTransientOpBase::idx_Settings, std::move(settings));

TExprNode::TListType flags;
flags.emplace_back(ctx.NewAtom(sort.Pos(), "FallbackOnError", TNodeFlags::Default));
flags.emplace_back(ctx.NewAtom(sort.Pos(), "FallbackOpYtSort", TNodeFlags::Default));

return Build<TYtTryFirst>(ctx, sort.Pos())
.First<TYtDqProcessWrite>()
.World(std::move(newWorld))
Expand All @@ -261,7 +253,7 @@ class TYtDqHybridTransformer : public TOptimizeTransformerBase {
.Build()
.ColumnHints().Build()
.Build()
.Flags().Add(std::move(flags)).Build()
.Flags().Add(GetHybridFlags(sort, ctx)).Build()
.Build()
.Second(std::move(operation))
.Done();
Expand Down Expand Up @@ -410,10 +402,6 @@ class TYtDqHybridTransformer : public TOptimizeTransformerBase {
.Done();
}

TExprNode::TListType flags;
flags.emplace_back(ctx.NewAtom(map.Pos(), "FallbackOnError", TNodeFlags::Default));
flags.emplace_back(ctx.NewAtom(map.Pos(), "FallbackOpYtMap", TNodeFlags::Default));

return Build<TYtTryFirst>(ctx, map.Pos())
.First<TYtDqProcessWrite>()
.World(std::move(newWorld))
Expand All @@ -426,7 +414,7 @@ class TYtDqHybridTransformer : public TOptimizeTransformerBase {
.Build()
.ColumnHints().Build()
.Build()
.Flags().Add(std::move(flags)).Build()
.Flags().Add(GetHybridFlags(map, ctx)).Build()
.Build()
.Second<TYtMap>()
.InitFrom(map)
Expand Down Expand Up @@ -581,10 +569,6 @@ class TYtDqHybridTransformer : public TOptimizeTransformerBase {

auto reducer = ctx.NewLambda(reduce.Pos(), ctx.NewArguments(reduce.Pos(), {std::move(arg)}), std::move(body));

TExprNode::TListType flags;
flags.emplace_back(ctx.NewAtom(reduce.Pos(), "FallbackOnError", TNodeFlags::Default));
flags.emplace_back(ctx.NewAtom(reduce.Pos(), "FallbackOpYtReduce", TNodeFlags::Default));

return Build<TYtTryFirst>(ctx, reduce.Pos())
.template First<TYtDqProcessWrite>()
.World(std::move(newWorld))
Expand Down Expand Up @@ -614,7 +598,7 @@ class TYtDqHybridTransformer : public TOptimizeTransformerBase {
.Build()
.ColumnHints().Build()
.Build()
.Flags().Add(std::move(flags)).Build()
.Flags().Add(GetHybridFlags(reduce, ctx)).Build()
.Build()
.template Second<TYtOperation>()
.InitFrom(reduce)
Expand Down Expand Up @@ -681,6 +665,13 @@ class TYtDqHybridTransformer : public TOptimizeTransformerBase {
}
};

TExprNode::TListType GetHybridFlags(TExprBase node, TExprContext& ctx) const {
TExprNode::TListType flags;
flags.emplace_back(ctx.NewAtom(node.Pos(), "FallbackOnError", TNodeFlags::Default));
flags.emplace_back(ctx.NewAtom(node.Pos(), "FallbackOp" + TString(node.Raw()->Content()), TNodeFlags::Default));
return flags;
}

const TYtState::TPtr State_;
const THolder<IGraphTransformer> Finalizer_;
};
Expand Down