WIP-35-0-5

Author: Enjection

ydb/core/tx/datashard/datashard_ut_incremental_backup.cpp

@@ -3108,30 +3108,56 @@ Y_UNIT_TEST_SUITE(IncrementalBackup) {
 
         SimulateSleep(server, TDuration::Seconds(5));
 
-        auto mainTableBackup = KqpSimpleExec(runtime, R"(
-            SELECT key, value FROM `/Root/.backups/collections/MyCollection/19700101000002Z_incremental/Table`
+        // Find the incremental backup directory using DescribePath
+        TString backupDir = FindIncrementalBackupDir(runtime, edgeActor, "/Root/.backups/collections/MyCollection");
+        UNIT_ASSERT_C(!backupDir.empty(), "Could not find incremental backup directory");
+        
+        Cerr << "Using backup directory: " << backupDir << Endl;
+        
+        // Verify the incremental backup table was created using DescribePath
+        TString mainTablePath = TStringBuilder() << "/Root/.backups/collections/MyCollection/" << backupDir << "/Table";
+        
+        auto tableRequest = MakeHolder<TEvTxUserProxy::TEvNavigate>();
+        tableRequest->Record.MutableDescribePath()->SetPath(mainTablePath);
+        tableRequest->Record.MutableDescribePath()->MutableOptions()->SetShowPrivateTable(true);
+        runtime.Send(new IEventHandle(MakeTxProxyID(), edgeActor, tableRequest.Release()));
+        auto tableReply = runtime.GrabEdgeEventRethrow<NSchemeShard::TEvSchemeShard::TEvDescribeSchemeResult>(edgeActor);
+        
+        UNIT_ASSERT_EQUAL(tableReply->Get()->GetRecord().GetStatus(), NKikimrScheme::EStatus::StatusSuccess);
+        UNIT_ASSERT(tableReply->Get()->GetRecord().GetPathDescription().HasTable());
+        
+        // Verify the table has the expected schema (including incremental backup metadata column)
+        bool hasChangeMetadataColumn = false;
+        for (const auto& col : tableReply->Get()->GetRecord().GetPathDescription().GetTable().GetColumns()) {
+            if (col.GetName() == "__ydb_incrBackupImpl_changeMetadata") {
+                hasChangeMetadataColumn = true;
+                break;
+            }
+        }
+        UNIT_ASSERT_C(hasChangeMetadataColumn, "Incremental backup table should have __ydb_incrBackupImpl_changeMetadata column");
+        
+        // Now verify the actual data
+        auto mainTableBackup = KqpSimpleExec(runtime, TStringBuilder() << R"(
+            SELECT key, value FROM `)" << mainTablePath << R"(`
             ORDER BY key
             )");
 
         UNIT_ASSERT_C(mainTableBackup.find("uint32_value: 2") != TString::npos,
-            "Main table backup should exist with OmitIndexes flag");
+            "Main table backup should contain updated key 2");
         UNIT_ASSERT_C(mainTableBackup.find("uint32_value: 250") != TString::npos,
             "Main table backup should contain updated value");
 
-        bool indexBackupExists = true;
-        try {
-            auto indexBackup = KqpSimpleExec(runtime, R"(
-                SELECT * FROM `/Root/.backups/collections/MyCollection/19700101000002Z_incremental/__ydb_backup_meta/indexes/Table/ByValue`
-                )");
-            if (indexBackup.empty() || indexBackup.find("ERROR") != TString::npos || 
-                indexBackup.find("not found") != TString::npos || indexBackup.find("doesn't exist") != TString::npos) {
-                indexBackupExists = false;
-            }
-        } catch (...) {
-            indexBackupExists = false;
-        }
-
-        UNIT_ASSERT_C(!indexBackupExists, "Index backup should NOT exist when OmitIndexes flag is set");
+        // Verify index backup does NOT exist when OmitIndexes is set
+        TString indexMetaPath = TStringBuilder() << "/Root/.backups/collections/MyCollection/" << backupDir << "/__ydb_backup_meta";
+        
+        auto indexMetaRequest = MakeHolder<TEvTxUserProxy::TEvNavigate>();
+        indexMetaRequest->Record.MutableDescribePath()->SetPath(indexMetaPath);
+        runtime.Send(new IEventHandle(MakeTxProxyID(), edgeActor, indexMetaRequest.Release()));
+        auto indexMetaReply = runtime.GrabEdgeEventRethrow<NSchemeShard::TEvSchemeShard::TEvDescribeSchemeResult>(edgeActor);
+        
+        // With OmitIndexes=true, the __ydb_backup_meta directory should not exist
+        UNIT_ASSERT_C(indexMetaReply->Get()->GetRecord().GetStatus() == NKikimrScheme::EStatus::StatusPathDoesNotExist,
+            "Index backup metadata directory should NOT exist when OmitIndexes flag is set");
     }
     Y_UNIT_TEST(BasicIndexIncrementalRestore) {
         TPortManager portManager;