Merge d5fad5a into 57cf0e9

Author: gridnevvvit

ydb/core/kqp/common/kqp_resolve.h

@@ -33,6 +33,7 @@ struct TTableConstInfo : public TAtomicRefCount<TTableConstInfo> {
     ETableKind TableKind = ETableKind::Unknown;
     THashMap<TString, TString> Sequences;
     THashMap<TString, Ydb::TypedValue> DefaultFromLiteral;
+    bool IsBuildInProgress = false;
 
     TTableConstInfo() {}
     TTableConstInfo(const TString& path) : Path(path) {}
@@ -52,6 +53,7 @@ struct TTableConstInfo : public TAtomicRefCount<TTableConstInfo> {
                 NPg::TypeDescFromPgTypeName(phyColumn.GetPgTypeName()));
         }
         column.NotNull = phyColumn.GetNotNull();
+        column.IsBuildInProgress = phyColumn.GetIsBuildInProgress();
 
         Columns.emplace(phyColumn.GetId().GetName(), std::move(column));
         if (!phyColumn.GetDefaultFromSequence().empty()) {
@@ -144,19 +146,19 @@ class TKqpTableKeys {
         const TMap<TString, NSharding::TShardingBase::TColumn>& GetColumns() const {
             return TableConstInfo->Columns;
         }
-        
+
         const TVector<TString>& GetKeyColumns() const {
             return TableConstInfo->KeyColumns;
         }
-        
+
         const TVector<NScheme::TTypeInfo>& GetKeyColumnTypes() const {
             return TableConstInfo->KeyColumnTypes;
         }
-        
+
         const ETableKind& GetTableKind() const {
             return TableConstInfo->TableKind;
         }
-        
+
         const THashMap<TString, TString>& GetSequences() const {
             return TableConstInfo->Sequences;
         }

ydb/core/kqp/gateway/kqp_metadata_loader.cpp

@@ -192,7 +192,8 @@ TTableMetadataResult GetTableMetadataResult(const NSchemeCache::TSchemeCacheNavi
                 columnDesc.Name, columnDesc.Id, typeName, notNull, columnDesc.PType, columnDesc.PTypeMod,
                 columnDesc.DefaultFromSequence,
                 defaultKind,
-                columnDesc.DefaultFromLiteral
+                columnDesc.DefaultFromLiteral,
+                columnDesc.IsBuildInProgress
             )
         );
         if (columnDesc.KeyOrder >= 0) {

ydb/core/kqp/opt/kqp_opt_kql.cpp

@@ -447,7 +447,7 @@ TExprBase BuildRowsToDelete(const TKikimrTableDescription& tableData, bool withS
     const TPositionHandle pos, TExprContext& ctx, const TIntrusivePtr<TKqpOptimizeContext>& kqpCtx)
 {
     const auto tableMeta = BuildTableMeta(tableData, pos, ctx);
-    const auto tableColumns = BuildColumnsList(tableData, pos, ctx, withSystemColumns);
+    const auto tableColumns = BuildColumnsList(tableData, pos, ctx, withSystemColumns, true /*ignoreWriteOnlyColumns*/);
 
     const auto allRows = BuildReadTable(tableColumns, pos, tableData, false, ctx, kqpCtx);
 
@@ -522,7 +522,7 @@ TExprBase BuildDeleteTableWithIndex(const TKiDeleteTable& del, const TKikimrTabl
 TExprBase BuildRowsToUpdate(const TKikimrTableDescription& tableData, bool withSystemColumns, const TCoLambda& filter,
     const TPositionHandle pos, TExprContext& ctx, const TIntrusivePtr<TKqpOptimizeContext>& kqpCtx)
 {
-    auto kqlReadTable = BuildReadTable(BuildColumnsList(tableData, pos, ctx, withSystemColumns), pos, tableData, false, ctx, kqpCtx);
+    auto kqlReadTable = BuildReadTable(BuildColumnsList(tableData, pos, ctx, withSystemColumns, true /*ignoreWriteOnlyColumns*/), pos, tableData, false, ctx, kqpCtx);
 
     return Build<TCoFilter>(ctx, pos)
         .Input(kqlReadTable)

ydb/core/kqp/provider/yql_kikimr_datasink.cpp

@@ -671,7 +671,7 @@ class TKikimrDataSink : public TDataProviderBase
                             TString(dataSink.Cluster()),
                             key.GetTablePath(), node->Pos(), ctx);
 
-                        returningColumns = BuildColumnsList(*table, node->Pos(), ctx, sysColumnsEnabled);
+                        returningColumns = BuildColumnsList(*table, node->Pos(), ctx, sysColumnsEnabled, true /*ignoreWriteOnlyColumns*/);
 
                         break;
                     } else {

ydb/core/kqp/provider/yql_kikimr_expr_nodes.cpp

@@ -17,7 +17,7 @@ TCoAtomList TKiReadTable::GetSelectColumns(TExprContext& ctx, const TKikimrTable
     bool withSystemColumns) const
 {
     if (Select().Maybe<TCoVoid>()) {
-        return BuildColumnsList(tableData, Pos(), ctx, withSystemColumns);
+        return BuildColumnsList(tableData, Pos(), ctx, withSystemColumns, true /*ignoreWriteOnlyColumns*/);
     }
 
     return Select().Cast<TCoAtomList>();

ydb/core/kqp/provider/yql_kikimr_gateway.h

@@ -215,13 +215,14 @@ struct TKikimrColumnMetadata {
     NKikimrKqp::TKqpColumnMetadataProto::EDefaultKind DefaultKind = NKikimrKqp::TKqpColumnMetadataProto::DEFAULT_KIND_UNSPECIFIED;
     TString DefaultFromSequence;
     Ydb::TypedValue DefaultFromLiteral;
+    bool IsBuildInProgress = false;
 
     TKikimrColumnMetadata() = default;
 
     TKikimrColumnMetadata(const TString& name, ui32 id, const TString& type, bool notNull,
         NKikimr::NScheme::TTypeInfo typeInfo = {}, const TString& typeMod = {}, const TString& defaultFromSequence = {},
         NKikimrKqp::TKqpColumnMetadataProto::EDefaultKind defaultKind = NKikimrKqp::TKqpColumnMetadataProto::DEFAULT_KIND_UNSPECIFIED,
-        const Ydb::TypedValue& defaultFromLiteral = {})
+        const Ydb::TypedValue& defaultFromLiteral = {}, bool isBuildInProgress = false)
         : Name(name)
         , Id(id)
         , Type(type)
@@ -231,6 +232,7 @@ struct TKikimrColumnMetadata {
         , DefaultKind(defaultKind)
         , DefaultFromSequence(defaultFromSequence)
         , DefaultFromLiteral(defaultFromLiteral)
+        , IsBuildInProgress(isBuildInProgress)
     {}
 
     explicit TKikimrColumnMetadata(const NKikimrKqp::TKqpColumnMetadataProto* message)
@@ -242,6 +244,7 @@ struct TKikimrColumnMetadata {
         , DefaultKind(message->GetDefaultKind())
         , DefaultFromSequence(message->GetDefaultFromSequence())
         , DefaultFromLiteral(message->GetDefaultFromLiteral())
+        , IsBuildInProgress(message->GetIsBuildInProgress())
     {
         auto typeInfoMod = NKikimr::NScheme::TypeInfoModFromProtoColumnType(message->GetTypeId(),
             message->HasTypeInfo() ? &message->GetTypeInfo() : nullptr);
@@ -279,6 +282,7 @@ struct TKikimrColumnMetadata {
         message->SetDefaultFromSequence(DefaultFromSequence);
         message->SetDefaultKind(DefaultKind);
         message->MutableDefaultFromLiteral()->CopyFrom(DefaultFromLiteral);
+        message->SetIsBuildInProgress(IsBuildInProgress);
         if (columnType.TypeInfo) {
             *message->MutableTypeInfo() = *columnType.TypeInfo;
         }

ydb/core/kqp/provider/yql_kikimr_provider.cpp

@@ -463,10 +463,14 @@ bool TKikimrKey::Extract(const TExprNode& key) {
 }
 
 TCoAtomList BuildColumnsList(const TKikimrTableDescription& table, TPositionHandle pos,
-    TExprContext& ctx, bool withSystemColumns)
+    TExprContext& ctx, bool withSystemColumns, bool ignoreWriteOnlyColumns)
 {
     TVector<TExprBase> columnsToSelect;
     for (const auto& pair : table.Metadata->Columns) {
+        if (pair.second.IsBuildInProgress && ignoreWriteOnlyColumns) {
+            continue;
+        }
+
         auto atom = Build<TCoAtom>(ctx, pos)
             .Value(pair.second.Name)
             .Done();

ydb/core/kqp/provider/yql_kikimr_provider_impl.h

@@ -209,7 +209,7 @@ TAutoPtr<IGraphTransformer> CreateKiSinkCallableExecutionTransformer(
 TAutoPtr<IGraphTransformer> CreateKiSinkPlanInfoTransformer(TIntrusivePtr<IKikimrQueryExecutor> queryExecutor);
 
 NNodes::TCoAtomList BuildColumnsList(const TKikimrTableDescription& table, TPositionHandle pos,
-    TExprContext& ctx, bool withSystemColumns);
+    TExprContext& ctx, bool withSystemColumns, bool ignoreWriteOnlyColumns);
 
 const TTypeAnnotationNode* GetReadTableRowType(TExprContext& ctx, const TKikimrTablesData& tablesData,
     const TString& cluster, const TString& table, NNodes::TCoAtomList select, bool withSystemColumns = false);

ydb/core/kqp/provider/yql_kikimr_type_ann.cpp

@@ -431,7 +431,7 @@ class TKiSinkTypeAnnotationTransformer : public TKiSinkVisitorTransformer
             }
 
             if (info.IsDefaultKindDefined()) {
-                if (op == TYdbOperation::Upsert) {
+                if (op == TYdbOperation::Upsert && !info.IsBuildInProgress) {
                     generateColumnsIfInsertColumnsSet.emplace(name);
                 }
 

ydb/core/kqp/query_compiler/kqp_query_compiler.cpp

@@ -174,6 +174,7 @@ void FillTable(const TKikimrTableMetadata& tableMeta, THashSet<TStringBuf>&& col
         phyColumn.MutableId()->SetId(column->Id);
         phyColumn.MutableId()->SetName(column->Name);
         phyColumn.SetTypeId(column->TypeInfo.GetTypeId());
+        phyColumn.SetIsBuildInProgress(column->IsBuildInProgress);
         if (column->IsDefaultFromSequence()) {
             phyColumn.SetDefaultFromSequence(column->DefaultFromSequence);
         } else if (column->IsDefaultFromLiteral()) {