remove scan query stream lookup flag (#13886)

gridnevvvit · web-flow · commit e756b370dad4 · 2025-01-28T14:54:56.000+03:00
diff --git a/ydb/core/kqp/compile_service/kqp_compile_actor.cpp b/ydb/core/kqp/compile_service/kqp_compile_actor.cpp
@@ -630,7 +630,6 @@ void ApplyServiceConfig(TKikimrConfiguration& kqpConfig, const TTableServiceConf
 
     kqpConfig.EnableKqpScanQuerySourceRead = serviceConfig.GetEnableKqpScanQuerySourceRead();
     kqpConfig.EnableKqpDataQueryStreamLookup = serviceConfig.GetEnableKqpDataQueryStreamLookup();
-    kqpConfig.EnableKqpScanQueryStreamLookup = serviceConfig.GetEnableKqpScanQueryStreamLookup();
     kqpConfig.EnableKqpScanQueryStreamIdxLookupJoin = serviceConfig.GetEnableKqpScanQueryStreamIdxLookupJoin();
     kqpConfig.EnableKqpDataQueryStreamIdxLookupJoin = serviceConfig.GetEnableKqpDataQueryStreamIdxLookupJoin();
     kqpConfig.EnablePreparedDdl = serviceConfig.GetEnablePreparedDdl();
diff --git a/ydb/core/kqp/compile_service/kqp_compile_service.cpp b/ydb/core/kqp/compile_service/kqp_compile_service.cpp
@@ -280,7 +280,6 @@ class TKqpCompileService : public TActorBootstrapped<TKqpCompileService> {
         auto &event = ev->Get()->Record;
 
         bool enableKqpDataQueryStreamLookup = TableServiceConfig.GetEnableKqpDataQueryStreamLookup();
-        bool enableKqpScanQueryStreamLookup = TableServiceConfig.GetEnableKqpScanQueryStreamLookup();
         bool enableKqpDataQueryStreamIdxLookupJoin = TableServiceConfig.GetEnableKqpDataQueryStreamIdxLookupJoin();
         bool enableKqpScanQueryStreamIdxLookupJoin = TableServiceConfig.GetEnableKqpScanQueryStreamIdxLookupJoin();
 
@@ -325,7 +324,6 @@ class TKqpCompileService : public TActorBootstrapped<TKqpCompileService> {
 
         if (TableServiceConfig.GetSqlVersion() != defaultSyntaxVersion ||
             TableServiceConfig.GetEnableKqpDataQueryStreamLookup() != enableKqpDataQueryStreamLookup ||
-            TableServiceConfig.GetEnableKqpScanQueryStreamLookup() != enableKqpScanQueryStreamLookup ||
             TableServiceConfig.GetEnableKqpScanQueryStreamIdxLookupJoin() != enableKqpScanQueryStreamIdxLookupJoin ||
             TableServiceConfig.GetEnableKqpDataQueryStreamIdxLookupJoin() != enableKqpDataQueryStreamIdxLookupJoin ||
             TableServiceConfig.GetEnableKqpScanQuerySourceRead() != enableKqpScanQuerySourceRead ||
diff --git a/ydb/core/kqp/opt/kqp_opt_kql.cpp b/ydb/core/kqp/opt/kqp_opt_kql.cpp
@@ -711,6 +711,7 @@ TExprBase BuildUpdateTableWithIndex(const TKiUpdateTable& update, const TKikimrT
 TExprNode::TPtr HandleReadTable(const TKiReadTable& read, TExprContext& ctx, const TKikimrTablesData& tablesData,
     bool withSystemColumns, const TIntrusivePtr<TKqpOptimizeContext>& kqpCtx)
 {
+    Y_UNUSED(kqpCtx);
     TKikimrKey key(ctx);
     YQL_ENSURE(key.Extract(read.TableKey().Ref()));
     YQL_ENSURE(key.GetKeyType() == TKikimrKey::Type::Table);
@@ -723,12 +724,6 @@ TExprNode::TPtr HandleReadTable(const TKiReadTable& read, TExprContext& ctx, con
             return nullptr;
         }
 
-        if (kqpCtx->IsScanQuery() && !kqpCtx->Config->EnableKqpScanQueryStreamLookup) {
-            const TString err = "Secondary index is not supported for ScanQuery";
-            ctx.AddError(YqlIssue(ctx.GetPosition(read.Pos()), TIssuesIds::KIKIMR_BAD_REQUEST, err));
-            return nullptr;
-        }
-
         auto [metadata, state] = tableData.Metadata->GetIndexMetadata(indexName);
         YQL_ENSURE(metadata, "unable to find metadata for index: " << indexName);
         YQL_ENSURE(state == TIndexDescription::EIndexState::Ready
diff --git a/ydb/core/kqp/opt/logical/kqp_opt_log_ranges_predext.cpp b/ydb/core/kqp/opt/logical/kqp_opt_log_ranges_predext.cpp
@@ -281,18 +281,16 @@ TExprBase KqpPushExtractedPredicateToReadTable(TExprBase node, TExprContext& ctx
             auto buildLookup = [&] (TExprNode::TPtr keys, TMaybe<TExprBase>& result) {
                 if (indexName) {
                     if (kqpCtx.IsScanQuery()) {
-                        if (kqpCtx.Config->EnableKqpScanQueryStreamLookup) {
-                            TKqpStreamLookupSettings settings;
-                            settings.Strategy = EStreamLookupStrategyType::LookupRows;
-                            result = Build<TKqlStreamLookupIndex>(ctx, node.Pos())
-                                .Table(read.Table())
-                                .Columns(read.Columns())
-                                .LookupKeys(keys)
-                                .Index(indexName.Cast())
-                                .LookupKeys(keys)
-                                .Settings(settings.BuildNode(ctx, node.Pos()))
-                                .Done();
-                        }
+                        TKqpStreamLookupSettings settings;
+                        settings.Strategy = EStreamLookupStrategyType::LookupRows;
+                        result = Build<TKqlStreamLookupIndex>(ctx, node.Pos())
+                            .Table(read.Table())
+                            .Columns(read.Columns())
+                            .LookupKeys(keys)
+                            .Index(indexName.Cast())
+                            .LookupKeys(keys)
+                            .Settings(settings.BuildNode(ctx, node.Pos()))
+                            .Done();
                     } else {
                         result = Build<TKqlLookupIndex>(ctx, node.Pos())
                             .Table(read.Table())
@@ -303,16 +301,14 @@ TExprBase KqpPushExtractedPredicateToReadTable(TExprBase node, TExprContext& ctx
                     }
                 } else {
                     if (kqpCtx.IsScanQuery()) {
-                        if (kqpCtx.Config->EnableKqpScanQueryStreamLookup) {
-                            TKqpStreamLookupSettings settings;
-                            settings.Strategy = EStreamLookupStrategyType::LookupRows;
-                            result = Build<TKqlStreamLookupTable>(ctx, node.Pos())
-                                .Table(read.Table())
-                                .Columns(read.Columns())
-                                .LookupKeys(keys)
-                                .Settings(settings.BuildNode(ctx, node.Pos()))
-                                .Done();
-                        }
+                        TKqpStreamLookupSettings settings;
+                        settings.Strategy = EStreamLookupStrategyType::LookupRows;
+                        result = Build<TKqlStreamLookupTable>(ctx, node.Pos())
+                            .Table(read.Table())
+                            .Columns(read.Columns())
+                            .LookupKeys(keys)
+                            .Settings(settings.BuildNode(ctx, node.Pos()))
+                            .Done();
                     } else {
                         result = Build<TKqlLookupTable>(ctx, node.Pos())
                             .Table(read.Table())
diff --git a/ydb/core/kqp/opt/logical/kqp_opt_log_sqlin.cpp b/ydb/core/kqp/opt/logical/kqp_opt_log_sqlin.cpp
@@ -48,10 +48,6 @@ bool CanRewriteSqlInToEquiJoin(const TTypeAnnotationNode* lookupType, const TTyp
 TExprBase KqpRewriteSqlInToEquiJoin(const TExprBase& node, TExprContext& ctx, const TKqpOptimizeContext& kqpCtx,
     const TKikimrConfiguration::TPtr& config)
 {
-    if (kqpCtx.IsScanQuery() && !kqpCtx.Config->EnableKqpScanQueryStreamLookup) {
-        return node;
-    }
-
     if (config->HasOptDisableSqlInToJoin()) {
         return node;
     }
diff --git a/ydb/core/kqp/provider/yql_kikimr_settings.h b/ydb/core/kqp/provider/yql_kikimr_settings.h
@@ -153,7 +153,6 @@ struct TKikimrConfiguration : public TKikimrSettings, public NCommon::TSettingDi
     NKikimrConfig::TFeatureFlags FeatureFlags;
 
     bool EnableKqpScanQuerySourceRead = false;
-    bool EnableKqpScanQueryStreamLookup = false;
     bool EnableKqpDataQueryStreamLookup = false;
     bool EnableKqpScanQueryStreamIdxLookupJoin = false;
     bool EnableKqpDataQueryStreamIdxLookupJoin = false;
diff --git a/ydb/core/kqp/ut/query/kqp_stats_ut.cpp b/ydb/core/kqp/ut/query/kqp_stats_ut.cpp
@@ -103,7 +103,6 @@ TCollectedStreamResult JoinStatsBasic(
         std::function<Iterator(TKikimrRunner&, ECollectQueryStatsMode, const TString&)> getIter, bool StreamLookupJoin = false) {
     NKikimrConfig::TAppConfig appConfig;
     appConfig.MutableTableServiceConfig()->SetEnableKqpDataQueryStreamIdxLookupJoin(StreamLookupJoin);
-    appConfig.MutableTableServiceConfig()->SetEnableKqpScanQueryStreamLookup(false);
     appConfig.MutableTableServiceConfig()->SetEnableKqpScanQuerySourceRead(true);
     appConfig.MutableTableServiceConfig()->SetEnableKqpDataQueryStreamLookup(true);
 
diff --git a/ydb/core/kqp/ut/scan/kqp_flowcontrol_ut.cpp b/ydb/core/kqp/ut/scan/kqp_flowcontrol_ut.cpp
@@ -53,7 +53,6 @@ void DoFlowControlTest(ui64 limit, bool hasBlockedByCapacity) {
     appCfg.MutableTableServiceConfig()->MutableResourceManager()->SetMinChannelBufferSize(limit);
     appCfg.MutableTableServiceConfig()->MutableResourceManager()->SetMkqlHeavyProgramMemoryLimit(200ul << 20);
     appCfg.MutableTableServiceConfig()->MutableResourceManager()->SetQueryMemoryLimit(20ul << 30);
-    appCfg.MutableTableServiceConfig()->SetEnableKqpScanQueryStreamLookup(false);
 
     // TODO: KIKIMR-14294
     auto kikimrSettings = TKikimrSettings()
diff --git a/ydb/core/kqp/ut/scan/kqp_scan_ut.cpp b/ydb/core/kqp/ut/scan/kqp_scan_ut.cpp
@@ -1804,7 +1804,6 @@ Y_UNIT_TEST_SUITE(KqpScan) {
 
     Y_UNIT_TEST(SecondaryIndex) {
         NKikimrConfig::TAppConfig appConfig;
-        appConfig.MutableTableServiceConfig()->SetEnableKqpScanQueryStreamLookup(true);
         TKikimrRunner kikimr(TKikimrSettings().SetAppConfig(appConfig));
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
@@ -2321,7 +2320,6 @@ Y_UNIT_TEST_SUITE(KqpScan) {
 
     Y_UNIT_TEST(StreamLookupByFullPk) {
         NKikimrConfig::TAppConfig appConfig;
-        appConfig.MutableTableServiceConfig()->SetEnableKqpScanQueryStreamLookup(true);
         TKikimrRunner kikimr(TKikimrSettings().SetAppConfig(appConfig));
         auto db = kikimr.GetTableClient();
         CreateSampleTables(kikimr);
@@ -2471,7 +2469,6 @@ Y_UNIT_TEST_SUITE(KqpScan) {
 
     Y_UNIT_TEST(LimitOverSecondaryIndexRead) {
         NKikimrConfig::TAppConfig appConfig;
-        appConfig.MutableTableServiceConfig()->SetEnableKqpScanQueryStreamLookup(true);
         TKikimrRunner kikimr(TKikimrSettings().SetAppConfig(appConfig));
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
@@ -2511,7 +2508,6 @@ Y_UNIT_TEST_SUITE(KqpScan) {
 
     Y_UNIT_TEST(TopSortOverSecondaryIndexRead) {
         NKikimrConfig::TAppConfig appConfig;
-        appConfig.MutableTableServiceConfig()->SetEnableKqpScanQueryStreamLookup(true);
         TKikimrRunner kikimr(TKikimrSettings().SetAppConfig(appConfig));
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
diff --git a/ydb/core/kqp/ut/scan/kqp_split_ut.cpp b/ydb/core/kqp/ut/scan/kqp_split_ut.cpp
@@ -408,7 +408,6 @@ Y_UNIT_TEST_SUITE(KqpSplit) {
                 TKikimrSettings settings;
                 NKikimrConfig::TAppConfig appConfig;
                 appConfig.MutableTableServiceConfig()->SetEnableKqpScanQuerySourceRead(testActorType == ETestActorType::SorceRead);
-                appConfig.MutableTableServiceConfig()->SetEnableKqpScanQueryStreamLookup(testActorType == ETestActorType::StreamLookup);
                 settings.SetDomainRoot(KikimrDefaultUtDomainRoot);
                 settings.SetAppConfig(appConfig);
 
@@ -681,7 +680,6 @@ Y_UNIT_TEST_SUITE(KqpSplit) {
         Tests::TServerSettings serverSettings(pm.GetPort(2134));
         NKikimrConfig::TAppConfig appConfig;
         appConfig.MutableTableServiceConfig()->SetEnableKqpScanQuerySourceRead(true);
-        appConfig.MutableTableServiceConfig()->SetEnableKqpScanQueryStreamLookup(false);
         serverSettings.SetDomainName("Root")
             .SetUseRealThreads(false)
             .SetAppConfig(appConfig);
diff --git a/ydb/tools/query_replay_yt/query_compiler.cpp b/ydb/tools/query_replay_yt/query_compiler.cpp
@@ -237,7 +237,6 @@ class TReplayCompileActor: public TActorBootstrapped<TReplayCompileActor> {
         , FunctionRegistry(functionRegistry)
         , HttpGateway(std::move(httpGateway))
     {
-        Config->EnableKqpScanQueryStreamLookup = true;
         Config->EnablePreparedDdl = true;
         Config->EnableAntlr4Parser = enableAntlr4Parser;
     }

Original file line number	Diff line number	Diff line change
`@@ -48,10 +48,6 @@ bool CanRewriteSqlInToEquiJoin(const TTypeAnnotationNode* lookupType, const TTyp`
`48`	`48`	`TExprBase KqpRewriteSqlInToEquiJoin(const TExprBase& node, TExprContext& ctx, const TKqpOptimizeContext& kqpCtx,`
`49`	`49`	`const TKikimrConfiguration::TPtr& config)`
`50`	`50`	`{`
`51`		`- if (kqpCtx.IsScanQuery() && !kqpCtx.Config->EnableKqpScanQueryStreamLookup) {`
`52`		`- return node;`
`53`		`- }`
`54`		`-`
`55`	`51`	`if (config->HasOptDisableSqlInToJoin()) {`
`56`	`52`	`return node;`
`57`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,6 @@ class TReplayCompileActor: public TActorBootstrapped<TReplayCompileActor> {`
`237`	`237`	`, FunctionRegistry(functionRegistry)`
`238`	`238`	`, HttpGateway(std::move(httpGateway))`
`239`	`239`	`{`
`240`		`- Config->EnableKqpScanQueryStreamLookup = true;`
`241`	`240`	`Config->EnablePreparedDdl = true;`
`242`	`241`	`Config->EnableAntlr4Parser = enableAntlr4Parser;`
`243`	`242`	`}`