Merge d679ddd into a04d89b

Author: marsaly79

ydb/library/yql/providers/common/provider/yql_provider.cpp

@@ -1475,7 +1475,7 @@ bool NeedToRenamePgSelectColumns(const TCoPgSelect& pgSelect) {
 bool RenamePgSelectColumns(
     const TCoPgSelect& node,
     TExprNode::TPtr& output,
-    TMaybe<TVector<TString>> tableColumnOrder,
+    const TMaybe<TColumnOrder>& tableColumnOrder,
     TExprContext& ctx,
     TTypeAnnotationContext& types) {
 
@@ -1485,7 +1485,7 @@ bool RenamePgSelectColumns(
     TString optionName = (hasValues) ? "values" : "projection_order";
 
     auto selectorColumnOrder = types.LookupColumnOrder(node.Ref());
-    TVector<TString> insertColumnOrder;
+    TColumnOrder insertColumnOrder;
     if (auto targetColumnsOption = GetSetItemOption(node, "target_columns")) {
         auto targetColumns = GetSetItemOptionValue(TExprBase(targetColumnsOption));
         for (const auto& child : targetColumns->ChildrenList()) {

ydb/library/yql/providers/common/provider/yql_provider.h

@@ -209,7 +209,7 @@ bool NeedToRenamePgSelectColumns(const NNodes::TCoPgSelect& pgSelect);
 bool RenamePgSelectColumns(
     const NNodes::TCoPgSelect& node,
     TExprNode::TPtr& output,
-    TMaybe<TVector<TString>> tableColumnOrder,
+    const TMaybe<TColumnOrder>& tableColumnOrder,
     TExprContext& ctx,
     TTypeAnnotationContext& types);
 } // namespace NCommon

ydb/library/yql/providers/yt/provider/yql_yt_datasink_type_ann.cpp

@@ -459,7 +459,12 @@ class TYtDataSinkTypeAnnotationTransformer : public TVisitorTransformerBase {
             auto pgSelect = TCoPgSelect(content);
             if (NCommon::NeedToRenamePgSelectColumns(pgSelect)) {
                 TExprNode::TPtr output;
-                bool result = NCommon::RenamePgSelectColumns(pgSelect, output, contentColumnOrder, ctx, *State_->Types);
+
+                const auto& columnOrder = (outTableInfo.RowSpec)
+                    ? outTableInfo.RowSpec->GetColumnOrder()
+                    : contentColumnOrder;
+
+                bool result = NCommon::RenamePgSelectColumns(pgSelect, output, columnOrder, ctx, *State_->Types);
                 if (!result) {
                     return TStatus::Error;
                 }

ydb/library/yql/providers/yt/provider/yql_yt_physical_optimize.cpp

@@ -3400,6 +3400,13 @@ class TYtPhysicalOptProposalTransformer : public TOptimizeTransformerBase {
             return {};
         }
         TYtOutTableInfo outTable(outItemType, State_->Configuration->UseNativeYtTypes.Get().GetOrElse(DEFAULT_USE_NATIVE_YT_TYPES) ? NTCF_ALL : NTCF_NONE);
+
+        {
+            auto path = write.Table().Name().StringValue();
+            auto commitEpoch = TEpochInfo::Parse(write.Table().CommitEpoch().Ref()).GetOrElse(0);
+            auto dstRowSpec = State_->TablesData->GetTable(cluster, path, commitEpoch).RowSpec;
+            outTable.RowSpec->SetColumnOrder(dstRowSpec->GetColumnOrder());
+        }
         auto content = write.Content();
         if (auto sorted = content.Ref().GetConstraint<TSortedConstraintNode>()) {
             const bool useNativeDescSort = State_->Configuration->UseNativeDescSort.Get().GetOrElse(DEFAULT_USE_NATIVE_DESC_SORT);