Merge branch 'master' into sequential

cmake/ThriftGenerate.cmake

@@ -86,7 +86,7 @@ add_custom_command(
     --gen "js:node:"
     --gen "csharp"
     --gen "java:hashcode"
-    --gen "go:thrift_import=github.com/facebook/fbthrift/thrift/lib/go/thrift,package_prefix=github.com/vesoft-inc/nebula-go/v2/,use_context"
+    --gen "go:thrift_import=github.com/facebook/fbthrift/thrift/lib/go/thrift,package_prefix=github.com/vesoft-inc/nebula-go/v3/,use_context"
     -o "." "${file_path}/${file_name}.thrift"
   COMMAND
     mkdir -p "./gen-rust/${file_name}"

src/graph/service/GraphFlags.cpp

@@ -56,7 +56,7 @@ DEFINE_bool(enable_optimizer, false, "Whether to enable optimizer");
 DEFINE_uint32(ft_request_retry_times, 3, "Retry times if fulltext request failed");
 DEFINE_bool(enable_client_white_list, true, "Turn on/off the client white list.");
 DEFINE_string(client_white_list,
-              nebula::getOriginVersion() + ":2.5.0:2.5.1:2.6.0",
+              nebula::getOriginVersion() + ":3.0.0",
               "A white list for different client versions, separate with colon.");
 
 #endif

src/graph/service/test/StandAloneTestGraphFlags.cpp

@@ -9,5 +9,5 @@
 DEFINE_uint32(ft_request_retry_times, 3, "Retry times if fulltext request failed");
 DEFINE_bool(enable_client_white_list, true, "Turn on/off the client white list.");
 DEFINE_string(client_white_list,
-              nebula::getOriginVersion() + ":2.5.0:2.5.1:2.6.0",
+              nebula::getOriginVersion() + ":3.0.0",
               "A white list for different client versions, separate with colon.");

src/interface/common.thrift

@@ -10,7 +10,7 @@ namespace java com.vesoft.nebula
 namespace go nebula
 namespace js nebula
 namespace csharp nebula
-namespace py nebula2.common
+namespace py nebula3.common
 
 cpp_include "common/thrift/ThriftTypes.h"
 cpp_include "common/datatypes/DateOps-inl.h"
@@ -34,7 +34,7 @@ cpp_include "common/datatypes/DurationOps-inl.h"
  *
  */
 
-const binary (cpp.type = "char const *") version = "2.6.0"
+const binary (cpp.type = "char const *") version = "3.0.0"
 
 typedef i64 (cpp.type = "nebula::ClusterID") ClusterID
 typedef i32 (cpp.type = "nebula::GraphSpaceID") GraphSpaceID

src/interface/graph.thrift

@@ -9,7 +9,7 @@ namespace java com.vesoft.nebula.graph
 namespace go nebula.graph
 namespace js nebula.graph
 namespace csharp nebula.graph
-namespace py nebula2.graph
+namespace py nebula3.graph
 
 include "common.thrift"
 

src/interface/meta.thrift

@@ -8,7 +8,7 @@ namespace java com.vesoft.nebula.meta
 namespace go nebula.meta
 namespace js nebula.meta
 namespace csharp nebula.meta
-namespace py nebula2.meta
+namespace py nebula3.meta
 
 include "common.thrift"
 

src/interface/storage.thrift

@@ -9,7 +9,7 @@ namespace java com.vesoft.nebula.storage
 namespace go nebula.storage
 namespace csharp nebula.storage
 namespace js nebula.storage
-namespace py nebula2.storage
+namespace py nebula3.storage
 
 include "common.thrift"
 include "meta.thrift"

src/meta/processors/admin/VerifyClientVersionProcessor.cpp

@@ -9,7 +9,7 @@
 
 DEFINE_bool(enable_client_white_list, true, "Turn on/off the client white list.");
 DEFINE_string(client_white_list,
-              nebula::getOriginVersion() + ":2.5.0:2.5.1:2.6.0",
+              nebula::getOriginVersion() + ":3.0.0",
               "A white list for different client versions, separate with colon.");
 
 namespace nebula {

tests/admin/test_permission.py

@@ -6,7 +6,7 @@
 
 import time
 
-from nebula2.common import ttypes
+from nebula3.common import ttypes
 from tests.common.nebula_test_suite import NebulaTestSuite
 
 

tests/common/comparator.py

@@ -7,7 +7,7 @@
 
 from enum import Enum
 from typing import Union, Dict, List
-from nebula2.common.ttypes import (
+from nebula3.common.ttypes import (
     DataSet,
     Edge,
     Path,

tests/common/dataset_printer.py

@@ -6,7 +6,7 @@
 
 from typing import List, Union
 
-from nebula2.common.ttypes import DataSet, Edge, NullType, Path, Value, Vertex
+from nebula3.common.ttypes import DataSet, Edge, NullType, Path, Value, Vertex
 
 Pattern = type(re.compile(r'\d+'))
 

tests/common/nebula_service.py

@@ -20,8 +20,8 @@
 
 from tests.common.constants import TMP_DIR
 from tests.common.utils import get_ssl_config
-from nebula2.gclient.net import ConnectionPool
-from nebula2.Config import Config
+from nebula3.gclient.net import ConnectionPool
+from nebula3.Config import Config
 
 NEBULA_START_COMMAND_FORMAT = "bin/nebula-{} --flagfile conf/nebula-{}.conf {}"
 

tests/common/nebula_test_suite.py

@@ -11,10 +11,10 @@
 from pathlib import Path
 from typing import Pattern, Set
 
-from nebula2.common import ttypes as CommonTtypes
-# from nebula2.gclient.net import ConnectionPool
-# from nebula2.Config import Config
-from nebula2.graph import ttypes
+from nebula3.common import ttypes as CommonTtypes
+# from nebula3.gclient.net import ConnectionPool
+# from nebula3.Config import Config
+from nebula3.graph import ttypes
 from tests.common.configs import get_delay_time
 from tests.common.utils import (
     compare_value,

tests/common/path_value.py

@@ -4,7 +4,7 @@
 #
 # This source code is licensed under Apache 2.0 License.
 
-from nebula2.common import ttypes as CommonTtypes
+from nebula3.common import ttypes as CommonTtypes
 
 
 class PathVal:

tests/common/utils.py

@@ -13,10 +13,10 @@
 import yaml
 from typing import Pattern
 
-from nebula2.Config import Config, SSL_config
-from nebula2.common import ttypes as CommonTtypes
-from nebula2.gclient.net import Session
-from nebula2.gclient.net import ConnectionPool
+from nebula3.Config import Config, SSL_config
+from nebula3.common import ttypes as CommonTtypes
+from nebula3.gclient.net import Session
+from nebula3.gclient.net import ConnectionPool
 
 from tests.common.constants import NB_TMP_PATH, NEBULA_HOME
 from tests.common.csv_import import CSVImporter

tests/conftest.py

@@ -15,11 +15,11 @@
 from tests.common.constants import NB_TMP_PATH, SPACE_TMP_PATH, BUILD_DIR, NEBULA_HOME
 from tests.common.nebula_service import NebulaService
 
-from nebula2.fbthrift.transport import TSocket
-from nebula2.fbthrift.transport import TTransport
-from nebula2.fbthrift.protocol import TBinaryProtocol
-from nebula2.gclient.net import Connection
-from nebula2.graph import GraphService
+from nebula3.fbthrift.transport import TSocket
+from nebula3.fbthrift.transport import TTransport
+from nebula3.fbthrift.protocol import TBinaryProtocol
+from nebula3.gclient.net import Connection
+from nebula3.graph import GraphService
 
 
 tests_collected = set()

tests/job/test_session.py

@@ -10,15 +10,15 @@
 import pytest
 import concurrent
 
-from nebula2.fbthrift.transport import TSocket
-from nebula2.fbthrift.transport import TTransport
-from nebula2.fbthrift.protocol import TBinaryProtocol
+from nebula3.fbthrift.transport import TSocket
+from nebula3.fbthrift.transport import TTransport
+from nebula3.fbthrift.protocol import TBinaryProtocol
 
 
-from nebula2.gclient.net import Connection
-from nebula2.graph import GraphService
-from nebula2.common import ttypes
-from nebula2.data.ResultSet import ResultSet
+from nebula3.gclient.net import Connection
+from nebula3.graph import GraphService
+from nebula3.common import ttypes
+from nebula3.data.ResultSet import ResultSet
 from tests.common.nebula_test_suite import NebulaTestSuite
 
 class TestSession(NebulaTestSuite):

tests/query/stateless/test_if_exists.py

@@ -9,7 +9,7 @@
 import pytest
 import time
 
-from nebula2.graph import ttypes
+from nebula3.graph import ttypes
 
 from tests.common.nebula_test_suite import NebulaTestSuite
 

tests/query/stateless/test_keyword.py

@@ -9,7 +9,7 @@
 import pytest
 import time
 
-from nebula2.graph import ttypes
+from nebula3.graph import ttypes
 from tests.common.nebula_test_suite import NebulaTestSuite
 
 class TestReservedKeyword(NebulaTestSuite):

tests/query/stateless/test_range.py

@@ -10,7 +10,7 @@
 
 import pytest
 
-from nebula2.common import ttypes
+from nebula3.common import ttypes
 
 from tests.common.nebula_test_suite import NebulaTestSuite
 

tests/tck/conftest.py

@@ -12,9 +12,9 @@
 import threading
 import json
 
-from nebula2.common.ttypes import NList, NMap, Value, ErrorCode
-from nebula2.data.DataObject import ValueWrapper
-from nebula2.Exception import AuthFailedException
+from nebula3.common.ttypes import NList, NMap, Value, ErrorCode
+from nebula3.data.DataObject import ValueWrapper
+from nebula3.Exception import AuthFailedException
 from pytest_bdd import given, parsers, then, when
 
 from tests.common.dataset_printer import DataSetPrinter
@@ -37,8 +37,8 @@
 from tests.tck.utils.table import dataset, table
 from tests.tck.utils.nbv import murmurhash2
 
-from nebula2.graph.ttypes import VerifyClientVersionReq
-from nebula2.graph.ttypes import VerifyClientVersionResp
+from nebula3.graph.ttypes import VerifyClientVersionReq
+from nebula3.graph.ttypes import VerifyClientVersionResp
 
 parse = functools.partial(parsers.parse)
 rparse = functools.partial(parsers.re)

tests/tck/steps/conftest.py

@@ -8,7 +8,7 @@
     then,
 )
 
-from nebula2.common.ttypes import Value, NullType
+from nebula3.common.ttypes import Value, NullType
 from tests.tck.utils.nbv import register_function, parse
 
 # You could register functions that can be invoked from the parsing text

tests/tck/utils/nbv.py

@@ -12,7 +12,7 @@
 else:
     from tests.tck.utils.mmh2 import mmh2
 
-from nebula2.common.ttypes import (
+from nebula3.common.ttypes import (
     Value,
     NullType,
     NMap,

tests/tck/utils/table.py

@@ -7,7 +7,7 @@
 import re
 
 from tests.tck.utils.nbv import parse
-from nebula2.common.ttypes import DataSet, Row, Value
+from nebula3.common.ttypes import DataSet, Row, Value
 
 pattern = re.compile(r"^<\[(\w+)\]>$")