[KQP] Add KqpTypeAnnotation for KqpOptPhy. (#22614)

Author: denis0x0D

ydb/core/kqp/host/kqp_host_impl.h

@@ -270,12 +270,6 @@ TAutoPtr<NYql::IGraphTransformer> CreateKqpExplainPreparedTransformer(TIntrusive
     const TString& cluster, TIntrusivePtr<TKqlTransformContext> transformCtx, const NMiniKQL::IFunctionRegistry* funcRegistry,
     NYql::TTypeAnnotationContext& typeCtx, TIntrusivePtr<NOpt::TKqpOptimizeContext> optimizeCtx);
 
-TAutoPtr<NYql::IGraphTransformer> CreateKqpTypeAnnotationTransformer(const TString& cluster,
-    TIntrusivePtr<NYql::TKikimrTablesData> tablesData, NYql::TTypeAnnotationContext& typesCtx,
-    NYql::TKikimrConfiguration::TPtr config);
-
-TAutoPtr<NYql::IGraphTransformer> CreateKqpCheckQueryTransformer();
-
 TIntrusivePtr<NYql::IKikimrGateway> CreateKqpGatewayProxy(const TIntrusivePtr<IKqpGateway>& gateway,
     const TIntrusivePtr<NYql::TKikimrSessionContext>& sessionCtx, TActorSystem* actorSystem);
 

ydb/core/kqp/host/kqp_runner.cpp

@@ -313,7 +313,7 @@ class TKqpRunner : public IKqpRunner {
             .AddIOAnnotation()
             .AddTypeAnnotationTransformer(CreateKqpTypeAnnotationTransformer(Cluster, sessionCtx->TablesPtr(),
                 *typesCtx, Config))
-            .Add(CreateKqpCheckQueryTransformer(), "CheckKqlQuery")
+            .Add(NOpt::CreateKqpCheckQueryTransformer(), "CheckKqlQuery")
             .AddPostTypeAnnotation(/* forSubgraph */ true)
             .AddCommonOptimization()
             .Add(CreateKqpConstantFoldingTransformer(OptimizeCtx, *typesCtx, Config), "ConstantFolding")

ydb/core/kqp/host/kqp_statement_rewrite.cpp

@@ -124,7 +124,7 @@ namespace {
             .AddExpressionEvaluation(funcRegistry)
             .AddPreTypeAnnotation()
             .AddIOAnnotation()
-            .AddTypeAnnotationTransformer(CreateKqpTypeAnnotationTransformer(cluster, sessionCtx->TablesPtr(), typeCtx, sessionCtx->ConfigPtr()))
+            .AddTypeAnnotationTransformer(NOpt::CreateKqpTypeAnnotationTransformer(cluster, sessionCtx->TablesPtr(), typeCtx, sessionCtx->ConfigPtr()))
             .Build(false);
 
         return TPrepareRewriteInfo{

ydb/core/kqp/host/ya.make

@@ -7,7 +7,6 @@ SRCS(
     kqp_runner.cpp
     kqp_transform.cpp
     kqp_translate.cpp
-    kqp_type_ann.cpp
     kqp_statement_rewrite.cpp
 )
 

ydb/core/kqp/opt/kqp_opt.h

@@ -108,4 +108,9 @@ TAutoPtr<NYql::IGraphTransformer> CreateKqpBuildPhysicalQueryTransformer(const T
 
 TAutoPtr<NYql::IGraphTransformer> CreateKqpQueryBlocksTransformer(TAutoPtr<NYql::IGraphTransformer> queryBlockTransformer);
 
+TAutoPtr<NYql::IGraphTransformer> CreateKqpTypeAnnotationTransformer(const TString& cluster,
+    TIntrusivePtr<NYql::TKikimrTablesData> tablesData, NYql::TTypeAnnotationContext& typesCtx, NYql::TKikimrConfiguration::TPtr config);
+
+TAutoPtr<NYql::IGraphTransformer> CreateKqpCheckQueryTransformer();
+
 } // namespace NKikimr::NKqp::NOpt

ydb/core/kqp/opt/kqp_opt_build_txs.cpp

@@ -504,7 +504,8 @@ class TKqpBuildTxsTransformer : public TSyncTransformerBase {
             .Add(*TypeAnnTransformer, "TypeAnnotation")
             .AddPostTypeAnnotation(/* forSubgraph */ true)
             .Add(CreateKqpBuildPhyStagesTransformer(config->EnableSpilling, typesCtx, config->BlockChannelsMode), "BuildPhysicalStages")
-            .Add(CreateKqpPhyOptTransformer(kqpCtx, typesCtx, config, nullptr), "KqpPhysicalOptimize")
+            .Add(CreateKqpPhyOptTransformer(kqpCtx, typesCtx, config,
+                CreateTypeAnnotationTransformer(CreateKqpTypeAnnotationTransformer(kqpCtx->Cluster, kqpCtx->Tables, typesCtx, config), typesCtx)), "KqpPhysicalOptimize")
             // TODO(ilezhankin): "BuildWideBlockChannels" transformer is required only for BLOCK_CHANNELS_FORCE mode.
             .Add(CreateKqpBuildWideBlockChannelsTransformer(typesCtx, config->BlockChannelsMode), "BuildWideBlockChannels")
             .Add(*BuildTxTransformer, "BuildPhysicalTx")

ydb/core/kqp/host/kqp_type_ann.cpp renamed to ydb/core/kqp/opt/kqp_type_ann.cpp

@@ -1,5 +1,3 @@
-#include "kqp_host_impl.h"
-
 #include <ydb/core/kqp/common/kqp_yql.h>
 #include <ydb/core/kqp/provider/yql_kikimr_provider_impl.h>
 
@@ -12,8 +10,7 @@
 
 #include <library/cpp/containers/absl_flat_hash/flat_hash_set.h>
 
-namespace NKikimr {
-namespace NKqp {
+namespace NKikimr::NKqp::NOpt {
 
 using namespace NYql;
 using namespace NYql::NDq;
@@ -2438,5 +2435,4 @@ TAutoPtr<IGraphTransformer> CreateKqpCheckQueryTransformer() {
         });
 }
 
-} // namespace NKqp
 } // namespace NKikimr

ydb/core/kqp/opt/ya.make

@@ -15,6 +15,7 @@ SRCS(
     kqp_column_statistics_requester.cpp
     kqp_constant_folding_transformer.cpp
     kqp_opt_hash_func_propagate_transformer.cpp
+    kqp_type_ann.cpp
 )
 
 PEERDIR(