Move construction of current compatibility information out of driver_…

…lib (#2480)
ydb-platform · Mar 11, 2024 · f111064 · f111064
1 parent f24b02a
commit f111064
Show file tree

Hide file tree

Showing 17 changed files with 65 additions and 32 deletions.
diff --git a/ydb/apps/version/version_definition.cpp b/ydb/apps/version/version_definition.cpp
@@ -0,0 +1,38 @@
+#include <ydb/core/driver_lib/version/version.h>
+
+NKikimrConfig::TCurrentCompatibilityInfo NKikimr::TCompatibilityInfo::MakeCurrent() {
+    using TCurrentConstructor = NKikimr::TCompatibilityInfo::TProtoConstructor::TCurrentCompatibilityInfo;
+    // using TVersionConstructor = NKikimr::TCompatibilityInfo::TProtoConstructor::TVersion;
+    // using TCompatibilityRuleConstructor = NKikimr::TCompatibilityInfo::TProtoConstructor::TCompatibilityRule;
+
+    return TCurrentConstructor{
+        .Application = "ydb",
+        .Version = TVersionConstructor{
+            .Year = 24,
+            .Major = 1,
+        },
+        .CanLoadFrom = {
+            TCompatibilityRuleConstructor{
+                .LowerLimit = TVersionConstructor{ .Year = 23, .Major = 4 },
+                .UpperLimit = TVersionConstructor{ .Year = 24, .Major = 1 },
+            },
+        },
+        .StoresReadableBy = {
+            TCompatibilityRuleConstructor{
+                .LowerLimit = TVersionConstructor{ .Year = 23, .Major = 4 },
+                .UpperLimit = TVersionConstructor{ .Year = 24, .Major = 1 },
+            },
+        },
+        .CanConnectTo = {
+            TCompatibilityRuleConstructor{
+                .LowerLimit = TVersionConstructor{ .Year = 23, .Major = 4 },
+                .UpperLimit = TVersionConstructor{ .Year = 24, .Major = 1 },
+            },
+            TCompatibilityRuleConstructor{
+                .Application = "nbs",
+                .LowerLimit = TVersionConstructor{ .Year = 23, .Major = 3 },
+                .UpperLimit = TVersionConstructor{ .Year = 24, .Major = 1 },
+            },
+        }
+    }.ToPB();
+}
diff --git a/ydb/apps/version/ya.make b/ydb/apps/version/ya.make
@@ -0,0 +1,11 @@
+LIBRARY(version_definition)
+
+SRCS(
+    version_definition.cpp
+)
+
+PEERDIR(
+    ydb/core/driver_lib/version
+)
+
+END()
diff --git a/ydb/apps/ydbd/ya.make b/ydb/apps/ydbd/ya.make
@@ -35,6 +35,7 @@ IF (ARCH_X86_64)
 ENDIF()
 
 PEERDIR(
+    ydb/apps/version
     ydb/core/driver_lib/run
     ydb/core/protos
     ydb/core/security

diff --git a/ydb/core/actorlib_impl/ut/ya.make b/ydb/core/actorlib_impl/ut/ya.make
@@ -13,6 +13,7 @@ ELSE()
 ENDIF()
 
 PEERDIR(
+    ydb/apps/version
     ydb/library/actors/core
     ydb/library/actors/interconnect
     library/cpp/getopt

diff --git a/ydb/core/blobstorage/incrhuge/ut/ya.make b/ydb/core/blobstorage/incrhuge/ut/ya.make
@@ -12,6 +12,7 @@ ELSE()
 ENDIF()
 
 PEERDIR(
+    ydb/apps/version
     ydb/library/actors/protos
     ydb/core/blobstorage
     ydb/core/blobstorage/incrhuge

diff --git a/ydb/core/blobstorage/ut_blobstorage/lib/ya.make b/ydb/core/blobstorage/ut_blobstorage/lib/ya.make
@@ -16,6 +16,7 @@ SRCS(
 PEERDIR(
     library/cpp/digest/md5
     library/cpp/testing/unittest
+    ydb/apps/version
     ydb/core/base
     ydb/core/blob_depot
     ydb/core/blobstorage/backpressure

diff --git a/ydb/core/blobstorage/ut_group/ya.make b/ydb/core/blobstorage/ut_group/ya.make
@@ -16,6 +16,7 @@ ELSE()
 ENDIF()
 
 PEERDIR(
+    ydb/apps/version
     ydb/library/actors/interconnect/mock
     library/cpp/testing/unittest
     ydb/core/blobstorage/crypto

diff --git a/ydb/core/blobstorage/ut_mirror3of4/ya.make b/ydb/core/blobstorage/ut_mirror3of4/ya.make
@@ -9,6 +9,7 @@ SIZE(MEDIUM)
 TIMEOUT(600)
 
 PEERDIR(
+    ydb/apps/version
     ydb/library/actors/interconnect/mock
     library/cpp/testing/unittest
     ydb/core/blobstorage/backpressure

diff --git a/ydb/core/blobstorage/ut_vdisk/ya.make b/ydb/core/blobstorage/ut_vdisk/ya.make
@@ -18,6 +18,7 @@ SRCS(
 )
 
 PEERDIR(
+    ydb/apps/version
     ydb/library/actors/protos
     library/cpp/codecs
     ydb/core/base

diff --git a/ydb/core/blobstorage/ut_vdisk2/ya.make b/ydb/core/blobstorage/ut_vdisk2/ya.make
@@ -16,6 +16,7 @@ SRCS(
 )
 
 PEERDIR(
+    ydb/apps/version
     library/cpp/testing/unittest
     ydb/core/blobstorage/backpressure
     ydb/core/blobstorage/groupinfo

diff --git a/ydb/core/blobstorage/vdisk/syncer/ya.make b/ydb/core/blobstorage/vdisk/syncer/ya.make
@@ -1,6 +1,7 @@
 LIBRARY()
 
 PEERDIR(
+    ydb/apps/version
     ydb/library/actors/core
     ydb/library/actors/interconnect
     library/cpp/monlib/service/pages

diff --git a/ydb/core/driver_lib/version/ut/ya.make b/ydb/core/driver_lib/version/ut/ya.make
@@ -7,6 +7,7 @@ SIZE(MEDIUM)
 
 PEERDIR(
     ydb/core/driver_lib/version
+    ydb/apps/version
 )
 
 END()
diff --git a/ydb/core/driver_lib/version/version.cpp b/ydb/core/driver_lib/version/version.cpp
@@ -17,45 +17,14 @@ using EComponentId = NKikimrConfig::TCompatibilityRule;
 using TComponentId = NKikimrConfig::TCompatibilityRule::EComponentId;
 
 TCompatibilityInfo::TCompatibilityInfo() {
-    using TCurrentConstructor = TCompatibilityInfo::TProtoConstructor::TCurrentCompatibilityInfo;
     using TStoredConstructor = TCompatibilityInfo::TProtoConstructor::TStoredCompatibilityInfo;
-    using TCompatibilityRuleConstructor = TCompatibilityInfo::TProtoConstructor::TCompatibilityRule;
     using TVersionConstructor = TCompatibilityInfo::TProtoConstructor::TVersion;
 
     /////////////////////////////////////////////////////////
     // Current CompatibilityInfo
     /////////////////////////////////////////////////////////
 
-    auto current = TCurrentConstructor{
-        .Application = "ydb",
-        .Version = TVersionConstructor{
-            .Year = 24,
-            .Major = 1,
-        },
-        .CanLoadFrom = {
-            TCompatibilityRuleConstructor{
-                .LowerLimit = TVersionConstructor{ .Year = 23, .Major = 4 },
-                .UpperLimit = TVersionConstructor{ .Year = 24, .Major = 1 },
-            },
-        },
-        .StoresReadableBy = {
-            TCompatibilityRuleConstructor{
-                .LowerLimit = TVersionConstructor{ .Year = 23, .Major = 4 },
-                .UpperLimit = TVersionConstructor{ .Year = 24, .Major = 1 },
-            },
-        },
-        .CanConnectTo = {
-            TCompatibilityRuleConstructor{
-                .LowerLimit = TVersionConstructor{ .Year = 23, .Major = 4 },
-                .UpperLimit = TVersionConstructor{ .Year = 24, .Major = 1 },
-            },
-            TCompatibilityRuleConstructor{
-                .Application = "nbs",
-                .LowerLimit = TVersionConstructor{ .Year = 23, .Major = 3 },
-                .UpperLimit = TVersionConstructor{ .Year = 24, .Major = 1 },
-            },
-        }
-    }.ToPB();
+    auto current = MakeCurrent();
 
     bool success = CompleteFromTag(current);
     Y_UNUSED(success);

diff --git a/ydb/core/driver_lib/version/version.h b/ydb/core/driver_lib/version/version.h
@@ -141,6 +141,8 @@ class TCompatibilityInfo {
 
     bool CompleteFromTag(NKikimrConfig::TCurrentCompatibilityInfo& current);
 
+    static NKikimrConfig::TCurrentCompatibilityInfo MakeCurrent();
+
     NKikimrConfig::TStoredCompatibilityInfo MakeStored(TComponentId componentId) const;
     NKikimrConfig::TStoredCompatibilityInfo MakeStored(TComponentId componentId,
             const NKikimrConfig::TCurrentCompatibilityInfo* current) const;

diff --git a/ydb/core/mind/bscontroller/ut_selfheal/ya.make b/ydb/core/mind/bscontroller/ut_selfheal/ya.make
@@ -16,6 +16,7 @@ SRCS(
 )
 
 PEERDIR(
+    ydb/apps/version
     ydb/core/blobstorage/dsproxy/mock
     ydb/core/blobstorage/pdisk/mock
     ydb/core/mind/bscontroller

diff --git a/ydb/core/testlib/actors/ya.make b/ydb/core/testlib/actors/ya.make
@@ -5,6 +5,7 @@ SRCS(
 )
 
 PEERDIR(
+    ydb/apps/version
     ydb/library/actors/testlib
     library/cpp/testing/unittest
     ydb/core/base

diff --git a/ydb/core/testlib/ya.make b/ydb/core/testlib/ya.make
@@ -22,6 +22,7 @@ SRCS(
 )
 
 PEERDIR(
+    ydb/apps/version
     ydb/library/actors/core
     ydb/library/actors/interconnect
     ydb/library/grpc/client