Skip to content

Commit ea54d72

Browse files
authored
Merge f0f352a into 96c9390
2 parents 96c9390 + f0f352a commit ea54d72

5 files changed

Lines changed: 26 additions & 5 deletions

File tree

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#include <ydb/core/driver_lib/version/version.h>
2+
3+
NKikimrConfig::TCurrentCompatibilityInfo NKikimr::TCompatibilityInfo::MakeCurrent() {
4+
using TCurrentConstructor = NKikimr::TCompatibilityInfo::TProtoConstructor::TCurrentCompatibilityInfo;
5+
// using TVersionConstructor = NKikimr::TCompatibilityInfo::TProtoConstructor::TVersion;
6+
// using TCompatibilityRuleConstructor = NKikimr::TCompatibilityInfo::TProtoConstructor::TCompatibilityRule;
7+
8+
return TCurrentConstructor{
9+
.Application = "ydb",
10+
}.ToPB();
11+
}

ydb/apps/version/ya.make

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
LIBRARY(version_definition)
2+
3+
SRCS(
4+
version_definition.cpp
5+
)
6+
7+
PEERDIR(
8+
ydb/core/driver_lib/version
9+
)
10+
11+
END()

ydb/core/driver_lib/version/version.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,14 @@ using EComponentId = NKikimrConfig::TCompatibilityRule;
1717
using TComponentId = NKikimrConfig::TCompatibilityRule::EComponentId;
1818

1919
TCompatibilityInfo::TCompatibilityInfo() {
20-
using TCurrentConstructor = TCompatibilityInfo::TProtoConstructor::TCurrentCompatibilityInfo;
2120
using TStoredConstructor = TCompatibilityInfo::TProtoConstructor::TStoredCompatibilityInfo;
22-
// using TCompatibilityRuleConstructor = TCompatibilityInfo::TProtoConstructor::TCompatibilityRule;
2321
using TVersionConstructor = TCompatibilityInfo::TProtoConstructor::TVersion;
2422

2523
/////////////////////////////////////////////////////////
2624
// Current CompatibilityInfo
2725
/////////////////////////////////////////////////////////
2826

29-
auto current = TCurrentConstructor{
30-
.Application = "ydb"
31-
}.ToPB();
27+
auto current = MakeCurrent();
3228

3329
// bool success = CompleteFromTag(current);
3430
// Y_ABORT_UNLESS(success);

ydb/core/driver_lib/version/version.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ class TCompatibilityInfo {
141141

142142
bool CompleteFromTag(NKikimrConfig::TCurrentCompatibilityInfo& current);
143143

144+
static NKikimrConfig::TCurrentCompatibilityInfo MakeCurrent();
145+
144146
NKikimrConfig::TStoredCompatibilityInfo MakeStored(TComponentId componentId) const;
145147
NKikimrConfig::TStoredCompatibilityInfo MakeStored(TComponentId componentId,
146148
const NKikimrConfig::TCurrentCompatibilityInfo* current) const;

ydb/core/mind/bscontroller/ut_selfheal/ya.make

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ SRCS(
1616
)
1717

1818
PEERDIR(
19+
ydb/apps/version
1920
ydb/core/blobstorage/dsproxy/mock
2021
ydb/core/blobstorage/pdisk/mock
2122
ydb/core/mind/bscontroller

0 commit comments

Comments
 (0)