diff options
| author | Ilnaz Nizametdinov <i.nizametdinov@gmail.com> | 2022-05-04 21:02:37 +0300 |
|---|---|---|
| committer | Ilnaz Nizametdinov <i.nizametdinov@gmail.com> | 2022-05-04 21:02:37 +0300 |
| commit | 4865018f3ee342504dd8ca5cd9b3db7495cfdbd1 (patch) | |
| tree | f117fb41b4b57aae66ff77045e7d1bb6291d60c1 | |
| parent | da14acabe46c54a078a798be58577da2a78d224f (diff) | |
| download | ydb-4865018f3ee342504dd8ca5cd9b3db7495cfdbd1.tar.gz | |
(refactoring) Separate *BackupToYt() helper KIKIMR-14803
ref:c13a72a58928b00d7b75fd47c7d883a6dc0cfac9
| -rw-r--r-- | ydb/core/tx/schemeshard/ut_helpers/helpers.cpp | 32 | ||||
| -rw-r--r-- | ydb/core/tx/schemeshard/ut_helpers/helpers.h | 3 |
2 files changed, 24 insertions, 11 deletions
diff --git a/ydb/core/tx/schemeshard/ut_helpers/helpers.cpp b/ydb/core/tx/schemeshard/ut_helpers/helpers.cpp index b430f22ff2e..e87d0c63410 100644 --- a/ydb/core/tx/schemeshard/ut_helpers/helpers.cpp +++ b/ydb/core/tx/schemeshard/ut_helpers/helpers.cpp @@ -482,7 +482,7 @@ namespace NSchemeShardUT_Private { // Backup template <> - auto CreateTransaction(const TString& parentPath, const TString& tableName, const TApplyIf& applyIf, + auto CreateTransaction(const TString& parentPath, const TString& scheme, const TApplyIf& applyIf, NKikimrSchemeOp::EOperationType type, TModifySchemeFunc<NKikimrSchemeOp::TBackupTask> func) { NKikimrSchemeOp::TModifyScheme tx; @@ -492,17 +492,28 @@ namespace NSchemeShardUT_Private { SetApplyIf(tx, applyIf); auto task = std::apply(func, std::tie(tx)); + const bool ok = google::protobuf::TextFormat::ParseFromString(scheme, task); + + if (!ok || task->HasYTSettings()) { + const auto ytProxy = GetEnv("YT_PROXY"); + UNIT_ASSERT(ytProxy); + + if (!task->HasTableName()) { + task->SetTableName(scheme); + } - task->SetTableName(tableName); - auto& settings = *task->MutableYTSettings(); + TString ytHost; + TMaybe<ui16> ytPort; + Split(ytProxy, ':', ytHost, ytPort); - TString ytHost; - TMaybe<ui16> ytPort; - Split(GetEnv("YT_PROXY"), ':', ytHost, ytPort); + auto& settings = *task->MutableYTSettings(); + settings.SetHost(ytHost); + settings.SetPort(ytPort.GetOrElse(80)); - settings.SetHost(ytHost); - settings.SetPort(ytPort.GetOrElse(80)); - settings.SetTablePattern("<append=true>//tmp/table"); + if (!settings.HasTablePattern()) { + settings.SetTablePattern("<append=true>//tmp/table"); + } + } return tx; } @@ -722,7 +733,8 @@ namespace NSchemeShardUT_Private { GENERIC_HELPERS(DropTableIndex, NKikimrSchemeOp::EOperationType::ESchemeOpDropIndex, &NKikimrSchemeOp::TModifyScheme::MutableDropIndex) // backup & restore - GENERIC_HELPERS(BackupTable, NKikimrSchemeOp::EOperationType::ESchemeOpBackup, &NKikimrSchemeOp::TModifyScheme::MutableBackup) + GENERIC_HELPERS(Backup, NKikimrSchemeOp::EOperationType::ESchemeOpBackup, &NKikimrSchemeOp::TModifyScheme::MutableBackup) + GENERIC_HELPERS(BackupToYt, NKikimrSchemeOp::EOperationType::ESchemeOpBackup, &NKikimrSchemeOp::TModifyScheme::MutableBackup) GENERIC_HELPERS(Restore, NKikimrSchemeOp::EOperationType::ESchemeOpRestore, &NKikimrSchemeOp::TModifyScheme::MutableRestore) // cdc stream diff --git a/ydb/core/tx/schemeshard/ut_helpers/helpers.h b/ydb/core/tx/schemeshard/ut_helpers/helpers.h index 5fc35c4dc6a..02e8ce56092 100644 --- a/ydb/core/tx/schemeshard/ut_helpers/helpers.h +++ b/ydb/core/tx/schemeshard/ut_helpers/helpers.h @@ -131,7 +131,8 @@ namespace NSchemeShardUT_Private { GENERIC_HELPERS(DropTableIndex); // backup & restore - GENERIC_HELPERS(BackupTable); + GENERIC_HELPERS(Backup); + GENERIC_HELPERS(BackupToYt); GENERIC_HELPERS(Restore); // cdc stream |