diff --git a/ydb/apps/version/version_definition.cpp b/ydb/apps/version/version_definition.cpp new file mode 100644 index 000000000000..4cfb93b74f79 --- /dev/null +++ b/ydb/apps/version/version_definition.cpp @@ -0,0 +1,11 @@ +#include + +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", + }.ToPB(); +} diff --git a/ydb/apps/version/ya.make b/ydb/apps/version/ya.make new file mode 100644 index 000000000000..d3b1eb34a7f1 --- /dev/null +++ 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 index d894acdb873d..93da2652c5ce 100644 --- a/ydb/apps/ydbd/ya.make +++ b/ydb/apps/ydbd/ya.make @@ -28,6 +28,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 index 0a89b3e4b6e9..d4f2a0bb1540 100644 --- 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 index 1dab38ef3f26..c7936f615c71 100644 --- 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 index 0572ce32b6a4..58b44a1be8e2 100644 --- 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 index aa0a9c0ebab8..88e601a9eaa3 100644 --- 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 index 4d89f5e383fd..bfd43f049cd1 100644 --- 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 index 6b95175079a9..526d1e82de93 100644 --- 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 index 8d2d47103207..394f0576b6ac 100644 --- 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 index fae14c758326..176da08e58e0 100644 --- 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 index 0c5a755c2a82..4b3833beacea 100644 --- 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 index 4781640d0339..adc22dfeeca6 100644 --- a/ydb/core/driver_lib/version/version.cpp +++ b/ydb/core/driver_lib/version/version.cpp @@ -17,18 +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" - }.ToPB(); + auto current = MakeCurrent(); // bool success = CompleteFromTag(current); // Y_ABORT_UNLESS(success); diff --git a/ydb/core/driver_lib/version/version.h b/ydb/core/driver_lib/version/version.h index 1ecf76cb9e28..a18b2ad0cb5b 100644 --- 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 index c3b4ba285713..1189fc7e7025 100644 --- 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 index fc27aa01c236..25f814605794 100644 --- 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 index 5f3f7aa58928..b1ceaa00a41c 100644 --- 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