Update white list default value.

vesoft-inc · Sep 28, 2021 · f6fc10d · f6fc10d
1 parent 4101caf
commit f6fc10d
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 2 deletions.
diff --git a/src/graph/context/test/CMakeLists.txt b/src/graph/context/test/CMakeLists.txt
@@ -41,6 +41,7 @@ SET(CONTEXT_TEST_LIBS
     $<TARGET_OBJECTS:planner_obj>
     $<TARGET_OBJECTS:idgenerator_obj>
     $<TARGET_OBJECTS:ssl_obj>
+    $<TARGET_OBJECTS:version_obj>
 )
 
 nebula_add_test(

diff --git a/src/graph/executor/test/CMakeLists.txt b/src/graph/executor/test/CMakeLists.txt
@@ -48,6 +48,7 @@ SET(EXEC_QUERY_TEST_OBJS
     $<TARGET_OBJECTS:expr_visitor_obj>
     $<TARGET_OBJECTS:graph_obj>
     $<TARGET_OBJECTS:ssl_obj>
+    $<TARGET_OBJECTS:version_obj>
 )
 
 SET(EXEC_QUERY_TEST_LIBS

diff --git a/src/graph/optimizer/test/CMakeLists.txt b/src/graph/optimizer/test/CMakeLists.txt
@@ -44,6 +44,7 @@ set(OPTIMIZER_TEST_LIB
     $<TARGET_OBJECTS:validator_obj>
     $<TARGET_OBJECTS:optimizer_obj>
     $<TARGET_OBJECTS:ssl_obj>
+    $<TARGET_OBJECTS:version_obj>
 )
 
 nebula_add_test(

diff --git a/src/graph/planner/test/CMakeLists.txt b/src/graph/planner/test/CMakeLists.txt
@@ -48,6 +48,7 @@ nebula_add_test(
         $<TARGET_OBJECTS:util_obj>
         $<TARGET_OBJECTS:idgenerator_obj>
         $<TARGET_OBJECTS:graph_context_obj>
+        $<TARGET_OBJECTS:version_obj>
     LIBRARIES
         gtest
         ${PROXYGEN_LIBRARIES}

diff --git a/src/graph/service/GraphFlags.cpp b/src/graph/service/GraphFlags.cpp
@@ -6,6 +6,8 @@
 
 #include "graph/service/GraphFlags.h"
 
+#include "version/Version.h"
+
 DEFINE_int32(port, 3699, "Nebula Graph daemon's listen port");
 DEFINE_int32(client_idle_timeout_secs,
              0,
@@ -68,5 +70,5 @@ DEFINE_bool(enable_experimental_feature, false, "Whether to enable experimental
 
 DEFINE_bool(enable_client_white_list, true, "Turn on/off the client white list.");
 DEFINE_string(client_white_list,
-              "2.5.0:2.5.1",
+              nebula::getOriginVersion() + ":2.5.0:2.5.1",
               "A white list for diffrent client versions, seperate with colon.");
diff --git a/src/graph/util/test/CMakeLists.txt b/src/graph/util/test/CMakeLists.txt
@@ -43,6 +43,7 @@ nebula_add_test(
         $<TARGET_OBJECTS:parser_obj>
         $<TARGET_OBJECTS:graph_context_obj>
         $<TARGET_OBJECTS:validator_obj>
+        $<TARGET_OBJECTS:version_obj>
     LIBRARIES
         gtest
         gtest_main

diff --git a/src/meta/processors/admin/VerifyClientVersionProcessor.cpp b/src/meta/processors/admin/VerifyClientVersionProcessor.cpp
@@ -6,9 +6,11 @@
 
 #include "meta/processors/admin/VerifyClientVersionProcessor.h"
 
+#include "version/Version.h"
+
 DEFINE_bool(enable_client_white_list, true, "Turn on/off the client white list.");
 DEFINE_string(client_white_list,
-              "2.5.0:2.5.1",
+              nebula::getOriginVersion() + ":2.5.0:2.5.1",
               "A white list for diffrent client versions, seperate with colon.");
 
 namespace nebula {

diff --git a/src/parser/test/CMakeLists.txt b/src/parser/test/CMakeLists.txt
@@ -43,6 +43,7 @@ set(PARSER_TEST_LIBS
     $<TARGET_OBJECTS:idgenerator_obj>
     $<TARGET_OBJECTS:graph_obj>
     $<TARGET_OBJECTS:ssl_obj>
+    $<TARGET_OBJECTS:version_obj>
 )
 
 nebula_add_test(

diff --git a/src/version/Version.cpp.in b/src/version/Version.cpp.in
@@ -31,4 +31,11 @@ std::string versionString(bool verbose) {
   return version;
 }
 
+std::string getOriginVersion() {
+#if defined(NEBULA_BUILD_VERSION)
+  return NEBULA_BUILD_VERSION;
+#else
+  return "";
+#endif
+}
 }  // namespace nebula
diff --git a/src/version/Version.h b/src/version/Version.h
@@ -13,6 +13,7 @@ namespace nebula {
 
 std::string gitInfoSha();
 std::string versionString(bool verbose = true);
+std::string getOriginVersion();
 
 }  // namespace nebula