diff options
author | serg-belyakov <serg-belyakov@yandex-team.com> | 2023-01-18 10:59:10 +0300 |
---|---|---|
committer | serg-belyakov <serg-belyakov@yandex-team.com> | 2023-01-18 10:59:10 +0300 |
commit | 1fc17b8583aabcb57fab1c082783310d7b39ee94 (patch) | |
tree | 4a90c4910eda74334417de8d2ed3d4bb4026b307 | |
parent | aa68184d84e44486e8a84092c48554f68ed1fc8a (diff) | |
download | ydb-1fc17b8583aabcb57fab1c082783310d7b39ee94.tar.gz |
Refactoring, change variables' naming,
Refactoring
-rw-r--r-- | ydb/core/driver_lib/run/version.cpp | 40 | ||||
-rw-r--r-- | ydb/core/driver_lib/run/version.h | 16 | ||||
-rw-r--r-- | ydb/core/driver_lib/run/version_ut.cpp | 144 | ||||
-rw-r--r-- | ydb/core/protos/config.proto | 4 |
4 files changed, 102 insertions, 102 deletions
diff --git a/ydb/core/driver_lib/run/version.cpp b/ydb/core/driver_lib/run/version.cpp index 65be9c262c9..fb88cbbdf54 100644 --- a/ydb/core/driver_lib/run/version.cpp +++ b/ydb/core/driver_lib/run/version.cpp @@ -2,20 +2,20 @@ #include "version.h" -NKikimrConfig::TCurrentCompatibilityInformation* CompatibilityInformation = nullptr; +NKikimrConfig::TCurrentCompatibilityInfo* CompatibilityInfo = nullptr; -const NKikimrConfig::TCurrentCompatibilityInformation* GetCurrentCompatibilityInformation() { +const NKikimrConfig::TCurrentCompatibilityInfo* GetCurrentCompatibilityInfo() { static TSpinLock lock; TGuard<TSpinLock> g(lock); - if (!CompatibilityInformation) { - CompatibilityInformation = new NKikimrConfig::TCurrentCompatibilityInformation(); + if (!CompatibilityInfo) { + CompatibilityInfo = new NKikimrConfig::TCurrentCompatibilityInfo(); // Look for protobuf message format in ydb/core/protos/config.proto // To be changed in new release: - CompatibilityInformation->SetBuild("trunk"); + CompatibilityInfo->SetBuild("trunk"); } - return CompatibilityInformation; + return CompatibilityInfo; } @@ -23,13 +23,13 @@ const NKikimrConfig::TCurrentCompatibilityInformation* GetCurrentCompatibilityIn // Last stable YDB release, which doesn't include version control change // When the compatibility information is not present in component's data, // we assume component's version to be this version -NKikimrConfig::TStoredCompatibilityInformation* UnknownYdbRelease = nullptr; -const NKikimrConfig::TStoredCompatibilityInformation* GetUnknownYdbRelease() { +NKikimrConfig::TStoredCompatibilityInfo* UnknownYdbRelease = nullptr; +const NKikimrConfig::TStoredCompatibilityInfo* GetUnknownYdbRelease() { static TSpinLock lock; TGuard<TSpinLock> g(lock); if (!UnknownYdbRelease) { - UnknownYdbRelease = new NKikimrConfig::TStoredCompatibilityInformation(); + UnknownYdbRelease = new NKikimrConfig::TStoredCompatibilityInfo(); UnknownYdbRelease->SetBuild("ydb"); auto* version = UnknownYdbRelease->MutableYdbVersion(); @@ -42,11 +42,11 @@ const NKikimrConfig::TStoredCompatibilityInformation* GetUnknownYdbRelease() { return UnknownYdbRelease; } -NKikimrConfig::TStoredCompatibilityInformation MakeStoredCompatibiltyInformation( - ui32 componentId, const NKikimrConfig::TCurrentCompatibilityInformation* current) { +NKikimrConfig::TStoredCompatibilityInfo MakeStoredCompatibilityInfo( + ui32 componentId, const NKikimrConfig::TCurrentCompatibilityInfo* current) { Y_VERIFY(current); - NKikimrConfig::TStoredCompatibilityInformation stored; + NKikimrConfig::TStoredCompatibilityInfo stored; stored.SetBuild(current->GetBuild()); if (current->HasYdbVersion()) { stored.MutableYdbVersion()->CopyFrom(current->GetYdbVersion()); @@ -69,8 +69,8 @@ NKikimrConfig::TStoredCompatibilityInformation MakeStoredCompatibiltyInformation return stored; } -NKikimrConfig::TStoredCompatibilityInformation MakeStoredCompatibiltyInformation(ui32 componentId) { - return MakeStoredCompatibiltyInformation(componentId, GetCurrentCompatibilityInformation()); +NKikimrConfig::TStoredCompatibilityInfo MakeStoredCompatibilityInfo(ui32 componentId) { + return MakeStoredCompatibilityInfo(componentId, GetCurrentCompatibilityInfo()); } //////////////////////////////////////////////////////////////////////////////////////// @@ -126,10 +126,10 @@ i32 CompareVersions(const NKikimrConfig::TYdbVersion& left, const NKikimrConfig: return 0; } -// If StoredCompatibilityInformation is not present, we: +// If StoredCompatibilityInfo is not present, we: // compare current to UnknownYdbRelease, if current version is stable, otherwise // we consider versions compatible -bool CheckNonPresent(const NKikimrConfig::TCurrentCompatibilityInformation* current, +bool CheckNonPresent(const NKikimrConfig::TCurrentCompatibilityInfo* current, ui32 componentId, TString& errorReason) { if (!current->HasYdbVersion()) { return true; @@ -187,8 +187,8 @@ bool CheckRule(TString build, const NKikimrConfig::TYdbVersion* version, (!rule.HasUpperLimit() || CompareVersions(*version, rule.GetUpperLimit()) < 1); } -bool CheckVersionCompatibility(const NKikimrConfig::TCurrentCompatibilityInformation* current, - const NKikimrConfig::TStoredCompatibilityInformation* stored, ui32 componentId, TString& errorReason) { +bool CheckVersionCompatibility(const NKikimrConfig::TCurrentCompatibilityInfo* current, + const NKikimrConfig::TStoredCompatibilityInfo* stored, ui32 componentId, TString& errorReason) { if (stored == nullptr) { // version record is not found return CheckNonPresent(current, componentId, errorReason); @@ -251,9 +251,9 @@ bool CheckVersionCompatibility(const NKikimrConfig::TCurrentCompatibilityInforma } } -bool CheckVersionCompatibility(const NKikimrConfig::TStoredCompatibilityInformation* stored, +bool CheckVersionCompatibility(const NKikimrConfig::TStoredCompatibilityInfo* stored, ui32 componentId, TString& errorReason) { - return CheckVersionCompatibility(GetCurrentCompatibilityInformation(), + return CheckVersionCompatibility(GetCurrentCompatibilityInfo(), stored, componentId, errorReason); } diff --git a/ydb/core/driver_lib/run/version.h b/ydb/core/driver_lib/run/version.h index 644c518c372..b44d7ff8aff 100644 --- a/ydb/core/driver_lib/run/version.h +++ b/ydb/core/driver_lib/run/version.h @@ -3,19 +3,19 @@ #include <library/cpp/actors/interconnect/interconnect_common.h> #include <ydb/core/protos/config.pb.h> -const NKikimrConfig::TCurrentCompatibilityInformation* GetCurrentCompatibilityInformation(); -const NKikimrConfig::TStoredCompatibilityInformation* GetUnknownYdbRelease(); +const NKikimrConfig::TCurrentCompatibilityInfo* GetCurrentCompatibilityInfo(); +const NKikimrConfig::TStoredCompatibilityInfo* GetUnknownYdbRelease(); -NKikimrConfig::TStoredCompatibilityInformation MakeStoredCompatibiltyInformation(ui32 componentId, - const NKikimrConfig::TCurrentCompatibilityInformation* current); +NKikimrConfig::TStoredCompatibilityInfo MakeStoredCompatibilityInfo(ui32 componentId, + const NKikimrConfig::TCurrentCompatibilityInfo* current); -NKikimrConfig::TStoredCompatibilityInformation MakeStoredCompatibiltyInformation(ui32 componentId); +NKikimrConfig::TStoredCompatibilityInfo MakeStoredCompatibilityInfo(ui32 componentId); -bool CheckVersionCompatibility(const NKikimrConfig::TCurrentCompatibilityInformation* current, - const NKikimrConfig::TStoredCompatibilityInformation* stored, +bool CheckVersionCompatibility(const NKikimrConfig::TCurrentCompatibilityInfo* current, + const NKikimrConfig::TStoredCompatibilityInfo* stored, ui32 componentId, TString& errorReason); -bool CheckVersionCompatibility(const NKikimrConfig::TStoredCompatibilityInformation* stored, +bool CheckVersionCompatibility(const NKikimrConfig::TStoredCompatibilityInfo* stored, ui32 componentId, TString& errorReason); // obsolete version control diff --git a/ydb/core/driver_lib/run/version_ut.cpp b/ydb/core/driver_lib/run/version_ut.cpp index 3eaf55ed8ae..6690a177cf3 100644 --- a/ydb/core/driver_lib/run/version_ut.cpp +++ b/ydb/core/driver_lib/run/version_ut.cpp @@ -65,14 +65,14 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } }; - struct TCurrentCompatibilityInformation { + struct TCurrentCompatibilityInfo { std::string Build = "ydb"; std::optional<TYdbVersion> YdbVersion; std::vector<TCompatibilityRule> CanLoadFrom; std::vector<TCompatibilityRule> StoresReadableBy; - NKikimrConfig::TCurrentCompatibilityInformation ToPB() { - NKikimrConfig::TCurrentCompatibilityInformation res; + NKikimrConfig::TCurrentCompatibilityInfo ToPB() { + NKikimrConfig::TCurrentCompatibilityInfo res; res.SetBuild(Build.data()); if (YdbVersion) { res.MutableYdbVersion()->CopyFrom(YdbVersion->ToPB()); @@ -89,13 +89,13 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } }; - struct TStoredCompatibilityInformation { + struct TStoredCompatibilityInfo { std::string Build = "ydb"; std::optional<TYdbVersion> YdbVersion; std::vector<TCompatibilityRule> ReadableBy; - NKikimrConfig::TStoredCompatibilityInformation ToPB() { - NKikimrConfig::TStoredCompatibilityInformation res; + NKikimrConfig::TStoredCompatibilityInfo ToPB() { + NKikimrConfig::TStoredCompatibilityInfo res; res.SetBuild(Build.data()); if (YdbVersion) { res.MutableYdbVersion()->CopyFrom(YdbVersion->ToPB()); @@ -109,21 +109,21 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } }; - void Test(TCurrentCompatibilityInformation current, TCurrentCompatibilityInformation store, bool expected) { + void Test(TCurrentCompatibilityInfo current, TCurrentCompatibilityInfo store, bool expected) { TString errorReason; auto currentPB = current.ToPB(); auto storePB = store.ToPB(); - auto storedPB = MakeStoredCompatibiltyInformation((ui32)NKikimrConfig::TCompatibilityRule::Test1, &storePB); + auto storedPB = MakeStoredCompatibilityInfo((ui32)NKikimrConfig::TCompatibilityRule::Test1, &storePB); UNIT_ASSERT_EQUAL_C(CheckVersionCompatibility(¤tPB, &storedPB, (ui32)NKikimrConfig::TCompatibilityRule::Test1, errorReason), expected, errorReason); } Y_UNIT_TEST(DefaultSameVersion) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 0 } }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 0 } }, true @@ -131,10 +131,10 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(DefaultPrevMajor) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 2, .Minor = 1, .Hotfix = 0 } }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 10 } }, true @@ -142,10 +142,10 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(DefaultNextMajor) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 8, .Hotfix = 0 } }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 2, .Minor = 1, .Hotfix = 0 } }, true @@ -153,10 +153,10 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(DefaultHotfix) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 10 } }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 0 } }, true @@ -164,10 +164,10 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(DefaultCompatible) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 2, .Minor = 1, .Hotfix = 10 } }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 10, .Hotfix = 0 } }, true @@ -175,10 +175,10 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(DefaultNextYear) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 2, .Major = 1, .Minor = 1, .Hotfix = 0 } }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 0 } }, false @@ -186,10 +186,10 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(DefaultPrevYear) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 0 } }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 2, .Major = 1, .Minor = 1, .Hotfix = 0 } }, false @@ -197,10 +197,10 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(DefaultNewMajor) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 1, .Hotfix = 0 } }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 0 } }, false @@ -208,10 +208,10 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(DefaultOldMajor) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 0 } }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 1, .Hotfix = 0 } }, false @@ -219,11 +219,11 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(DefaultDifferentBuild) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .Build = "ydb", .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 0 } }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .Build = "nbs", .YdbVersion = TYdbVersion{ .Year = 1, .Major = 2, .Minor = 1, .Hotfix = 0 } }, @@ -232,11 +232,11 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(DefaultDifferentBuildIncompatible) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .Build = "ydb", .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 0 }, }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .Build = "nbs", .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 1, .Hotfix = 0 }, }, @@ -245,7 +245,7 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(LimitOld) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 2, .Minor = 1, .Hotfix = 0 }, .CanLoadFrom = { TCompatibilityRule{ @@ -255,7 +255,7 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } } }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 2, .Hotfix = 1 } }, false @@ -263,10 +263,10 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(LimitNew) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 3 }, }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 2, .Minor = 2, .Hotfix = 0 }, .StoresReadableBy = { TCompatibilityRule{ @@ -281,7 +281,7 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(CurrentCanLoadFrom) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .Build = "ydb", .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 1, .Hotfix = 0 }, .CanLoadFrom = { @@ -291,7 +291,7 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } } }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .Build = "nbs", .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 1 } }, @@ -300,7 +300,7 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(CurrentCanLoadFromAllOlder) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .Build = "ydb", .YdbVersion = TYdbVersion{ .Year = 2, .Major = 4, .Minor = 1, .Hotfix = 0 }, .CanLoadFrom = { @@ -309,7 +309,7 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } } }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .Build = "nbs", .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 1 } }, @@ -318,7 +318,7 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(CurrentCanLoadFromIncompatible) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .Build = "ydb", .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 1, .Hotfix = 0 }, .CanLoadFrom = { @@ -328,7 +328,7 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } } }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .Build = "nbs", .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 1 } }, @@ -337,7 +337,7 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(CurrentStoresReadableBy) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .Build = "ydb", .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 1, .Hotfix = 0 }, .StoresReadableBy = { @@ -347,7 +347,7 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } } }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .Build = "nbs", .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 1 } }, @@ -356,11 +356,11 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(StoredReadableBy) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .Build = "ydb", .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 2, .Hotfix = 0 } }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .Build = "nbs", .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 }, .StoresReadableBy = { @@ -375,11 +375,11 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(StoredReadableByIncompatible) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .Build = "ydb", .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 2, .Hotfix = 0 } }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .Build = "nbs", .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 }, .StoresReadableBy = { @@ -394,10 +394,10 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(StoredWithRules) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 4, .Minor = 1, .Hotfix = 0 } }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 }, .StoresReadableBy = { TCompatibilityRule{ @@ -411,10 +411,10 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(StoredWithRulesIncompatible) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 5, .Minor = 1, .Hotfix = 0 } }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 }, .StoresReadableBy = { TCompatibilityRule{ @@ -428,11 +428,11 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(OldNbsStored) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .Build = "nbs", .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 2, .Hotfix = 0 } }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .Build = "ydb", .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 }, .StoresReadableBy = { @@ -448,11 +448,11 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(OldNbsIncompatibleStored) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .Build = "ydb", .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 2, .Hotfix = 0 } }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .Build = "ydb", .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 }, .StoresReadableBy = { @@ -468,7 +468,7 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(NewNbsCurrent) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .Build = "nbs", .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 2, .Hotfix = 0 }, .CanLoadFrom = { @@ -479,7 +479,7 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } } }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .Build = "ydb", .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 2 }, }, @@ -488,7 +488,7 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(NewNbsIncompatibleCurrent) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .Build = "nbs", .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 2, .Hotfix = 0 }, .CanLoadFrom = { @@ -499,7 +499,7 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } } }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .Build = "nbs", .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 2 }, }, @@ -508,7 +508,7 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(OneAcceptedVersion) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 2, .Hotfix = 0 }, .CanLoadFrom = { TCompatibilityRule{ @@ -517,7 +517,7 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } } }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 2 }, }, true @@ -525,7 +525,7 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(ForbiddenMinor) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 2, .Minor = 2, .Hotfix = 0 }, .CanLoadFrom = { TCompatibilityRule{ @@ -535,7 +535,7 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } } }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 1 }, }, false @@ -543,7 +543,7 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(ExtraAndForbidden) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 4, .Minor = 2, .Hotfix = 0 }, .CanLoadFrom = { TCompatibilityRule{ @@ -557,7 +557,7 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } } }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 2, .Minor = 3, .Hotfix = 0 }, }, false @@ -565,7 +565,7 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(SomeRulesAndOtherForbidden) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 4, .Minor = 2, .Hotfix = 0 }, .CanLoadFrom = { TCompatibilityRule{ @@ -579,7 +579,7 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } } }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 2, .Minor = 3, .Hotfix = 0 }, }, true @@ -587,7 +587,7 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(Component) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 4, .Minor = 2, .Hotfix = 0 }, .CanLoadFrom = { TCompatibilityRule{ @@ -597,7 +597,7 @@ Y_UNIT_TEST_SUITE(YdbVersion) { }, } }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 2, .Minor = 3, .Hotfix = 0 }, }, true @@ -605,7 +605,7 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(OtherComponent) { Test( - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 4, .Minor = 2, .Hotfix = 0 }, .CanLoadFrom = { TCompatibilityRule{ @@ -615,7 +615,7 @@ Y_UNIT_TEST_SUITE(YdbVersion) { }, } }, - TCurrentCompatibilityInformation{ + TCurrentCompatibilityInfo{ .YdbVersion = TYdbVersion{ .Year = 1, .Major = 2, .Minor = 3, .Hotfix = 0 }, }, false @@ -623,8 +623,8 @@ Y_UNIT_TEST_SUITE(YdbVersion) { } Y_UNIT_TEST(CompatibleWithSelf) { - auto* current = GetCurrentCompatibilityInformation(); - auto stored = MakeStoredCompatibiltyInformation((ui32)NKikimrConfig::TCompatibilityRule::Test1); + auto* current = GetCurrentCompatibilityInfo(); + auto stored = MakeStoredCompatibilityInfo((ui32)NKikimrConfig::TCompatibilityRule::Test1); TString errorReason; UNIT_ASSERT_C(CheckVersionCompatibility(current, &stored, (ui32)NKikimrConfig::TCompatibilityRule::Test1, errorReason), errorReason); diff --git a/ydb/core/protos/config.proto b/ydb/core/protos/config.proto index e474859d5c8..1f4617bb239 100644 --- a/ydb/core/protos/config.proto +++ b/ydb/core/protos/config.proto @@ -1753,7 +1753,7 @@ message TCompatibilityRule { optional bool Forbidden = 5 [default = false]; } -message TCurrentCompatibilityInformation { +message TCurrentCompatibilityInfo { required string Build = 1; // if YdbVersion is empty, build is assumed to be non-stable @@ -1763,7 +1763,7 @@ message TCurrentCompatibilityInformation { repeated TCompatibilityRule StoresReadableBy = 4; } -message TStoredCompatibilityInformation { +message TStoredCompatibilityInfo { required string Build = 1; // if YdbVersion is empty, build is assumed to be non-stable |