Skip to content

Avoid block aggregation in auto mode for YT #8894

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
merged 2 commits into from
Sep 7, 2024
Merged

Avoid block aggregation in auto mode for YT #8894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfd202b
init
vitstn Sep 6, 2024
872c90f
fix
vitstn Sep 6, 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
6 changes: 3 additions & 3 deletions ydb/library/yql/core/yql_aggregate_expander.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace NYql {
class TAggregateExpander {
public:
TAggregateExpander(bool usePartitionsByKeys, const bool useFinalizeByKeys, const TExprNode::TPtr& node, TExprContext& ctx, TTypeAnnotationContext& typesCtx,
bool forceCompact = false, bool compactForDistinct = false, bool usePhases = false, bool allowSpilling = false)
bool forceCompact = false, bool compactForDistinct = false, bool usePhases = false, bool useBlocks = false)
: Node(node)
, Ctx(ctx)
, TypesCtx(typesCtx)
Expand All @@ -25,7 +25,7 @@ class TAggregateExpander {
, HaveSessionSetting(false)
, OriginalRowType(nullptr)
, RowType(nullptr)
, UseBlocks(typesCtx.IsBlockEngineEnabled() && !allowSpilling)
, UseBlocks(useBlocks)
{
PreMap = Ctx.Builder(node->Pos())
.Lambda()
Expand Down Expand Up @@ -135,7 +135,7 @@ class TAggregateExpander {
inline TExprNode::TPtr ExpandAggregatePeepholeImpl(const TExprNode::TPtr& node, TExprContext& ctx, TTypeAnnotationContext& typesCtx,
const bool useFinalizeByKey, const bool useBlocks, const bool allowSpilling) {
TAggregateExpander aggExpander(!useFinalizeByKey && !useBlocks, useFinalizeByKey, node, ctx, typesCtx,
true, false, false, allowSpilling);
true, false, false, typesCtx.IsBlockEngineEnabled() && !allowSpilling);
return aggExpander.ExpandAggregate();
}

Expand Down
3 changes: 2 additions & 1 deletion ydb/library/yql/dq/opt/dq_opt_log.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ TExprBase DqRewriteAggregate(TExprBase node, TExprContext& ctx, TTypeAnnotationC
return node;
}
TAggregateExpander aggExpander(!typesCtx.IsBlockEngineEnabled() && !useFinalizeByKey,
useFinalizeByKey, node.Ptr(), ctx, typesCtx, false, compactForDistinct, usePhases, allowSpilling);
useFinalizeByKey, node.Ptr(), ctx, typesCtx, false, compactForDistinct, usePhases,
typesCtx.IsBlockEngineEnabled() && !allowSpilling);
auto result = aggExpander.ExpandAggregate();
YQL_ENSURE(result);

Expand Down
6 changes: 4 additions & 2 deletions ydb/library/yql/providers/yt/provider/yql_yt_logical_optimize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,8 @@ class TYtLogicalOptProposalTransformer : public TOptimizeTransformerBase {

auto usePhases = State_->Configuration->UseAggPhases.Get().GetOrElse(false);
auto usePartitionsByKeys = State_->Configuration->UsePartitionsByKeysForFinalAgg.Get().GetOrElse(true);
TAggregateExpander aggExpander(usePartitionsByKeys, false, node.Ptr(), ctx, *State_->Types, false, false, usePhases);
TAggregateExpander aggExpander(usePartitionsByKeys, false, node.Ptr(), ctx, *State_->Types, false, false,
usePhases, State_->Types->UseBlocks || State_->Types->BlockEngineMode == EBlockEngineMode::Force);
return aggExpander.ExpandAggregate();
}

Expand Down Expand Up @@ -2518,7 +2519,8 @@ class TYtLogicalOptProposalTransformer : public TOptimizeTransformerBase {
return node;
}

return TAggregateExpander::CountAggregateRewrite(aggregate, ctx, State_->Types->IsBlockEngineEnabled());
return TAggregateExpander::CountAggregateRewrite(aggregate, ctx,
State_->Types->UseBlocks || State_->Types->BlockEngineMode == EBlockEngineMode::Force);
}

TMaybeNode<TExprBase> ZeroSampleToZeroLimit(TExprBase node, TExprContext& ctx) const {
Expand Down