Wrap version control code in namespace, other minor improvements,

Code improvements

9 files changed, 55 insertions, 30 deletions

diff --git a/ydb/core/driver_lib/version/ut/CMakeLists.darwin-x86_64.txt b/ydb/core/driver_lib/version/ut/CMakeLists.darwin-x86_64.txt
index bf3aad7446d..e0a3ec19bc8 100644
--- a/ydb/core/driver_lib/version/ut/CMakeLists.darwin-x86_64.txt
+++ b/ydb/core/driver_lib/version/ut/CMakeLists.darwin-x86_64.txt
@@ -17,10 +17,6 @@ target_link_libraries(ydb-core-driver_lib-version-ut PUBLIC
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   version
-  contrib-libs-protobuf
-  cpp-actors-interconnect
-  library-cpp-svnversion
-  ydb-core-protos
 )
 target_link_options(ydb-core-driver_lib-version-ut PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
@@ -56,7 +52,7 @@ set_yunittest_property(
   ydb-core-driver_lib-version-ut
   PROPERTY
   LABELS
-  SMALL
+  MEDIUM
 )
 set_yunittest_property(
   TEST
@@ -65,6 +61,13 @@ set_yunittest_property(
   PROCESSORS
   1
 )
+set_yunittest_property(
+  TEST
+  ydb-core-driver_lib-version-ut
+  PROPERTY
+  TIMEOUT
+  300
+)
 target_allocator(ydb-core-driver_lib-version-ut
   system_allocator
 )
diff --git a/ydb/core/driver_lib/version/ut/CMakeLists.linux-aarch64.txt b/ydb/core/driver_lib/version/ut/CMakeLists.linux-aarch64.txt
index 34048705cb6..0905a7b00a6 100644
--- a/ydb/core/driver_lib/version/ut/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/driver_lib/version/ut/CMakeLists.linux-aarch64.txt
@@ -17,10 +17,6 @@ target_link_libraries(ydb-core-driver_lib-version-ut PUBLIC
   yutil
   cpp-testing-unittest_main
   version
-  contrib-libs-protobuf
-  cpp-actors-interconnect
-  library-cpp-svnversion
-  ydb-core-protos
 )
 target_link_options(ydb-core-driver_lib-version-ut PRIVATE
   -ldl
@@ -59,7 +55,7 @@ set_yunittest_property(
   ydb-core-driver_lib-version-ut
   PROPERTY
   LABELS
-  SMALL
+  MEDIUM
 )
 set_yunittest_property(
   TEST
@@ -68,6 +64,13 @@ set_yunittest_property(
   PROCESSORS
   1
 )
+set_yunittest_property(
+  TEST
+  ydb-core-driver_lib-version-ut
+  PROPERTY
+  TIMEOUT
+  300
+)
 target_allocator(ydb-core-driver_lib-version-ut
   cpp-malloc-jemalloc
 )
diff --git a/ydb/core/driver_lib/version/ut/CMakeLists.linux-x86_64.txt b/ydb/core/driver_lib/version/ut/CMakeLists.linux-x86_64.txt
index 609e9ec0e28..7e32e2defdf 100644
--- a/ydb/core/driver_lib/version/ut/CMakeLists.linux-x86_64.txt
+++ b/ydb/core/driver_lib/version/ut/CMakeLists.linux-x86_64.txt
@@ -18,10 +18,6 @@ target_link_libraries(ydb-core-driver_lib-version-ut PUBLIC
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   version
-  contrib-libs-protobuf
-  cpp-actors-interconnect
-  library-cpp-svnversion
-  ydb-core-protos
 )
 target_link_options(ydb-core-driver_lib-version-ut PRIVATE
   -ldl
@@ -60,7 +56,7 @@ set_yunittest_property(
   ydb-core-driver_lib-version-ut
   PROPERTY
   LABELS
-  SMALL
+  MEDIUM
 )
 set_yunittest_property(
   TEST
@@ -69,6 +65,13 @@ set_yunittest_property(
   PROCESSORS
   1
 )
+set_yunittest_property(
+  TEST
+  ydb-core-driver_lib-version-ut
+  PROPERTY
+  TIMEOUT
+  300
+)
 target_allocator(ydb-core-driver_lib-version-ut
   cpp-malloc-tcmalloc
   libs-tcmalloc-no_percpu_cache
diff --git a/ydb/core/driver_lib/version/ut/CMakeLists.windows-x86_64.txt b/ydb/core/driver_lib/version/ut/CMakeLists.windows-x86_64.txt
index 2662eede47a..811a5dda44d 100644
--- a/ydb/core/driver_lib/version/ut/CMakeLists.windows-x86_64.txt
+++ b/ydb/core/driver_lib/version/ut/CMakeLists.windows-x86_64.txt
@@ -17,10 +17,6 @@ target_link_libraries(ydb-core-driver_lib-version-ut PUBLIC
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   version
-  contrib-libs-protobuf
-  cpp-actors-interconnect
-  library-cpp-svnversion
-  ydb-core-protos
 )
 target_sources(ydb-core-driver_lib-version-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/version/ut/version_ut.cpp
@@ -49,7 +45,7 @@ set_yunittest_property(
   ydb-core-driver_lib-version-ut
   PROPERTY
   LABELS
-  SMALL
+  MEDIUM
 )
 set_yunittest_property(
   TEST
@@ -58,6 +54,13 @@ set_yunittest_property(
   PROCESSORS
   1
 )
+set_yunittest_property(
+  TEST
+  ydb-core-driver_lib-version-ut
+  PROPERTY
+  TIMEOUT
+  300
+)
 target_allocator(ydb-core-driver_lib-version-ut
   system_allocator
 )
diff --git a/ydb/core/driver_lib/version/ut/ut_helpers.h b/ydb/core/driver_lib/version/ut/ut_helpers.h
index ac52a1e73ec..f66aadb6c8e 100644
--- a/ydb/core/driver_lib/version/ut/ut_helpers.h
+++ b/ydb/core/driver_lib/version/ut/ut_helpers.h
@@ -1,5 +1,7 @@
 #include <ydb/core/driver_lib/version/version.h>
 
+namespace NKikimr {
+    
 class TCompatibilityInfoTest {
 public:
     TCompatibilityInfoTest() = delete;
@@ -8,3 +10,5 @@ public:
         TCompatibilityInfo::Reset(newCurrent);
     }
 };
+
+}
diff --git a/ydb/core/driver_lib/version/ut/version_ut.cpp b/ydb/core/driver_lib/version/ut/version_ut.cpp
index 3674b1130fb..cafe9e0e6e2 100644
--- a/ydb/core/driver_lib/version/ut/version_ut.cpp
+++ b/ydb/core/driver_lib/version/ut/version_ut.cpp
@@ -2,6 +2,8 @@
 #include <ydb/core/driver_lib/version/version.h>
 #include "ut_helpers.h"
 
+using namespace NKikimr;
+
 Y_UNIT_TEST_SUITE(VersionParser) {
     Y_UNIT_TEST(Basic) {
         UNIT_ASSERT_VALUES_EQUAL(GetBranchName("svn+ssh://arcadia.yandex.ru/arc/trunk/arcadia"), "trunk");
diff --git a/ydb/core/driver_lib/version/ut/ya.make b/ydb/core/driver_lib/version/ut/ya.make
index 9378ab78d17..0c5a755c2a8 100644
--- a/ydb/core/driver_lib/version/ut/ya.make
+++ b/ydb/core/driver_lib/version/ut/ya.make
@@ -2,11 +2,11 @@ UNITTEST_FOR(ydb/core/driver_lib/version)
 
 SRCS(version_ut.cpp)
 
+TIMEOUT(300)
+SIZE(MEDIUM)
+
 PEERDIR(
-    contrib/libs/protobuf
-    library/cpp/actors/interconnect
-    library/cpp/svnversion
-    ydb/core/protos
+    ydb/core/driver_lib/version
 )
 
 END()
diff --git a/ydb/core/driver_lib/version/version.cpp b/ydb/core/driver_lib/version/version.cpp
index 11e4d972ca9..fd5fc287e42 100644
--- a/ydb/core/driver_lib/version/version.cpp
+++ b/ydb/core/driver_lib/version/version.cpp
@@ -5,6 +5,7 @@
 using TCurrent = NKikimrConfig::TCurrentCompatibilityInfo;
 using TStored = NKikimrConfig::TStoredCompatibilityInfo;
 
+namespace NKikimr {
 
 /////////////////////////////////////////////////////////////
 // Global definitions
@@ -157,9 +158,9 @@ i32 CompareVersions(const NKikimrConfig::TYdbVersion& left, const NKikimrConfig:
     return 0;
 }
 
-// If StoredCompatibilityInfo is not present, we:
-// compare current to UnknownYdbRelease, if current version is stable, otherwise
-// we consider versions compatible
+// If stored CompatibilityInfo is not present, we:
+// - compare current to UnknownYdbRelease if current is stable version
+// - consider versions compatible otherwise
 bool CheckNonPresent(const TCurrent* current, ui32 componentId, TString& errorReason) {
     Y_VERIFY(current);
     if (!current->HasYdbVersion()) {
@@ -168,7 +169,7 @@ bool CheckNonPresent(const TCurrent* current, ui32 componentId, TString& errorRe
     const auto* lastUnsupported = TCompatibilityInfo::GetUnknown();
     Y_VERIFY(lastUnsupported);
     TString errorReason1;
-    if (!TCompatibilityInfo::CheckCompatibility(current, lastUnsupported, componentId, errorReason1)) {
+    if (!TCompatibilityInfo::CheckCompatibility(lastUnsupported, componentId, errorReason1)) {
         errorReason = "No stored YDB version found, last unsupported release is incompatible: " + errorReason1;
         return false;
     } else {
@@ -276,7 +277,6 @@ bool TCompatibilityInfo::CheckCompatibility(const TCurrent* current, const TStor
         }
     }
 
-
     if (permitted) {
         return true;
     } else {
@@ -518,7 +518,7 @@ void CheckVersionTag() {
 using TOldFormat = NActors::TInterconnectProxyCommon::TVersionInfo;
 
 bool TCompatibilityInfo::CheckCompatibility(const NKikimrConfig::TCurrentCompatibilityInfo* current,
-            const TOldFormat& stored, ui32 componentId, TString& errorReason) {
+        const TOldFormat& stored, ui32 componentId, TString& errorReason) {
     Y_VERIFY(current);
 
     std::optional<TString> storedBuild;
@@ -613,3 +613,5 @@ bool TCompatibilityInfo::CheckCompatibility(const NKikimrConfig::TCurrentCompati
 bool TCompatibilityInfo::CheckCompatibility(const TOldFormat& stored, ui32 componentId, TString& errorReason) {
     return CheckCompatibility(GetCurrent(), stored, componentId, errorReason);
 }
+
+}
diff --git a/ydb/core/driver_lib/version/version.h b/ydb/core/driver_lib/version/version.h
index da4ffaa9847..7d30bbdeb31 100644
--- a/ydb/core/driver_lib/version/version.h
+++ b/ydb/core/driver_lib/version/version.h
@@ -3,6 +3,8 @@
 #include <library/cpp/actors/interconnect/interconnect_common.h>
 #include <ydb/core/protos/config.pb.h>
 
+namespace NKikimr {
+
 class TCompatibilityInfo {
     friend class TCompatibilityInfoTest;
     using TOldFormat = NActors::TInterconnectProxyCommon::TVersionInfo;
@@ -120,6 +122,7 @@ public:
 
     static NKikimrConfig::TStoredCompatibilityInfo MakeStored(NKikimrConfig::TCompatibilityRule::EComponentId componentId);
 
+    // pass nullptr if stored CompatibilityInfo is absent
     static bool CheckCompatibility(const NKikimrConfig::TStoredCompatibilityInfo* stored,
             ui32 componentId, TString& errorReason);
     static bool CheckCompatibility(const NKikimrConfig::TCurrentCompatibilityInfo* current,
@@ -149,3 +152,5 @@ extern TMaybe<NActors::TInterconnectProxyCommon::TVersionInfo> VERSION;
 
 void CheckVersionTag();
 TString GetBranchName(TString url);
+
+} // namespace NKikimr