Skip to content

Commit aefb890

Browse files
ssmikessmike
authored
Merge 54b264c into 483e9ee 
2 parents 483e9ee + 54b264c commit aefb890

22 files changed

+27
-2194
lines changed

‎ydb/core/kqp/compile_service/kqp_compile_actor.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,6 @@ void ApplyServiceConfig(TKikimrConfiguration& kqpConfig, const TTableServiceConf
597597
kqpConfig.EnableSequences = serviceConfig.GetEnableSequences();
598598
kqpConfig.EnableColumnsWithDefault = serviceConfig.GetEnableColumnsWithDefault();
599599
kqpConfig.BindingsMode = RemapBindingsMode(serviceConfig.GetBindingsMode());
600-
kqpConfig.PredicateExtract20 = serviceConfig.GetPredicateExtract20();
601600
kqpConfig.IndexAutoChooserMode = serviceConfig.GetIndexAutoChooseMode();
602601
kqpConfig.EnablePgConstsToParams = serviceConfig.GetEnablePgConstsToParams() && serviceConfig.GetEnableAstCache();
603602
kqpConfig.ExtractPredicateRangesLimit = serviceConfig.GetExtractPredicateRangesLimit();
@@ -607,7 +606,6 @@ void ApplyServiceConfig(TKikimrConfiguration& kqpConfig, const TTableServiceConf
607606
kqpConfig.EnableOltpSink = serviceConfig.GetEnableOltpSink();
608607
kqpConfig.BlockChannelsMode = serviceConfig.GetBlockChannelsMode();
609608
kqpConfig.IdxLookupJoinsPrefixPointLimit = serviceConfig.GetIdxLookupJoinPointsLimit();
610-
kqpConfig.OldLookupJoinBehaviour = serviceConfig.GetOldLookupJoinBehaviour();
611609
kqpConfig.EnableSpillingGenericQuery = serviceConfig.GetEnableQueryServiceSpilling();
612610

613611
if (const auto limit = serviceConfig.GetResourceManager().GetMkqlHeavyProgramMemoryLimit()) {

‎ydb/core/kqp/compile_service/kqp_compile_service.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -509,15 +509,12 @@ class TKqpCompileService : public TActorBootstrapped<TKqpCompileService> {
509509

510510
bool enableKqpScanQuerySourceRead = TableServiceConfig.GetEnableKqpScanQuerySourceRead();
511511

512-
bool predicateExtract20 = TableServiceConfig.GetPredicateExtract20();
513-
514512
bool defaultSyntaxVersion = TableServiceConfig.GetSqlVersion();
515513

516514
auto indexAutoChooser = TableServiceConfig.GetIndexAutoChooseMode();
517515

518516
ui64 rangesLimit = TableServiceConfig.GetExtractPredicateRangesLimit();
519517
ui64 idxLookupPointsLimit = TableServiceConfig.GetIdxLookupJoinPointsLimit();
520-
bool oldLookupJoinBehaviour = TableServiceConfig.GetOldLookupJoinBehaviour();
521518

522519
bool enableSequences = TableServiceConfig.GetEnableSequences();
523520
bool enableColumnsWithDefault = TableServiceConfig.GetEnableColumnsWithDefault();
@@ -542,15 +539,13 @@ class TKqpCompileService : public TActorBootstrapped<TKqpCompileService> {
542539
TableServiceConfig.GetEnableKqpScanQueryStreamIdxLookupJoin() != enableKqpScanQueryStreamIdxLookupJoin ||
543540
TableServiceConfig.GetEnableKqpDataQueryStreamIdxLookupJoin() != enableKqpDataQueryStreamIdxLookupJoin ||
544541
TableServiceConfig.GetEnableKqpScanQuerySourceRead() != enableKqpScanQuerySourceRead ||
545-
TableServiceConfig.GetPredicateExtract20() != predicateExtract20 ||
546542
TableServiceConfig.GetIndexAutoChooseMode() != indexAutoChooser ||
547543
TableServiceConfig.GetEnableSequences() != enableSequences ||
548544
TableServiceConfig.GetEnableColumnsWithDefault() != enableColumnsWithDefault ||
549545
TableServiceConfig.GetEnableOlapSink() != enableOlapSink ||
550546
TableServiceConfig.GetEnableOltpSink() != enableOltpSink ||
551547
TableServiceConfig.GetEnableCreateTableAs() != enableCreateTableAs ||
552548
TableServiceConfig.GetBlockChannelsMode() != blockChannelsMode ||
553-
TableServiceConfig.GetOldLookupJoinBehaviour() != oldLookupJoinBehaviour ||
554549
TableServiceConfig.GetExtractPredicateRangesLimit() != rangesLimit ||
555550
TableServiceConfig.GetResourceManager().GetMkqlHeavyProgramMemoryLimit() != mkqlHeavyLimit ||
556551
TableServiceConfig.GetIdxLookupJoinPointsLimit() != idxLookupPointsLimit ||

‎ydb/core/kqp/opt/kqp_opt_impl.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
#include <ydb/library/yql/core/yql_expr_optimize.h>
66
#include <ydb/library/yql/dq/opt/dq_opt.h>
7-
#include <ydb/library/yql/providers/common/provider/yql_table_lookup.h>
87

98
namespace NKikimr::NKqp::NOpt {
109

@@ -48,12 +47,6 @@ NYql::NNodes::TKqpTable BuildTableMeta(const NYql::TKikimrTableMetadata& tableMe
4847
TIntrusivePtr<NYql::TKikimrTableMetadata> GetIndexMetadata(const NYql::NNodes::TKqlReadTableIndex& index,
4948
const NYql::TKikimrTablesData& tables, TStringBuf cluster);
5049

51-
bool KqpTableLookupCanCompare(NYql::NNodes::TExprBase node);
52-
NYql::NNodes::TMaybeNode<NYql::NNodes::TExprBase> KqpTableLookupGetValue(NYql::NNodes::TExprBase node,
53-
const NYql::TTypeAnnotationNode* type, NYql::TExprContext& ctx);
54-
NYql::NCommon::TTableLookup::TCompareResult KqpTableLookupCompare(NYql::NNodes::TExprBase left,
55-
NYql::NNodes::TExprBase right);
56-
5750
TVector<std::pair<NYql::TExprNode::TPtr, const NYql::TIndexDescription*>> BuildSecondaryIndexVector(
5851
const NYql::TKikimrTableDescription& table, NYql::TPositionHandle pos, NYql::TExprContext& ctx,
5952
const THashSet<TStringBuf>* filter,

‎ydb/core/kqp/opt/kqp_opt_range_legacy.cpp

Lines changed: 0 additions & 256 deletions
This file was deleted.

‎ydb/core/kqp/opt/logical/kqp_opt_log.cpp

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ class TKqpLogicalOptTransformer : public TOptimizeTransformerBase {
3030
, Config(config)
3131
{
3232
#define HNDL(name) "KqpLogical-"#name, Hndl(&TKqpLogicalOptTransformer::name)
33-
AddHandler(0, &TCoFlatMapBase::Match, HNDL(PushPredicateToReadTable));
3433
AddHandler(0, &TCoFlatMapBase::Match, HNDL(PushExtractedPredicateToReadTable));
3534
AddHandler(0, &TCoAggregate::Match, HNDL(RewriteAggregate));
3635
AddHandler(0, &TCoAggregateCombine::Match, HNDL(PushdownOlapGroupByKeys));
@@ -62,7 +61,6 @@ class TKqpLogicalOptTransformer : public TOptimizeTransformerBase {
6261
AddHandler(0, &TCoNarrowMultiMap::Match, HNDL(DqReadWideWrapFieldSubset));
6362
AddHandler(0, &TCoWideMap::Match, HNDL(DqReadWideWrapFieldSubset));
6463

65-
AddHandler(1, &TCoFlatMap::Match, HNDL(LatePushExtractedPredicateToReadTable));
6664
AddHandler(1, &TCoTop::Match, HNDL(RewriteTopSortOverIndexRead));
6765
AddHandler(1, &TCoTopSort::Match, HNDL(RewriteTopSortOverIndexRead));
6866
AddHandler(1, &TCoTake::Match, HNDL(RewriteTakeOverIndexRead));
@@ -88,28 +86,7 @@ class TKqpLogicalOptTransformer : public TOptimizeTransformerBase {
8886
}
8987

9088
protected:
91-
TMaybeNode<TExprBase> PushPredicateToReadTable(TExprBase node, TExprContext& ctx) {
92-
if (KqpCtx.Config->PredicateExtract20) {
93-
return node;
94-
}
95-
TExprBase output = KqpPushPredicateToReadTable(node, ctx, KqpCtx);
96-
DumpAppliedRule("PushPredicateToReadTable", node.Ptr(), output.Ptr(), ctx);
97-
return output;
98-
}
99-
10089
TMaybeNode<TExprBase> PushExtractedPredicateToReadTable(TExprBase node, TExprContext& ctx, const TGetParents& getParents) {
101-
if (!KqpCtx.Config->PredicateExtract20) {
102-
return node;
103-
}
104-
TExprBase output = KqpPushExtractedPredicateToReadTable(node, ctx, KqpCtx, TypesCtx, *getParents());
105-
DumpAppliedRule("PushExtractedPredicateToReadTable", node.Ptr(), output.Ptr(), ctx);
106-
return output;
107-
}
108-
109-
TMaybeNode<TExprBase> LatePushExtractedPredicateToReadTable(TExprBase node, TExprContext& ctx, const TGetParents& getParents) {
110-
if (KqpCtx.Config->PredicateExtract20) {
111-
return node;
112-
}
11390
TExprBase output = KqpPushExtractedPredicateToReadTable(node, ctx, KqpCtx, TypesCtx, *getParents());
11491
DumpAppliedRule("PushExtractedPredicateToReadTable", node.Ptr(), output.Ptr(), ctx);
11592
return output;

‎ydb/core/kqp/opt/logical/kqp_opt_log_extract.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
#include <ydb/library/yql/core/yql_opt_utils.h>
88
#include <ydb/library/yql/dq/opt/dq_opt_log.h>
9-
#include <ydb/library/yql/providers/common/provider/yql_table_lookup.h>
109

1110
namespace NKikimr::NKqp::NOpt {
1211

‎ydb/core/kqp/opt/logical/kqp_opt_log_join.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -569,10 +569,6 @@ TMaybeNode<TExprBase> KqpJoinToIndexLookupImpl(const TDqJoin& join, TExprContext
569569
return {};
570570
}
571571

572-
if ((!kqpCtx.Config->PredicateExtract20 || kqpCtx.Config->OldLookupJoinBehaviour) && prefixLookup->Filter.IsValid()) {
573-
return {};
574-
}
575-
576572
TMap<std::string_view, TString> rightJoinKeyToLeft;
577573
TVector<TCoAtom> rightKeyColumns;
578574
rightKeyColumns.reserve(join.JoinKeys().Size());
@@ -632,9 +628,6 @@ TMaybeNode<TExprBase> KqpJoinToIndexLookupImpl(const TDqJoin& join, TExprContext
632628
.Build()
633629
.Done());
634630
deduplicateLeftColumns.insert(*leftColumn);
635-
if ((!kqpCtx.Config->PredicateExtract20 || kqpCtx.Config->OldLookupJoinBehaviour)) {
636-
return {};
637-
}
638631
}
639632

640633
member = Build<TCoNth>(ctx, prefixRowArg.Pos())

0 commit comments

Comments
 (0)