fix(kqp): use ReadTableRange instead LookupTable

Author: ulya-sidorina

ydb/core/kqp/opt/logical/kqp_opt_log_ranges.cpp

@@ -222,42 +222,19 @@ TExprBase KqpPushPredicateToReadTable(TExprBase node, TExprContext& ctx, const T
     fetches.reserve(lookup.GetKeyRanges().size());
 
     for (auto& keyRange : lookup.GetKeyRanges()) {
-        bool useDataOrGenericQueryLookup = false;
         bool useScanQueryLookup = false;
         if (onlyPointRanges && !IsPointPrefix(keyRange)) {
             return node;
         }
         if (keyRange.IsEquiRange()) {
             bool isFullKey = keyRange.GetNumDefined() == tableDesc.Metadata->KeyColumnNames.size();
-
-            // NOTE: Use more efficient full key lookup implementation in datashard.
-            // Consider using lookup for partial keys as well once better constant folding
-            // is available, currently it can introduce redundant compute stage.
-            useDataOrGenericQueryLookup = (kqpCtx.IsDataQuery() || kqpCtx.IsGenericQuery()) && isFullKey;
             useScanQueryLookup = kqpCtx.IsScanQuery() && isFullKey
                 && kqpCtx.Config->EnableKqpScanQueryStreamLookup;
         }
 
         TMaybeNode<TExprBase> readInput;
         // TODO: Use single implementation for all kinds of queries.
-        if (useDataOrGenericQueryLookup) {
-            auto lookupKeys = BuildEquiRangeLookup(keyRange, tableDesc, read.Pos(), ctx);
-
-            if (indexName) {
-                readInput = Build<TKqlLookupIndex>(ctx, read.Pos())
-                    .Table(read.Table())
-                    .LookupKeys(lookupKeys)
-                    .Columns(read.Columns())
-                    .Index(indexName.Cast())
-                    .Done();
-            } else {
-                readInput = Build<TKqlLookupTable>(ctx, read.Pos())
-                    .Table(read.Table())
-                    .LookupKeys(lookupKeys)
-                    .Columns(read.Columns())
-                    .Done();
-            }
-        } else if (useScanQueryLookup) {
+        if (useScanQueryLookup) {
             YQL_ENSURE(kqpCtx.Config->EnableKqpScanQueryStreamLookup);
             auto lookupKeys = BuildEquiRangeLookup(keyRange, tableDesc, read.Pos(), ctx);
 

ydb/core/kqp/opt/logical/kqp_opt_log_ranges_predext.cpp

@@ -384,13 +384,6 @@ TExprBase KqpPushExtractedPredicateToReadTable(TExprBase node, TExprContext& ctx
                                 .LookupKeys(keys)
                                 .Done();
                         }
-                    } else {
-                        result = Build<TKqlLookupIndex>(ctx, node.Pos())
-                            .Table(read.Table())
-                            .Columns(read.Columns())
-                            .LookupKeys(keys)
-                            .Index(indexName.Cast())
-                            .Done();
                     }
                 } else {
                     if (kqpCtx.IsScanQuery()) {
@@ -402,19 +395,13 @@ TExprBase KqpPushExtractedPredicateToReadTable(TExprBase node, TExprContext& ctx
                                 .LookupStrategy().Build(TKqpStreamLookupStrategyName)
                                 .Done();
                         }
-                    } else {
-                        result = Build<TKqlLookupTable>(ctx, node.Pos())
-                            .Table(read.Table())
-                            .Columns(read.Columns())
-                            .LookupKeys(keys)
-                            .Done();
                     }
                 }
             };
 
         if (buildResult.LiteralRange) {
             bool ispoint = buildResult.PointPrefixLen == tableDesc.Metadata->KeyColumnNames.size();
-            if (ispoint) {
+            if (ispoint && kqpCtx.IsScanQuery()) { // Use lookup table only for scan query
                 TVector<TExprBase> structMembers;
                 for (size_t i = 0; i < tableDesc.Metadata->KeyColumnNames.size(); ++i) {
                     auto member = Build<TCoNameValueTuple>(ctx, node.Pos())
@@ -462,10 +449,6 @@ TExprBase KqpPushExtractedPredicateToReadTable(TExprBase node, TExprContext& ctx
                         .Done();
                 }
             }
-        } else if (buildResult.PointPrefixLen == tableDesc.Metadata->KeyColumnNames.size()) {
-            YQL_ENSURE(prefixPointsExpr);
-            residualLambda = pointsExtractionResult.PrunedLambda;
-            buildLookup(prefixPointsExpr, input);
         }
     }