Skip to content

KIKIMR-20138: remove unused pragmas #1052

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

KIKIMR-20138: remove unused pragmas #1052

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
5 changes: 0 additions & 5 deletions ydb/core/kqp/kqp_default_settings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,6 @@ DefaultSettings {
Value: "1000"
}

DefaultSettings {
Name: "OptDisableJoinReverseTableLookup"
Value: "true"
}

DefaultSettings {
Name: "_KqpMaxComputeActors"
Value: "10000"
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/kqp/opt/logical/kqp_opt_log.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ class TKqpLogicalOptTransformer : public TOptimizeTransformerBase {
}

TMaybeNode<TExprBase> JoinToIndexLookup(TExprBase node, TExprContext& ctx) {
TExprBase output = KqpJoinToIndexLookup(node, ctx, KqpCtx, Config);
TExprBase output = KqpJoinToIndexLookup(node, ctx, KqpCtx);
DumpAppliedRule("JoinToIndexLookup", node.Ptr(), output.Ptr(), ctx);
return output;
}
Expand Down
5 changes: 2 additions & 3 deletions ydb/core/kqp/opt/logical/kqp_opt_log_join.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,8 +859,7 @@ TMaybeNode<TExprBase> KqpJoinToIndexLookupImpl(const TDqJoin& join, TExprContext

} // anonymous namespace

TExprBase KqpJoinToIndexLookup(const TExprBase& node, TExprContext& ctx, const TKqpOptimizeContext& kqpCtx,
const NYql::TKikimrConfiguration::TPtr& config)
TExprBase KqpJoinToIndexLookup(const TExprBase& node, TExprContext& ctx, const TKqpOptimizeContext& kqpCtx)
{
if ((kqpCtx.IsScanQuery() && !kqpCtx.Config->EnableKqpScanQueryStreamIdxLookupJoin) || !node.Maybe<TDqJoin>()) {
return node;
Expand All @@ -870,7 +869,7 @@ TExprBase KqpJoinToIndexLookup(const TExprBase& node, TExprContext& ctx, const T
DBG("-- Join: " << KqpExprToPrettyString(join, ctx));

// SqlIn support (preferred lookup direction)
if (join.JoinType().Value() == "LeftSemi" && !config->HasOptDisableJoinReverseTableLookupLeftSemi()) {
if (join.JoinType().Value() == "LeftSemi") {
auto flipJoin = FlipLeftSemiJoin(join, ctx);
DBG("-- Flip join");

Expand Down
2 changes: 1 addition & 1 deletion ydb/core/kqp/opt/logical/kqp_opt_log_rules.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ NYql::NNodes::TExprBase KqpPushExtractedPredicateToReadTable(NYql::NNodes::TExpr
const TKqpOptimizeContext& kqpCtx, NYql::TTypeAnnotationContext& typesCtx);

NYql::NNodes::TExprBase KqpJoinToIndexLookup(const NYql::NNodes::TExprBase& node, NYql::TExprContext& ctx,
const TKqpOptimizeContext& kqpCtx, const NYql::TKikimrConfiguration::TPtr& config);
const TKqpOptimizeContext& kqpCtx);

NYql::NNodes::TExprBase KqpRewriteSqlInToEquiJoin(const NYql::NNodes::TExprBase& node, NYql::TExprContext& ctx,
const TKqpOptimizeContext& kqpCtx, const NYql::TKikimrConfiguration::TPtr& config);
Expand Down
20 changes: 0 additions & 20 deletions ydb/core/kqp/provider/yql_kikimr_settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,6 @@ TKikimrConfiguration::TKikimrConfiguration() {
REGISTER_SETTING(*this, EnableLlvm);
REGISTER_SETTING(*this, HashJoinMode).Parser([](const TString& v) { return FromString<NDq::EHashJoinMode>(v); });

REGISTER_SETTING(*this, OptDisableJoinRewrite);
REGISTER_SETTING(*this, OptDisableJoinTableLookup);
REGISTER_SETTING(*this, OptDisableJoinReverseTableLookup);
REGISTER_SETTING(*this, OptDisableJoinReverseTableLookupLeftSemi);
REGISTER_SETTING(*this, OptDisableTopSort);
REGISTER_SETTING(*this, OptDisableSqlInToJoin);
REGISTER_SETTING(*this, OptEnableInplaceUpdate);
Expand Down Expand Up @@ -102,22 +98,6 @@ bool TKikimrSettings::DisableLlvmForUdfStages() const {
return GetFlagValue(_KqpDisableLlvmForUdfStages.Get());
}

bool TKikimrSettings::HasOptDisableJoinRewrite() const {
return GetFlagValue(OptDisableJoinRewrite.Get());
}

bool TKikimrSettings::HasOptDisableJoinTableLookup() const {
return GetFlagValue(OptDisableJoinTableLookup.Get());
}

bool TKikimrSettings::HasOptDisableJoinReverseTableLookup() const {
return GetFlagValue(OptDisableJoinReverseTableLookup.Get());
}

bool TKikimrSettings::HasOptDisableJoinReverseTableLookupLeftSemi() const {
return GetFlagValue(OptDisableJoinReverseTableLookupLeftSemi.Get());
}

bool TKikimrSettings::HasOptDisableTopSort() const {
return GetFlagValue(OptDisableTopSort.Get());
}
Expand Down
8 changes: 0 additions & 8 deletions ydb/core/kqp/provider/yql_kikimr_settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,6 @@ struct TKikimrSettings {
NCommon::TConfSetting<NDq::EHashJoinMode, false> HashJoinMode;

/* Disable optimizer rules */
NCommon::TConfSetting<bool, false> OptDisableJoinRewrite;
NCommon::TConfSetting<bool, false> OptDisableJoinTableLookup;
NCommon::TConfSetting<bool, false> OptDisableJoinReverseTableLookup;
NCommon::TConfSetting<bool, false> OptDisableJoinReverseTableLookupLeftSemi;
NCommon::TConfSetting<bool, false> OptDisableTopSort;
NCommon::TConfSetting<bool, false> OptDisableSqlInToJoin;
NCommon::TConfSetting<bool, false> OptEnableInplaceUpdate;
Expand All @@ -80,10 +76,6 @@ struct TKikimrSettings {
bool SpillingEnabled() const;
bool DisableLlvmForUdfStages() const;

bool HasOptDisableJoinRewrite() const;
bool HasOptDisableJoinTableLookup() const;
bool HasOptDisableJoinReverseTableLookup() const;
bool HasOptDisableJoinReverseTableLookupLeftSemi() const;
bool HasOptDisableTopSort() const;
bool HasOptDisableSqlInToJoin() const;
bool HasOptEnableOlapPushdown() const;
Expand Down
Loading