Split FillACL method

Author: pixcc

ydb/core/tx/schemeshard/schemeshard_import_flow_proposals.cpp

@@ -66,8 +66,9 @@ THolder<TEvSchemeShard::TEvModifySchemeTransaction> CreateTablePropose(
     if (importInfo->UserSID) {
         record.SetOwner(*importInfo->UserSID);
     }
+    FillOwner(record, item.Permissions);
 
-    if (!FillACL(record, item.Permissions, error)) {
+    if (!FillACL(modifyScheme, item.Permissions, error)) {
         return nullptr;
     }
 

ydb/core/ydb_convert/ydb_convert.cpp

@@ -1432,7 +1432,7 @@ void ProtoValueFromCell(NYdb::TValueBuilder& vb, const NScheme::TTypeInfo& typeI
     }
 }
 
-bool FillACL(NKikimrScheme::TEvModifySchemeTransaction& out,
+bool FillACL(NKikimrSchemeOp::TModifyScheme& out,
              const TMaybeFail<Ydb::Scheme::ModifyPermissionsRequest>& in,
              TString& error) {
     if (in.Empty()) {
@@ -1443,15 +1443,24 @@ bool FillACL(NKikimrScheme::TEvModifySchemeTransaction& out,
     for (const auto& action : in->actions()) {
         if (action.has_grant() && !FillAllowPermissions(diffACL, action.grant(), error)) {
             return false;
-        } else if (action.has_change_owner()) {
-            out.SetOwner(action.change_owner());
         }
     }
+    out.MutableModifyACL()->SetDiffACL(diffACL.SerializeAsString());
 
-    for (auto& tx : *out.MutableTransaction()) {
-        tx.MutableModifyACL()->SetDiffACL(diffACL.SerializeAsString());
-    }
     return true;
 }
 
+void FillOwner(NKikimrScheme::TEvModifySchemeTransaction& out,
+    const TMaybeFail<Ydb::Scheme::ModifyPermissionsRequest>& in) {
+    if (in.Empty()) {
+        return;
+    }
+
+    for (const auto& action : in->actions()) {
+        if (action.has_change_owner()) {
+            out.SetOwner(action.change_owner());
+        }
+    }
+}
+
 } // namespace NKikimr

ydb/core/ydb_convert/ydb_convert.h

@@ -57,8 +57,11 @@ bool CellFromProtoVal(NScheme::TTypeInfo type, i32 typmod, const Ydb::Value* vp,
 
 void ProtoValueFromCell(NYdb::TValueBuilder& vb, const NScheme::TTypeInfo& typeInfo, const TCell& cell);
 
-bool FillACL(NKikimrScheme::TEvModifySchemeTransaction& out,
+bool FillACL(NKikimrSchemeOp::TModifyScheme& out,
     const TMaybeFail<Ydb::Scheme::ModifyPermissionsRequest>& in,
     TString& error);
 
+void FillOwner(NKikimrScheme::TEvModifySchemeTransaction& out,
+    const TMaybeFail<Ydb::Scheme::ModifyPermissionsRequest>& in);
+
 } // namespace NKikimr

ydb/tests/functional/scheme_tests/canondata/tablet_scheme_tests.TestTabletSchemes.test_tablet_schemes_flat_schemeshard_/flat_schemeshard.schema

@@ -5833,6 +5833,11 @@
                 "ColumnId": 10,
                 "ColumnName": "Issue",
                 "ColumnType": "Utf8"
+            },
+            {
+                "ColumnId": 11,
+                "ColumnName": "Permissions",
+                "ColumnType": "String"
             }
         ],
         "ColumnsDropped": [],
@@ -5848,7 +5853,8 @@
                     7,
                     8,
                     9,
-                    10
+                    10,
+                    11
                 ],
                 "RoomID": 0,
                 "Codec": 0,