Rename incr backup system columns (#7847)

Author: Enjection

ydb/core/backup/impl/table_writer_impl.h

@@ -97,7 +97,7 @@ class TChangeRecord: public NChangeExchange::TChangeRecordBase {
             *upsert.MutableTags() = {
                 ProtoBody.GetCdcDataChange().GetUpsert().GetTags().begin(),
                 ProtoBody.GetCdcDataChange().GetUpsert().GetTags().end()};
-            auto it = Schema->ValueColumns.find("__incrBackupImpl_deleted");
+            auto it = Schema->ValueColumns.find("__ydb_incrBackupImpl_deleted");
             Y_ABORT_UNLESS(it != Schema->ValueColumns.end(), "Invariant violation");
             upsert.AddTags(it->second.Tag);
 
@@ -119,7 +119,7 @@ class TChangeRecord: public NChangeExchange::TChangeRecordBase {
 
             for (const auto& [name, value] : Schema->ValueColumns) {
                 tags.push_back(value.Tag);
-                if (name != "__incrBackupImpl_deleted") {
+                if (name != "__ydb_incrBackupImpl_deleted") {
                     cells.emplace_back();
                 } else {
                     cells.emplace_back(TCell::Make<bool>(true));

ydb/core/backup/impl/table_writer_ut.cpp

@@ -14,7 +14,7 @@ Y_UNIT_TEST_SUITE(TableWriter) {
                     .Tag = 1,
                     .Type = NScheme::TTypeInfo{NScheme::NTypeIds::Uint64},
                 });
-        schema->ValueColumns.emplace("__incrBackupImpl_deleted", TLightweightSchema::TColumn{
+        schema->ValueColumns.emplace("__ydb_incrBackupImpl_deleted", TLightweightSchema::TColumn{
                     .Tag = 123,
                     .Type = NScheme::TTypeInfo{NScheme::NTypeIds::Bool},
                 });
@@ -59,10 +59,10 @@ Y_UNIT_TEST_SUITE(TableWriter) {
             TString out = TSerializedCellVec::Serialize(outCells);
 
             UNIT_ASSERT_VALUES_EQUAL(TSerializedCellVec::Serialize(keyCells), result.GetKey());
-            UNIT_ASSERT_VALUES_EQUAL(out, result.GetUpsert().GetData());
             UNIT_ASSERT(result.GetUpsert().TagsSize() == 2);
             UNIT_ASSERT(result.GetUpsert().GetTags(0) == 1);
             UNIT_ASSERT(result.GetUpsert().GetTags(1) == 123);
+            UNIT_ASSERT_VALUES_EQUAL(out, result.GetUpsert().GetData());
         }
 
         {
@@ -93,17 +93,17 @@ Y_UNIT_TEST_SUITE(TableWriter) {
             record->Serialize(result, ctx);
 
             TVector<TCell> outCells{
-                TCell::Make<bool>(true),
                 TCell(),
+                TCell::Make<bool>(true),
             };
 
             TString out = TSerializedCellVec::Serialize(outCells);
 
             UNIT_ASSERT_VALUES_EQUAL(TSerializedCellVec::Serialize(keyCells), result.GetKey());
-            UNIT_ASSERT_VALUES_EQUAL(out, result.GetUpsert().GetData());
             UNIT_ASSERT(result.GetUpsert().TagsSize() == 2);
-            UNIT_ASSERT(result.GetUpsert().GetTags(0) == 123);
-            UNIT_ASSERT(result.GetUpsert().GetTags(1) == 1);
+            UNIT_ASSERT(result.GetUpsert().GetTags(1) == 123);
+            UNIT_ASSERT(result.GetUpsert().GetTags(0) == 1);
+            UNIT_ASSERT_VALUES_EQUAL(out, result.GetUpsert().GetData());
         }
     }
 
@@ -148,9 +148,9 @@ Y_UNIT_TEST_SUITE(TableWriter) {
             record->Serialize(result, ctx);
 
             UNIT_ASSERT_VALUES_EQUAL(TSerializedCellVec::Serialize(keyCells), result.GetKey());
-            UNIT_ASSERT_VALUES_EQUAL(upsert.GetData(), result.GetUpsert().GetData());
             UNIT_ASSERT(result.GetUpsert().TagsSize() == 1);
             UNIT_ASSERT(result.GetUpsert().GetTags(0) == 1);
+            UNIT_ASSERT_VALUES_EQUAL(upsert.GetData(), result.GetUpsert().GetData());
         }
 
     }

ydb/core/tx/datashard/cdc_stream_scan.cpp

@@ -218,7 +218,7 @@ class TDataShard::TTxCdcStreamScanProgress
             const auto tag = tags.at(pos);
             auto it = table->Columns.find(tag);
             Y_ABORT_UNLESS(it != table->Columns.end());
-            if (it->second.Name == "__incrBackupImpl_deleted") {
+            if (it->second.Name == "__ydb_incrBackupImpl_deleted") {
                 if (const auto& cell = cells.at(pos); !cell.IsNull() && cell.AsValue<bool>()) {
                     return std::nullopt;
                 }

ydb/core/tx/datashard/datashard_ut_incremental_backup.cpp

@@ -274,13 +274,14 @@ Y_UNIT_TEST_SUITE(IncrementalBackup) {
             "/Root",
             "IncrBackupImpl",
             SimpleTable()
+                .AllowSystemColumnNames(true)
                 .Columns({
                     {"key", "Uint32", true, false},
                     {"value", "Uint32", false, false},
-                    {"__incrBackupImpl_deleted", "Bool", false, false}}));
+                    {"__ydb_incrBackupImpl_deleted", "Bool", false, false}}));
 
         ExecSQL(server, edgeActor, R"(
-            UPSERT INTO `/Root/IncrBackupImpl` (key, value, __incrBackupImpl_deleted) VALUES
+            UPSERT INTO `/Root/IncrBackupImpl` (key, value, __ydb_incrBackupImpl_deleted) VALUES
             (1, 10, NULL),
             (2, NULL, true),
             (3, 30, NULL),

ydb/core/tx/datashard/ut_common/datashard_ut_common.cpp

@@ -1184,6 +1184,10 @@ std::tuple<TVector<ui64>, TTableId> CreateShardedTable(
     UNIT_ASSERT(desc);
     desc->SetName(name);
 
+    if (opts.AllowSystemColumnNames_) {
+        desc->SetSystemColumnNamesAllowed(true);
+    }
+
     std::vector<TString> defaultFromSequences;
 
     for (const auto& column : opts.Columns_) {

ydb/core/tx/datashard/ut_common/datashard_ut_common.h

@@ -487,6 +487,7 @@ struct TShardedTableOptions {
     TABLE_OPTION(std::optional<EReplicationConsistency>, ReplicationConsistency, std::nullopt);
     TABLE_OPTION(TAttributes, Attributes, {});
     TABLE_OPTION(bool, Sequences, false);
+    TABLE_OPTION(bool, AllowSystemColumnNames, false);
 
 #undef TABLE_OPTION
 #undef TABLE_OPTION_IMPL

ydb/core/tx/schemeshard/schemeshard__operation_alter_continuous_backup.cpp

@@ -44,6 +44,7 @@ void DoCreateIncrBackupTable(const TOperationId& opId, const TPath& dst, NKikimr
     auto& desc = *outTx.MutableCreateTable();
     desc.CopyFrom(tableDesc);
     desc.SetName(dst.LeafName());
+    desc.SetSystemColumnNamesAllowed(true);
 
     auto& attrsDesc = *outTx.MutableAlterUserAttributes();
     attrsDesc.SetPathName(dst.LeafName());
@@ -59,7 +60,7 @@ void DoCreateIncrBackupTable(const TOperationId& opId, const TPath& dst, NKikimr
     // TODO: cleanup all sequences
 
     auto* col = desc.AddColumns();
-    col->SetName("__incrBackupImpl_deleted");
+    col->SetName("__ydb_incrBackupImpl_deleted");
     col->SetType("Bool");
 
     result.push_back(CreateNewTable(NextPartId(opId, result), outTx));

ydb/core/tx/schemeshard/ut_continuous_backup/ut_continuous_backup.cpp

@@ -125,7 +125,7 @@ Y_UNIT_TEST_SUITE(TContinuousBackupTests) {
         TestDescribeResult(DescribePrivatePath(runtime, "/MyRoot/IncrBackupImpl"), {
             NLs::PathExist,
             NLs::IsTable,
-            NLs::CheckColumns("IncrBackupImpl", {"key", "value", "__incrBackupImpl_deleted"}, {}, {"key"}),
+            NLs::CheckColumns("IncrBackupImpl", {"key", "value", "__ydb_incrBackupImpl_deleted"}, {}, {"key"}),
         });
     }
 } // TCdcStreamWithInitialScanTests