Просмотр исходного кода

Rename some CompatibilityInfo fields, KIKIMR-15989

Rename Build->Application, YdbVersion->Version
serg-belyakov 1 год назад
Родитель
Сommit
b8963aaeed

+ 7 - 7
ydb/core/actorlib_impl/test_interconnect_ut.cpp

@@ -746,8 +746,8 @@ Y_UNIT_TEST_SUITE(TInterconnectTest) {
         std::shared_ptr<NKikimrConfig::TCurrentCompatibilityInfo> node0 =
             std::make_shared<NKikimrConfig::TCurrentCompatibilityInfo>();
         {
-            node0->SetBuild("nbs");
-            auto* version = node0->MutableYdbVersion();
+            node0->SetApplication("nbs");
+            auto* version = node0->MutableVersion();
             version->SetYear(22);
             version->SetMajor(4);
             version->SetMinor(1);
@@ -757,8 +757,8 @@ Y_UNIT_TEST_SUITE(TInterconnectTest) {
         std::shared_ptr<NKikimrConfig::TCurrentCompatibilityInfo> node1 =
             std::make_shared<NKikimrConfig::TCurrentCompatibilityInfo>();
         {
-            node1->SetBuild("ydb");
-            auto* version = node1->MutableYdbVersion();
+            node1->SetApplication("ydb");
+            auto* version = node1->MutableVersion();
             version->SetYear(23);
             version->SetMajor(1);
             version->SetMinor(1);
@@ -766,7 +766,7 @@ Y_UNIT_TEST_SUITE(TInterconnectTest) {
 
             {
                 auto* nbsRule = node1->AddCanLoadFrom();
-                nbsRule->SetBuild("nbs");
+                nbsRule->SetApplication("nbs");
                 nbsRule->SetComponentId((ui32)NKikimrConfig::TCompatibilityRule::Interconnect);
 
                 auto* lowerLimit = nbsRule->MutableLowerLimit();
@@ -787,8 +787,8 @@ Y_UNIT_TEST_SUITE(TInterconnectTest) {
         std::shared_ptr<NKikimrConfig::TCurrentCompatibilityInfo> node0 =
             std::make_shared<NKikimrConfig::TCurrentCompatibilityInfo>();
         {
-            node0->SetBuild("ydb");
-            auto* version = node0->MutableYdbVersion();
+            node0->SetApplication("ydb");
+            auto* version = node0->MutableVersion();
             version->SetYear(23);
             version->SetMajor(1);
             version->SetMinor(1);

+ 14 - 14
ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut.cpp

@@ -896,12 +896,12 @@ Y_UNIT_TEST_SUITE(TPDiskTest) {
     Y_UNIT_TEST(YdbVersionOldCompatible) {
         TestRestartWithDifferentVersion(
             TCompatibilityInfo::TProtoConstructor::TCurrentCompatibilityInfo{
-                .Build = "ydb",
-                .YdbVersion = TCompatibilityInfo::TProtoConstructor::TYdbVersion{ .Year = 23, .Major = 1, .Minor = 26, .Hotfix = 0 },
+                .Application = "ydb",
+                .Version = TCompatibilityInfo::TProtoConstructor::TVersion{ .Year = 23, .Major = 1, .Minor = 26, .Hotfix = 0 },
             }.ToPB(),
             TCompatibilityInfo::TProtoConstructor::TCurrentCompatibilityInfo{
-                .Build = "ydb",
-                .YdbVersion = TCompatibilityInfo::TProtoConstructor::TYdbVersion{ .Year = 23, .Major = 2, .Minor = 1, .Hotfix = 0 },
+                .Application = "ydb",
+                .Version = TCompatibilityInfo::TProtoConstructor::TVersion{ .Year = 23, .Major = 2, .Minor = 1, .Hotfix = 0 },
             }.ToPB(),
             true
         );
@@ -910,12 +910,12 @@ Y_UNIT_TEST_SUITE(TPDiskTest) {
     Y_UNIT_TEST(YdbVersionIncompatible) {
         TestRestartWithDifferentVersion(
             TCompatibilityInfo::TProtoConstructor::TCurrentCompatibilityInfo{
-                .Build = "ydb",
-                .YdbVersion = TCompatibilityInfo::TProtoConstructor::TYdbVersion{ .Year = 23, .Major = 1, .Minor = 26, .Hotfix = 0 },
+                .Application = "ydb",
+                .Version = TCompatibilityInfo::TProtoConstructor::TVersion{ .Year = 23, .Major = 1, .Minor = 26, .Hotfix = 0 },
             }.ToPB(),
             TCompatibilityInfo::TProtoConstructor::TCurrentCompatibilityInfo{
-                .Build = "ydb",
-                .YdbVersion = TCompatibilityInfo::TProtoConstructor::TYdbVersion{ .Year = 23, .Major = 3, .Minor = 1, .Hotfix = 0 },
+                .Application = "ydb",
+                .Version = TCompatibilityInfo::TProtoConstructor::TVersion{ .Year = 23, .Major = 3, .Minor = 1, .Hotfix = 0 },
             }.ToPB(),
             false
         );
@@ -924,12 +924,12 @@ Y_UNIT_TEST_SUITE(TPDiskTest) {
     Y_UNIT_TEST(YdbVersionNewIncompatibleWithDefault) {
         TestRestartWithDifferentVersion(
             TCompatibilityInfo::TProtoConstructor::TCurrentCompatibilityInfo{
-                .Build = "ydb",
-                .YdbVersion = TCompatibilityInfo::TProtoConstructor::TYdbVersion{ .Year = 24, .Major = 3, .Minor = 1, .Hotfix = 0 },
+                .Application = "ydb",
+                .Version = TCompatibilityInfo::TProtoConstructor::TVersion{ .Year = 24, .Major = 3, .Minor = 1, .Hotfix = 0 },
             }.ToPB(),
             TCompatibilityInfo::TProtoConstructor::TCurrentCompatibilityInfo{
-                .Build = "ydb",
-                .YdbVersion = TCompatibilityInfo::TProtoConstructor::TYdbVersion{ .Year = 24, .Major = 4, .Minor = 1, .Hotfix = 0 },
+                .Application = "ydb",
+                .Version = TCompatibilityInfo::TProtoConstructor::TVersion{ .Year = 24, .Major = 4, .Minor = 1, .Hotfix = 0 },
             }.ToPB(),
             true
         );
@@ -938,10 +938,10 @@ Y_UNIT_TEST_SUITE(TPDiskTest) {
     Y_UNIT_TEST(YdbVersionTrunk) {
         TestRestartWithDifferentVersion(
             TCompatibilityInfo::TProtoConstructor::TCurrentCompatibilityInfo{
-                .Build = "trunk",
+                .Application = "trunk",
             }.ToPB(),
             TCompatibilityInfo::TProtoConstructor::TCurrentCompatibilityInfo{
-                .Build = "trunk",
+                .Application = "trunk",
             }.ToPB(),
             true
         );

+ 6 - 6
ydb/core/blobstorage/ut_blobstorage/recovery.cpp

@@ -11,7 +11,7 @@ Y_UNIT_TEST_SUITE(CompatibilityInfo) {
     using EComponentId = NKikimrConfig::TCompatibilityRule::EComponentId;
 
     using TCurrent = NKikimrConfig::TCurrentCompatibilityInfo;
-    using TYdbVersion = TCompatibilityInfo::TProtoConstructor::TYdbVersion;
+    using TYdbVersion = TCompatibilityInfo::TProtoConstructor::TVersion;
     using TCompatibilityRule = TCompatibilityInfo::TProtoConstructor::TCompatibilityRule;
     using TCurrentConstructor = TCompatibilityInfo::TProtoConstructor::TCurrentCompatibilityInfo;
 
@@ -32,8 +32,8 @@ Y_UNIT_TEST_SUITE(CompatibilityInfo) {
         const TString build = "ydb";
     
         auto oldInfoConstructor = TCurrentConstructor{
-            .Build = build,
-            .YdbVersion = TYdbVersion{
+            .Application = build,
+            .Version = TYdbVersion{
                 .Year = std::get<0>(oldVersion),
                 .Major = std::get<1>(oldVersion),
                 .Minor = std::get<2>(oldVersion),
@@ -42,8 +42,8 @@ Y_UNIT_TEST_SUITE(CompatibilityInfo) {
         };
 
         auto newInfoConstructor = TCurrentConstructor{
-            .Build = "ydb",
-            .YdbVersion = TYdbVersion{
+            .Application = "ydb",
+            .Version = TYdbVersion{
                 .Year = std::get<0>(newVersion),
                 .Major = std::get<1>(newVersion),
                 .Minor = std::get<2>(newVersion),
@@ -55,7 +55,7 @@ Y_UNIT_TEST_SUITE(CompatibilityInfo) {
         for (auto component : Components) {
             if (component != componentId) {
                 auto newRule = TCompatibilityRule{
-                    .Build = build,
+                    .Application = build,
                     .LowerLimit = TYdbVersion{ .Year = 0, .Major = 0, .Minor = 0, .Hotfix = 0 },
                     .UpperLimit = TYdbVersion{ .Year = 1000, .Major = 1000, .Minor = 1000, .Hotfix = 1000 },
                     .ComponentId = component,

+ 232 - 232
ydb/core/driver_lib/version/ut/version_ut.cpp

@@ -16,7 +16,7 @@ Y_UNIT_TEST_SUITE(VersionParser) {
 
 using EComponentId = NKikimrConfig::TCompatibilityRule;
 using TOldFormat = NActors::TInterconnectProxyCommon::TVersionInfo;
-using TYdbVersion = TCompatibilityInfo::TProtoConstructor::TYdbVersion;
+using TVersion = TCompatibilityInfo::TProtoConstructor::TVersion;
 using TCompatibilityRule = TCompatibilityInfo::TProtoConstructor::TCompatibilityRule;
 using TCurrentCompatibilityInfo = TCompatibilityInfo::TProtoConstructor::TCurrentCompatibilityInfo;
 using TStoredCompatibilityInfo = TCompatibilityInfo::TProtoConstructor::TStoredCompatibilityInfo;
@@ -35,12 +35,12 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(DefaultSameVersion) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 0 }
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 0 }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 0 }
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 0 }
                 }, 
                 true
         );
@@ -48,12 +48,12 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(DefaultPrevMajor) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 2, .Minor = 1, .Hotfix = 0 }
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 2, .Minor = 1, .Hotfix = 0 }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 10 }
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 10 }
                 }, 
                 true
         );
@@ -61,12 +61,12 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(DefaultNextMajor) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 8, .Hotfix = 0 }
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 1, .Minor = 8, .Hotfix = 0 }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 2, .Minor = 1, .Hotfix = 0 }
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 2, .Minor = 1, .Hotfix = 0 }
                 }, 
                 true
         );
@@ -74,12 +74,12 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(DefaultHotfix) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 10 }
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 10 }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 0 }
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 0 }
                 }, 
                 true
         );
@@ -87,12 +87,12 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(DefaultCompatible) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 2, .Minor = 1, .Hotfix = 10 }
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 2, .Minor = 1, .Hotfix = 10 }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 10, .Hotfix = 0 }
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 1, .Minor = 10, .Hotfix = 0 }
                 }, 
                 true
         );
@@ -100,12 +100,12 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(DefaultNextYear) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 2, .Major = 1, .Minor = 1, .Hotfix = 0 }
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 2, .Major = 1, .Minor = 1, .Hotfix = 0 }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 0 }
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 0 }
                 }, 
                 false
         );
@@ -113,12 +113,12 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(DefaultPrevYear) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 0 }
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 0 }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 2, .Major = 1, .Minor = 1, .Hotfix = 0 }
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 2, .Major = 1, .Minor = 1, .Hotfix = 0 }
                 }, 
                 false
         );
@@ -126,12 +126,12 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(DefaultNewMajor) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 1, .Hotfix = 0 }
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 3, .Minor = 1, .Hotfix = 0 }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 0 }
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 0 }
                 }, 
                 false
         );
@@ -139,12 +139,12 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(DefaultOldMajor) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 0 }
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 0 }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 1, .Hotfix = 0 }
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 3, .Minor = 1, .Hotfix = 0 }
                 }, 
                 false
         );
@@ -152,12 +152,12 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(DefaultDifferentBuild) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 0 }
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 0 }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "nbs",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 2, .Minor = 1, .Hotfix = 0 }
+                    .Application = "nbs",
+                    .Version = TVersion{ .Year = 1, .Major = 2, .Minor = 1, .Hotfix = 0 }
                 }, 
                 true
         );
@@ -165,12 +165,12 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(DefaultDifferentBuildIncompatible) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 0 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 0 },
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "nbs",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 1, .Hotfix = 0 },
+                    .Application = "nbs",
+                    .Version = TVersion{ .Year = 1, .Major = 3, .Minor = 1, .Hotfix = 0 },
                 }, 
                 false
         );
@@ -178,19 +178,19 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(LimitOld) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 2, .Minor = 1, .Hotfix = 0 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 2, .Minor = 1, .Hotfix = 0 },
                     .CanLoadFrom = {
                         TCompatibilityRule{
-                            .LowerLimit = TYdbVersion{ .Year = 1, .Major = 1 },
-                            .UpperLimit = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 3 },
+                            .LowerLimit = TVersion{ .Year = 1, .Major = 1 },
+                            .UpperLimit = TVersion{ .Year = 1, .Major = 1, .Minor = 3 },
                             .Forbidden = true
                         }
                     }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 2, .Hotfix = 1 }
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 1, .Minor = 2, .Hotfix = 1 }
                 }, 
                 false
         );
@@ -198,16 +198,16 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(LimitNew) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 3 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 1, .Minor = 1, .Hotfix = 3 },
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 2, .Minor = 2, .Hotfix = 0 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 2, .Minor = 2, .Hotfix = 0 },
                     .StoresReadableBy = {
                         TCompatibilityRule{
-                            .LowerLimit = TYdbVersion{ .Year = 1, .Major = 1 },
-                            .UpperLimit = TYdbVersion{ .Year = 1, .Major = 2, .Minor = 1 },
+                            .LowerLimit = TVersion{ .Year = 1, .Major = 1 },
+                            .UpperLimit = TVersion{ .Year = 1, .Major = 2, .Minor = 1 },
                             .Forbidden = true
                         }
                     }
@@ -218,18 +218,18 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(CurrentCanLoadFrom) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 1, .Hotfix = 0 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 3, .Minor = 1, .Hotfix = 0 },
                     .CanLoadFrom = {
                         TCompatibilityRule{
-                            .LowerLimit = TYdbVersion{ .Year = 1, .Major = 1 },
-                            .UpperLimit = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 1, .Hotfix = 0 }
+                            .LowerLimit = TVersion{ .Year = 1, .Major = 1 },
+                            .UpperLimit = TVersion{ .Year = 1, .Major = 3, .Minor = 1, .Hotfix = 0 }
                         }
                     }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "nbs",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 1 }
+                    .Application = "nbs",
+                    .Version = TVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 1 }
                 }, 
                 true
         );
@@ -237,17 +237,17 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(CurrentCanLoadFromAllOlder) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 2, .Major = 4, .Minor = 1, .Hotfix = 0 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 2, .Major = 4, .Minor = 1, .Hotfix = 0 },
                     .CanLoadFrom = {
                         TCompatibilityRule{
-                            .UpperLimit = TYdbVersion{ .Year = 2, .Major = 4, .Minor = 1, .Hotfix = 0 }
+                            .UpperLimit = TVersion{ .Year = 2, .Major = 4, .Minor = 1, .Hotfix = 0 }
                         }
                     }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "nbs",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 1 }
+                    .Application = "nbs",
+                    .Version = TVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 1 }
                 }, 
                 true
         );
@@ -255,18 +255,18 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(CurrentCanLoadFromIncompatible) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 1, .Hotfix = 0 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 3, .Minor = 1, .Hotfix = 0 },
                     .CanLoadFrom = {
                         TCompatibilityRule{
-                            .LowerLimit = TYdbVersion{ .Year = 1, .Major = 2 }, 
-                            .UpperLimit = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 1, .Hotfix = 0 }
+                            .LowerLimit = TVersion{ .Year = 1, .Major = 2 }, 
+                            .UpperLimit = TVersion{ .Year = 1, .Major = 3, .Minor = 1, .Hotfix = 0 }
                         }
                     }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "nbs",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 1 }
+                    .Application = "nbs",
+                    .Version = TVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 1 }
                 }, 
                 false
         );
@@ -274,18 +274,18 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(CurrentStoresReadableBy) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 1, .Hotfix = 0 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 3, .Minor = 1, .Hotfix = 0 },
                     .StoresReadableBy = {
                         TCompatibilityRule{
-                            .LowerLimit = TYdbVersion{ .Year = 1, .Major = 1 },
-                            .UpperLimit = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 1, .Hotfix = 0 }
+                            .LowerLimit = TVersion{ .Year = 1, .Major = 1 },
+                            .UpperLimit = TVersion{ .Year = 1, .Major = 3, .Minor = 1, .Hotfix = 0 }
                         }
                     }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "nbs",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 1 }
+                    .Application = "nbs",
+                    .Version = TVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 1 }
                 }, 
                 false
         );
@@ -293,16 +293,16 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(StoredReadableBy) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 2, .Hotfix = 0 }
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 1, .Minor = 2, .Hotfix = 0 }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "nbs",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 },
+                    .Application = "nbs",
+                    .Version = TVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 },
                     .StoresReadableBy = {
                         TCompatibilityRule{
-                            .LowerLimit = TYdbVersion{ .Year = 1, .Major = 1 },
-                            .UpperLimit = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 }
+                            .LowerLimit = TVersion{ .Year = 1, .Major = 1 },
+                            .UpperLimit = TVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 }
                         }
                     }
                 }, 
@@ -312,16 +312,16 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(StoredReadableByIncompatible) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 2, .Hotfix = 0 }
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 1, .Minor = 2, .Hotfix = 0 }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "nbs",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 },
+                    .Application = "nbs",
+                    .Version = TVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 },
                     .StoresReadableBy = {
                         TCompatibilityRule{
-                            .LowerLimit = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 1 },
-                            .UpperLimit = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 }
+                            .LowerLimit = TVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 1 },
+                            .UpperLimit = TVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 }
                         }
                     }
                 }, 
@@ -331,16 +331,16 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(StoredWithRules) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 4, .Minor = 1, .Hotfix = 0 }
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 4, .Minor = 1, .Hotfix = 0 }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 },
                     .StoresReadableBy = {
                         TCompatibilityRule{
-                            .LowerLimit = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 3 },
-                            .UpperLimit = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 }
+                            .LowerLimit = TVersion{ .Year = 1, .Major = 1, .Minor = 3 },
+                            .UpperLimit = TVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 }
                         }
                     }
                 }, 
@@ -350,16 +350,16 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(StoredWithRulesIncompatible) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 5, .Minor = 1, .Hotfix = 0 }
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 5, .Minor = 1, .Hotfix = 0 }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 },
                     .StoresReadableBy = {
                         TCompatibilityRule{
-                            .LowerLimit = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 3 },
-                            .UpperLimit = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 }
+                            .LowerLimit = TVersion{ .Year = 1, .Major = 1, .Minor = 3 },
+                            .UpperLimit = TVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 }
                         }
                     }
                 }, 
@@ -369,17 +369,17 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(OldNbsStored) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "nbs",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 2, .Hotfix = 0 }
+                    .Application = "nbs",
+                    .Version = TVersion{ .Year = 1, .Major = 1, .Minor = 2, .Hotfix = 0 }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 },
                     .StoresReadableBy = {
                         TCompatibilityRule{
-                            .Build = "nbs",
-                            .LowerLimit = TYdbVersion{ .Year = 1, .Major = 1 },
-                            .UpperLimit = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 }
+                            .Application = "nbs",
+                            .LowerLimit = TVersion{ .Year = 1, .Major = 1 },
+                            .UpperLimit = TVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 }
                         }
                     }
                 }, 
@@ -389,17 +389,17 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(OldNbsIncompatibleStored) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 2, .Hotfix = 0 }
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 1, .Minor = 2, .Hotfix = 0 }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 },
                     .StoresReadableBy = {
                         TCompatibilityRule{
-                            .Build = "nbs",
-                            .LowerLimit = TYdbVersion{ .Year = 1, .Major = 1 },
-                            .UpperLimit = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 }
+                            .Application = "nbs",
+                            .LowerLimit = TVersion{ .Year = 1, .Major = 1 },
+                            .UpperLimit = TVersion{ .Year = 1, .Major = 3, .Minor = 3, .Hotfix = 1 }
                         }
                     }
                 }, 
@@ -409,19 +409,19 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(NewNbsCurrent) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "nbs",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 2, .Hotfix = 0 },
+                    .Application = "nbs",
+                    .Version = TVersion{ .Year = 1, .Major = 3, .Minor = 2, .Hotfix = 0 },
                     .CanLoadFrom = {
                         TCompatibilityRule{
-                            .Build = "ydb",
-                            .LowerLimit = TYdbVersion{ .Year = 1, .Major = 1 },
-                            .UpperLimit = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 2, .Hotfix = 0 }
+                            .Application = "ydb",
+                            .LowerLimit = TVersion{ .Year = 1, .Major = 1 },
+                            .UpperLimit = TVersion{ .Year = 1, .Major = 3, .Minor = 2, .Hotfix = 0 }
                         }
                     }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 2 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 2 },
                 }, 
                 true
         );
@@ -429,19 +429,19 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(NewNbsIncompatibleCurrent) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "nbs",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 2, .Hotfix = 0 },
+                    .Application = "nbs",
+                    .Version = TVersion{ .Year = 1, .Major = 3, .Minor = 2, .Hotfix = 0 },
                     .CanLoadFrom = {
                         TCompatibilityRule{
-                            .Build = "ydb",
-                            .LowerLimit = TYdbVersion{ .Year = 1, .Major = 1 },
-                            .UpperLimit = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 2, .Hotfix = 0 }
+                            .Application = "ydb",
+                            .LowerLimit = TVersion{ .Year = 1, .Major = 1 },
+                            .UpperLimit = TVersion{ .Year = 1, .Major = 3, .Minor = 2, .Hotfix = 0 }
                         }
                     }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "nbs",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 2 },
+                    .Application = "nbs",
+                    .Version = TVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 2 },
                 }, 
                 false
         );
@@ -449,18 +449,18 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(OneAcceptedVersion) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 3, .Minor = 2, .Hotfix = 0 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 3, .Minor = 2, .Hotfix = 0 },
                     .CanLoadFrom = {
                         TCompatibilityRule{
-                            .LowerLimit = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 2 },
-                            .UpperLimit = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 2 }
+                            .LowerLimit = TVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 2 },
+                            .UpperLimit = TVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 2 }
                         }
                     }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 2 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 2 },
                 }, 
                 true
         );
@@ -468,19 +468,19 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(ForbiddenMinor) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 2, .Minor = 2, .Hotfix = 0 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 2, .Minor = 2, .Hotfix = 0 },
                     .CanLoadFrom = {
                         TCompatibilityRule{
-                            .LowerLimit = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 3 },
-                            .UpperLimit = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 3 },
+                            .LowerLimit = TVersion{ .Year = 1, .Major = 1, .Minor = 3 },
+                            .UpperLimit = TVersion{ .Year = 1, .Major = 1, .Minor = 3 },
                             .Forbidden = true
                         }
                     }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 1 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 1, .Minor = 3, .Hotfix = 1 },
                 }, 
                 false
         );
@@ -488,19 +488,19 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(DefaultRulesWithExtraForbidden) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 2, .Minor = 2, .Hotfix = 0 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 2, .Minor = 2, .Hotfix = 0 },
                     .CanLoadFrom = {
                         TCompatibilityRule{
-                            .LowerLimit = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 3 },
-                            .UpperLimit = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 3 },
+                            .LowerLimit = TVersion{ .Year = 1, .Major = 1, .Minor = 3 },
+                            .UpperLimit = TVersion{ .Year = 1, .Major = 1, .Minor = 3 },
                             .Forbidden = true
                         }
                     }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 1, .Minor = 4 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 1, .Minor = 4 },
                 }, 
                 true
         );
@@ -508,23 +508,23 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(ExtraAndForbidden) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 4, .Minor = 2, .Hotfix = 0 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 4, .Minor = 2, .Hotfix = 0 },
                     .CanLoadFrom = {
                         TCompatibilityRule{
-                            .LowerLimit = TYdbVersion{ .Year = 1, .Major = 1 },
-                            .UpperLimit = TYdbVersion{ .Year = 1, .Major = 4, .Minor = 2, .Hotfix = 0 },
+                            .LowerLimit = TVersion{ .Year = 1, .Major = 1 },
+                            .UpperLimit = TVersion{ .Year = 1, .Major = 4, .Minor = 2, .Hotfix = 0 },
                         },
                         TCompatibilityRule{
-                            .LowerLimit = TYdbVersion{ .Year = 1, .Major = 2, .Minor = 3 },
-                            .UpperLimit = TYdbVersion{ .Year = 1, .Major = 2, .Minor = 3 },
+                            .LowerLimit = TVersion{ .Year = 1, .Major = 2, .Minor = 3 },
+                            .UpperLimit = TVersion{ .Year = 1, .Major = 2, .Minor = 3 },
                             .Forbidden = true
                         }
                     }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 2, .Minor = 3, .Hotfix = 0 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 2, .Minor = 3, .Hotfix = 0 },
                 }, 
                 false
         );
@@ -532,23 +532,23 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(SomeRulesAndOtherForbidden) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 4, .Minor = 2, .Hotfix = 0 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 4, .Minor = 2, .Hotfix = 0 },
                     .CanLoadFrom = {
                         TCompatibilityRule{
-                            .LowerLimit = TYdbVersion{ .Year = 1, .Major = 1 },
-                            .UpperLimit = TYdbVersion{ .Year = 1, .Major = 4, .Minor = 2, .Hotfix = 0 },
+                            .LowerLimit = TVersion{ .Year = 1, .Major = 1 },
+                            .UpperLimit = TVersion{ .Year = 1, .Major = 4, .Minor = 2, .Hotfix = 0 },
                         },
                         TCompatibilityRule{
-                            .LowerLimit = TYdbVersion{ .Year = 1, .Major = 2, .Minor = 4 },
-                            .UpperLimit = TYdbVersion{ .Year = 1, .Major = 2, .Minor = 4 },
+                            .LowerLimit = TVersion{ .Year = 1, .Major = 2, .Minor = 4 },
+                            .UpperLimit = TVersion{ .Year = 1, .Major = 2, .Minor = 4 },
                             .Forbidden = true
                         }
                     }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 2, .Minor = 3, .Hotfix = 0 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 2, .Minor = 3, .Hotfix = 0 },
                 }, 
                 true
         );
@@ -556,19 +556,19 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(Component) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 4, .Minor = 2, .Hotfix = 0 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 4, .Minor = 2, .Hotfix = 0 },
                     .CanLoadFrom = {
                         TCompatibilityRule{
-                            .LowerLimit = TYdbVersion{ .Year = 1, .Major = 1 },
-                            .UpperLimit = TYdbVersion{ .Year = 1, .Major = 4, .Minor = 2, .Hotfix = 0 },
+                            .LowerLimit = TVersion{ .Year = 1, .Major = 1 },
+                            .UpperLimit = TVersion{ .Year = 1, .Major = 4, .Minor = 2, .Hotfix = 0 },
                             .ComponentId = (ui32)EComponentId::Test1,
                         },
                     }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 2, .Minor = 3, .Hotfix = 0 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 2, .Minor = 3, .Hotfix = 0 },
                 }, 
                 true
         );
@@ -576,19 +576,19 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(OtherComponent) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 4, .Minor = 2, .Hotfix = 0 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 4, .Minor = 2, .Hotfix = 0 },
                     .CanLoadFrom = {
                         TCompatibilityRule{
-                            .LowerLimit = TYdbVersion{ .Year = 1, .Major = 1 },
-                            .UpperLimit = TYdbVersion{ .Year = 1, .Major = 4, .Minor = 2, .Hotfix = 0 },
+                            .LowerLimit = TVersion{ .Year = 1, .Major = 1 },
+                            .UpperLimit = TVersion{ .Year = 1, .Major = 4, .Minor = 2, .Hotfix = 0 },
                             .ComponentId = (ui32)EComponentId::Test2,
                         },
                     }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 1, .Major = 2, .Minor = 3, .Hotfix = 0 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 1, .Major = 2, .Minor = 3, .Hotfix = 0 },
                 }, 
                 false
         );
@@ -598,24 +598,24 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(YDBAndNbs) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "nbs",
-                    .YdbVersion = TYdbVersion{ .Year = 23, .Major = 3, .Minor = 2, .Hotfix = 0 },
+                    .Application = "nbs",
+                    .Version = TVersion{ .Year = 23, .Major = 3, .Minor = 2, .Hotfix = 0 },
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 24, .Major = 2, .Minor = 3, .Hotfix = 0 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 24, .Major = 2, .Minor = 3, .Hotfix = 0 },
                     .CanLoadFrom = {
                         TCompatibilityRule{
-                            .Build = "nbs",
-                            .LowerLimit = TYdbVersion{ .Year = 23, .Major = 3 },
-                            .UpperLimit = TYdbVersion{ .Year = 24, .Major = 2 },
+                            .Application = "nbs",
+                            .LowerLimit = TVersion{ .Year = 23, .Major = 3 },
+                            .UpperLimit = TVersion{ .Year = 24, .Major = 2 },
                         },
                     },
                     .StoresReadableBy = {
                         TCompatibilityRule{
-                            .Build = "nbs",
-                            .LowerLimit = TYdbVersion{ .Year = 23, .Major = 3 },
-                            .UpperLimit = TYdbVersion{ .Year = 24, .Major = 2 },
+                            .Application = "nbs",
+                            .LowerLimit = TVersion{ .Year = 23, .Major = 3 },
+                            .UpperLimit = TVersion{ .Year = 24, .Major = 2 },
                         },
                     }
                 }, 
@@ -626,38 +626,38 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
     Y_UNIT_TEST(DifferentYdbVersionsWithNBSRules) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 24, .Major = 3, .Minor = 1, .Hotfix = 0 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 24, .Major = 3, .Minor = 1, .Hotfix = 0 },
                     .CanLoadFrom = {
                         TCompatibilityRule{
-                            .Build = "nbs",
-                            .LowerLimit = TYdbVersion{ .Year = 23, .Major = 3 },
-                            .UpperLimit = TYdbVersion{ .Year = 24, .Major = 3 },
+                            .Application = "nbs",
+                            .LowerLimit = TVersion{ .Year = 23, .Major = 3 },
+                            .UpperLimit = TVersion{ .Year = 24, .Major = 3 },
                         },
                     },
                     .StoresReadableBy = {
                         TCompatibilityRule{
-                            .Build = "nbs",
-                            .LowerLimit = TYdbVersion{ .Year = 23, .Major = 3 },
-                            .UpperLimit = TYdbVersion{ .Year = 24, .Major = 3 },
+                            .Application = "nbs",
+                            .LowerLimit = TVersion{ .Year = 23, .Major = 3 },
+                            .UpperLimit = TVersion{ .Year = 24, .Major = 3 },
                         },
                     }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 24, .Major = 2, .Minor = 3, .Hotfix = 0 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 24, .Major = 2, .Minor = 3, .Hotfix = 0 },
                     .CanLoadFrom = {
                         TCompatibilityRule{
-                            .Build = "nbs",
-                            .LowerLimit = TYdbVersion{ .Year = 23, .Major = 3 },
-                            .UpperLimit = TYdbVersion{ .Year = 24, .Major = 2 },
+                            .Application = "nbs",
+                            .LowerLimit = TVersion{ .Year = 23, .Major = 3 },
+                            .UpperLimit = TVersion{ .Year = 24, .Major = 2 },
                         },
                     },
                     .StoresReadableBy = {
                         TCompatibilityRule{
-                            .Build = "nbs",
-                            .LowerLimit = TYdbVersion{ .Year = 23, .Major = 3 },
-                            .UpperLimit = TYdbVersion{ .Year = 24, .Major = 2 },
+                            .Application = "nbs",
+                            .LowerLimit = TVersion{ .Year = 23, .Major = 3 },
+                            .UpperLimit = TVersion{ .Year = 24, .Major = 2 },
                         },
                     }
                 }, 
@@ -665,27 +665,27 @@ Y_UNIT_TEST_SUITE(YdbVersion) {
         );
     }
 
-    Y_UNIT_TEST(RestrictedCompatibilitySameBuild) {
+    Y_UNIT_TEST(RestrictedCompatibilitySameApplication) {
         Test(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 24, .Major = 3, .Minor = 1, .Hotfix = 0 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 24, .Major = 3, .Minor = 1, .Hotfix = 0 },
                     .CanLoadFrom = {
                         TCompatibilityRule{
-                            .LowerLimit = TYdbVersion{ .Year = 24, .Major = 2, .Minor = 4},
-                            .UpperLimit = TYdbVersion{ .Year = 24, .Major = 3 },
+                            .LowerLimit = TVersion{ .Year = 24, .Major = 2, .Minor = 4},
+                            .UpperLimit = TVersion{ .Year = 24, .Major = 3 },
                         },
                     },
                     .StoresReadableBy = {
                         TCompatibilityRule{
-                            .LowerLimit = TYdbVersion{ .Year = 24, .Major = 2, .Minor = 4},
-                            .UpperLimit = TYdbVersion{ .Year = 24, .Major = 3 },
+                            .LowerLimit = TVersion{ .Year = 24, .Major = 2, .Minor = 4},
+                            .UpperLimit = TVersion{ .Year = 24, .Major = 3 },
                         },
                     }
                 }, 
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 24, .Major = 2, .Minor = 1, .Hotfix = 0 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 24, .Major = 2, .Minor = 1, .Hotfix = 0 },
                 }, 
                 false
         );
@@ -715,8 +715,8 @@ Y_UNIT_TEST_SUITE(OldFormat) {
     Y_UNIT_TEST(SameVersion) {
         TestOldFormat(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 22, .Major = 4, .Minor = 1, .Hotfix = 0 }
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 22, .Major = 4, .Minor = 1, .Hotfix = 0 }
                 }, 
                 TOldFormat{
                     .Tag = "stable-22-4",
@@ -729,8 +729,8 @@ Y_UNIT_TEST_SUITE(OldFormat) {
     Y_UNIT_TEST(DefaultRules) {
         TestOldFormat(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 22, .Major = 5, .Minor = 1, .Hotfix = 0 }
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 22, .Major = 5, .Minor = 1, .Hotfix = 0 }
                 }, 
                 TOldFormat{
                     .Tag = "stable-22-4",
@@ -743,12 +743,12 @@ Y_UNIT_TEST_SUITE(OldFormat) {
     Y_UNIT_TEST(PrevYear) {
         TestOldFormat(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 23, .Major = 1, .Minor = 1, .Hotfix = 0 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 23, .Major = 1, .Minor = 1, .Hotfix = 0 },
                     .CanLoadFrom = {
                         TCompatibilityRule{
-                            .LowerLimit = TYdbVersion{ .Year = 22, .Major = 5 },
-                            .UpperLimit = TYdbVersion{ .Year = 23, .Major = 1, .Minor = 1, .Hotfix = 0 },
+                            .LowerLimit = TVersion{ .Year = 22, .Major = 5 },
+                            .UpperLimit = TVersion{ .Year = 23, .Major = 1, .Minor = 1, .Hotfix = 0 },
                         },
                     }
                 }, 
@@ -763,7 +763,7 @@ Y_UNIT_TEST_SUITE(OldFormat) {
     Y_UNIT_TEST(Trunk) {
         TestOldFormat(
                 TCurrentCompatibilityInfo{
-                    .Build = "trunk"
+                    .Application = "trunk"
                 }, 
                 TOldFormat{
                     .Tag = "trunk",
@@ -776,8 +776,8 @@ Y_UNIT_TEST_SUITE(OldFormat) {
     Y_UNIT_TEST(UnexpectedTrunk) {
         TestOldFormat(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 22, .Major = 4, .Minor = 1, .Hotfix = 0 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 22, .Major = 4, .Minor = 1, .Hotfix = 0 },
                 }, 
                 TOldFormat{
                     .Tag = "trunk",
@@ -790,8 +790,8 @@ Y_UNIT_TEST_SUITE(OldFormat) {
     Y_UNIT_TEST(TooOld) {
         TestOldFormat(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 22, .Major = 4, .Minor = 1, .Hotfix = 0 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 22, .Major = 4, .Minor = 1, .Hotfix = 0 },
                 }, 
                 TOldFormat{
                     .Tag = "stable-22-2",
@@ -804,19 +804,19 @@ Y_UNIT_TEST_SUITE(OldFormat) {
     Y_UNIT_TEST(OldNbs) {
         TestOldFormat(
                 TCurrentCompatibilityInfo{
-                    .Build = "ydb",
-                    .YdbVersion = TYdbVersion{ .Year = 23, .Major = 1, .Minor = 1, .Hotfix = 0 },
+                    .Application = "ydb",
+                    .Version = TVersion{ .Year = 23, .Major = 1, .Minor = 1, .Hotfix = 0 },
                     .CanLoadFrom = {
                         TCompatibilityRule{
-                            .LowerLimit = TYdbVersion{ .Year = 22, .Major = 4 },
-                            .UpperLimit = TYdbVersion{ .Year = 23, .Major = 1, .Minor = 1, .Hotfix = 0 },
+                            .LowerLimit = TVersion{ .Year = 22, .Major = 4 },
+                            .UpperLimit = TVersion{ .Year = 23, .Major = 1, .Minor = 1, .Hotfix = 0 },
                             .ComponentId = (ui32)EComponentId::Interconnect
                         },
                     },
                     .StoresReadableBy = {
                         TCompatibilityRule{
-                            .LowerLimit = TYdbVersion{ .Year = 22, .Major = 4 },
-                            .UpperLimit = TYdbVersion{ .Year = 23, .Major = 1, .Minor = 1, .Hotfix = 0 },
+                            .LowerLimit = TVersion{ .Year = 22, .Major = 4 },
+                            .UpperLimit = TVersion{ .Year = 23, .Major = 1, .Minor = 1, .Hotfix = 0 },
                             .ComponentId = (ui32)EComponentId::Interconnect
                         },
                     }

+ 58 - 58
ydb/core/driver_lib/version/version.cpp

@@ -17,13 +17,13 @@ using TComponentId = NKikimrConfig::TCompatibilityRule::EComponentId;
 TCompatibilityInfo::TCompatibilityInfo() {
     using TCurrentConstructor = TCompatibilityInfo::TProtoConstructor::TCurrentCompatibilityInfo;
     using TStoredConstructor = TCompatibilityInfo::TProtoConstructor::TStoredCompatibilityInfo;
-    using TYdbVersionConstructor = TCompatibilityInfo::TProtoConstructor::TYdbVersion;
+    using TVersionConstructor = TCompatibilityInfo::TProtoConstructor::TVersion;
 
     /////////////////////////////////////////////////////////
     // Current CompatibilityInfo
     /////////////////////////////////////////////////////////
     auto current = TCurrentConstructor{
-        .Build = "trunk"
+        .Application = "trunk"
     }.ToPB();
 
     // bool success = CompleteFromTag(current);
@@ -35,14 +35,14 @@ TCompatibilityInfo::TCompatibilityInfo() {
     // Default CompatibilityInfo
     /////////////////////////////////////////////////////////
     DefaultCompatibilityInfo = TDefaultCompatibilityInfo{};
-#define EMPLACE_DEFAULT_COMPATIBILITY_INFO(componentName, build, year, major, minor, hotfix)    \
+#define EMPLACE_DEFAULT_COMPATIBILITY_INFO(componentName, app, year, major, minor, hotfix)      \
     do {                                                                                        \
         auto& defaultInfo = DefaultCompatibilityInfo[(ui32)EComponentId::componentName];        \
         defaultInfo.emplace();                                                                  \
         defaultInfo->CopyFrom(                                                                  \
             TStoredConstructor{                                                                 \
-                .Build = build,                                                                 \
-                .YdbVersion = TYdbVersionConstructor{                                           \
+                .Application = app,                                                             \
+                .Version = TVersionConstructor{                                                 \
                     .Year = year,                                                               \
                     .Major = major,                                                             \
                     .Minor = minor,                                                             \
@@ -114,9 +114,9 @@ TStored TCompatibilityInfo::MakeStored(TComponentId componentId, const TCurrent*
     Y_VERIFY(current);
 
     TStored stored;
-    stored.SetBuild(current->GetBuild());
-    if (current->HasYdbVersion()) {
-        stored.MutableYdbVersion()->CopyFrom(current->GetYdbVersion());
+    stored.SetApplication(current->GetApplication());
+    if (current->HasVersion()) {
+        stored.MutableVersion()->CopyFrom(current->GetVersion());
     }
 
     for (ui32 i = 0; i < current->StoresReadableBySize(); i++) {
@@ -124,8 +124,8 @@ TStored TCompatibilityInfo::MakeStored(TComponentId componentId, const TCurrent*
         const auto ruleComponentId = TComponentId(rule.GetComponentId());
         if (!rule.HasComponentId() || ruleComponentId == componentId || ruleComponentId == EComponentId::Any) {
             auto *newRule = stored.AddReadableBy();
-            if (rule.HasBuild()) {
-                newRule->SetBuild(rule.GetBuild());
+            if (rule.HasApplication()) {
+                newRule->SetApplication(rule.GetApplication());
             }
             newRule->MutableUpperLimit()->CopyFrom(rule.GetUpperLimit());
             newRule->MutableLowerLimit()->CopyFrom(rule.GetLowerLimit());
@@ -198,7 +198,7 @@ i32 CompareVersions(const NKikimrConfig::TYdbVersion& left, const NKikimrConfig:
 // - consider versions compatible otherwise
 bool CheckNonPresent(const TCurrent* current, TComponentId componentId, TString& errorReason) {
     Y_VERIFY(current);
-    if (!current->HasYdbVersion()) {
+    if (!current->HasVersion()) {
         return true;
     }
     const auto* lastUnsupported = CompatibilityInfo.GetDefault(componentId);
@@ -214,41 +214,41 @@ bool CheckNonPresent(const TCurrent* current, TComponentId componentId, TString&
 }
 
 // By default two stable versions are considered compatible, if their Year is the same 
-// and Major differ for no more, than 1, regardless of their Build
-// Two unstable versions are compatible only if they have the same Build
+// and Major differ for no more, than 1, regardless of their Application
+// Two unstable versions are compatible only if they have the same Application
 // Stable and non-stable versions are not compatible by default
-bool CheckDefaultRules(TString currentBuild, const NKikimrConfig::TYdbVersion* currentYdbVersion, 
-        TString storedBuild, const NKikimrConfig::TYdbVersion* storedYdbVersion) {
-    if (!currentYdbVersion && !storedYdbVersion) {
-        return currentBuild == storedBuild;
+bool CheckDefaultRules(TString currentApplication, const NKikimrConfig::TYdbVersion* currentVersion, 
+        TString storedApplication, const NKikimrConfig::TYdbVersion* storedVersion) {
+    if (!currentVersion && !storedVersion) {
+        return currentApplication == storedApplication;
     }
-    if (currentYdbVersion && storedYdbVersion) {
-        if (!currentYdbVersion->HasYear() || !storedYdbVersion->HasYear()) {
+    if (currentVersion && storedVersion) {
+        if (!currentVersion->HasYear() || !storedVersion->HasYear()) {
             return true;
         }
-        if (currentYdbVersion->GetYear() != storedYdbVersion->GetYear()) {
+        if (currentVersion->GetYear() != storedVersion->GetYear()) {
             return false;
         }
-        if (!currentYdbVersion->HasMajor() || !storedYdbVersion->HasMajor()) {
+        if (!currentVersion->HasMajor() || !storedVersion->HasMajor()) {
             return true;
         }
-        return std::abs((i32)currentYdbVersion->GetMajor() - (i32)storedYdbVersion->GetMajor()) <= 1;
+        return std::abs((i32)currentVersion->GetMajor() - (i32)storedVersion->GetMajor()) <= 1;
     }
 
     return false;
 }
 
-bool CheckRule(std::optional<TString> build, const NKikimrConfig::TYdbVersion* version, const NKikimrConfig::TCompatibilityRule& rule) {
-    if (build) {
-        if (rule.HasBuild()) {
-            if (rule.GetBuild() != *build) {
+bool CheckRule(std::optional<TString> app, const NKikimrConfig::TYdbVersion* version, const NKikimrConfig::TCompatibilityRule& rule) {
+    if (app) {
+        if (rule.HasApplication()) {
+            if (rule.GetApplication() != *app) {
                 return false;
             }
             if (version == nullptr) {
                 return true;
             }
         } else {
-            // non-stable build is incompatible with stable
+            // non-stable app is incompatible with stable
             if (version == nullptr) {
                 return false;
             }
@@ -257,7 +257,7 @@ bool CheckRule(std::optional<TString> build, const NKikimrConfig::TYdbVersion* v
         if (version == nullptr) {
             return false;
         }
-        if (rule.HasBuild()) {
+        if (rule.HasApplication()) {
             return false;
         }
     }
@@ -273,10 +273,10 @@ bool TCompatibilityInfo::CheckCompatibility(const TCurrent* current, const TStor
         return CheckNonPresent(current, componentId, errorReason);
     }
 
-    const auto& currentBuild = current->GetBuild();
-    const auto& storedBuild = stored->GetBuild();
-    const auto* currentYdbVersion = current->HasYdbVersion() ? &current->GetYdbVersion() : nullptr;
-    const auto* storedYdbVersion = stored->HasYdbVersion() ? &stored->GetYdbVersion() : nullptr;
+    const auto& currentApplication = current->GetApplication();
+    const auto& storedApplication = stored->GetApplication();
+    const auto* currentVersion = current->HasVersion() ? &current->GetVersion() : nullptr;
+    const auto* storedVersion = stored->HasVersion() ? &stored->GetVersion() : nullptr;
 
     bool permitted = false;
     bool useDefault = true;
@@ -286,10 +286,10 @@ bool TCompatibilityInfo::CheckCompatibility(const TCurrent* current, const TStor
         const auto ruleComponentId = TComponentId(rule.GetComponentId());
         if (!rule.HasComponentId() || ruleComponentId == componentId || ruleComponentId == EComponentId::Any) {
             bool isForbidding = rule.HasForbidden() && rule.GetForbidden();
-            if ((!rule.HasBuild() || rule.GetBuild() == storedBuild) && !isForbidding) {
+            if ((!rule.HasApplication() || rule.GetApplication() == storedApplication) && !isForbidding) {
                 useDefault = false;
             }
-            if (CheckRule(storedBuild, storedYdbVersion, rule)) {
+            if (CheckRule(storedApplication, storedVersion, rule)) {
                 if (isForbidding) {
                     errorReason = "Stored version is explicitly prohibited, " + PrintStoredAndCurrent(stored, current);
                     return false;
@@ -304,7 +304,7 @@ bool TCompatibilityInfo::CheckCompatibility(const TCurrent* current, const TStor
         const auto rule = stored->GetReadableBy(i);
         const auto ruleComponentId = TComponentId(rule.GetComponentId());
         if (!rule.HasComponentId() || ruleComponentId == componentId || ruleComponentId == EComponentId::Any) {
-            if (CheckRule(currentBuild, currentYdbVersion, rule)) {
+            if (CheckRule(currentApplication, currentVersion, rule)) {
                 useDefault = false;
                 if (rule.HasForbidden() && rule.GetForbidden()) {
                     errorReason = "Current version is explicitly prohibited, " + PrintStoredAndCurrent(stored, current);
@@ -320,7 +320,7 @@ bool TCompatibilityInfo::CheckCompatibility(const TCurrent* current, const TStor
         return true;
     } else {
         if (useDefault) {
-            if (CheckDefaultRules(currentBuild, currentYdbVersion, storedBuild, storedYdbVersion)) {
+            if (CheckDefaultRules(currentApplication, currentVersion, storedApplication, storedVersion)) {
                 return true;
             } else {
                 errorReason = "Versions are not compatible by default rules, " + PrintStoredAndCurrent(stored, current);
@@ -367,7 +367,7 @@ TString GetBranchName(TString url) {
     return url;
 }
 
-std::optional<NKikimrConfig::TYdbVersion> ParseYdbVersionFromTag(TString tag, TString delimiter = "-") {
+std::optional<NKikimrConfig::TYdbVersion> ParseVersionFromTag(TString tag, TString delimiter = "-") {
     NKikimrConfig::TYdbVersion version;
     TVector<TString> splitted;
     Split(tag, delimiter , splitted);
@@ -491,16 +491,16 @@ TString GetTagString() {
 }
 
 bool TCompatibilityInfo::CompleteFromTag(NKikimrConfig::TCurrentCompatibilityInfo& current) {
-    if (current.GetBuild() == "trunk") {
+    if (current.GetApplication() == "trunk") {
         Y_FAIL("Cannot complete trunk version");
     }
 
     TString tag = GetTagString();
     for (TString delim : {"-", "."}) {
-        auto tryParse = ParseYdbVersionFromTag(tag, delim);
+        auto tryParse = ParseVersionFromTag(tag, delim);
         if (tryParse) {
             auto versionFromTag = *tryParse;
-            auto version = current.MutableYdbVersion();
+            auto version = current.MutableVersion();
             if (version->HasYear()) {
                 Y_VERIFY(version->GetYear() == versionFromTag.GetYear());
             } else {
@@ -554,15 +554,15 @@ void CheckVersionTag() {
 bool TCompatibilityInfo::CheckCompatibility(const TCurrent* current, const TOldFormat& stored, TComponentId componentId, TString& errorReason) const {
     Y_VERIFY(current);
 
-    std::optional<TString> storedBuild;
+    std::optional<TString> storedApplication;
 
-    auto storedVersion = ParseYdbVersionFromTag(stored.Tag);
+    auto storedVersion = ParseVersionFromTag(stored.Tag);
     if (!storedVersion) {
         // non-stable version is stored
-        if (current->GetBuild() == stored.Tag) {
+        if (current->GetApplication() == stored.Tag) {
             return true;
         }
-        storedBuild = stored.Tag;
+        storedApplication = stored.Tag;
     }
 
     bool permitted = false;
@@ -573,10 +573,10 @@ bool TCompatibilityInfo::CheckCompatibility(const TCurrent* current, const TOldF
         const auto ruleComponentId = TComponentId(rule.GetComponentId());
         if (!rule.HasComponentId() || ruleComponentId == componentId || ruleComponentId == EComponentId::Any) {
             bool isForbidding = rule.HasForbidden() && rule.GetForbidden();
-            if (!rule.HasBuild() && !isForbidding) {
+            if (!rule.HasApplication() && !isForbidding) {
                 useDefault = false;
             }
-            if (CheckRule(storedBuild, &*storedVersion, rule)) {
+            if (CheckRule(storedApplication, &*storedVersion, rule)) {
                 if (isForbidding) {
                     errorReason = "Stored version is explicitly prohibited, " + PrintStoredAndCurrent(stored, current);
                     return false;
@@ -591,9 +591,9 @@ bool TCompatibilityInfo::CheckCompatibility(const TCurrent* current, const TOldF
         return true;
     }
 
-    const auto* currentVersion = current->HasYdbVersion() ? &current->GetYdbVersion() : nullptr;
+    const auto* currentVersion = current->HasVersion() ? &current->GetVersion() : nullptr;
     for (const auto& tag : stored.AcceptedTags) {
-        auto version = ParseYdbVersionFromTag(tag);
+        auto version = ParseVersionFromTag(tag);
         if (storedVersion && currentVersion) {
             if (version->GetYear() == currentVersion->GetYear() &&
                     version->GetMajor() == currentVersion->GetMajor() &&
@@ -602,38 +602,38 @@ bool TCompatibilityInfo::CheckCompatibility(const TCurrent* current, const TOldF
                 return true;
             }
         } else if (!storedVersion && !currentVersion)  {
-            if (current->GetBuild() == tag) {
+            if (current->GetApplication() == tag) {
                 return true;
             }
         }
     }
 
     if (useDefault) {
-        if (current->HasYdbVersion() && storedVersion) {
-            auto currentYdbVersion = current->GetYdbVersion();
-            if (!currentYdbVersion.HasYear() || !storedVersion->HasYear()) {
+        if (current->HasVersion() && storedVersion) {
+            auto currentVersion = current->GetVersion();
+            if (!currentVersion.HasYear() || !storedVersion->HasYear()) {
                 return true;
             }
-            if (currentYdbVersion.GetYear() != storedVersion->GetYear()) {
+            if (currentVersion.GetYear() != storedVersion->GetYear()) {
                 errorReason = "Default rules used, stored's and current's Year differ, "
                         + PrintStoredAndCurrent(stored, current);
                 return false;
             }
-            if (!currentYdbVersion.HasMajor() || !storedVersion->HasMajor()) {
+            if (!currentVersion.HasMajor() || !storedVersion->HasMajor()) {
                 return true;
             }
-            if (std::abs((i32)currentYdbVersion.GetMajor() - (i32)storedVersion->GetMajor()) <= 1) {
+            if (std::abs((i32)currentVersion.GetMajor() - (i32)storedVersion->GetMajor()) <= 1) {
                 return true;
             } else {
                 errorReason = "Default rules used, stored's and current's Major difference is more than 1, "
                         + PrintStoredAndCurrent(stored, current);
                 return false;
             }
-        } else if (!current->HasYdbVersion() && !storedVersion) {
-            if (*storedBuild == current->GetBuild()) {
+        } else if (!current->HasVersion() && !storedVersion) {
+            if (*storedApplication == current->GetApplication()) {
                 return true;
             } else {
-                errorReason = "Default rules used, both versions are non-stable, stored's and current's Build differ, "
+                errorReason = "Default rules used, both versions are non-stable, stored's and current's Application differ, "
                         + PrintStoredAndCurrent(stored, current);
                 return false;
             }

+ 18 - 18
ydb/core/driver_lib/version/version.h

@@ -16,7 +16,7 @@ public:
     struct TProtoConstructor {
         TProtoConstructor() = delete;
 
-        struct TYdbVersion {
+        struct TVersion {
             std::optional<ui32> Year;
             std::optional<ui32> Major;
             std::optional<ui32> Minor;
@@ -42,16 +42,16 @@ public:
         };
 
         struct TCompatibilityRule {
-            std::optional<std::string> Build;
-            std::optional<TYdbVersion> LowerLimit;
-            std::optional<TYdbVersion> UpperLimit;
+            std::optional<std::string> Application;
+            std::optional<TVersion> LowerLimit;
+            std::optional<TVersion> UpperLimit;
             std::optional<ui32> ComponentId;
             std::optional<bool> Forbidden;
 
             NKikimrConfig::TCompatibilityRule ToPB() {
                 NKikimrConfig::TCompatibilityRule res;
-                if (Build) {
-                    res.SetBuild(Build->data());
+                if (Application) {
+                    res.SetApplication(Application->data());
                 }
                 if (LowerLimit) {
                     res.MutableLowerLimit()->CopyFrom(LowerLimit->ToPB());
@@ -71,17 +71,17 @@ public:
         };
 
         struct TCurrentCompatibilityInfo {
-            std::optional<std::string> Build;
-            std::optional<TYdbVersion> YdbVersion;
+            std::optional<std::string> Application;
+            std::optional<TVersion> Version;
             std::vector<TCompatibilityRule> CanLoadFrom;
             std::vector<TCompatibilityRule> StoresReadableBy;
 
             NKikimrConfig::TCurrentCompatibilityInfo ToPB() {
                 NKikimrConfig::TCurrentCompatibilityInfo res;
-                Y_VERIFY(Build);
-                res.SetBuild(Build->data());
-                if (YdbVersion) {
-                    res.MutableYdbVersion()->CopyFrom(YdbVersion->ToPB());
+                Y_VERIFY(Application);
+                res.SetApplication(Application->data());
+                if (Version) {
+                    res.MutableVersion()->CopyFrom(Version->ToPB());
                 }
 
                 for (auto canLoadFrom : CanLoadFrom) {
@@ -96,17 +96,17 @@ public:
         };
 
         struct TStoredCompatibilityInfo {
-            std::optional<std::string> Build;
-            std::optional<TYdbVersion> YdbVersion;
+            std::optional<std::string> Application;
+            std::optional<TVersion> Version;
             std::vector<TCompatibilityRule> ReadableBy;
 
             NKikimrConfig::TStoredCompatibilityInfo ToPB() {
                 NKikimrConfig::TStoredCompatibilityInfo res;
-                Y_VERIFY(Build);
+                Y_VERIFY(Application);
 
-                res.SetBuild(Build->data());
-                if (YdbVersion) {
-                    res.MutableYdbVersion()->CopyFrom(YdbVersion->ToPB());
+                res.SetApplication(Application->data());
+                if (Version) {
+                    res.MutableVersion()->CopyFrom(Version->ToPB());
                 }
 
                 for (auto readableBy : ReadableBy) {

+ 7 - 7
ydb/core/protos/config.proto

@@ -2018,7 +2018,7 @@ message TCompatibilityRule {
         ComponentsCount = 7;
     }
 
-    optional string Build = 1;
+    optional string Application = 1;
     optional TYdbVersion LowerLimit = 2;
     optional TYdbVersion UpperLimit = 3;
 
@@ -2031,20 +2031,20 @@ message TCompatibilityRule {
 }
 
 message TCurrentCompatibilityInfo {
-    required string Build = 1;
+    required string Application = 1;
 
-    // if YdbVersion is empty, build is assumed to be non-stable
-    optional TYdbVersion YdbVersion = 2;
+    // if Version is empty, build is assumed to be non-stable
+    optional TYdbVersion Version = 2;
 
     repeated TCompatibilityRule CanLoadFrom = 3;
     repeated TCompatibilityRule StoresReadableBy = 4;
 }
 
 message TStoredCompatibilityInfo {
-    required string Build = 1;
+    required string Application = 1;
 
-    // if YdbVersion is empty, build is assumed to be non-stable
-    optional TYdbVersion YdbVersion = 2;
+    // if Version is empty, build is assumed to be non-stable
+    optional TYdbVersion Version = 2;
 
     repeated TCompatibilityRule ReadableBy = 3;
 }