Added support for PG into CBO (#2399)

Author: pavelvelikhov

ydb/core/kqp/opt/kqp_query_plan.cpp

@@ -1394,6 +1394,7 @@ class TxPlanSerializer {
 
         TOperator op;
         op.Properties["Name"] = name;
+        op.Properties["Condition"] = MakeJoinConditionString(join.LeftKeysColumnNames(), join.RightKeysColumnNames());
 
         auto operatorId = AddOperator(planNode, name, std::move(op));
 
@@ -1409,7 +1410,7 @@ class TxPlanSerializer {
 
         TOperator op;
         op.Properties["Name"] = name;
-
+        op.Properties["Condition"] = MakeJoinConditionString(join.LeftKeysColumnNames(), join.RightKeysColumnNames());
         AddOptimizerEstimates(op, join);
 
         return AddOperator(planNode, name, std::move(op));

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

@@ -147,6 +147,11 @@ bool IsKqlPureExpr(const TExprBase& expr) {
 TDqJoin FlipLeftSemiJoin(const TDqJoin& join, TExprContext& ctx) {
     Y_DEBUG_ABORT_UNLESS(join.JoinType().Value() == "LeftSemi");
 
+    TVector<TCoAtom> leftJoinKeyNames;
+    leftJoinKeyNames.reserve(join.JoinKeys().Size());
+    TVector<TCoAtom> rightJoinKeyNames;
+    rightJoinKeyNames.reserve(join.JoinKeys().Size());
+
     auto joinKeysBuilder = Build<TDqJoinKeyTupleList>(ctx, join.Pos());
     for (const auto& keys : join.JoinKeys()) {
         joinKeysBuilder.Add<TDqJoinKeyTuple>()
@@ -155,6 +160,8 @@ TDqJoin FlipLeftSemiJoin(const TDqJoin& join, TExprContext& ctx) {
             .RightLabel(keys.LeftLabel())
             .RightColumn(keys.LeftColumn())
             .Build();
+        leftJoinKeyNames.emplace_back(keys.RightColumn());
+        rightJoinKeyNames.emplace_back(keys.LeftColumn());
     }
 
     return Build<TDqJoin>(ctx, join.Pos())
@@ -164,6 +171,10 @@ TDqJoin FlipLeftSemiJoin(const TDqJoin& join, TExprContext& ctx) {
         .RightLabel(join.LeftLabel())
         .JoinType().Build("RightSemi")
         .JoinKeys(joinKeysBuilder.Done())
+        .LeftJoinKeyNames()
+            .Add(leftJoinKeyNames).Build()
+        .RightJoinKeyNames()
+            .Add(rightJoinKeyNames).Build()
         .Done();
 }
 
@@ -835,6 +846,8 @@ TMaybeNode<TExprBase> KqpJoinToIndexLookupImpl(const TDqJoin& join, TExprContext
         .RightLabel(join.RightLabel())
         .JoinType(join.JoinType())
         .JoinKeys(join.JoinKeys())
+        .LeftJoinKeyNames(join.LeftJoinKeyNames())
+        .RightJoinKeyNames(join.RightJoinKeyNames())
         .Done();
 }
 

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

@@ -120,6 +120,12 @@ TExprBase KqpRewriteSqlInCompactToJoin(const TExprBase& node, TExprContext& ctx)
         .Value(leftLabelStr)
         .Done().Ptr();
 
+    TVector<TCoAtom> leftJoinKeyNames;
+    TVector<TCoAtom> rightJoinKeyNames;
+
+    leftJoinKeyNames.emplace_back(leftColumn);
+    rightJoinKeyNames.emplace_back(rightColumn);
+
     auto joinKeys = Build<TDqJoinKeyTupleList>(ctx, node.Pos())
         .Add<TDqJoinKeyTuple>()
             .LeftLabel(leftLabel)
@@ -149,6 +155,12 @@ TExprBase KqpRewriteSqlInCompactToJoin(const TExprBase& node, TExprContext& ctx)
             .Value("LeftSemi")
             .Build()
         .JoinKeys(joinKeys)
+        .LeftJoinKeyNames()
+            .Add(leftJoinKeyNames)
+            .Build()
+        .RightJoinKeyNames()
+            .Add(rightJoinKeyNames)
+            .Build()
         .Done();
 
     // Convert column names back, i.e. leftLabel.ColumnName -> ColumnName

ydb/core/kqp/ut/common/kqp_ut_common.cpp

@@ -70,6 +70,7 @@ SIMPLE_MODULE(TTestUdfsModule, TTestFilter, TTestFilterTerminate, TRandString);
 NYql::NUdf::TUniquePtr<NYql::NUdf::IUdfModule> CreateJson2Module();
 NYql::NUdf::TUniquePtr<NYql::NUdf::IUdfModule> CreateRe2Module();
 NYql::NUdf::TUniquePtr<NYql::NUdf::IUdfModule> CreateStringModule();
+NYql::NUdf::TUniquePtr<NYql::NUdf::IUdfModule> CreateDateTime2Module();
 
 NMiniKQL::IFunctionRegistry* UdfFrFactory(const NScheme::TTypeRegistry& typeRegistry) {
     Y_UNUSED(typeRegistry);
@@ -78,6 +79,7 @@ NMiniKQL::IFunctionRegistry* UdfFrFactory(const NScheme::TTypeRegistry& typeRegi
     funcRegistry->AddModule("", "Json2", CreateJson2Module());
     funcRegistry->AddModule("", "Re2", CreateRe2Module());
     funcRegistry->AddModule("", "String", CreateStringModule());
+    funcRegistry->AddModule("", "DateTime", CreateDateTime2Module());
     NKikimr::NMiniKQL::FillStaticModules(*funcRegistry);
     return funcRegistry.Release();
 }