From d031bb9e26b20c82ca8357b7f81a7c293e282e4f Mon Sep 17 00:00:00 2001 From: groot Date: Fri, 14 Jun 2019 17:29:29 +0800 Subject: [PATCH 1/3] remove old names from source code Former-commit-id: 3fcd7e5e6d2a8d147f09aa455c4a3f3eab20a24a --- cpp/.gitignore | 6 +- cpp/CHANGELOG.md | 4 +- cpp/CMakeLists.txt | 74 +-- cpp/README.md | 4 +- cpp/build.sh | 4 +- cpp/cmake/DefineOptions.cmake | 78 +-- cpp/cmake/ThirdPartyPackages.cmake | 149 +++-- ...ecwise_engine_log.conf => log_config.conf} | 12 +- cpp/conf/server_config.yaml | 2 +- cpp/conf/server_config_template.yaml | 15 +- cpp/scripts/start_server.sh | 2 +- cpp/scripts/stop_server.sh | 2 +- cpp/src/CMakeLists.txt | 34 +- cpp/src/main.cpp | 2 +- cpp/src/sdk/CMakeLists.txt | 10 +- cpp/src/sdk/examples/simple/CMakeLists.txt | 6 +- .../sdk/examples/simple/src/ClientTest.cpp | 8 +- .../sdk/include/{MegaSearch.h => MilvusApi.h} | 6 +- cpp/src/sdk/include/Status.h | 4 +- cpp/src/sdk/src/client/ClientProxy.cpp | 2 +- cpp/src/sdk/src/client/ClientProxy.h | 4 +- cpp/src/sdk/src/client/ThriftClient.cpp | 12 +- cpp/src/sdk/src/client/ThriftClient.h | 10 +- cpp/src/sdk/src/interface/ConnectionImpl.cpp | 6 +- cpp/src/sdk/src/interface/ConnectionImpl.h | 4 +- cpp/src/sdk/src/interface/Status.cpp | 2 +- cpp/src/sdk/src/util/ConvertUtil.cpp | 18 +- cpp/src/sdk/src/util/ConvertUtil.h | 8 +- cpp/src/sdk/src/util/Exception.h | 2 +- cpp/src/server/MegasearchThreadPoolServer.cpp | 34 - ...{MegasearchServer.cpp => MilvusServer.cpp} | 23 +- .../{MegasearchServer.h => MilvusServer.h} | 2 +- ...gasearchHandler.cpp => RequestHandler.cpp} | 44 +- .../{MegasearchHandler.h => RequestHandler.h} | 18 +- ...archScheduler.cpp => RequestScheduler.cpp} | 24 +- ...gasearchScheduler.h => RequestScheduler.h} | 10 +- .../{MegasearchTask.cpp => RequestTask.cpp} | 12 +- .../{MegasearchTask.h => RequestTask.h} | 41 +- cpp/src/server/Server.cpp | 6 +- cpp/src/server/ThreadPoolServer.cpp | 36 ++ ...hThreadPoolServer.h => ThreadPoolServer.h} | 4 +- cpp/src/thrift/cpp_gen.sh | 2 +- ...egasearchService.cpp => MilvusService.cpp} | 542 ++++++++-------- .../{MegasearchService.h => MilvusService.h} | 598 +++++++++--------- ....cpp => MilvusService_server.skeleton.cpp} | 12 +- .../thrift/gen-cpp/megasearch_constants.cpp | 17 - cpp/src/thrift/gen-cpp/megasearch_constants.h | 24 - cpp/src/thrift/gen-cpp/milvus_constants.cpp | 17 + cpp/src/thrift/gen-cpp/milvus_constants.h | 24 + ...{megasearch_types.cpp => milvus_types.cpp} | 4 +- .../{megasearch_types.h => milvus_types.h} | 6 +- .../{megasearch.thrift => milvus.thrift} | 20 +- cpp/start_server.sh | 2 +- cpp/stop_server.sh | 6 +- cpp/unittest/CMakeLists.txt | 3 +- cpp/unittest/db/meta_tests.cpp | 4 +- cpp/unittest/db/utils.cpp | 6 +- cpp/unittest/license/license_check_test.cpp | 12 +- .../license/license_library_tests.cpp | 6 +- cpp/unittest/{vecwise_test.cpp => main.cpp} | 0 cpp/unittest/server/common_test.cpp | 2 +- cpp/unittest/server/log_test.cpp | 2 +- cpp/version.h.macro | 2 +- 63 files changed, 1028 insertions(+), 1027 deletions(-) rename cpp/conf/{vecwise_engine_log.conf => log_config.conf} (54%) rename cpp/src/sdk/include/{MegaSearch.h => MilvusApi.h} (98%) delete mode 100644 cpp/src/server/MegasearchThreadPoolServer.cpp rename cpp/src/server/{MegasearchServer.cpp => MilvusServer.cpp} (87%) rename cpp/src/server/{MegasearchServer.h => MilvusServer.h} (95%) rename cpp/src/server/{MegasearchHandler.cpp => RequestHandler.cpp} (51%) rename cpp/src/server/{MegasearchHandler.h => RequestHandler.h} (82%) rename cpp/src/server/{MegasearchScheduler.cpp => RequestScheduler.cpp} (91%) rename cpp/src/server/{MegasearchScheduler.h => RequestScheduler.h} (90%) rename cpp/src/server/{MegasearchTask.cpp => RequestTask.cpp} (98%) rename cpp/src/server/{MegasearchTask.h => RequestTask.h} (71%) create mode 100644 cpp/src/server/ThreadPoolServer.cpp rename cpp/src/server/{MegasearchThreadPoolServer.h => ThreadPoolServer.h} (91%) rename cpp/src/thrift/gen-cpp/{MegasearchService.cpp => MilvusService.cpp} (79%) rename cpp/src/thrift/gen-cpp/{MegasearchService.h => MilvusService.h} (55%) rename cpp/src/thrift/gen-cpp/{MegasearchService_server.skeleton.cpp => MilvusService_server.skeleton.cpp} (93%) delete mode 100644 cpp/src/thrift/gen-cpp/megasearch_constants.cpp delete mode 100644 cpp/src/thrift/gen-cpp/megasearch_constants.h create mode 100644 cpp/src/thrift/gen-cpp/milvus_constants.cpp create mode 100644 cpp/src/thrift/gen-cpp/milvus_constants.h rename cpp/src/thrift/gen-cpp/{megasearch_types.cpp => milvus_types.cpp} (99%) rename cpp/src/thrift/gen-cpp/{megasearch_types.h => milvus_types.h} (98%) rename cpp/src/thrift/{megasearch.thrift => milvus.thrift} (92%) rename cpp/unittest/{vecwise_test.cpp => main.cpp} (100%) diff --git a/cpp/.gitignore b/cpp/.gitignore index 88c9c4c2f4..4b9079031f 100644 --- a/cpp/.gitignore +++ b/cpp/.gitignore @@ -1,7 +1,3 @@ -third_party/thrift-0.12.0/ -third_party/faiss-1.5.1/ -third_party/bzip2-1.0.6/ -third_party/sqlite3/ -megasearch/ +milvus/ conf/server_config.yaml version.h diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md index c2418aca65..4134528d64 100644 --- a/cpp/CHANGELOG.md +++ b/cpp/CHANGELOG.md @@ -2,7 +2,7 @@ Please mark all change in change log and use the ticket from JIRA. -# MegaSearch 0.3.0 (TBD) +# Milvus 0.3.0 (TBD) ## Bug - MS-80 - Fix server hang issue @@ -34,7 +34,7 @@ Please mark all change in change log and use the ticket from JIRA. ## Task - MS-74 - Change README.md in cpp -# MegaSearch 0.2.0 (2019-05-31) +# Milvus 0.2.0 (2019-05-31) ## Bug diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 028b602056..7973225cee 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -24,8 +24,8 @@ if(NOT GIT_BRANCH_NAME STREQUAL "") string(REGEX REPLACE "\n" "" GIT_BRANCH_NAME ${GIT_BRANCH_NAME}) endif() -set(MEGASEARCH_VERSION "${GIT_BRANCH_NAME}") -string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]" MEGASEARCH_VERSION "${MEGASEARCH_VERSION}") +set(MILVUS_VERSION "${GIT_BRANCH_NAME}") +string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]" MILVUS_VERSION "${MILVUS_VERSION}") if(CMAKE_BUILD_TYPE STREQUAL "Release") set(BUILD_TYPE "release") @@ -34,8 +34,8 @@ else() endif() message(STATUS "Build type = ${BUILD_TYPE}") -project(megasearch VERSION "${MEGASEARCH_VERSION}") -project(vecwise_engine LANGUAGES CUDA CXX) +project(milvus VERSION "${MILVUS_VERSION}") +project(milvus_engine LANGUAGES CUDA CXX) # Ensure that a default make is set if("${MAKE}" STREQUAL "") @@ -44,26 +44,26 @@ if("${MAKE}" STREQUAL "") endif() endif() -set(MEGASEARCH_VERSION_MAJOR "${megasearch_VERSION_MAJOR}") -set(MEGASEARCH_VERSION_MINOR "${megasearch_VERSION_MINOR}") -set(MEGASEARCH_VERSION_PATCH "${megasearch_VERSION_PATCH}") +set(MILVUS_VERSION_MAJOR "${milvus_VERSION_MAJOR}") +set(MILVUS_VERSION_MINOR "${milvus_VERSION_MINOR}") +set(MILVUS_VERSION_PATCH "${milvus_VERSION_PATCH}") -if(MEGASEARCH_VERSION_MAJOR STREQUAL "" - OR MEGASEARCH_VERSION_MINOR STREQUAL "" - OR MEGASEARCH_VERSION_PATCH STREQUAL "") - message(WARNING "Failed to determine MegaSearch version from '${MEGASEARCH_VERSION}'") - set(MEGASEARCH_VERSION "unknown") +if(MILVUS_VERSION_MAJOR STREQUAL "" + OR MILVUS_VERSION_MINOR STREQUAL "" + OR MILVUS_VERSION_PATCH STREQUAL "") + message(WARNING "Failed to determine Milvus version from '${MILVUS_VERSION}'") + set(MILVUS_VERSION "unknown") endif() -message(STATUS "Build version = ${MEGASEARCH_VERSION}") +message(STATUS "Build version = ${MILVUS_VERSION}") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.macro ${CMAKE_CURRENT_SOURCE_DIR}/version.h) -message(STATUS "MegaSearch version: " - "${MEGASEARCH_VERSION_MAJOR}.${MEGASEARCH_VERSION_MINOR}.${MEGASEARCH_VERSION_PATCH} " - "(full: '${MEGASEARCH_VERSION}')") +message(STATUS "Milvus version: " + "${MILVUS_VERSION_MAJOR}.${MILVUS_VERSION_MINOR}.${MILVUS_VERSION_PATCH} " + "(full: '${MILVUS_VERSION}')") -set(MEGASEARCH_SOURCE_DIR ${PROJECT_SOURCE_DIR}) -set(MEGASEARCH_BINARY_DIR ${PROJECT_BINARY_DIR}) +set(MILVUS_SOURCE_DIR ${PROJECT_SOURCE_DIR}) +set(MILVUS_BINARY_DIR ${PROJECT_BINARY_DIR}) find_package(CUDA) set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} -Xcompiler -fPIC -std=c++11 -D_FORCE_INLINES -arch sm_60 --expt-extended-lambda") @@ -79,15 +79,15 @@ set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED on) if(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)") - message("building vecwise_engine on x86 architecture") - set(VECWISE_BUILD_ARCH x86_64) + message("building milvus_engine on x86 architecture") + set(MILVUS_BUILD_ARCH x86_64) elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc)") - message("building vecwise_engine on ppc architecture") - set(VECWISE_BUILD_ARCH ppc64le) + message("building milvus_engine on ppc architecture") + set(MILVUS_BUILD_ARCH ppc64le) else() message("unknown processor type") message("CMAKE_SYSTEM_PROCESSOR=${CMAKE_SYSTEM_PROCESSOR}") - set(VECWISE_BUILD_ARCH unknown) + set(MILVUS_BUILD_ARCH unknown) endif() if(CMAKE_BUILD_TYPE STREQUAL "Release") @@ -104,34 +104,30 @@ endif() set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake") -#if (BUILD_UNIT_TEST) -# option(MEGASEARCH_BUILD_TESTS "Build the megasearch test suite" ON) -#endif(BUILD_UNIT_TEST) - include(ExternalProject) include(DefineOptions) include(BuildUtils) include(ThirdPartyPackages) -include_directories(${MEGASEARCH_SOURCE_DIR}) -link_directories(${MEGASEARCH_BINARY_DIR}) +include_directories(${MILVUS_SOURCE_DIR}) +link_directories(${MILVUS_BINARY_DIR}) ## Following should be check -set(VECWISE_ENGINE_INCLUDE ${PROJECT_SOURCE_DIR}/include) -set(VECWISE_ENGINE_SRC ${PROJECT_SOURCE_DIR}/src) -#set(VECWISE_THIRD_PARTY ${CMAKE_CURRENT_SOURCE_DIR}/third_party) -#set(VECWISE_THIRD_PARTY_BUILD ${CMAKE_CURRENT_SOURCE_DIR}/third_party/build) +set(MILVUS_ENGINE_INCLUDE ${PROJECT_SOURCE_DIR}/include) +set(MILVUS_ENGINE_SRC ${PROJECT_SOURCE_DIR}/src) +#set(MILVUS_THIRD_PARTY ${CMAKE_CURRENT_SOURCE_DIR}/third_party) +#set(MILVUS_THIRD_PARTY_BUILD ${CMAKE_CURRENT_SOURCE_DIR}/third_party/build) add_compile_definitions(PROFILER=${PROFILER}) -include_directories(${VECWISE_ENGINE_INCLUDE}) -include_directories(${VECWISE_ENGINE_SRC}) -#include_directories(${VECWISE_THIRD_PARTY_BUILD}/include) +include_directories(${MILVUS_ENGINE_INCLUDE}) +include_directories(${MILVUS_ENGINE_SRC}) +#include_directories(${MILVUS_THIRD_PARTY_BUILD}/include) link_directories(${CMAKE_CURRRENT_BINARY_DIR}) -#link_directories(${VECWISE_THIRD_PARTY_BUILD}/lib) -#link_directories(${VECWISE_THIRD_PARTY_BUILD}/lib64) +#link_directories(${MILVUS_THIRD_PARTY_BUILD}/lib) +#link_directories(${MILVUS_THIRD_PARTY_BUILD}/lib64) #execute_process(COMMAND bash build.sh # WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/third_party) @@ -151,7 +147,7 @@ install(FILES scripts) install(FILES conf/server_config.yaml - conf/vecwise_engine_log.conf + conf/log_config.conf DESTINATION conf) diff --git a/cpp/README.md b/cpp/README.md index 32b79dae98..7e739badcc 100644 --- a/cpp/README.md +++ b/cpp/README.md @@ -8,9 +8,9 @@ sudo apt-get install gfortran flex bison #### Step 2: build(output to cmake_build folder) -cmake_build/src/vecwise_server is the server +cmake_build/src/milvus_server is the server -cmake_build/src/libvecwise_engine.a is the static library +cmake_build/src/libmilvus_engine.a is the static library cd [sourcecode path]/cpp ./build.sh -t Debug diff --git a/cpp/build.sh b/cpp/build.sh index 66f06a617f..79a128e45e 100755 --- a/cpp/build.sh +++ b/cpp/build.sh @@ -3,7 +3,7 @@ BUILD_TYPE="Debug" BUILD_UNITTEST="off" BUILD_GPU="OFF" -INSTALL_PREFIX=$(pwd)/megasearch +INSTALL_PREFIX=$(pwd)/milvus MAKE_CLEAN="OFF" while getopts "p:t:uhgr" arg @@ -75,7 +75,7 @@ fi make -j 4 || exit 1 if [[ ${BUILD_TYPE} != "Debug" ]]; then - strip src/vecwise_server + strip src/milvus_server fi make install diff --git a/cpp/cmake/DefineOptions.cmake b/cpp/cmake/DefineOptions.cmake index d72ea9ca5a..09998c480c 100644 --- a/cpp/cmake/DefineOptions.cmake +++ b/cpp/cmake/DefineOptions.cmake @@ -1,12 +1,12 @@ macro(set_option_category name) - set(MEGASEARCH_OPTION_CATEGORY ${name}) - list(APPEND "MEGASEARCH_OPTION_CATEGORIES" ${name}) + set(MILVUS_OPTION_CATEGORY ${name}) + list(APPEND "MILVUS_OPTION_CATEGORIES" ${name}) endmacro() macro(define_option name description default) option(${name} ${description} ${default}) - list(APPEND "MEGASEARCH_${MEGASEARCH_OPTION_CATEGORY}_OPTION_NAMES" ${name}) + list(APPEND "MILVUS_${MILVUS_OPTION_CATEGORY}_OPTION_NAMES" ${name}) set("${name}_OPTION_DESCRIPTION" ${description}) set("${name}_OPTION_DEFAULT" ${default}) set("${name}_OPTION_TYPE" "bool") @@ -28,7 +28,7 @@ endfunction() macro(define_option_string name description default) set(${name} ${default} CACHE STRING ${description}) - list(APPEND "MEGASEARCH_${MEGASEARCH_OPTION_CATEGORY}_OPTION_NAMES" ${name}) + list(APPEND "MILVUS_${MILVUS_OPTION_CATEGORY}_OPTION_NAMES" ${name}) set("${name}_OPTION_DESCRIPTION" ${description}) set("${name}_OPTION_DEFAULT" "\"${default}\"") set("${name}_OPTION_TYPE" "string") @@ -43,69 +43,69 @@ endmacro() #---------------------------------------------------------------------- set_option_category("Thirdparty") -set(MEGASEARCH_DEPENDENCY_SOURCE_DEFAULT "AUTO") +set(MILVUS_DEPENDENCY_SOURCE_DEFAULT "AUTO") -define_option_string(MEGASEARCH_DEPENDENCY_SOURCE - "Method to use for acquiring MEGASEARCH's build dependencies" - "${MEGASEARCH_DEPENDENCY_SOURCE_DEFAULT}" +define_option_string(MILVUS_DEPENDENCY_SOURCE + "Method to use for acquiring MILVUS's build dependencies" + "${MILVUS_DEPENDENCY_SOURCE_DEFAULT}" "AUTO" "BUNDLED" "SYSTEM") -define_option(MEGASEARCH_VERBOSE_THIRDPARTY_BUILD +define_option(MILVUS_VERBOSE_THIRDPARTY_BUILD "Show output from ExternalProjects rather than just logging to files" ON) -define_option(MEGASEARCH_WITH_ARROW "Build with ARROW" OFF) +define_option(MILVUS_WITH_ARROW "Build with ARROW" OFF) -define_option(MEGASEARCH_BOOST_USE_SHARED "Rely on boost shared libraries where relevant" OFF) +define_option(MILVUS_BOOST_USE_SHARED "Rely on boost shared libraries where relevant" OFF) -define_option(MEGASEARCH_BOOST_VENDORED "Use vendored Boost instead of existing Boost. \ +define_option(MILVUS_BOOST_VENDORED "Use vendored Boost instead of existing Boost. \ Note that this requires linking Boost statically" ON) -define_option(MEGASEARCH_BOOST_HEADER_ONLY "Use only BOOST headers" OFF) +define_option(MILVUS_BOOST_HEADER_ONLY "Use only BOOST headers" OFF) -define_option(MEGASEARCH_WITH_BZ2 "Build with BZ2 compression" ON) +define_option(MILVUS_WITH_BZ2 "Build with BZ2 compression" ON) -define_option(MEGASEARCH_WITH_EASYLOGGINGPP "Build with Easylogging++ library" ON) +define_option(MILVUS_WITH_EASYLOGGINGPP "Build with Easylogging++ library" ON) -define_option(MEGASEARCH_WITH_FAISS "Build with FAISS library" ON) +define_option(MILVUS_WITH_FAISS "Build with FAISS library" ON) -define_option(MEGASEARCH_WITH_FAISS_GPU_VERSION "Build with FAISS GPU version" ON) +define_option(MILVUS_WITH_FAISS_GPU_VERSION "Build with FAISS GPU version" ON) -#define_option_string(MEGASEARCH_FAISS_GPU_ARCH "Specifying which GPU architectures to build against" +#define_option_string(MILVUS_FAISS_GPU_ARCH "Specifying which GPU architectures to build against" # "-gencode=arch=compute_35,code=compute_35 -gencode=arch=compute_52,code=compute_52 -gencode=arch=compute_60,code=compute_60 -gencode=arch=compute_61,code=compute_61") -define_option(MEGASEARCH_WITH_LAPACK "Build with LAPACK library" ON) +define_option(MILVUS_WITH_LAPACK "Build with LAPACK library" ON) -define_option(MEGASEARCH_WITH_LZ4 "Build with lz4 compression" ON) +define_option(MILVUS_WITH_LZ4 "Build with lz4 compression" ON) -define_option(MEGASEARCH_WITH_JSONCONS "Build with JSONCONS" OFF) +define_option(MILVUS_WITH_JSONCONS "Build with JSONCONS" OFF) -define_option(MEGASEARCH_WITH_OPENBLAS "Build with OpenBLAS library" ON) +define_option(MILVUS_WITH_OPENBLAS "Build with OpenBLAS library" ON) -define_option(MEGASEARCH_WITH_PROMETHEUS "Build with PROMETHEUS library" ON) +define_option(MILVUS_WITH_PROMETHEUS "Build with PROMETHEUS library" ON) -define_option(MEGASEARCH_WITH_ROCKSDB "Build with RocksDB library" OFF) +define_option(MILVUS_WITH_ROCKSDB "Build with RocksDB library" OFF) -define_option(MEGASEARCH_WITH_SNAPPY "Build with Snappy compression" ON) +define_option(MILVUS_WITH_SNAPPY "Build with Snappy compression" ON) -define_option(MEGASEARCH_WITH_SQLITE "Build with SQLite library" ON) +define_option(MILVUS_WITH_SQLITE "Build with SQLite library" ON) -define_option(MEGASEARCH_WITH_SQLITE_ORM "Build with SQLite ORM library" ON) +define_option(MILVUS_WITH_SQLITE_ORM "Build with SQLite ORM library" ON) -define_option(MEGASEARCH_WITH_THRIFT "Build with Apache Thrift library" ON) +define_option(MILVUS_WITH_THRIFT "Build with Apache Thrift library" ON) -define_option(MEGASEARCH_WITH_YAMLCPP "Build with yaml-cpp library" ON) +define_option(MILVUS_WITH_YAMLCPP "Build with yaml-cpp library" ON) -define_option(MEGASEARCH_WITH_ZLIB "Build with zlib compression" ON) +define_option(MILVUS_WITH_ZLIB "Build with zlib compression" ON) if(CMAKE_VERSION VERSION_LESS 3.7) - set(MEGASEARCH_WITH_ZSTD_DEFAULT OFF) + set(MILVUS_WITH_ZSTD_DEFAULT OFF) else() # ExternalProject_Add(SOURCE_SUBDIR) is available since CMake 3.7. - set(MEGASEARCH_WITH_ZSTD_DEFAULT ON) + set(MILVUS_WITH_ZSTD_DEFAULT ON) endif() -define_option(MEGASEARCH_WITH_ZSTD "Build with zstd compression" ${MEGASEARCH_WITH_ZSTD_DEFAULT}) +define_option(MILVUS_WITH_ZSTD "Build with zstd compression" ${MILVUS_WITH_ZSTD_DEFAULT}) #---------------------------------------------------------------------- if(MSVC) @@ -115,7 +115,7 @@ if(MSVC) "Pass verbose linking options when linking libraries and executables" OFF) - define_option(MEGASEARCH_USE_STATIC_CRT "Build MEGASEARCH with statically linked CRT" OFF) + define_option(MILVUS_USE_STATIC_CRT "Build MILVUS with statically linked CRT" OFF) endif() @@ -123,15 +123,15 @@ endif() set_option_category("Test and benchmark") if (BUILD_UNIT_TEST) - define_option(MEGASEARCH_BUILD_TESTS "Build the MEGASEARCH googletest unit tests" ON) + define_option(MILVUS_BUILD_TESTS "Build the MILVUS googletest unit tests" ON) else() - define_option(MEGASEARCH_BUILD_TESTS "Build the MEGASEARCH googletest unit tests" OFF) + define_option(MILVUS_BUILD_TESTS "Build the MILVUS googletest unit tests" OFF) endif(BUILD_UNIT_TEST) #---------------------------------------------------------------------- macro(config_summary) message(STATUS "---------------------------------------------------------------------") - message(STATUS "MEGASEARCH version: ${MEGASEARCH_VERSION}") + message(STATUS "MILVUS version: ${MILVUS_VERSION}") message(STATUS) message(STATUS "Build configuration summary:") @@ -143,12 +143,12 @@ macro(config_summary) STATUS " Compile commands: ${CMAKE_CURRENT_BINARY_DIR}/compile_commands.json") endif() - foreach(category ${MEGASEARCH_OPTION_CATEGORIES}) + foreach(category ${MILVUS_OPTION_CATEGORIES}) message(STATUS) message(STATUS "${category} options:") - set(option_names ${MEGASEARCH_${category}_OPTION_NAMES}) + set(option_names ${MILVUS_${category}_OPTION_NAMES}) set(max_value_length 0) foreach(name ${option_names}) diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake index 25a9a5077f..9addc66793 100644 --- a/cpp/cmake/ThirdPartyPackages.cmake +++ b/cpp/cmake/ThirdPartyPackages.cmake @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -set(MEGASEARCH_THIRDPARTY_DEPENDENCIES +set(MILVUS_THIRDPARTY_DEPENDENCIES ARROW BOOST @@ -37,12 +37,12 @@ set(MEGASEARCH_THIRDPARTY_DEPENDENCIES ZLIB ZSTD) -message(STATUS "Using ${MEGASEARCH_DEPENDENCY_SOURCE} approach to find dependencies") +message(STATUS "Using ${MILVUS_DEPENDENCY_SOURCE} approach to find dependencies") # For each dependency, set dependency source to global default, if unset -foreach(DEPENDENCY ${MEGASEARCH_THIRDPARTY_DEPENDENCIES}) +foreach(DEPENDENCY ${MILVUS_THIRDPARTY_DEPENDENCIES}) if("${${DEPENDENCY}_SOURCE}" STREQUAL "") - set(${DEPENDENCY}_SOURCE ${MEGASEARCH_DEPENDENCY_SOURCE}) + set(${DEPENDENCY}_SOURCE ${MILVUS_DEPENDENCY_SOURCE}) endif() endforeach() @@ -145,7 +145,7 @@ set(EP_COMMON_CMAKE_ARGS -DCMAKE_CXX_FLAGS=${EP_CXX_FLAGS} -DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_CXX_FLAGS}) -if(NOT MEGASEARCH_VERBOSE_THIRDPARTY_BUILD) +if(NOT MILVUS_VERBOSE_THIRDPARTY_BUILD) set(EP_LOG_OPTIONS LOG_CONFIGURE 1 LOG_BUILD 1 LOG_INSTALL 1 LOG_DOWNLOAD 1) else() set(EP_LOG_OPTIONS) @@ -161,7 +161,6 @@ endif() set(MAKE_BUILD_ARGS "-j4") ## Using make -j in sub-make is fragile -## see discussion https://github.com/apache/MEGASEARCH/pull/2779 #if(${CMAKE_GENERATOR} MATCHES "Makefiles") # set(MAKE_BUILD_ARGS "") #else() @@ -180,7 +179,7 @@ find_package(Threads REQUIRED) # offline builds # Read toolchain versions from cpp/thirdparty/versions.txt -set(THIRDPARTY_DIR "${MEGASEARCH_SOURCE_DIR}/thirdparty") +set(THIRDPARTY_DIR "${MILVUS_SOURCE_DIR}/thirdparty") file(STRINGS "${THIRDPARTY_DIR}/versions.txt" TOOLCHAIN_VERSIONS_TXT) foreach(_VERSION_ENTRY ${TOOLCHAIN_VERSIONS_TXT}) # Exclude comments @@ -202,16 +201,16 @@ foreach(_VERSION_ENTRY ${TOOLCHAIN_VERSIONS_TXT}) set(${_LIB_NAME} "${_LIB_VERSION}") endforeach() -if(DEFINED ENV{MEGASEARCH_ARROW_URL}) - set(ARROW_SOURCE_URL "$ENV{MEGASEARCH_ARROW_URL}") +if(DEFINED ENV{MILVUS_ARROW_URL}) + set(ARROW_SOURCE_URL "$ENV{MILVUS_ARROW_URL}") else() set(ARROW_SOURCE_URL "https://github.com/youny626/arrow.git" ) endif() -if(DEFINED ENV{MEGASEARCH_BOOST_URL}) - set(BOOST_SOURCE_URL "$ENV{MEGASEARCH_BOOST_URL}") +if(DEFINED ENV{MILVUS_BOOST_URL}) + set(BOOST_SOURCE_URL "$ENV{MILVUS_BOOST_URL}") else() string(REPLACE "." "_" BOOST_VERSION_UNDERSCORES ${BOOST_VERSION}) set(BOOST_SOURCE_URL @@ -219,58 +218,58 @@ else() ) endif() -if(DEFINED ENV{MEGASEARCH_BZIP2_URL}) - set(BZIP2_SOURCE_URL "$ENV{MEGASEARCH_BZIP2_URL}") +if(DEFINED ENV{MILVUS_BZIP2_URL}) + set(BZIP2_SOURCE_URL "$ENV{MILVUS_BZIP2_URL}") else() set(BZIP2_SOURCE_URL "https://fossies.org/linux/misc/bzip2-${BZIP2_VERSION}.tar.gz") endif() -if(DEFINED ENV{MEGASEARCH_EASYLOGGINGPP_URL}) - set(EASYLOGGINGPP_SOURCE_URL "$ENV{MEGASEARCH_EASYLOGGINGPP_URL}") +if(DEFINED ENV{MILVUS_EASYLOGGINGPP_URL}) + set(EASYLOGGINGPP_SOURCE_URL "$ENV{MILVUS_EASYLOGGINGPP_URL}") else() set(EASYLOGGINGPP_SOURCE_URL "https://github.com/zuhd-org/easyloggingpp/archive/${EASYLOGGINGPP_VERSION}.tar.gz") endif() -if(DEFINED ENV{MEGASEARCH_FAISS_URL}) - set(FAISS_SOURCE_URL "$ENV{MEGASEARCH_FAISS_URL}") +if(DEFINED ENV{MILVUS_FAISS_URL}) + set(FAISS_SOURCE_URL "$ENV{MILVUS_FAISS_URL}") else() set(FAISS_SOURCE_URL "https://github.com/facebookresearch/faiss/archive/${FAISS_VERSION}.tar.gz") endif() -if (DEFINED ENV{MEGASEARCH_GTEST_URL}) - set(GTEST_SOURCE_URL "$ENV{MEGASEARCH_GTEST_URL}") +if (DEFINED ENV{MILVUS_GTEST_URL}) + set(GTEST_SOURCE_URL "$ENV{MILVUS_GTEST_URL}") else () set(GTEST_SOURCE_URL "https://github.com/google/googletest/archive/release-${GTEST_VERSION}.tar.gz") endif() -if (DEFINED ENV{MEGASEARCH_JSONCONS_URL}) - set(JSONCONS_SOURCE_URL "$ENV{MEGASEARCH_JSONCONS_URL}") +if (DEFINED ENV{MILVUS_JSONCONS_URL}) + set(JSONCONS_SOURCE_URL "$ENV{MILVUS_JSONCONS_URL}") else () set(JSONCONS_SOURCE_URL "https://github.com/danielaparker/jsoncons/archive/v${JSONCONS_VERSION}.tar.gz") endif() -if(DEFINED ENV{MEGASEARCH_LAPACK_URL}) - set(LAPACK_SOURCE_URL "$ENV{MEGASEARCH_LAPACK_URL}") +if(DEFINED ENV{MILVUS_LAPACK_URL}) + set(LAPACK_SOURCE_URL "$ENV{MILVUS_LAPACK_URL}") else() set(LAPACK_SOURCE_URL "https://github.com/Reference-LAPACK/lapack/archive/${LAPACK_VERSION}.tar.gz") endif() -if(DEFINED ENV{MEGASEARCH_LZ4_URL}) - set(LZ4_SOURCE_URL "$ENV{MEGASEARCH_LZ4_URL}") +if(DEFINED ENV{MILVUS_LZ4_URL}) + set(LZ4_SOURCE_URL "$ENV{MILVUS_LZ4_URL}") else() set(LZ4_SOURCE_URL "https://github.com/lz4/lz4/archive/${LZ4_VERSION}.tar.gz") endif() -if (DEFINED ENV{MEGASEARCH_OPENBLAS_URL}) - set(OPENBLAS_SOURCE_URL "$ENV{MEGASEARCH_OPENBLAS_URL}") +if (DEFINED ENV{MILVUS_OPENBLAS_URL}) + set(OPENBLAS_SOURCE_URL "$ENV{MILVUS_OPENBLAS_URL}") else () set(OPENBLAS_SOURCE_URL "https://github.com/xianyi/OpenBLAS/archive/${OPENBLAS_VERSION}.tar.gz") endif() -if (DEFINED ENV{MEGASEARCH_PROMETHEUS_URL}) +if (DEFINED ENV{MILVUS_PROMETHEUS_URL}) set(PROMETHEUS_SOURCE_URL "$ENV{PROMETHEUS_OPENBLAS_URL}") else () set(PROMETHEUS_SOURCE_URL @@ -278,55 +277,55 @@ else () https://github.com/jupp0r/prometheus-cpp.git) endif() -if (DEFINED ENV{MEGASEARCH_ROCKSDB_URL}) - set(ROCKSDB_SOURCE_URL "$ENV{MEGASEARCH_ROCKSDB_URL}") +if (DEFINED ENV{MILVUS_ROCKSDB_URL}) + set(ROCKSDB_SOURCE_URL "$ENV{MILVUS_ROCKSDB_URL}") else () set(ROCKSDB_SOURCE_URL "https://github.com/facebook/rocksdb/archive/${ROCKSDB_VERSION}.tar.gz") endif() -if(DEFINED ENV{MEGASEARCH_SNAPPY_URL}) - set(SNAPPY_SOURCE_URL "$ENV{MEGASEARCH_SNAPPY_URL}") +if(DEFINED ENV{MILVUS_SNAPPY_URL}) + set(SNAPPY_SOURCE_URL "$ENV{MILVUS_SNAPPY_URL}") else() set(SNAPPY_SOURCE_URL "https://github.com/google/snappy/archive/${SNAPPY_VERSION}.tar.gz") endif() -if(DEFINED ENV{MEGASEARCH_SQLITE_URL}) - set(SQLITE_SOURCE_URL "$ENV{MEGASEARCH_SQLITE_URL}") +if(DEFINED ENV{MILVUS_SQLITE_URL}) + set(SQLITE_SOURCE_URL "$ENV{MILVUS_SQLITE_URL}") else() set(SQLITE_SOURCE_URL "https://www.sqlite.org/2019/sqlite-autoconf-${SQLITE_VERSION}.tar.gz") endif() -if(DEFINED ENV{MEGASEARCH_SQLITE_ORM_URL}) - set(SQLITE_ORM_SOURCE_URL "$ENV{MEGASEARCH_SQLITE_ORM_URL}") +if(DEFINED ENV{MILVUS_SQLITE_ORM_URL}) + set(SQLITE_ORM_SOURCE_URL "$ENV{MILVUS_SQLITE_ORM_URL}") else() set(SQLITE_ORM_SOURCE_URL "https://github.com/fnc12/sqlite_orm/archive/${SQLITE_ORM_VERSION}.zip") endif() -if(DEFINED ENV{MEGASEARCH_THRIFT_URL}) - set(THRIFT_SOURCE_URL "$ENV{MEGASEARCH_THRIFT_URL}") +if(DEFINED ENV{MILVUS_THRIFT_URL}) + set(THRIFT_SOURCE_URL "$ENV{MILVUS_THRIFT_URL}") else() set(THRIFT_SOURCE_URL "https://github.com/apache/thrift/archive/${THRIFT_VERSION}.tar.gz") endif() -if(DEFINED ENV{MEGASEARCH_YAMLCPP_URL}) - set(YAMLCPP_SOURCE_URL "$ENV{MEGASEARCH_YAMLCPP_URL}") +if(DEFINED ENV{MILVUS_YAMLCPP_URL}) + set(YAMLCPP_SOURCE_URL "$ENV{MILVUS_YAMLCPP_URL}") else() set(YAMLCPP_SOURCE_URL "https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-${YAMLCPP_VERSION}.tar.gz") endif() -if(DEFINED ENV{MEGASEARCH_ZLIB_URL}) - set(ZLIB_SOURCE_URL "$ENV{MEGASEARCH_ZLIB_URL}") +if(DEFINED ENV{MILVUS_ZLIB_URL}) + set(ZLIB_SOURCE_URL "$ENV{MILVUS_ZLIB_URL}") else() set(ZLIB_SOURCE_URL "https://github.com/madler/zlib/archive/${ZLIB_VERSION}.tar.gz") endif() -if(DEFINED ENV{MEGASEARCH_ZSTD_URL}) - set(ZSTD_SOURCE_URL "$ENV{MEGASEARCH_ZSTD_URL}") +if(DEFINED ENV{MILVUS_ZSTD_URL}) + set(ZSTD_SOURCE_URL "$ENV{MILVUS_ZSTD_URL}") else() set(ZSTD_SOURCE_URL "https://github.com/facebook/zstd/archive/${ZSTD_VERSION}.tar.gz") endif() @@ -410,7 +409,7 @@ macro(build_arrow) endmacro() -if(MEGASEARCH_WITH_ARROW) +if(MILVUS_WITH_ARROW) resolve_dependency(ARROW) @@ -422,7 +421,7 @@ endif() # Add Boost dependencies (code adapted from Apache Kudu (incubating)) set(Boost_USE_MULTITHREADED ON) -if(MSVC AND MEGASEARCH_USE_STATIC_CRT) +if(MSVC AND MILVUS_USE_STATIC_CRT) set(Boost_USE_STATIC_RUNTIME ON) endif() set(Boost_ADDITIONAL_VERSIONS @@ -449,7 +448,7 @@ set(Boost_ADDITIONAL_VERSIONS "1.60.0" "1.60") -if(MEGASEARCH_BOOST_VENDORED) +if(MILVUS_BOOST_VENDORED) set(BOOST_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/boost_ep-prefix/src/boost_ep") set(BOOST_LIB_DIR "${BOOST_PREFIX}/stage/lib") set(BOOST_BUILD_LINK "static") @@ -466,7 +465,7 @@ if(MEGASEARCH_BOOST_VENDORED) set(BOOST_FILESYSTEM_LIBRARY boost_filesystem_static) set(BOOST_SERIALIZATION_LIBRARY boost_serialization_static) - if(MEGASEARCH_BOOST_HEADER_ONLY) + if(MILVUS_BOOST_HEADER_ONLY) set(BOOST_BUILD_PRODUCTS) set(BOOST_CONFIGURE_COMMAND "") set(BOOST_BUILD_COMMAND "") @@ -492,7 +491,7 @@ if(MEGASEARCH_BOOST_VENDORED) add_thirdparty_lib(boost_serialization STATIC_LIB "${BOOST_STATIC_SERIALIZATION_LIBRARY}") - set(MEGASEARCH_BOOST_LIBS ${BOOST_SYSTEM_LIBRARY} ${BOOST_FILESYSTEM_LIBRARY} ${BOOST_STATIC_SERIALIZATION_LIBRARY}) + set(MILVUS_BOOST_LIBS ${BOOST_SYSTEM_LIBRARY} ${BOOST_FILESYSTEM_LIBRARY} ${BOOST_STATIC_SERIALIZATION_LIBRARY}) endif() externalproject_add(boost_ep URL @@ -526,7 +525,7 @@ else() # set(Boost_NO_SYSTEM_PATHS ON) # endif() - if(MEGASEARCH_BOOST_USE_SHARED) + if(MILVUS_BOOST_USE_SHARED) # Find shared Boost libraries. set(Boost_USE_STATIC_LIBS OFF) set(BUILD_SHARED_LIBS_KEEP ${BUILD_SHARED_LIBS}) @@ -537,14 +536,14 @@ else() add_definitions(-DBOOST_ALL_DYN_LINK) endif() - if(MEGASEARCH_BOOST_HEADER_ONLY) + if(MILVUS_BOOST_HEADER_ONLY) find_package(Boost REQUIRED) else() find_package(Boost COMPONENTS serialization system filesystem REQUIRED) set(BOOST_SYSTEM_LIBRARY Boost::system) set(BOOST_FILESYSTEM_LIBRARY Boost::filesystem) set(BOOST_SERIALIZATION_LIBRARY Boost::serialization) - set(MEGASEARCH_BOOST_LIBS ${BOOST_SYSTEM_LIBRARY} ${BOOST_FILESYSTEM_LIBRARY}) + set(MILVUS_BOOST_LIBS ${BOOST_SYSTEM_LIBRARY} ${BOOST_FILESYSTEM_LIBRARY}) endif() set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_KEEP}) unset(BUILD_SHARED_LIBS_KEEP) @@ -552,14 +551,14 @@ else() # Find static boost headers and libs # TODO Differentiate here between release and debug builds set(Boost_USE_STATIC_LIBS ON) - if(MEGASEARCH_BOOST_HEADER_ONLY) + if(MILVUS_BOOST_HEADER_ONLY) find_package(Boost REQUIRED) else() find_package(Boost COMPONENTS serialization system filesystem REQUIRED) set(BOOST_SYSTEM_LIBRARY Boost::system) set(BOOST_FILESYSTEM_LIBRARY Boost::filesystem) set(BOOST_SERIALIZATION_LIBRARY Boost::serialization) - set(MEGASEARCH_BOOST_LIBS ${BOOST_SYSTEM_LIBRARY} ${BOOST_FILESYSTEM_LIBRARY}) + set(MILVUS_BOOST_LIBS ${BOOST_SYSTEM_LIBRARY} ${BOOST_FILESYSTEM_LIBRARY}) endif() endif() endif() @@ -612,7 +611,7 @@ macro(build_bzip2) add_dependencies(bzip2 bzip2_ep) endmacro() -if(MEGASEARCH_WITH_BZ2) +if(MILVUS_WITH_BZ2) resolve_dependency(BZip2) if(NOT TARGET bzip2) @@ -664,7 +663,7 @@ macro(build_easyloggingpp) add_dependencies(easyloggingpp easyloggingpp_ep) endmacro() -if(MEGASEARCH_WITH_EASYLOGGINGPP) +if(MILVUS_WITH_EASYLOGGINGPP) resolve_dependency(Easylogging++) get_target_property(EASYLOGGINGPP_INCLUDE_DIR easyloggingpp INTERFACE_INCLUDE_DIRECTORIES) @@ -710,7 +709,7 @@ macro(build_openblas) add_dependencies(openblas openblas_ep) endmacro() -#if(MEGASEARCH_WITH_OPENBLAS) +#if(MILVUS_WITH_OPENBLAS) # resolve_dependency(OpenBLAS) # # get_target_property(OPENBLAS_INCLUDE_DIR openblas INTERFACE_INCLUDE_DIRECTORIES) @@ -754,7 +753,7 @@ macro(build_lapack) add_dependencies(lapack lapack_ep) endmacro() -#if(MEGASEARCH_WITH_LAPACK) +#if(MILVUS_WITH_LAPACK) # resolve_dependency(LAPACK) # # get_target_property(LAPACK_INCLUDE_DIR lapack INTERFACE_INCLUDE_DIRECTORIES) @@ -791,7 +790,7 @@ macro(build_faiss) # endif() # set(FAISS_DEPENDENCIES ${FAISS_DEPENDENCIES} ${OPENBLAS_LIBRARY}) - if(${MEGASEARCH_WITH_FAISS_GPU_VERSION} STREQUAL "ON") + if(${MILVUS_WITH_FAISS_GPU_VERSION} STREQUAL "ON") set(FAISS_CONFIGURE_ARGS ${FAISS_CONFIGURE_ARGS} "--with-cuda=${CUDA_TOOLKIT_ROOT_DIR}" # "with_cuda_arch=\"-gencode=arch=compute_35,code=compute_35 \\ @@ -852,7 +851,7 @@ macro(build_faiss) endmacro() -if(MEGASEARCH_WITH_FAISS) +if(MILVUS_WITH_FAISS) resolve_dependency(OpenBLAS) get_target_property(OPENBLAS_INCLUDE_DIR openblas INTERFACE_INCLUDE_DIRECTORIES) @@ -944,7 +943,7 @@ macro(build_gtest) endmacro() -if (MEGASEARCH_BUILD_TESTS) +if (MILVUS_BUILD_TESTS) #message(STATUS "Resolving gtest dependency") resolve_dependency(GTest) @@ -976,7 +975,7 @@ macro(build_jsoncons) endif () endmacro() -if(MEGASEARCH_WITH_JSONCONS) +if(MILVUS_WITH_JSONCONS) resolve_dependency(JSONCONS) include_directories(SYSTEM "${JSONCONS_INCLUDE_DIR}") endif() @@ -990,7 +989,7 @@ macro(build_lz4) set(LZ4_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/lz4_ep-prefix/") if(MSVC) - if(MEGASEARCH_USE_STATIC_CRT) + if(MILVUS_USE_STATIC_CRT) if(${UPPERCASE_BUILD_TYPE} STREQUAL "DEBUG") set(LZ4_RUNTIME_LIBRARY_LINKAGE "/p:RuntimeLibrary=MultiThreadedDebug") else() @@ -1046,7 +1045,7 @@ macro(build_lz4) add_dependencies(lz4 lz4_ep) endmacro() -if(MEGASEARCH_WITH_LZ4) +if(MILVUS_WITH_LZ4) resolve_dependency(Lz4) # TODO: Don't use global includes but rather target_include_directories @@ -1129,7 +1128,7 @@ macro(build_prometheus) add_dependencies(prometheus-cpp-core prometheus_ep) endmacro() -if(MEGASEARCH_WITH_PROMETHEUS) +if(MILVUS_WITH_PROMETHEUS) resolve_dependency(Prometheus) @@ -1191,7 +1190,7 @@ macro(build_rocksdb) add_dependencies(rocksdb rocksdb_ep) endmacro() -if(MEGASEARCH_WITH_ROCKSDB) +if(MILVUS_WITH_ROCKSDB) resolve_dependency(RocksDB) @@ -1244,7 +1243,7 @@ macro(build_snappy) add_dependencies(snappy snappy_ep) endmacro() -if(MEGASEARCH_WITH_SNAPPY) +if(MILVUS_WITH_SNAPPY) # if(Snappy_SOURCE STREQUAL "AUTO") # # Normally *Config.cmake files reside in /usr/lib/cmake but Snappy # # errornously places them in ${CMAKE_ROOT}/Modules/ @@ -1320,7 +1319,7 @@ macro(build_sqlite) add_dependencies(sqlite sqlite_ep) endmacro() -if(MEGASEARCH_WITH_SQLITE) +if(MILVUS_WITH_SQLITE) resolve_dependency(SQLite) include_directories(SYSTEM "${SQLITE_INCLUDE_DIR}") link_directories(SYSTEM ${SQLITE_PREFIX}/lib/) @@ -1407,7 +1406,7 @@ macro(build_sqlite_orm) # add_dependencies(sqlite_orm sqlite_orm_ep) endmacro() -if(MEGASEARCH_WITH_SQLITE_ORM) +if(MILVUS_WITH_SQLITE_ORM) resolve_dependency(SQLite_ORM) # ExternalProject_Get_Property(sqlite_orm_ep source_dir) # set(SQLITE_ORM_INCLUDE_DIR ${source_dir}/sqlite_orm_ep) @@ -1451,7 +1450,7 @@ macro(build_thrift) set(THRIFT_STATIC_LIB_NAME "${CMAKE_STATIC_LIBRARY_PREFIX}thrift") if(MSVC) - if(MEGASEARCH_USE_STATIC_CRT) + if(MILVUS_USE_STATIC_CRT) set(THRIFT_STATIC_LIB_NAME "${THRIFT_STATIC_LIB_NAME}") set(THRIFT_CMAKE_ARGS ${THRIFT_CMAKE_ARGS} "-DWITH_MT=ON") else() @@ -1550,7 +1549,7 @@ macro(build_thrift) add_dependencies(thrift thrift_ep) endmacro() -if(MEGASEARCH_WITH_THRIFT) +if(MILVUS_WITH_THRIFT) resolve_dependency(Thrift) # TODO: Don't use global includes but rather target_include_directories # MESSAGE(STATUS ${THRIFT_PREFIX}/lib/) @@ -1594,7 +1593,7 @@ macro(build_yamlcpp) add_dependencies(yaml-cpp yaml-cpp_ep) endmacro() -if(MEGASEARCH_WITH_YAMLCPP) +if(MILVUS_WITH_YAMLCPP) resolve_dependency(yaml-cpp) # TODO: Don't use global includes but rather target_include_directories @@ -1644,7 +1643,7 @@ macro(build_zlib) add_dependencies(zlib zlib_ep) endmacro() -if(MEGASEARCH_WITH_ZLIB) +if(MILVUS_WITH_ZLIB) resolve_dependency(ZLIB) # TODO: Don't use global includes but rather target_include_directories @@ -1671,7 +1670,7 @@ macro(build_zstd) if(MSVC) set(ZSTD_STATIC_LIB "${ZSTD_PREFIX}/lib/zstd_static.lib") - if(MEGASEARCH_USE_STATIC_CRT) + if(MILVUS_USE_STATIC_CRT) set(ZSTD_CMAKE_ARGS ${ZSTD_CMAKE_ARGS} "-DZSTD_USE_STATIC_RUNTIME=on") endif() else() @@ -1716,7 +1715,7 @@ macro(build_zstd) add_dependencies(zstd zstd_ep) endmacro() -if(MEGASEARCH_WITH_ZSTD) +if(MILVUS_WITH_ZSTD) resolve_dependency(ZSTD) # TODO: Don't use global includes but rather target_include_directories diff --git a/cpp/conf/vecwise_engine_log.conf b/cpp/conf/log_config.conf similarity index 54% rename from cpp/conf/vecwise_engine_log.conf rename to cpp/conf/log_config.conf index cf16da6d18..9ad4219637 100644 --- a/cpp/conf/vecwise_engine_log.conf +++ b/cpp/conf/log_config.conf @@ -1,6 +1,6 @@ * GLOBAL: FORMAT = "%datetime | %level | %logger | %msg" - FILENAME = "/tmp/milvus/logs/vecwise_engine-%datetime{%H:%m}-global.log" + FILENAME = "/tmp/milvus/logs/milvus-%datetime{%H:%m}-global.log" ENABLED = true TO_FILE = true TO_STANDARD_OUTPUT = true @@ -8,12 +8,12 @@ PERFORMANCE_TRACKING = false MAX_LOG_FILE_SIZE = 2097152 ## Throw log files away after 2MB * DEBUG: - FILENAME = "/tmp/milvus/logs/vecwise_engine-%datetime{%H:%m}-debug.log" + FILENAME = "/tmp/milvus/logs/milvus-%datetime{%H:%m}-debug.log" ENABLED = true * WARNING: - FILENAME = "/tmp/milvus/logs/vecwise_engine-%datetime{%H:%m}-warning.log" + FILENAME = "/tmp/milvus/logs/milvus-%datetime{%H:%m}-warning.log" * TRACE: - FILENAME = "/tmp/milvus/logs/vecwise_engine-%datetime{%H:%m}-trace.log" + FILENAME = "/tmp/milvus/logs/milvus-%datetime{%H:%m}-trace.log" * VERBOSE: FORMAT = "%datetime{%d/%M/%y} | %level-%vlevel | %msg" TO_FILE = false @@ -21,7 +21,7 @@ ## Error logs * ERROR: ENABLED = false - FILENAME = "/tmp/milvus/logs/vecwise_engine-%datetime{%H:%m}-error.log" + FILENAME = "/tmp/milvus/logs/milvus-%datetime{%H:%m}-error.log" * FATAL: ENABLED = false - FILENAME = "/tmp/milvus/logs/vecwise_engine-%datetime{%H:%m}-fatal.log" \ No newline at end of file + FILENAME = "/tmp/milvus/logs/milvus-%datetime{%H:%m}-fatal.log" \ No newline at end of file diff --git a/cpp/conf/server_config.yaml b/cpp/conf/server_config.yaml index 64bea0121c..6d7c9f6d0d 100644 --- a/cpp/conf/server_config.yaml +++ b/cpp/conf/server_config.yaml @@ -15,7 +15,7 @@ metric_config: is_startup: true # true is on, false is off collector: prometheus # prometheus, now we only have prometheus prometheus_config: - collect_type: pull # pull means prometheus pull the message from megasearch, push means megasearch push metric to push gateway + collect_type: pull # pull means prometheus pull the message from server, push means server push metric to push gateway port: 8080 push_gateway_ip_address: 127.0.0.1 push_gateway_port: 9091 diff --git a/cpp/conf/server_config_template.yaml b/cpp/conf/server_config_template.yaml index 131fa57153..59096cd8b6 100644 --- a/cpp/conf/server_config_template.yaml +++ b/cpp/conf/server_config_template.yaml @@ -1,7 +1,7 @@ server_config: address: 0.0.0.0 port: 33001 - transfer_protocol: binary #optional: binary, compact, json + transfer_protocol: binary #optional: binary, compact, json server_mode: thread_pool #optional: simple, thread_pool gpu_index: 0 #which gpu to be used @@ -11,9 +11,18 @@ db_config: db_flush_interval: 5 #unit: second idmapper_max_open_file: 128 +metric_config: + is_startup: true # true is on, false is off + collector: prometheus # prometheus, now we only have prometheus + prometheus_config: + collect_type: pull # pull means prometheus pull the message from server, push means server push metric to push gateway + port: 8080 + push_gateway_ip_address: 127.0.0.1 + push_gateway_port: 9091 + license_config: license_path: "/tmp/system.license" cache_config: - cpu_cache_capacity: 16 # unit: GB - gpu_cache_capacity: 2 # unit: GB \ No newline at end of file + cpu_cache_capacity: 16 # unit: GB + gpu_cache_capacity: 2 # unit: GB \ No newline at end of file diff --git a/cpp/scripts/start_server.sh b/cpp/scripts/start_server.sh index 6f5db9490c..312cef86d6 100755 --- a/cpp/scripts/start_server.sh +++ b/cpp/scripts/start_server.sh @@ -1,4 +1,4 @@ #!/bin/bash -../bin/vecwise_server -c ../conf/server_config.yaml -l ../conf/vecwise_engine_log.conf +../bin/milvus_server -c ../conf/server_config.yaml -l ../conf/log_config.conf diff --git a/cpp/scripts/stop_server.sh b/cpp/scripts/stop_server.sh index 6af1c47727..f15e48a954 100755 --- a/cpp/scripts/stop_server.sh +++ b/cpp/scripts/stop_server.sh @@ -7,7 +7,7 @@ function kill_progress() sleep 2 } -STATUS=$(kill_progress "vecwise_server" ) +STATUS=$(kill_progress "milvus_server" ) if [[ ${STATUS} == "false" ]];then echo "Milvus server closed abnormally!" diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt index ac5644dda8..71e4af231c 100644 --- a/cpp/src/CMakeLists.txt +++ b/cpp/src/CMakeLists.txt @@ -31,16 +31,16 @@ set(license_generator_files ) set(service_files - thrift/gen-cpp/MegasearchService.cpp - thrift/gen-cpp/megasearch_constants.cpp - thrift/gen-cpp/megasearch_types.cpp + thrift/gen-cpp/MilvusService.cpp + thrift/gen-cpp/milvus_constants.cpp + thrift/gen-cpp/milvus_types.cpp metrics/SystemInfo.cpp metrics/SystemInfo.h - server/MegasearchThreadPoolServer.cpp - server/MegasearchThreadPoolServer.h + server/ThreadPoolServer.cpp + server/ThreadPoolServer.h ) -set(vecwise_engine_files +set(engine_files ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp ${cache_files} ${db_files} @@ -58,7 +58,6 @@ include_directories("${CUDA_TOOLKIT_ROOT_DIR}/include") include_directories(thrift/gen-cpp) set(third_party_libs - arrow easyloggingpp sqlite thrift @@ -114,14 +113,14 @@ endif () -cuda_add_library(vecwise_engine STATIC ${vecwise_engine_files}) -target_link_libraries(vecwise_engine ${engine_libs} ${third_party_libs}) +cuda_add_library(milvus_engine STATIC ${engine_files}) +target_link_libraries(milvus_engine ${engine_libs} ${third_party_libs}) add_library(metrics STATIC ${metrics_files}) if (ENABLE_LICENSE STREQUAL "ON") - add_library(vecwise_license STATIC ${license_check_files}) - target_link_libraries(vecwise_license ${license_libs} ${third_party_libs}) + add_library(license_check STATIC ${license_check_files}) + target_link_libraries(license_check ${license_libs} ${third_party_libs}) endif () set(metrics_lib @@ -130,17 +129,16 @@ set(metrics_lib prometheus-cpp-core ) -#add_library(vecwise_engine STATIC ${metrics_files} ) target_link_libraries(metrics ${metrics_lib}) set(server_libs - vecwise_engine + milvus_engine pthread dl metrics ) -add_executable(vecwise_server +add_executable(milvus_server ${config_files} ${server_files} ${utils_files} @@ -150,23 +148,23 @@ add_executable(vecwise_server ) if (ENABLE_LICENSE STREQUAL "ON") - target_link_libraries(vecwise_server ${server_libs} vecwise_license ${third_party_libs}) + target_link_libraries(milvus_server ${server_libs} license_check ${third_party_libs}) else () - target_link_libraries(vecwise_server ${server_libs} ${third_party_libs}) + target_link_libraries(milvus_server ${server_libs} ${third_party_libs}) endif() if (ENABLE_LICENSE STREQUAL "ON") add_executable(get_sys_info ${get_sys_info_files}) add_executable(license_generator ${license_generator_files}) - target_link_libraries(get_sys_info ${license_libs} vecwise_license ${third_party_libs}) + target_link_libraries(get_sys_info ${license_libs} license_check ${third_party_libs}) target_link_libraries(license_generator ${license_libs} ${third_party_libs}) install(TARGETS get_sys_info DESTINATION bin) install(TARGETS license_generator DESTINATION bin) endif () -install(TARGETS vecwise_server DESTINATION bin) +install(TARGETS milvus_server DESTINATION bin) add_subdirectory(sdk) #target_link_libraries( diff --git a/cpp/src/main.cpp b/cpp/src/main.cpp index 6cbb0e489c..6726bc505d 100644 --- a/cpp/src/main.cpp +++ b/cpp/src/main.cpp @@ -27,7 +27,7 @@ using namespace zilliz::milvus; int main(int argc, char *argv[]) { printf("\nWelcome to use Milvus by Zillz!\n"); - printf("Milvus %s version: v%s built at %s\n", BUILD_TYPE, MEGASEARCH_VERSION, BUILD_TIME); + printf("Milvus %s version: v%s built at %s\n", BUILD_TYPE, MILVUS_VERSION, BUILD_TIME); signal(SIGINT, server::SignalUtil::HandleSignal); signal(SIGSEGV, server::SignalUtil::HandleSignal); diff --git a/cpp/src/sdk/CMakeLists.txt b/cpp/src/sdk/CMakeLists.txt index 4e4b8a2c23..093e2243a9 100644 --- a/cpp/src/sdk/CMakeLists.txt +++ b/cpp/src/sdk/CMakeLists.txt @@ -14,19 +14,19 @@ include_directories(/usr/include) include_directories(${CMAKE_SOURCE_DIR}/src/thrift/gen-cpp) set(service_files - ${CMAKE_SOURCE_DIR}/src/thrift/gen-cpp/MegasearchService.cpp - ${CMAKE_SOURCE_DIR}/src/thrift/gen-cpp/megasearch_constants.cpp - ${CMAKE_SOURCE_DIR}/src/thrift/gen-cpp/megasearch_types.cpp + ${CMAKE_SOURCE_DIR}/src/thrift/gen-cpp/MilvusService.cpp + ${CMAKE_SOURCE_DIR}/src/thrift/gen-cpp/milvus_constants.cpp + ${CMAKE_SOURCE_DIR}/src/thrift/gen-cpp/milvus_types.cpp ) -add_library(megasearch_sdk STATIC +add_library(milvus_sdk STATIC ${interface_files} ${client_files} ${util_files} ${service_files} ) -target_link_libraries(megasearch_sdk +target_link_libraries(milvus_sdk ${third_party_libs} ) diff --git a/cpp/src/sdk/examples/simple/CMakeLists.txt b/cpp/src/sdk/examples/simple/CMakeLists.txt index 3b51a6ae86..cad08d856c 100644 --- a/cpp/src/sdk/examples/simple/CMakeLists.txt +++ b/cpp/src/sdk/examples/simple/CMakeLists.txt @@ -7,9 +7,9 @@ aux_source_directory(src src_files) include_directories(src) -include_directories(../../megasearch_sdk/include) +include_directories(../../include) -link_directories(${CMAKE_BINARY_DIR}/megasearch_sdk) +link_directories(${CMAKE_BINARY_DIR}) add_executable(sdk_simple ./main.cpp @@ -17,6 +17,6 @@ add_executable(sdk_simple ) target_link_libraries(sdk_simple - megasearch_sdk + milvus_sdk pthread ) diff --git a/cpp/src/sdk/examples/simple/src/ClientTest.cpp b/cpp/src/sdk/examples/simple/src/ClientTest.cpp index 412633c4eb..27f6ed1490 100644 --- a/cpp/src/sdk/examples/simple/src/ClientTest.cpp +++ b/cpp/src/sdk/examples/simple/src/ClientTest.cpp @@ -4,13 +4,13 @@ * Proprietary and confidential. ******************************************************************************/ #include "ClientTest.h" -#include "MegaSearch.h" +#include "MilvusApi.h" #include #include #include -using namespace megasearch; +using namespace ::milvus; namespace { std::string GetTableName(); @@ -23,7 +23,7 @@ namespace { #define BLOCK_SPLITER std::cout << "===========================================" << std::endl; - void PrintTableSchema(const megasearch::TableSchema& tb_schema) { + void PrintTableSchema(const TableSchema& tb_schema) { BLOCK_SPLITER std::cout << "Table name: " << tb_schema.table_name << std::endl; std::cout << "Table index type: " << (int)tb_schema.index_type << std::endl; @@ -134,7 +134,7 @@ ClientTest::Test(const std::string& address, const std::string& port) { {//server version std::string version = conn->ServerVersion(); - std::cout << "MegaSearch server version: " << version << std::endl; + std::cout << "Server version: " << version << std::endl; } {//sdk version diff --git a/cpp/src/sdk/include/MegaSearch.h b/cpp/src/sdk/include/MilvusApi.h similarity index 98% rename from cpp/src/sdk/include/MegaSearch.h rename to cpp/src/sdk/include/MilvusApi.h index 7cbfdb1ed9..2f4532b761 100644 --- a/cpp/src/sdk/include/MegaSearch.h +++ b/cpp/src/sdk/include/MilvusApi.h @@ -6,9 +6,9 @@ #include #include -/** \brief MegaSearch SDK namespace +/** \brief Milvus SDK namespace */ -namespace megasearch { +namespace milvus { /** @@ -119,7 +119,7 @@ public: * Connect function should be called before any operations * Server will be connected after Connect return OK * - * @param uri, use to provide server information, example: megasearch://ipaddress:port + * @param uri, use to provide server information, example: milvus://ipaddress:port * * @return Indicate if connect is successful */ diff --git a/cpp/src/sdk/include/Status.h b/cpp/src/sdk/include/Status.h index b7090bffa1..3e0d07302e 100644 --- a/cpp/src/sdk/include/Status.h +++ b/cpp/src/sdk/include/Status.h @@ -3,9 +3,9 @@ #include #include -/** \brief MegaSearch SDK namespace +/** \brief Milvus SDK namespace */ -namespace megasearch { +namespace milvus { /** * @brief Status Code for SDK interface return diff --git a/cpp/src/sdk/src/client/ClientProxy.cpp b/cpp/src/sdk/src/client/ClientProxy.cpp index 83bcd7153b..6f68344fac 100644 --- a/cpp/src/sdk/src/client/ClientProxy.cpp +++ b/cpp/src/sdk/src/client/ClientProxy.cpp @@ -6,7 +6,7 @@ #include "ClientProxy.h" #include "util/ConvertUtil.h" -namespace megasearch { +namespace milvus { std::shared_ptr& ClientProxy::ClientPtr() const { diff --git a/cpp/src/sdk/src/client/ClientProxy.h b/cpp/src/sdk/src/client/ClientProxy.h index 71515739af..601bcddd8a 100644 --- a/cpp/src/sdk/src/client/ClientProxy.h +++ b/cpp/src/sdk/src/client/ClientProxy.h @@ -5,10 +5,10 @@ ******************************************************************************/ #pragma once -#include "MegaSearch.h" +#include "MilvusApi.h" #include "ThriftClient.h" -namespace megasearch { +namespace milvus { class ClientProxy : public Connection { public: diff --git a/cpp/src/sdk/src/client/ThriftClient.cpp b/cpp/src/sdk/src/client/ThriftClient.cpp index 179512387f..99b1c7cf2e 100644 --- a/cpp/src/sdk/src/client/ThriftClient.cpp +++ b/cpp/src/sdk/src/client/ThriftClient.cpp @@ -5,8 +5,8 @@ ******************************************************************************/ #include "ThriftClient.h" -#include "megasearch_types.h" -#include "megasearch_constants.h" +#include "milvus_types.h" +#include "milvus_constants.h" #include @@ -21,7 +21,7 @@ #include #include -namespace megasearch { +namespace milvus { using namespace ::apache::thrift; using namespace ::apache::thrift::protocol; @@ -36,7 +36,7 @@ ThriftClient::~ThriftClient() { } -MegasearchServiceClientPtr +ServiceClientPtr ThriftClient::interface() { if(client_ == nullptr) { throw std::exception(); @@ -62,10 +62,10 @@ ThriftClient::Connect(const std::string& address, int32_t port, const std::strin } transport_ptr->open(); - client_ = std::make_shared(protocol_ptr); + client_ = std::make_shared(protocol_ptr); } catch ( std::exception& ex) { //CLIENT_LOG_ERROR << "connect encounter exception: " << ex.what(); - return Status(StatusCode::NotConnected, "failed to connect megasearch server" + std::string(ex.what())); + return Status(StatusCode::NotConnected, "failed to connect server" + std::string(ex.what())); } return Status::OK(); diff --git a/cpp/src/sdk/src/client/ThriftClient.h b/cpp/src/sdk/src/client/ThriftClient.h index 4834835edf..1b97dc73a0 100644 --- a/cpp/src/sdk/src/client/ThriftClient.h +++ b/cpp/src/sdk/src/client/ThriftClient.h @@ -5,14 +5,14 @@ ******************************************************************************/ #pragma once -#include "MegasearchService.h" +#include "MilvusService.h" #include "Status.h" #include -namespace megasearch { +namespace milvus { -using MegasearchServiceClientPtr = std::shared_ptr; +using ServiceClientPtr = std::shared_ptr<::milvus::thrift::MilvusServiceClient>; static const std::string THRIFT_PROTOCOL_JSON = "json"; static const std::string THRIFT_PROTOCOL_BINARY = "binary"; @@ -23,13 +23,13 @@ public: ThriftClient(); virtual ~ThriftClient(); - MegasearchServiceClientPtr interface(); + ServiceClientPtr interface(); Status Connect(const std::string& address, int32_t port, const std::string& protocol); Status Disconnect(); private: - MegasearchServiceClientPtr client_; + ServiceClientPtr client_; }; diff --git a/cpp/src/sdk/src/interface/ConnectionImpl.cpp b/cpp/src/sdk/src/interface/ConnectionImpl.cpp index 4dd9baa23a..e303cf0aa0 100644 --- a/cpp/src/sdk/src/interface/ConnectionImpl.cpp +++ b/cpp/src/sdk/src/interface/ConnectionImpl.cpp @@ -6,7 +6,7 @@ #include "ConnectionImpl.h" #include "version.h" -namespace megasearch { +namespace milvus { std::shared_ptr Connection::Create() { @@ -14,7 +14,7 @@ Connection::Create() { } Status -Connection::Destroy(std::shared_ptr connection_ptr) { +Connection::Destroy(std::shared_ptr connection_ptr) { if(connection_ptr != nullptr) { return connection_ptr->Disconnect(); } @@ -48,7 +48,7 @@ ConnectionImpl::Disconnect() { std::string ConnectionImpl::ClientVersion() const { - return MEGASEARCH_VERSION; + return MILVUS_VERSION; } Status diff --git a/cpp/src/sdk/src/interface/ConnectionImpl.h b/cpp/src/sdk/src/interface/ConnectionImpl.h index a74703986c..61e11c9390 100644 --- a/cpp/src/sdk/src/interface/ConnectionImpl.h +++ b/cpp/src/sdk/src/interface/ConnectionImpl.h @@ -5,10 +5,10 @@ ******************************************************************************/ #pragma once -#include "MegaSearch.h" +#include "MilvusApi.h" #include "client/ClientProxy.h" -namespace megasearch { +namespace milvus { class ConnectionImpl : public Connection { public: diff --git a/cpp/src/sdk/src/interface/Status.cpp b/cpp/src/sdk/src/interface/Status.cpp index 1c47acfb4e..0bacdfbe97 100644 --- a/cpp/src/sdk/src/interface/Status.cpp +++ b/cpp/src/sdk/src/interface/Status.cpp @@ -6,7 +6,7 @@ #include "Status.h" -namespace megasearch { +namespace milvus { Status::~Status() noexcept { if (state_ != nullptr) { diff --git a/cpp/src/sdk/src/util/ConvertUtil.cpp b/cpp/src/sdk/src/util/ConvertUtil.cpp index bf225074f4..867221dc89 100644 --- a/cpp/src/sdk/src/util/ConvertUtil.cpp +++ b/cpp/src/sdk/src/util/ConvertUtil.cpp @@ -8,15 +8,15 @@ #include -namespace megasearch { +namespace milvus { static const std::string INDEX_RAW = "raw"; static const std::string INDEX_IVFFLAT = "ivfflat"; -std::string ConvertUtil::IndexType2Str(megasearch::IndexType index) { - static const std::map s_index2str = { - {megasearch::IndexType::cpu_idmap, INDEX_RAW}, - {megasearch::IndexType::gpu_ivfflat, INDEX_IVFFLAT} +std::string ConvertUtil::IndexType2Str(IndexType index) { + static const std::map s_index2str = { + {IndexType::cpu_idmap, INDEX_RAW}, + {IndexType::gpu_ivfflat, INDEX_IVFFLAT} }; const auto& iter = s_index2str.find(index); @@ -27,10 +27,10 @@ std::string ConvertUtil::IndexType2Str(megasearch::IndexType index) { return iter->second; } -megasearch::IndexType ConvertUtil::Str2IndexType(const std::string& type) { - static const std::map s_str2index = { - {INDEX_RAW, megasearch::IndexType::cpu_idmap}, - {INDEX_IVFFLAT, megasearch::IndexType::gpu_ivfflat} +IndexType ConvertUtil::Str2IndexType(const std::string& type) { + static const std::map s_str2index = { + {INDEX_RAW, IndexType::cpu_idmap}, + {INDEX_IVFFLAT, IndexType::gpu_ivfflat} }; const auto& iter = s_str2index.find(type); diff --git a/cpp/src/sdk/src/util/ConvertUtil.h b/cpp/src/sdk/src/util/ConvertUtil.h index 7b48ad6f92..1411f3eb6d 100644 --- a/cpp/src/sdk/src/util/ConvertUtil.h +++ b/cpp/src/sdk/src/util/ConvertUtil.h @@ -5,14 +5,14 @@ ******************************************************************************/ #pragma once -#include "MegaSearch.h" +#include "MilvusApi.h" -namespace megasearch { +namespace milvus { class ConvertUtil { public: - static std::string IndexType2Str(megasearch::IndexType index); - static megasearch::IndexType Str2IndexType(const std::string& type); + static std::string IndexType2Str(IndexType index); + static IndexType Str2IndexType(const std::string& type); }; } diff --git a/cpp/src/sdk/src/util/Exception.h b/cpp/src/sdk/src/util/Exception.h index 7e31b182a6..0ad08305f8 100644 --- a/cpp/src/sdk/src/util/Exception.h +++ b/cpp/src/sdk/src/util/Exception.h @@ -9,7 +9,7 @@ #include -namespace megasearch { +namespace milvus { class Exception : public std::exception { public: Exception(StatusCode error_code, diff --git a/cpp/src/server/MegasearchThreadPoolServer.cpp b/cpp/src/server/MegasearchThreadPoolServer.cpp deleted file mode 100644 index 6d7bb8c200..0000000000 --- a/cpp/src/server/MegasearchThreadPoolServer.cpp +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* - * Copyright 上海赜睿信息科技有限公司(Zilliz) - All Rights Reserved - * Unauthorized copying of this file, via any medium is strictly prohibited. - * Proprietary and confidential. - ******************************************************************************/ -#include "metrics/Metrics.h" -#include "MegasearchThreadPoolServer.h" - -namespace zilliz { -namespace milvus { -namespace server { - -void -MegasearchThreadPoolServer::onClientConnected(const std::shared_ptr &pClient) { - server::Metrics::GetInstance().ConnectionGaugeIncrement(); - TThreadPoolServer::onClientConnected(pClient); -} - -void -MegasearchThreadPoolServer::onClientDisconnected(apache::thrift::server::TConnectedClient *pClient) { - server::Metrics::GetInstance().ConnectionGaugeDecrement(); - TThreadPoolServer::onClientDisconnected(pClient); -} -zilliz::milvus::server::MegasearchThreadPoolServer::MegasearchThreadPoolServer(const std::shared_ptr &processor, - const std::shared_ptr &serverTransport, - const std::shared_ptr &transportFactory, - const std::shared_ptr &protocolFactory, - const std::shared_ptr &threadManager) - : TThreadPoolServer(processor, serverTransport, transportFactory, protocolFactory, threadManager) { - -} -} -} -} \ No newline at end of file diff --git a/cpp/src/server/MegasearchServer.cpp b/cpp/src/server/MilvusServer.cpp similarity index 87% rename from cpp/src/server/MegasearchServer.cpp rename to cpp/src/server/MilvusServer.cpp index 0e4ef9c45d..2b46627ad0 100644 --- a/cpp/src/server/MegasearchServer.cpp +++ b/cpp/src/server/MilvusServer.cpp @@ -3,12 +3,13 @@ * Unauthorized copying of this file, via any medium is strictly prohibited. * Proprietary and confidential. ******************************************************************************/ -#include "MegasearchServer.h" -#include "MegasearchHandler.h" -#include "megasearch_types.h" -#include "megasearch_constants.h" +#include "MilvusServer.h" +#include "RequestHandler.h" #include "ServerConfig.h" -#include "MegasearchThreadPoolServer.h" +#include "ThreadPoolServer.h" + +#include "milvus_types.h" +#include "milvus_constants.h" #include #include @@ -26,7 +27,7 @@ namespace zilliz { namespace milvus { namespace server { -using namespace megasearch::thrift; +using namespace ::milvus::thrift; using namespace ::apache::thrift; using namespace ::apache::thrift::protocol; using namespace ::apache::thrift::transport; @@ -36,7 +37,7 @@ using namespace ::apache::thrift::concurrency; static stdcxx::shared_ptr s_server; void -MegasearchServer::StartService() { +MilvusServer::StartService() { if(s_server != nullptr){ StopService(); } @@ -50,8 +51,8 @@ MegasearchServer::StartService() { std::string mode = server_config.GetValue(CONFIG_SERVER_MODE, "thread_pool"); try { - stdcxx::shared_ptr handler(new MegasearchServiceHandler()); - stdcxx::shared_ptr processor(new MegasearchServiceProcessor(handler)); + stdcxx::shared_ptr handler(new RequestHandler()); + stdcxx::shared_ptr processor(new MilvusServiceProcessor(handler)); stdcxx::shared_ptr server_transport(new TServerSocket(address, port)); stdcxx::shared_ptr transport_factory(new TBufferedTransportFactory()); @@ -77,7 +78,7 @@ MegasearchServer::StartService() { threadManager->threadFactory(threadFactory); threadManager->start(); - s_server.reset(new MegasearchThreadPoolServer(processor, + s_server.reset(new ThreadPoolServer(processor, server_transport, transport_factory, protocol_factory, @@ -93,7 +94,7 @@ MegasearchServer::StartService() { } void -MegasearchServer::StopService() { +MilvusServer::StopService() { auto stop_server_worker = [&]{ if(s_server != nullptr) { s_server->stop(); diff --git a/cpp/src/server/MegasearchServer.h b/cpp/src/server/MilvusServer.h similarity index 95% rename from cpp/src/server/MegasearchServer.h rename to cpp/src/server/MilvusServer.h index 854d89fc1a..b71cf1ef42 100644 --- a/cpp/src/server/MegasearchServer.h +++ b/cpp/src/server/MilvusServer.h @@ -12,7 +12,7 @@ namespace zilliz { namespace milvus { namespace server { -class MegasearchServer { +class MilvusServer { public: static void StartService(); static void StopService(); diff --git a/cpp/src/server/MegasearchHandler.cpp b/cpp/src/server/RequestHandler.cpp similarity index 51% rename from cpp/src/server/MegasearchHandler.cpp rename to cpp/src/server/RequestHandler.cpp index 5ad7169b68..2f0ecd835e 100644 --- a/cpp/src/server/MegasearchHandler.cpp +++ b/cpp/src/server/RequestHandler.cpp @@ -4,62 +4,62 @@ * Proprietary and confidential. ******************************************************************************/ -#include "MegasearchHandler.h" -#include "MegasearchTask.h" +#include "RequestHandler.h" +#include "RequestTask.h" #include "utils/TimeRecorder.h" namespace zilliz { namespace milvus { namespace server { -using namespace megasearch; +using namespace ::milvus; -MegasearchServiceHandler::MegasearchServiceHandler() { +RequestHandler::RequestHandler() { } void -MegasearchServiceHandler::CreateTable(const thrift::TableSchema ¶m) { +RequestHandler::CreateTable(const thrift::TableSchema ¶m) { BaseTaskPtr task_ptr = CreateTableTask::Create(param); - MegasearchScheduler::ExecTask(task_ptr); + RequestScheduler::ExecTask(task_ptr); } void -MegasearchServiceHandler::DeleteTable(const std::string &table_name) { +RequestHandler::DeleteTable(const std::string &table_name) { BaseTaskPtr task_ptr = DeleteTableTask::Create(table_name); - MegasearchScheduler::ExecTask(task_ptr); + RequestScheduler::ExecTask(task_ptr); } void -MegasearchServiceHandler::AddVector(std::vector &_return, +RequestHandler::AddVector(std::vector &_return, const std::string &table_name, const std::vector &record_array) { BaseTaskPtr task_ptr = AddVectorTask::Create(table_name, record_array, _return); - MegasearchScheduler::ExecTask(task_ptr); + RequestScheduler::ExecTask(task_ptr); } void -MegasearchServiceHandler::SearchVector(std::vector & _return, +RequestHandler::SearchVector(std::vector & _return, const std::string& table_name, - const std::vector & query_record_array, - const std::vector & query_range_array, + const std::vector & query_record_array, + const std::vector & query_range_array, const int64_t topk) { BaseTaskPtr task_ptr = SearchVectorTask::Create(table_name, query_record_array, query_range_array, topk, _return); - MegasearchScheduler::ExecTask(task_ptr); + RequestScheduler::ExecTask(task_ptr); } void -MegasearchServiceHandler::DescribeTable(thrift::TableSchema &_return, const std::string &table_name) { +RequestHandler::DescribeTable(thrift::TableSchema &_return, const std::string &table_name) { BaseTaskPtr task_ptr = DescribeTableTask::Create(table_name, _return); - MegasearchScheduler::ExecTask(task_ptr); + RequestScheduler::ExecTask(task_ptr); } int64_t -MegasearchServiceHandler::GetTableRowCount(const std::string& table_name) { +RequestHandler::GetTableRowCount(const std::string& table_name) { int64_t row_count = 0; { BaseTaskPtr task_ptr = GetTableRowCountTask::Create(table_name, row_count); - MegasearchScheduler::ExecTask(task_ptr); + RequestScheduler::ExecTask(task_ptr); task_ptr->WaitToFinish(); } @@ -67,15 +67,15 @@ MegasearchServiceHandler::GetTableRowCount(const std::string& table_name) { } void -MegasearchServiceHandler::ShowTables(std::vector &_return) { +RequestHandler::ShowTables(std::vector &_return) { BaseTaskPtr task_ptr = ShowTablesTask::Create(_return); - MegasearchScheduler::ExecTask(task_ptr); + RequestScheduler::ExecTask(task_ptr); } void -MegasearchServiceHandler::Ping(std::string& _return, const std::string& cmd) { +RequestHandler::Ping(std::string& _return, const std::string& cmd) { BaseTaskPtr task_ptr = PingTask::Create(cmd, _return); - MegasearchScheduler::ExecTask(task_ptr); + RequestScheduler::ExecTask(task_ptr); } } diff --git a/cpp/src/server/MegasearchHandler.h b/cpp/src/server/RequestHandler.h similarity index 82% rename from cpp/src/server/MegasearchHandler.h rename to cpp/src/server/RequestHandler.h index 0a48c66bbc..d43734bd97 100644 --- a/cpp/src/server/MegasearchHandler.h +++ b/cpp/src/server/RequestHandler.h @@ -8,15 +8,15 @@ #include #include -#include "MegasearchService.h" +#include "MilvusService.h" namespace zilliz { namespace milvus { namespace server { -class MegasearchServiceHandler : virtual public megasearch::thrift::MegasearchServiceIf { +class RequestHandler : virtual public ::milvus::thrift::MilvusServiceIf { public: - MegasearchServiceHandler(); + RequestHandler(); /** * @brief Create table method @@ -28,7 +28,7 @@ public: * * @param param */ - void CreateTable(const megasearch::thrift::TableSchema& param); + void CreateTable(const ::milvus::thrift::TableSchema& param); /** * @brief Delete table method @@ -57,7 +57,7 @@ public: */ void AddVector(std::vector & _return, const std::string& table_name, - const std::vector & record_array); + const std::vector<::milvus::thrift::RowRecord> & record_array); /** * @brief Query vector @@ -76,10 +76,10 @@ public: * @param query_range_array * @param topk */ - void SearchVector(std::vector & _return, + void SearchVector(std::vector<::milvus::thrift::TopKQueryResult> & _return, const std::string& table_name, - const std::vector & query_record_array, - const std::vector & query_range_array, + const std::vector<::milvus::thrift::RowRecord> & query_record_array, + const std::vector<::milvus::thrift::Range> & query_range_array, const int64_t topk); /** @@ -93,7 +93,7 @@ public: * * @param table_name */ - void DescribeTable(megasearch::thrift::TableSchema& _return, const std::string& table_name); + void DescribeTable(::milvus::thrift::TableSchema& _return, const std::string& table_name); /** * @brief Get table row count diff --git a/cpp/src/server/MegasearchScheduler.cpp b/cpp/src/server/RequestScheduler.cpp similarity index 91% rename from cpp/src/server/MegasearchScheduler.cpp rename to cpp/src/server/RequestScheduler.cpp index ffbebc8418..99ae36701e 100644 --- a/cpp/src/server/MegasearchScheduler.cpp +++ b/cpp/src/server/RequestScheduler.cpp @@ -3,17 +3,17 @@ * Unauthorized copying of this file, via any medium is strictly prohibited. * Proprietary and confidential. ******************************************************************************/ -#include "MegasearchScheduler.h" +#include "RequestScheduler.h" #include "utils/Log.h" -#include "megasearch_types.h" -#include "megasearch_constants.h" +#include "milvus_types.h" +#include "milvus_constants.h" namespace zilliz { namespace milvus { namespace server { -using namespace megasearch; +using namespace ::milvus; namespace { const std::map &ErrorMap() { @@ -77,21 +77,21 @@ ServerError BaseTask::WaitToFinish() { } //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -MegasearchScheduler::MegasearchScheduler() +RequestScheduler::RequestScheduler() : stopped_(false) { Start(); } -MegasearchScheduler::~MegasearchScheduler() { +RequestScheduler::~RequestScheduler() { Stop(); } -void MegasearchScheduler::ExecTask(BaseTaskPtr& task_ptr) { +void RequestScheduler::ExecTask(BaseTaskPtr& task_ptr) { if(task_ptr == nullptr) { return; } - MegasearchScheduler& scheduler = MegasearchScheduler::GetInstance(); + RequestScheduler& scheduler = RequestScheduler::GetInstance(); scheduler.ExecuteTask(task_ptr); if(!task_ptr->IsAsync()) { @@ -110,7 +110,7 @@ void MegasearchScheduler::ExecTask(BaseTaskPtr& task_ptr) { } } -void MegasearchScheduler::Start() { +void RequestScheduler::Start() { if(!stopped_) { return; } @@ -118,7 +118,7 @@ void MegasearchScheduler::Start() { stopped_ = false; } -void MegasearchScheduler::Stop() { +void RequestScheduler::Stop() { if(stopped_) { return; } @@ -143,7 +143,7 @@ void MegasearchScheduler::Stop() { SERVER_LOG_INFO << "Scheduler stopped"; } -ServerError MegasearchScheduler::ExecuteTask(const BaseTaskPtr& task_ptr) { +ServerError RequestScheduler::ExecuteTask(const BaseTaskPtr& task_ptr) { if(task_ptr == nullptr) { return SERVER_NULL_POINTER; } @@ -184,7 +184,7 @@ namespace { } } -ServerError MegasearchScheduler::PutTaskToQueue(const BaseTaskPtr& task_ptr) { +ServerError RequestScheduler::PutTaskToQueue(const BaseTaskPtr& task_ptr) { std::lock_guard lock(queue_mtx_); std::string group_name = task_ptr->TaskGroup(); diff --git a/cpp/src/server/MegasearchScheduler.h b/cpp/src/server/RequestScheduler.h similarity index 90% rename from cpp/src/server/MegasearchScheduler.h rename to cpp/src/server/RequestScheduler.h index dd569fc35e..b7562cc367 100644 --- a/cpp/src/server/MegasearchScheduler.h +++ b/cpp/src/server/RequestScheduler.h @@ -50,10 +50,10 @@ using TaskQueue = BlockingQueue; using TaskQueuePtr = std::shared_ptr; using ThreadPtr = std::shared_ptr; -class MegasearchScheduler { +class RequestScheduler { public: - static MegasearchScheduler& GetInstance() { - static MegasearchScheduler scheduler; + static RequestScheduler& GetInstance() { + static RequestScheduler scheduler; return scheduler; } @@ -65,8 +65,8 @@ public: static void ExecTask(BaseTaskPtr& task_ptr); protected: - MegasearchScheduler(); - virtual ~MegasearchScheduler(); + RequestScheduler(); + virtual ~RequestScheduler(); ServerError PutTaskToQueue(const BaseTaskPtr& task_ptr); diff --git a/cpp/src/server/MegasearchTask.cpp b/cpp/src/server/RequestTask.cpp similarity index 98% rename from cpp/src/server/MegasearchTask.cpp rename to cpp/src/server/RequestTask.cpp index 46687aed87..5715b55cb0 100644 --- a/cpp/src/server/MegasearchTask.cpp +++ b/cpp/src/server/RequestTask.cpp @@ -3,7 +3,7 @@ * Unauthorized copying of this file, via any medium is strictly prohibited. * Proprietary and confidential. ******************************************************************************/ -#include "MegasearchTask.h" +#include "RequestTask.h" #include "ServerConfig.h" #include "utils/CommonUtil.h" #include "utils/Log.h" @@ -17,6 +17,8 @@ namespace zilliz { namespace milvus { namespace server { +using namespace ::milvus; + static const std::string DQL_TASK_GROUP = "dql"; static const std::string DDL_DML_TASK_GROUP = "ddl_dml"; static const std::string PING_TASK_GROUP = "ping"; @@ -122,7 +124,7 @@ namespace { static constexpr long DAY_SECONDS = 86400; ServerError - ConvertTimeRangeToDBDates(const std::vector &range_array, + ConvertTimeRangeToDBDates(const std::vector &range_array, std::vector& dates) { dates.clear(); ServerError error_code; @@ -411,7 +413,7 @@ ServerError AddVectorTask::OnExecute() { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// SearchVectorTask::SearchVectorTask(const std::string& table_name, const std::vector & query_record_array, - const std::vector & query_range_array, + const std::vector & query_range_array, const int64_t top_k, std::vector& result_array) : BaseTask(DQL_TASK_GROUP), @@ -425,7 +427,7 @@ SearchVectorTask::SearchVectorTask(const std::string& table_name, BaseTaskPtr SearchVectorTask::Create(const std::string& table_name, const std::vector & query_record_array, - const std::vector & query_range_array, + const std::vector & query_range_array, const int64_t top_k, std::vector& result_array) { return std::shared_ptr(new SearchVectorTask(table_name, @@ -582,7 +584,7 @@ BaseTaskPtr PingTask::Create(const std::string& cmd, std::string& result) { ServerError PingTask::OnExecute() { if(cmd_ == "version") { - result_ = MEGASEARCH_VERSION; + result_ = MILVUS_VERSION; } return SERVER_SUCCESS; diff --git a/cpp/src/server/MegasearchTask.h b/cpp/src/server/RequestTask.h similarity index 71% rename from cpp/src/server/MegasearchTask.h rename to cpp/src/server/RequestTask.h index d99a3f7881..ff7d7e020c 100644 --- a/cpp/src/server/MegasearchTask.h +++ b/cpp/src/server/RequestTask.h @@ -5,12 +5,12 @@ ******************************************************************************/ #pragma once -#include "MegasearchScheduler.h" +#include "RequestScheduler.h" #include "utils/Error.h" #include "utils/AttributeSerializer.h" #include "db/Types.h" -#include "megasearch_types.h" +#include "milvus_types.h" #include #include @@ -19,35 +19,34 @@ namespace zilliz { namespace milvus { namespace server { -using namespace megasearch; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// class CreateTableTask : public BaseTask { public: - static BaseTaskPtr Create(const thrift::TableSchema& schema); + static BaseTaskPtr Create(const ::milvus::thrift::TableSchema& schema); protected: - CreateTableTask(const thrift::TableSchema& schema); + CreateTableTask(const ::milvus::thrift::TableSchema& schema); ServerError OnExecute() override; private: - const thrift::TableSchema& schema_; + const ::milvus::thrift::TableSchema& schema_; }; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// class DescribeTableTask : public BaseTask { public: - static BaseTaskPtr Create(const std::string& table_name, thrift::TableSchema& schema); + static BaseTaskPtr Create(const std::string& table_name, ::milvus::thrift::TableSchema& schema); protected: - DescribeTableTask(const std::string& table_name, thrift::TableSchema& schema); + DescribeTableTask(const std::string& table_name, ::milvus::thrift::TableSchema& schema); ServerError OnExecute() override; private: std::string table_name_; - thrift::TableSchema& schema_; + ::milvus::thrift::TableSchema& schema_; }; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -83,19 +82,19 @@ private: class AddVectorTask : public BaseTask { public: static BaseTaskPtr Create(const std::string& table_name, - const std::vector& record_array, + const std::vector<::milvus::thrift::RowRecord>& record_array, std::vector& record_ids_); protected: AddVectorTask(const std::string& table_name, - const std::vector& record_array, + const std::vector<::milvus::thrift::RowRecord>& record_array, std::vector& record_ids_); ServerError OnExecute() override; private: std::string table_name_; - const std::vector& record_array_; + const std::vector<::milvus::thrift::RowRecord>& record_array_; std::vector& record_ids_; }; @@ -103,26 +102,26 @@ private: class SearchVectorTask : public BaseTask { public: static BaseTaskPtr Create(const std::string& table_name, - const std::vector & query_record_array, - const std::vector & query_range_array, + const std::vector<::milvus::thrift::RowRecord> & query_record_array, + const std::vector<::milvus::thrift::Range> & query_range_array, const int64_t top_k, - std::vector& result_array); + std::vector<::milvus::thrift::TopKQueryResult>& result_array); protected: SearchVectorTask(const std::string& table_name, - const std::vector & query_record_array, - const std::vector & query_range_array, + const std::vector<::milvus::thrift::RowRecord> & query_record_array, + const std::vector<::milvus::thrift::Range> & query_range_array, const int64_t top_k, - std::vector& result_array); + std::vector<::milvus::thrift::TopKQueryResult>& result_array); ServerError OnExecute() override; private: std::string table_name_; int64_t top_k_; - const std::vector& record_array_; - const std::vector& range_array_; - std::vector& result_array_; + const std::vector<::milvus::thrift::RowRecord>& record_array_; + const std::vector<::milvus::thrift::Range>& range_array_; + std::vector<::milvus::thrift::TopKQueryResult>& result_array_; }; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/cpp/src/server/Server.cpp b/cpp/src/server/Server.cpp index 08bf84fe94..de74e6e689 100644 --- a/cpp/src/server/Server.cpp +++ b/cpp/src/server/Server.cpp @@ -5,7 +5,7 @@ //////////////////////////////////////////////////////////////////////////////// #include "Server.h" #include "ServerConfig.h" -#include "MegasearchServer.h" +#include "MilvusServer.h" #include "utils/Log.h" #include "utils/SignalUtil.h" #include "utils/TimeRecorder.h" @@ -232,12 +232,12 @@ Server::LoadConfig() { void Server::StartService() { - MegasearchServer::StartService(); + MilvusServer::StartService(); } void Server::StopService() { - MegasearchServer::StopService(); + MilvusServer::StopService(); } } diff --git a/cpp/src/server/ThreadPoolServer.cpp b/cpp/src/server/ThreadPoolServer.cpp new file mode 100644 index 0000000000..507ff3b9ed --- /dev/null +++ b/cpp/src/server/ThreadPoolServer.cpp @@ -0,0 +1,36 @@ +/******************************************************************************* + * Copyright 上海赜睿信息科技有限公司(Zilliz) - All Rights Reserved + * Unauthorized copying of this file, via any medium is strictly prohibited. + * Proprietary and confidential. + ******************************************************************************/ +#include "metrics/Metrics.h" +#include "ThreadPoolServer.h" + +namespace zilliz { +namespace milvus { +namespace server { + +void +ThreadPoolServer::onClientConnected(const std::shared_ptr &pClient) { + server::Metrics::GetInstance().ConnectionGaugeIncrement(); + TThreadPoolServer::onClientConnected(pClient); +} + +void +ThreadPoolServer::onClientDisconnected(apache::thrift::server::TConnectedClient *pClient) { + server::Metrics::GetInstance().ConnectionGaugeDecrement(); + TThreadPoolServer::onClientDisconnected(pClient); +} + +zilliz::milvus::server::ThreadPoolServer::ThreadPoolServer(const std::shared_ptr &processor, + const std::shared_ptr &serverTransport, + const std::shared_ptr &transportFactory, + const std::shared_ptr &protocolFactory, + const std::shared_ptr &threadManager) + : TThreadPoolServer(processor, serverTransport, transportFactory, protocolFactory, threadManager) { + +} + +} +} +} \ No newline at end of file diff --git a/cpp/src/server/MegasearchThreadPoolServer.h b/cpp/src/server/ThreadPoolServer.h similarity index 91% rename from cpp/src/server/MegasearchThreadPoolServer.h rename to cpp/src/server/ThreadPoolServer.h index 57495c7751..501ebc6e1d 100644 --- a/cpp/src/server/MegasearchThreadPoolServer.h +++ b/cpp/src/server/ThreadPoolServer.h @@ -13,9 +13,9 @@ namespace zilliz { namespace milvus { namespace server { -class MegasearchThreadPoolServer : public apache::thrift::server::TThreadPoolServer { +class ThreadPoolServer : public apache::thrift::server::TThreadPoolServer { public: - MegasearchThreadPoolServer( + ThreadPoolServer( const std::shared_ptr& processor, const std::shared_ptr& serverTransport, const std::shared_ptr& transportFactory, diff --git a/cpp/src/thrift/cpp_gen.sh b/cpp/src/thrift/cpp_gen.sh index c3065b1f50..69f73c87f4 100755 --- a/cpp/src/thrift/cpp_gen.sh +++ b/cpp/src/thrift/cpp_gen.sh @@ -1,4 +1,4 @@ #!/bin/bash -thrift -r --gen cpp ./megasearch.thrift +thrift -r --gen cpp ./milvus.thrift diff --git a/cpp/src/thrift/gen-cpp/MegasearchService.cpp b/cpp/src/thrift/gen-cpp/MilvusService.cpp similarity index 79% rename from cpp/src/thrift/gen-cpp/MegasearchService.cpp rename to cpp/src/thrift/gen-cpp/MilvusService.cpp index a0d8a21810..3d27d6a194 100644 --- a/cpp/src/thrift/gen-cpp/MegasearchService.cpp +++ b/cpp/src/thrift/gen-cpp/MilvusService.cpp @@ -4,16 +4,16 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -#include "MegasearchService.h" +#include "MilvusService.h" -namespace megasearch { namespace thrift { +namespace milvus { namespace thrift { -MegasearchService_CreateTable_args::~MegasearchService_CreateTable_args() throw() { +MilvusService_CreateTable_args::~MilvusService_CreateTable_args() throw() { } -uint32_t MegasearchService_CreateTable_args::read(::apache::thrift::protocol::TProtocol* iprot) { +uint32_t MilvusService_CreateTable_args::read(::apache::thrift::protocol::TProtocol* iprot) { ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; @@ -54,10 +54,10 @@ uint32_t MegasearchService_CreateTable_args::read(::apache::thrift::protocol::TP return xfer; } -uint32_t MegasearchService_CreateTable_args::write(::apache::thrift::protocol::TProtocol* oprot) const { +uint32_t MilvusService_CreateTable_args::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); - xfer += oprot->writeStructBegin("MegasearchService_CreateTable_args"); + xfer += oprot->writeStructBegin("MilvusService_CreateTable_args"); xfer += oprot->writeFieldBegin("param", ::apache::thrift::protocol::T_STRUCT, 2); xfer += this->param.write(oprot); @@ -69,14 +69,14 @@ uint32_t MegasearchService_CreateTable_args::write(::apache::thrift::protocol::T } -MegasearchService_CreateTable_pargs::~MegasearchService_CreateTable_pargs() throw() { +MilvusService_CreateTable_pargs::~MilvusService_CreateTable_pargs() throw() { } -uint32_t MegasearchService_CreateTable_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const { +uint32_t MilvusService_CreateTable_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); - xfer += oprot->writeStructBegin("MegasearchService_CreateTable_pargs"); + xfer += oprot->writeStructBegin("MilvusService_CreateTable_pargs"); xfer += oprot->writeFieldBegin("param", ::apache::thrift::protocol::T_STRUCT, 2); xfer += (*(this->param)).write(oprot); @@ -88,11 +88,11 @@ uint32_t MegasearchService_CreateTable_pargs::write(::apache::thrift::protocol:: } -MegasearchService_CreateTable_result::~MegasearchService_CreateTable_result() throw() { +MilvusService_CreateTable_result::~MilvusService_CreateTable_result() throw() { } -uint32_t MegasearchService_CreateTable_result::read(::apache::thrift::protocol::TProtocol* iprot) { +uint32_t MilvusService_CreateTable_result::read(::apache::thrift::protocol::TProtocol* iprot) { ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; @@ -133,11 +133,11 @@ uint32_t MegasearchService_CreateTable_result::read(::apache::thrift::protocol:: return xfer; } -uint32_t MegasearchService_CreateTable_result::write(::apache::thrift::protocol::TProtocol* oprot) const { +uint32_t MilvusService_CreateTable_result::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; - xfer += oprot->writeStructBegin("MegasearchService_CreateTable_result"); + xfer += oprot->writeStructBegin("MilvusService_CreateTable_result"); if (this->__isset.e) { xfer += oprot->writeFieldBegin("e", ::apache::thrift::protocol::T_STRUCT, 1); @@ -150,11 +150,11 @@ uint32_t MegasearchService_CreateTable_result::write(::apache::thrift::protocol: } -MegasearchService_CreateTable_presult::~MegasearchService_CreateTable_presult() throw() { +MilvusService_CreateTable_presult::~MilvusService_CreateTable_presult() throw() { } -uint32_t MegasearchService_CreateTable_presult::read(::apache::thrift::protocol::TProtocol* iprot) { +uint32_t MilvusService_CreateTable_presult::read(::apache::thrift::protocol::TProtocol* iprot) { ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; @@ -196,11 +196,11 @@ uint32_t MegasearchService_CreateTable_presult::read(::apache::thrift::protocol: } -MegasearchService_DeleteTable_args::~MegasearchService_DeleteTable_args() throw() { +MilvusService_DeleteTable_args::~MilvusService_DeleteTable_args() throw() { } -uint32_t MegasearchService_DeleteTable_args::read(::apache::thrift::protocol::TProtocol* iprot) { +uint32_t MilvusService_DeleteTable_args::read(::apache::thrift::protocol::TProtocol* iprot) { ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; @@ -241,10 +241,10 @@ uint32_t MegasearchService_DeleteTable_args::read(::apache::thrift::protocol::TP return xfer; } -uint32_t MegasearchService_DeleteTable_args::write(::apache::thrift::protocol::TProtocol* oprot) const { +uint32_t MilvusService_DeleteTable_args::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); - xfer += oprot->writeStructBegin("MegasearchService_DeleteTable_args"); + xfer += oprot->writeStructBegin("MilvusService_DeleteTable_args"); xfer += oprot->writeFieldBegin("table_name", ::apache::thrift::protocol::T_STRING, 2); xfer += oprot->writeString(this->table_name); @@ -256,14 +256,14 @@ uint32_t MegasearchService_DeleteTable_args::write(::apache::thrift::protocol::T } -MegasearchService_DeleteTable_pargs::~MegasearchService_DeleteTable_pargs() throw() { +MilvusService_DeleteTable_pargs::~MilvusService_DeleteTable_pargs() throw() { } -uint32_t MegasearchService_DeleteTable_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const { +uint32_t MilvusService_DeleteTable_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); - xfer += oprot->writeStructBegin("MegasearchService_DeleteTable_pargs"); + xfer += oprot->writeStructBegin("MilvusService_DeleteTable_pargs"); xfer += oprot->writeFieldBegin("table_name", ::apache::thrift::protocol::T_STRING, 2); xfer += oprot->writeString((*(this->table_name))); @@ -275,11 +275,11 @@ uint32_t MegasearchService_DeleteTable_pargs::write(::apache::thrift::protocol:: } -MegasearchService_DeleteTable_result::~MegasearchService_DeleteTable_result() throw() { +MilvusService_DeleteTable_result::~MilvusService_DeleteTable_result() throw() { } -uint32_t MegasearchService_DeleteTable_result::read(::apache::thrift::protocol::TProtocol* iprot) { +uint32_t MilvusService_DeleteTable_result::read(::apache::thrift::protocol::TProtocol* iprot) { ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; @@ -320,11 +320,11 @@ uint32_t MegasearchService_DeleteTable_result::read(::apache::thrift::protocol:: return xfer; } -uint32_t MegasearchService_DeleteTable_result::write(::apache::thrift::protocol::TProtocol* oprot) const { +uint32_t MilvusService_DeleteTable_result::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; - xfer += oprot->writeStructBegin("MegasearchService_DeleteTable_result"); + xfer += oprot->writeStructBegin("MilvusService_DeleteTable_result"); if (this->__isset.e) { xfer += oprot->writeFieldBegin("e", ::apache::thrift::protocol::T_STRUCT, 1); @@ -337,11 +337,11 @@ uint32_t MegasearchService_DeleteTable_result::write(::apache::thrift::protocol: } -MegasearchService_DeleteTable_presult::~MegasearchService_DeleteTable_presult() throw() { +MilvusService_DeleteTable_presult::~MilvusService_DeleteTable_presult() throw() { } -uint32_t MegasearchService_DeleteTable_presult::read(::apache::thrift::protocol::TProtocol* iprot) { +uint32_t MilvusService_DeleteTable_presult::read(::apache::thrift::protocol::TProtocol* iprot) { ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; @@ -383,11 +383,11 @@ uint32_t MegasearchService_DeleteTable_presult::read(::apache::thrift::protocol: } -MegasearchService_AddVector_args::~MegasearchService_AddVector_args() throw() { +MilvusService_AddVector_args::~MilvusService_AddVector_args() throw() { } -uint32_t MegasearchService_AddVector_args::read(::apache::thrift::protocol::TProtocol* iprot) { +uint32_t MilvusService_AddVector_args::read(::apache::thrift::protocol::TProtocol* iprot) { ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; @@ -448,10 +448,10 @@ uint32_t MegasearchService_AddVector_args::read(::apache::thrift::protocol::TPro return xfer; } -uint32_t MegasearchService_AddVector_args::write(::apache::thrift::protocol::TProtocol* oprot) const { +uint32_t MilvusService_AddVector_args::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); - xfer += oprot->writeStructBegin("MegasearchService_AddVector_args"); + xfer += oprot->writeStructBegin("MilvusService_AddVector_args"); xfer += oprot->writeFieldBegin("table_name", ::apache::thrift::protocol::T_STRING, 2); xfer += oprot->writeString(this->table_name); @@ -475,14 +475,14 @@ uint32_t MegasearchService_AddVector_args::write(::apache::thrift::protocol::TPr } -MegasearchService_AddVector_pargs::~MegasearchService_AddVector_pargs() throw() { +MilvusService_AddVector_pargs::~MilvusService_AddVector_pargs() throw() { } -uint32_t MegasearchService_AddVector_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const { +uint32_t MilvusService_AddVector_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); - xfer += oprot->writeStructBegin("MegasearchService_AddVector_pargs"); + xfer += oprot->writeStructBegin("MilvusService_AddVector_pargs"); xfer += oprot->writeFieldBegin("table_name", ::apache::thrift::protocol::T_STRING, 2); xfer += oprot->writeString((*(this->table_name))); @@ -506,11 +506,11 @@ uint32_t MegasearchService_AddVector_pargs::write(::apache::thrift::protocol::TP } -MegasearchService_AddVector_result::~MegasearchService_AddVector_result() throw() { +MilvusService_AddVector_result::~MilvusService_AddVector_result() throw() { } -uint32_t MegasearchService_AddVector_result::read(::apache::thrift::protocol::TProtocol* iprot) { +uint32_t MilvusService_AddVector_result::read(::apache::thrift::protocol::TProtocol* iprot) { ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; @@ -571,11 +571,11 @@ uint32_t MegasearchService_AddVector_result::read(::apache::thrift::protocol::TP return xfer; } -uint32_t MegasearchService_AddVector_result::write(::apache::thrift::protocol::TProtocol* oprot) const { +uint32_t MilvusService_AddVector_result::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; - xfer += oprot->writeStructBegin("MegasearchService_AddVector_result"); + xfer += oprot->writeStructBegin("MilvusService_AddVector_result"); if (this->__isset.success) { xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0); @@ -600,11 +600,11 @@ uint32_t MegasearchService_AddVector_result::write(::apache::thrift::protocol::T } -MegasearchService_AddVector_presult::~MegasearchService_AddVector_presult() throw() { +MilvusService_AddVector_presult::~MilvusService_AddVector_presult() throw() { } -uint32_t MegasearchService_AddVector_presult::read(::apache::thrift::protocol::TProtocol* iprot) { +uint32_t MilvusService_AddVector_presult::read(::apache::thrift::protocol::TProtocol* iprot) { ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; @@ -666,11 +666,11 @@ uint32_t MegasearchService_AddVector_presult::read(::apache::thrift::protocol::T } -MegasearchService_SearchVector_args::~MegasearchService_SearchVector_args() throw() { +MilvusService_SearchVector_args::~MilvusService_SearchVector_args() throw() { } -uint32_t MegasearchService_SearchVector_args::read(::apache::thrift::protocol::TProtocol* iprot) { +uint32_t MilvusService_SearchVector_args::read(::apache::thrift::protocol::TProtocol* iprot) { ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; @@ -759,10 +759,10 @@ uint32_t MegasearchService_SearchVector_args::read(::apache::thrift::protocol::T return xfer; } -uint32_t MegasearchService_SearchVector_args::write(::apache::thrift::protocol::TProtocol* oprot) const { +uint32_t MilvusService_SearchVector_args::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); - xfer += oprot->writeStructBegin("MegasearchService_SearchVector_args"); + xfer += oprot->writeStructBegin("MilvusService_SearchVector_args"); xfer += oprot->writeFieldBegin("table_name", ::apache::thrift::protocol::T_STRING, 2); xfer += oprot->writeString(this->table_name); @@ -802,14 +802,14 @@ uint32_t MegasearchService_SearchVector_args::write(::apache::thrift::protocol:: } -MegasearchService_SearchVector_pargs::~MegasearchService_SearchVector_pargs() throw() { +MilvusService_SearchVector_pargs::~MilvusService_SearchVector_pargs() throw() { } -uint32_t MegasearchService_SearchVector_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const { +uint32_t MilvusService_SearchVector_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); - xfer += oprot->writeStructBegin("MegasearchService_SearchVector_pargs"); + xfer += oprot->writeStructBegin("MilvusService_SearchVector_pargs"); xfer += oprot->writeFieldBegin("table_name", ::apache::thrift::protocol::T_STRING, 2); xfer += oprot->writeString((*(this->table_name))); @@ -849,11 +849,11 @@ uint32_t MegasearchService_SearchVector_pargs::write(::apache::thrift::protocol: } -MegasearchService_SearchVector_result::~MegasearchService_SearchVector_result() throw() { +MilvusService_SearchVector_result::~MilvusService_SearchVector_result() throw() { } -uint32_t MegasearchService_SearchVector_result::read(::apache::thrift::protocol::TProtocol* iprot) { +uint32_t MilvusService_SearchVector_result::read(::apache::thrift::protocol::TProtocol* iprot) { ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; @@ -914,11 +914,11 @@ uint32_t MegasearchService_SearchVector_result::read(::apache::thrift::protocol: return xfer; } -uint32_t MegasearchService_SearchVector_result::write(::apache::thrift::protocol::TProtocol* oprot) const { +uint32_t MilvusService_SearchVector_result::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; - xfer += oprot->writeStructBegin("MegasearchService_SearchVector_result"); + xfer += oprot->writeStructBegin("MilvusService_SearchVector_result"); if (this->__isset.success) { xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0); @@ -943,11 +943,11 @@ uint32_t MegasearchService_SearchVector_result::write(::apache::thrift::protocol } -MegasearchService_SearchVector_presult::~MegasearchService_SearchVector_presult() throw() { +MilvusService_SearchVector_presult::~MilvusService_SearchVector_presult() throw() { } -uint32_t MegasearchService_SearchVector_presult::read(::apache::thrift::protocol::TProtocol* iprot) { +uint32_t MilvusService_SearchVector_presult::read(::apache::thrift::protocol::TProtocol* iprot) { ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; @@ -1009,11 +1009,11 @@ uint32_t MegasearchService_SearchVector_presult::read(::apache::thrift::protocol } -MegasearchService_DescribeTable_args::~MegasearchService_DescribeTable_args() throw() { +MilvusService_DescribeTable_args::~MilvusService_DescribeTable_args() throw() { } -uint32_t MegasearchService_DescribeTable_args::read(::apache::thrift::protocol::TProtocol* iprot) { +uint32_t MilvusService_DescribeTable_args::read(::apache::thrift::protocol::TProtocol* iprot) { ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; @@ -1054,10 +1054,10 @@ uint32_t MegasearchService_DescribeTable_args::read(::apache::thrift::protocol:: return xfer; } -uint32_t MegasearchService_DescribeTable_args::write(::apache::thrift::protocol::TProtocol* oprot) const { +uint32_t MilvusService_DescribeTable_args::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); - xfer += oprot->writeStructBegin("MegasearchService_DescribeTable_args"); + xfer += oprot->writeStructBegin("MilvusService_DescribeTable_args"); xfer += oprot->writeFieldBegin("table_name", ::apache::thrift::protocol::T_STRING, 2); xfer += oprot->writeString(this->table_name); @@ -1069,14 +1069,14 @@ uint32_t MegasearchService_DescribeTable_args::write(::apache::thrift::protocol: } -MegasearchService_DescribeTable_pargs::~MegasearchService_DescribeTable_pargs() throw() { +MilvusService_DescribeTable_pargs::~MilvusService_DescribeTable_pargs() throw() { } -uint32_t MegasearchService_DescribeTable_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const { +uint32_t MilvusService_DescribeTable_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); - xfer += oprot->writeStructBegin("MegasearchService_DescribeTable_pargs"); + xfer += oprot->writeStructBegin("MilvusService_DescribeTable_pargs"); xfer += oprot->writeFieldBegin("table_name", ::apache::thrift::protocol::T_STRING, 2); xfer += oprot->writeString((*(this->table_name))); @@ -1088,11 +1088,11 @@ uint32_t MegasearchService_DescribeTable_pargs::write(::apache::thrift::protocol } -MegasearchService_DescribeTable_result::~MegasearchService_DescribeTable_result() throw() { +MilvusService_DescribeTable_result::~MilvusService_DescribeTable_result() throw() { } -uint32_t MegasearchService_DescribeTable_result::read(::apache::thrift::protocol::TProtocol* iprot) { +uint32_t MilvusService_DescribeTable_result::read(::apache::thrift::protocol::TProtocol* iprot) { ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; @@ -1141,11 +1141,11 @@ uint32_t MegasearchService_DescribeTable_result::read(::apache::thrift::protocol return xfer; } -uint32_t MegasearchService_DescribeTable_result::write(::apache::thrift::protocol::TProtocol* oprot) const { +uint32_t MilvusService_DescribeTable_result::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; - xfer += oprot->writeStructBegin("MegasearchService_DescribeTable_result"); + xfer += oprot->writeStructBegin("MilvusService_DescribeTable_result"); if (this->__isset.success) { xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRUCT, 0); @@ -1162,11 +1162,11 @@ uint32_t MegasearchService_DescribeTable_result::write(::apache::thrift::protoco } -MegasearchService_DescribeTable_presult::~MegasearchService_DescribeTable_presult() throw() { +MilvusService_DescribeTable_presult::~MilvusService_DescribeTable_presult() throw() { } -uint32_t MegasearchService_DescribeTable_presult::read(::apache::thrift::protocol::TProtocol* iprot) { +uint32_t MilvusService_DescribeTable_presult::read(::apache::thrift::protocol::TProtocol* iprot) { ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; @@ -1216,11 +1216,11 @@ uint32_t MegasearchService_DescribeTable_presult::read(::apache::thrift::protoco } -MegasearchService_GetTableRowCount_args::~MegasearchService_GetTableRowCount_args() throw() { +MilvusService_GetTableRowCount_args::~MilvusService_GetTableRowCount_args() throw() { } -uint32_t MegasearchService_GetTableRowCount_args::read(::apache::thrift::protocol::TProtocol* iprot) { +uint32_t MilvusService_GetTableRowCount_args::read(::apache::thrift::protocol::TProtocol* iprot) { ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; @@ -1261,10 +1261,10 @@ uint32_t MegasearchService_GetTableRowCount_args::read(::apache::thrift::protoco return xfer; } -uint32_t MegasearchService_GetTableRowCount_args::write(::apache::thrift::protocol::TProtocol* oprot) const { +uint32_t MilvusService_GetTableRowCount_args::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); - xfer += oprot->writeStructBegin("MegasearchService_GetTableRowCount_args"); + xfer += oprot->writeStructBegin("MilvusService_GetTableRowCount_args"); xfer += oprot->writeFieldBegin("table_name", ::apache::thrift::protocol::T_STRING, 2); xfer += oprot->writeString(this->table_name); @@ -1276,14 +1276,14 @@ uint32_t MegasearchService_GetTableRowCount_args::write(::apache::thrift::protoc } -MegasearchService_GetTableRowCount_pargs::~MegasearchService_GetTableRowCount_pargs() throw() { +MilvusService_GetTableRowCount_pargs::~MilvusService_GetTableRowCount_pargs() throw() { } -uint32_t MegasearchService_GetTableRowCount_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const { +uint32_t MilvusService_GetTableRowCount_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); - xfer += oprot->writeStructBegin("MegasearchService_GetTableRowCount_pargs"); + xfer += oprot->writeStructBegin("MilvusService_GetTableRowCount_pargs"); xfer += oprot->writeFieldBegin("table_name", ::apache::thrift::protocol::T_STRING, 2); xfer += oprot->writeString((*(this->table_name))); @@ -1295,11 +1295,11 @@ uint32_t MegasearchService_GetTableRowCount_pargs::write(::apache::thrift::proto } -MegasearchService_GetTableRowCount_result::~MegasearchService_GetTableRowCount_result() throw() { +MilvusService_GetTableRowCount_result::~MilvusService_GetTableRowCount_result() throw() { } -uint32_t MegasearchService_GetTableRowCount_result::read(::apache::thrift::protocol::TProtocol* iprot) { +uint32_t MilvusService_GetTableRowCount_result::read(::apache::thrift::protocol::TProtocol* iprot) { ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; @@ -1348,11 +1348,11 @@ uint32_t MegasearchService_GetTableRowCount_result::read(::apache::thrift::proto return xfer; } -uint32_t MegasearchService_GetTableRowCount_result::write(::apache::thrift::protocol::TProtocol* oprot) const { +uint32_t MilvusService_GetTableRowCount_result::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; - xfer += oprot->writeStructBegin("MegasearchService_GetTableRowCount_result"); + xfer += oprot->writeStructBegin("MilvusService_GetTableRowCount_result"); if (this->__isset.success) { xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_I64, 0); @@ -1369,11 +1369,11 @@ uint32_t MegasearchService_GetTableRowCount_result::write(::apache::thrift::prot } -MegasearchService_GetTableRowCount_presult::~MegasearchService_GetTableRowCount_presult() throw() { +MilvusService_GetTableRowCount_presult::~MilvusService_GetTableRowCount_presult() throw() { } -uint32_t MegasearchService_GetTableRowCount_presult::read(::apache::thrift::protocol::TProtocol* iprot) { +uint32_t MilvusService_GetTableRowCount_presult::read(::apache::thrift::protocol::TProtocol* iprot) { ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; @@ -1423,11 +1423,11 @@ uint32_t MegasearchService_GetTableRowCount_presult::read(::apache::thrift::prot } -MegasearchService_ShowTables_args::~MegasearchService_ShowTables_args() throw() { +MilvusService_ShowTables_args::~MilvusService_ShowTables_args() throw() { } -uint32_t MegasearchService_ShowTables_args::read(::apache::thrift::protocol::TProtocol* iprot) { +uint32_t MilvusService_ShowTables_args::read(::apache::thrift::protocol::TProtocol* iprot) { ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; @@ -1455,10 +1455,10 @@ uint32_t MegasearchService_ShowTables_args::read(::apache::thrift::protocol::TPr return xfer; } -uint32_t MegasearchService_ShowTables_args::write(::apache::thrift::protocol::TProtocol* oprot) const { +uint32_t MilvusService_ShowTables_args::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); - xfer += oprot->writeStructBegin("MegasearchService_ShowTables_args"); + xfer += oprot->writeStructBegin("MilvusService_ShowTables_args"); xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); @@ -1466,14 +1466,14 @@ uint32_t MegasearchService_ShowTables_args::write(::apache::thrift::protocol::TP } -MegasearchService_ShowTables_pargs::~MegasearchService_ShowTables_pargs() throw() { +MilvusService_ShowTables_pargs::~MilvusService_ShowTables_pargs() throw() { } -uint32_t MegasearchService_ShowTables_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const { +uint32_t MilvusService_ShowTables_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); - xfer += oprot->writeStructBegin("MegasearchService_ShowTables_pargs"); + xfer += oprot->writeStructBegin("MilvusService_ShowTables_pargs"); xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); @@ -1481,11 +1481,11 @@ uint32_t MegasearchService_ShowTables_pargs::write(::apache::thrift::protocol::T } -MegasearchService_ShowTables_result::~MegasearchService_ShowTables_result() throw() { +MilvusService_ShowTables_result::~MilvusService_ShowTables_result() throw() { } -uint32_t MegasearchService_ShowTables_result::read(::apache::thrift::protocol::TProtocol* iprot) { +uint32_t MilvusService_ShowTables_result::read(::apache::thrift::protocol::TProtocol* iprot) { ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; @@ -1546,11 +1546,11 @@ uint32_t MegasearchService_ShowTables_result::read(::apache::thrift::protocol::T return xfer; } -uint32_t MegasearchService_ShowTables_result::write(::apache::thrift::protocol::TProtocol* oprot) const { +uint32_t MilvusService_ShowTables_result::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; - xfer += oprot->writeStructBegin("MegasearchService_ShowTables_result"); + xfer += oprot->writeStructBegin("MilvusService_ShowTables_result"); if (this->__isset.success) { xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0); @@ -1575,11 +1575,11 @@ uint32_t MegasearchService_ShowTables_result::write(::apache::thrift::protocol:: } -MegasearchService_ShowTables_presult::~MegasearchService_ShowTables_presult() throw() { +MilvusService_ShowTables_presult::~MilvusService_ShowTables_presult() throw() { } -uint32_t MegasearchService_ShowTables_presult::read(::apache::thrift::protocol::TProtocol* iprot) { +uint32_t MilvusService_ShowTables_presult::read(::apache::thrift::protocol::TProtocol* iprot) { ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; @@ -1641,11 +1641,11 @@ uint32_t MegasearchService_ShowTables_presult::read(::apache::thrift::protocol:: } -MegasearchService_Ping_args::~MegasearchService_Ping_args() throw() { +MilvusService_Ping_args::~MilvusService_Ping_args() throw() { } -uint32_t MegasearchService_Ping_args::read(::apache::thrift::protocol::TProtocol* iprot) { +uint32_t MilvusService_Ping_args::read(::apache::thrift::protocol::TProtocol* iprot) { ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; @@ -1686,10 +1686,10 @@ uint32_t MegasearchService_Ping_args::read(::apache::thrift::protocol::TProtocol return xfer; } -uint32_t MegasearchService_Ping_args::write(::apache::thrift::protocol::TProtocol* oprot) const { +uint32_t MilvusService_Ping_args::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); - xfer += oprot->writeStructBegin("MegasearchService_Ping_args"); + xfer += oprot->writeStructBegin("MilvusService_Ping_args"); xfer += oprot->writeFieldBegin("cmd", ::apache::thrift::protocol::T_STRING, 2); xfer += oprot->writeString(this->cmd); @@ -1701,14 +1701,14 @@ uint32_t MegasearchService_Ping_args::write(::apache::thrift::protocol::TProtoco } -MegasearchService_Ping_pargs::~MegasearchService_Ping_pargs() throw() { +MilvusService_Ping_pargs::~MilvusService_Ping_pargs() throw() { } -uint32_t MegasearchService_Ping_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const { +uint32_t MilvusService_Ping_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); - xfer += oprot->writeStructBegin("MegasearchService_Ping_pargs"); + xfer += oprot->writeStructBegin("MilvusService_Ping_pargs"); xfer += oprot->writeFieldBegin("cmd", ::apache::thrift::protocol::T_STRING, 2); xfer += oprot->writeString((*(this->cmd))); @@ -1720,11 +1720,11 @@ uint32_t MegasearchService_Ping_pargs::write(::apache::thrift::protocol::TProtoc } -MegasearchService_Ping_result::~MegasearchService_Ping_result() throw() { +MilvusService_Ping_result::~MilvusService_Ping_result() throw() { } -uint32_t MegasearchService_Ping_result::read(::apache::thrift::protocol::TProtocol* iprot) { +uint32_t MilvusService_Ping_result::read(::apache::thrift::protocol::TProtocol* iprot) { ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; @@ -1773,11 +1773,11 @@ uint32_t MegasearchService_Ping_result::read(::apache::thrift::protocol::TProtoc return xfer; } -uint32_t MegasearchService_Ping_result::write(::apache::thrift::protocol::TProtocol* oprot) const { +uint32_t MilvusService_Ping_result::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; - xfer += oprot->writeStructBegin("MegasearchService_Ping_result"); + xfer += oprot->writeStructBegin("MilvusService_Ping_result"); if (this->__isset.success) { xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRING, 0); @@ -1794,11 +1794,11 @@ uint32_t MegasearchService_Ping_result::write(::apache::thrift::protocol::TProto } -MegasearchService_Ping_presult::~MegasearchService_Ping_presult() throw() { +MilvusService_Ping_presult::~MilvusService_Ping_presult() throw() { } -uint32_t MegasearchService_Ping_presult::read(::apache::thrift::protocol::TProtocol* iprot) { +uint32_t MilvusService_Ping_presult::read(::apache::thrift::protocol::TProtocol* iprot) { ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; @@ -1847,18 +1847,18 @@ uint32_t MegasearchService_Ping_presult::read(::apache::thrift::protocol::TProto return xfer; } -void MegasearchServiceClient::CreateTable(const TableSchema& param) +void MilvusServiceClient::CreateTable(const TableSchema& param) { send_CreateTable(param); recv_CreateTable(); } -void MegasearchServiceClient::send_CreateTable(const TableSchema& param) +void MilvusServiceClient::send_CreateTable(const TableSchema& param) { int32_t cseqid = 0; oprot_->writeMessageBegin("CreateTable", ::apache::thrift::protocol::T_CALL, cseqid); - MegasearchService_CreateTable_pargs args; + MilvusService_CreateTable_pargs args; args.param = ¶m; args.write(oprot_); @@ -1867,7 +1867,7 @@ void MegasearchServiceClient::send_CreateTable(const TableSchema& param) oprot_->getTransport()->flush(); } -void MegasearchServiceClient::recv_CreateTable() +void MilvusServiceClient::recv_CreateTable() { int32_t rseqid = 0; @@ -1892,7 +1892,7 @@ void MegasearchServiceClient::recv_CreateTable() iprot_->readMessageEnd(); iprot_->getTransport()->readEnd(); } - MegasearchService_CreateTable_presult result; + MilvusService_CreateTable_presult result; result.read(iprot_); iprot_->readMessageEnd(); iprot_->getTransport()->readEnd(); @@ -1903,18 +1903,18 @@ void MegasearchServiceClient::recv_CreateTable() return; } -void MegasearchServiceClient::DeleteTable(const std::string& table_name) +void MilvusServiceClient::DeleteTable(const std::string& table_name) { send_DeleteTable(table_name); recv_DeleteTable(); } -void MegasearchServiceClient::send_DeleteTable(const std::string& table_name) +void MilvusServiceClient::send_DeleteTable(const std::string& table_name) { int32_t cseqid = 0; oprot_->writeMessageBegin("DeleteTable", ::apache::thrift::protocol::T_CALL, cseqid); - MegasearchService_DeleteTable_pargs args; + MilvusService_DeleteTable_pargs args; args.table_name = &table_name; args.write(oprot_); @@ -1923,7 +1923,7 @@ void MegasearchServiceClient::send_DeleteTable(const std::string& table_name) oprot_->getTransport()->flush(); } -void MegasearchServiceClient::recv_DeleteTable() +void MilvusServiceClient::recv_DeleteTable() { int32_t rseqid = 0; @@ -1948,7 +1948,7 @@ void MegasearchServiceClient::recv_DeleteTable() iprot_->readMessageEnd(); iprot_->getTransport()->readEnd(); } - MegasearchService_DeleteTable_presult result; + MilvusService_DeleteTable_presult result; result.read(iprot_); iprot_->readMessageEnd(); iprot_->getTransport()->readEnd(); @@ -1959,18 +1959,18 @@ void MegasearchServiceClient::recv_DeleteTable() return; } -void MegasearchServiceClient::AddVector(std::vector & _return, const std::string& table_name, const std::vector & record_array) +void MilvusServiceClient::AddVector(std::vector & _return, const std::string& table_name, const std::vector & record_array) { send_AddVector(table_name, record_array); recv_AddVector(_return); } -void MegasearchServiceClient::send_AddVector(const std::string& table_name, const std::vector & record_array) +void MilvusServiceClient::send_AddVector(const std::string& table_name, const std::vector & record_array) { int32_t cseqid = 0; oprot_->writeMessageBegin("AddVector", ::apache::thrift::protocol::T_CALL, cseqid); - MegasearchService_AddVector_pargs args; + MilvusService_AddVector_pargs args; args.table_name = &table_name; args.record_array = &record_array; args.write(oprot_); @@ -1980,7 +1980,7 @@ void MegasearchServiceClient::send_AddVector(const std::string& table_name, cons oprot_->getTransport()->flush(); } -void MegasearchServiceClient::recv_AddVector(std::vector & _return) +void MilvusServiceClient::recv_AddVector(std::vector & _return) { int32_t rseqid = 0; @@ -2005,7 +2005,7 @@ void MegasearchServiceClient::recv_AddVector(std::vector & _return) iprot_->readMessageEnd(); iprot_->getTransport()->readEnd(); } - MegasearchService_AddVector_presult result; + MilvusService_AddVector_presult result; result.success = &_return; result.read(iprot_); iprot_->readMessageEnd(); @@ -2021,18 +2021,18 @@ void MegasearchServiceClient::recv_AddVector(std::vector & _return) throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "AddVector failed: unknown result"); } -void MegasearchServiceClient::SearchVector(std::vector & _return, const std::string& table_name, const std::vector & query_record_array, const std::vector & query_range_array, const int64_t topk) +void MilvusServiceClient::SearchVector(std::vector & _return, const std::string& table_name, const std::vector & query_record_array, const std::vector & query_range_array, const int64_t topk) { send_SearchVector(table_name, query_record_array, query_range_array, topk); recv_SearchVector(_return); } -void MegasearchServiceClient::send_SearchVector(const std::string& table_name, const std::vector & query_record_array, const std::vector & query_range_array, const int64_t topk) +void MilvusServiceClient::send_SearchVector(const std::string& table_name, const std::vector & query_record_array, const std::vector & query_range_array, const int64_t topk) { int32_t cseqid = 0; oprot_->writeMessageBegin("SearchVector", ::apache::thrift::protocol::T_CALL, cseqid); - MegasearchService_SearchVector_pargs args; + MilvusService_SearchVector_pargs args; args.table_name = &table_name; args.query_record_array = &query_record_array; args.query_range_array = &query_range_array; @@ -2044,7 +2044,7 @@ void MegasearchServiceClient::send_SearchVector(const std::string& table_name, c oprot_->getTransport()->flush(); } -void MegasearchServiceClient::recv_SearchVector(std::vector & _return) +void MilvusServiceClient::recv_SearchVector(std::vector & _return) { int32_t rseqid = 0; @@ -2069,7 +2069,7 @@ void MegasearchServiceClient::recv_SearchVector(std::vector & _ iprot_->readMessageEnd(); iprot_->getTransport()->readEnd(); } - MegasearchService_SearchVector_presult result; + MilvusService_SearchVector_presult result; result.success = &_return; result.read(iprot_); iprot_->readMessageEnd(); @@ -2085,18 +2085,18 @@ void MegasearchServiceClient::recv_SearchVector(std::vector & _ throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "SearchVector failed: unknown result"); } -void MegasearchServiceClient::DescribeTable(TableSchema& _return, const std::string& table_name) +void MilvusServiceClient::DescribeTable(TableSchema& _return, const std::string& table_name) { send_DescribeTable(table_name); recv_DescribeTable(_return); } -void MegasearchServiceClient::send_DescribeTable(const std::string& table_name) +void MilvusServiceClient::send_DescribeTable(const std::string& table_name) { int32_t cseqid = 0; oprot_->writeMessageBegin("DescribeTable", ::apache::thrift::protocol::T_CALL, cseqid); - MegasearchService_DescribeTable_pargs args; + MilvusService_DescribeTable_pargs args; args.table_name = &table_name; args.write(oprot_); @@ -2105,7 +2105,7 @@ void MegasearchServiceClient::send_DescribeTable(const std::string& table_name) oprot_->getTransport()->flush(); } -void MegasearchServiceClient::recv_DescribeTable(TableSchema& _return) +void MilvusServiceClient::recv_DescribeTable(TableSchema& _return) { int32_t rseqid = 0; @@ -2130,7 +2130,7 @@ void MegasearchServiceClient::recv_DescribeTable(TableSchema& _return) iprot_->readMessageEnd(); iprot_->getTransport()->readEnd(); } - MegasearchService_DescribeTable_presult result; + MilvusService_DescribeTable_presult result; result.success = &_return; result.read(iprot_); iprot_->readMessageEnd(); @@ -2146,18 +2146,18 @@ void MegasearchServiceClient::recv_DescribeTable(TableSchema& _return) throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "DescribeTable failed: unknown result"); } -int64_t MegasearchServiceClient::GetTableRowCount(const std::string& table_name) +int64_t MilvusServiceClient::GetTableRowCount(const std::string& table_name) { send_GetTableRowCount(table_name); return recv_GetTableRowCount(); } -void MegasearchServiceClient::send_GetTableRowCount(const std::string& table_name) +void MilvusServiceClient::send_GetTableRowCount(const std::string& table_name) { int32_t cseqid = 0; oprot_->writeMessageBegin("GetTableRowCount", ::apache::thrift::protocol::T_CALL, cseqid); - MegasearchService_GetTableRowCount_pargs args; + MilvusService_GetTableRowCount_pargs args; args.table_name = &table_name; args.write(oprot_); @@ -2166,7 +2166,7 @@ void MegasearchServiceClient::send_GetTableRowCount(const std::string& table_nam oprot_->getTransport()->flush(); } -int64_t MegasearchServiceClient::recv_GetTableRowCount() +int64_t MilvusServiceClient::recv_GetTableRowCount() { int32_t rseqid = 0; @@ -2192,7 +2192,7 @@ int64_t MegasearchServiceClient::recv_GetTableRowCount() iprot_->getTransport()->readEnd(); } int64_t _return; - MegasearchService_GetTableRowCount_presult result; + MilvusService_GetTableRowCount_presult result; result.success = &_return; result.read(iprot_); iprot_->readMessageEnd(); @@ -2207,18 +2207,18 @@ int64_t MegasearchServiceClient::recv_GetTableRowCount() throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "GetTableRowCount failed: unknown result"); } -void MegasearchServiceClient::ShowTables(std::vector & _return) +void MilvusServiceClient::ShowTables(std::vector & _return) { send_ShowTables(); recv_ShowTables(_return); } -void MegasearchServiceClient::send_ShowTables() +void MilvusServiceClient::send_ShowTables() { int32_t cseqid = 0; oprot_->writeMessageBegin("ShowTables", ::apache::thrift::protocol::T_CALL, cseqid); - MegasearchService_ShowTables_pargs args; + MilvusService_ShowTables_pargs args; args.write(oprot_); oprot_->writeMessageEnd(); @@ -2226,7 +2226,7 @@ void MegasearchServiceClient::send_ShowTables() oprot_->getTransport()->flush(); } -void MegasearchServiceClient::recv_ShowTables(std::vector & _return) +void MilvusServiceClient::recv_ShowTables(std::vector & _return) { int32_t rseqid = 0; @@ -2251,7 +2251,7 @@ void MegasearchServiceClient::recv_ShowTables(std::vector & _return iprot_->readMessageEnd(); iprot_->getTransport()->readEnd(); } - MegasearchService_ShowTables_presult result; + MilvusService_ShowTables_presult result; result.success = &_return; result.read(iprot_); iprot_->readMessageEnd(); @@ -2267,18 +2267,18 @@ void MegasearchServiceClient::recv_ShowTables(std::vector & _return throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "ShowTables failed: unknown result"); } -void MegasearchServiceClient::Ping(std::string& _return, const std::string& cmd) +void MilvusServiceClient::Ping(std::string& _return, const std::string& cmd) { send_Ping(cmd); recv_Ping(_return); } -void MegasearchServiceClient::send_Ping(const std::string& cmd) +void MilvusServiceClient::send_Ping(const std::string& cmd) { int32_t cseqid = 0; oprot_->writeMessageBegin("Ping", ::apache::thrift::protocol::T_CALL, cseqid); - MegasearchService_Ping_pargs args; + MilvusService_Ping_pargs args; args.cmd = &cmd; args.write(oprot_); @@ -2287,7 +2287,7 @@ void MegasearchServiceClient::send_Ping(const std::string& cmd) oprot_->getTransport()->flush(); } -void MegasearchServiceClient::recv_Ping(std::string& _return) +void MilvusServiceClient::recv_Ping(std::string& _return) { int32_t rseqid = 0; @@ -2312,7 +2312,7 @@ void MegasearchServiceClient::recv_Ping(std::string& _return) iprot_->readMessageEnd(); iprot_->getTransport()->readEnd(); } - MegasearchService_Ping_presult result; + MilvusService_Ping_presult result; result.success = &_return; result.read(iprot_); iprot_->readMessageEnd(); @@ -2328,7 +2328,7 @@ void MegasearchServiceClient::recv_Ping(std::string& _return) throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "Ping failed: unknown result"); } -bool MegasearchServiceProcessor::dispatchCall(::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, const std::string& fname, int32_t seqid, void* callContext) { +bool MilvusServiceProcessor::dispatchCall(::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, const std::string& fname, int32_t seqid, void* callContext) { ProcessMap::iterator pfn; pfn = processMap_.find(fname); if (pfn == processMap_.end()) { @@ -2347,28 +2347,28 @@ bool MegasearchServiceProcessor::dispatchCall(::apache::thrift::protocol::TProto return true; } -void MegasearchServiceProcessor::process_CreateTable(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext) +void MilvusServiceProcessor::process_CreateTable(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext) { void* ctx = NULL; if (this->eventHandler_.get() != NULL) { - ctx = this->eventHandler_->getContext("MegasearchService.CreateTable", callContext); + ctx = this->eventHandler_->getContext("MilvusService.CreateTable", callContext); } - ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "MegasearchService.CreateTable"); + ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "MilvusService.CreateTable"); if (this->eventHandler_.get() != NULL) { - this->eventHandler_->preRead(ctx, "MegasearchService.CreateTable"); + this->eventHandler_->preRead(ctx, "MilvusService.CreateTable"); } - MegasearchService_CreateTable_args args; + MilvusService_CreateTable_args args; args.read(iprot); iprot->readMessageEnd(); uint32_t bytes = iprot->getTransport()->readEnd(); if (this->eventHandler_.get() != NULL) { - this->eventHandler_->postRead(ctx, "MegasearchService.CreateTable", bytes); + this->eventHandler_->postRead(ctx, "MilvusService.CreateTable", bytes); } - MegasearchService_CreateTable_result result; + MilvusService_CreateTable_result result; try { iface_->CreateTable(args.param); } catch (Exception &e) { @@ -2376,7 +2376,7 @@ void MegasearchServiceProcessor::process_CreateTable(int32_t seqid, ::apache::th result.__isset.e = true; } catch (const std::exception& e) { if (this->eventHandler_.get() != NULL) { - this->eventHandler_->handlerError(ctx, "MegasearchService.CreateTable"); + this->eventHandler_->handlerError(ctx, "MilvusService.CreateTable"); } ::apache::thrift::TApplicationException x(e.what()); @@ -2389,7 +2389,7 @@ void MegasearchServiceProcessor::process_CreateTable(int32_t seqid, ::apache::th } if (this->eventHandler_.get() != NULL) { - this->eventHandler_->preWrite(ctx, "MegasearchService.CreateTable"); + this->eventHandler_->preWrite(ctx, "MilvusService.CreateTable"); } oprot->writeMessageBegin("CreateTable", ::apache::thrift::protocol::T_REPLY, seqid); @@ -2399,32 +2399,32 @@ void MegasearchServiceProcessor::process_CreateTable(int32_t seqid, ::apache::th oprot->getTransport()->flush(); if (this->eventHandler_.get() != NULL) { - this->eventHandler_->postWrite(ctx, "MegasearchService.CreateTable", bytes); + this->eventHandler_->postWrite(ctx, "MilvusService.CreateTable", bytes); } } -void MegasearchServiceProcessor::process_DeleteTable(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext) +void MilvusServiceProcessor::process_DeleteTable(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext) { void* ctx = NULL; if (this->eventHandler_.get() != NULL) { - ctx = this->eventHandler_->getContext("MegasearchService.DeleteTable", callContext); + ctx = this->eventHandler_->getContext("MilvusService.DeleteTable", callContext); } - ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "MegasearchService.DeleteTable"); + ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "MilvusService.DeleteTable"); if (this->eventHandler_.get() != NULL) { - this->eventHandler_->preRead(ctx, "MegasearchService.DeleteTable"); + this->eventHandler_->preRead(ctx, "MilvusService.DeleteTable"); } - MegasearchService_DeleteTable_args args; + MilvusService_DeleteTable_args args; args.read(iprot); iprot->readMessageEnd(); uint32_t bytes = iprot->getTransport()->readEnd(); if (this->eventHandler_.get() != NULL) { - this->eventHandler_->postRead(ctx, "MegasearchService.DeleteTable", bytes); + this->eventHandler_->postRead(ctx, "MilvusService.DeleteTable", bytes); } - MegasearchService_DeleteTable_result result; + MilvusService_DeleteTable_result result; try { iface_->DeleteTable(args.table_name); } catch (Exception &e) { @@ -2432,7 +2432,7 @@ void MegasearchServiceProcessor::process_DeleteTable(int32_t seqid, ::apache::th result.__isset.e = true; } catch (const std::exception& e) { if (this->eventHandler_.get() != NULL) { - this->eventHandler_->handlerError(ctx, "MegasearchService.DeleteTable"); + this->eventHandler_->handlerError(ctx, "MilvusService.DeleteTable"); } ::apache::thrift::TApplicationException x(e.what()); @@ -2445,7 +2445,7 @@ void MegasearchServiceProcessor::process_DeleteTable(int32_t seqid, ::apache::th } if (this->eventHandler_.get() != NULL) { - this->eventHandler_->preWrite(ctx, "MegasearchService.DeleteTable"); + this->eventHandler_->preWrite(ctx, "MilvusService.DeleteTable"); } oprot->writeMessageBegin("DeleteTable", ::apache::thrift::protocol::T_REPLY, seqid); @@ -2455,32 +2455,32 @@ void MegasearchServiceProcessor::process_DeleteTable(int32_t seqid, ::apache::th oprot->getTransport()->flush(); if (this->eventHandler_.get() != NULL) { - this->eventHandler_->postWrite(ctx, "MegasearchService.DeleteTable", bytes); + this->eventHandler_->postWrite(ctx, "MilvusService.DeleteTable", bytes); } } -void MegasearchServiceProcessor::process_AddVector(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext) +void MilvusServiceProcessor::process_AddVector(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext) { void* ctx = NULL; if (this->eventHandler_.get() != NULL) { - ctx = this->eventHandler_->getContext("MegasearchService.AddVector", callContext); + ctx = this->eventHandler_->getContext("MilvusService.AddVector", callContext); } - ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "MegasearchService.AddVector"); + ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "MilvusService.AddVector"); if (this->eventHandler_.get() != NULL) { - this->eventHandler_->preRead(ctx, "MegasearchService.AddVector"); + this->eventHandler_->preRead(ctx, "MilvusService.AddVector"); } - MegasearchService_AddVector_args args; + MilvusService_AddVector_args args; args.read(iprot); iprot->readMessageEnd(); uint32_t bytes = iprot->getTransport()->readEnd(); if (this->eventHandler_.get() != NULL) { - this->eventHandler_->postRead(ctx, "MegasearchService.AddVector", bytes); + this->eventHandler_->postRead(ctx, "MilvusService.AddVector", bytes); } - MegasearchService_AddVector_result result; + MilvusService_AddVector_result result; try { iface_->AddVector(result.success, args.table_name, args.record_array); result.__isset.success = true; @@ -2489,7 +2489,7 @@ void MegasearchServiceProcessor::process_AddVector(int32_t seqid, ::apache::thri result.__isset.e = true; } catch (const std::exception& e) { if (this->eventHandler_.get() != NULL) { - this->eventHandler_->handlerError(ctx, "MegasearchService.AddVector"); + this->eventHandler_->handlerError(ctx, "MilvusService.AddVector"); } ::apache::thrift::TApplicationException x(e.what()); @@ -2502,7 +2502,7 @@ void MegasearchServiceProcessor::process_AddVector(int32_t seqid, ::apache::thri } if (this->eventHandler_.get() != NULL) { - this->eventHandler_->preWrite(ctx, "MegasearchService.AddVector"); + this->eventHandler_->preWrite(ctx, "MilvusService.AddVector"); } oprot->writeMessageBegin("AddVector", ::apache::thrift::protocol::T_REPLY, seqid); @@ -2512,32 +2512,32 @@ void MegasearchServiceProcessor::process_AddVector(int32_t seqid, ::apache::thri oprot->getTransport()->flush(); if (this->eventHandler_.get() != NULL) { - this->eventHandler_->postWrite(ctx, "MegasearchService.AddVector", bytes); + this->eventHandler_->postWrite(ctx, "MilvusService.AddVector", bytes); } } -void MegasearchServiceProcessor::process_SearchVector(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext) +void MilvusServiceProcessor::process_SearchVector(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext) { void* ctx = NULL; if (this->eventHandler_.get() != NULL) { - ctx = this->eventHandler_->getContext("MegasearchService.SearchVector", callContext); + ctx = this->eventHandler_->getContext("MilvusService.SearchVector", callContext); } - ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "MegasearchService.SearchVector"); + ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "MilvusService.SearchVector"); if (this->eventHandler_.get() != NULL) { - this->eventHandler_->preRead(ctx, "MegasearchService.SearchVector"); + this->eventHandler_->preRead(ctx, "MilvusService.SearchVector"); } - MegasearchService_SearchVector_args args; + MilvusService_SearchVector_args args; args.read(iprot); iprot->readMessageEnd(); uint32_t bytes = iprot->getTransport()->readEnd(); if (this->eventHandler_.get() != NULL) { - this->eventHandler_->postRead(ctx, "MegasearchService.SearchVector", bytes); + this->eventHandler_->postRead(ctx, "MilvusService.SearchVector", bytes); } - MegasearchService_SearchVector_result result; + MilvusService_SearchVector_result result; try { iface_->SearchVector(result.success, args.table_name, args.query_record_array, args.query_range_array, args.topk); result.__isset.success = true; @@ -2546,7 +2546,7 @@ void MegasearchServiceProcessor::process_SearchVector(int32_t seqid, ::apache::t result.__isset.e = true; } catch (const std::exception& e) { if (this->eventHandler_.get() != NULL) { - this->eventHandler_->handlerError(ctx, "MegasearchService.SearchVector"); + this->eventHandler_->handlerError(ctx, "MilvusService.SearchVector"); } ::apache::thrift::TApplicationException x(e.what()); @@ -2559,7 +2559,7 @@ void MegasearchServiceProcessor::process_SearchVector(int32_t seqid, ::apache::t } if (this->eventHandler_.get() != NULL) { - this->eventHandler_->preWrite(ctx, "MegasearchService.SearchVector"); + this->eventHandler_->preWrite(ctx, "MilvusService.SearchVector"); } oprot->writeMessageBegin("SearchVector", ::apache::thrift::protocol::T_REPLY, seqid); @@ -2569,32 +2569,32 @@ void MegasearchServiceProcessor::process_SearchVector(int32_t seqid, ::apache::t oprot->getTransport()->flush(); if (this->eventHandler_.get() != NULL) { - this->eventHandler_->postWrite(ctx, "MegasearchService.SearchVector", bytes); + this->eventHandler_->postWrite(ctx, "MilvusService.SearchVector", bytes); } } -void MegasearchServiceProcessor::process_DescribeTable(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext) +void MilvusServiceProcessor::process_DescribeTable(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext) { void* ctx = NULL; if (this->eventHandler_.get() != NULL) { - ctx = this->eventHandler_->getContext("MegasearchService.DescribeTable", callContext); + ctx = this->eventHandler_->getContext("MilvusService.DescribeTable", callContext); } - ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "MegasearchService.DescribeTable"); + ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "MilvusService.DescribeTable"); if (this->eventHandler_.get() != NULL) { - this->eventHandler_->preRead(ctx, "MegasearchService.DescribeTable"); + this->eventHandler_->preRead(ctx, "MilvusService.DescribeTable"); } - MegasearchService_DescribeTable_args args; + MilvusService_DescribeTable_args args; args.read(iprot); iprot->readMessageEnd(); uint32_t bytes = iprot->getTransport()->readEnd(); if (this->eventHandler_.get() != NULL) { - this->eventHandler_->postRead(ctx, "MegasearchService.DescribeTable", bytes); + this->eventHandler_->postRead(ctx, "MilvusService.DescribeTable", bytes); } - MegasearchService_DescribeTable_result result; + MilvusService_DescribeTable_result result; try { iface_->DescribeTable(result.success, args.table_name); result.__isset.success = true; @@ -2603,7 +2603,7 @@ void MegasearchServiceProcessor::process_DescribeTable(int32_t seqid, ::apache:: result.__isset.e = true; } catch (const std::exception& e) { if (this->eventHandler_.get() != NULL) { - this->eventHandler_->handlerError(ctx, "MegasearchService.DescribeTable"); + this->eventHandler_->handlerError(ctx, "MilvusService.DescribeTable"); } ::apache::thrift::TApplicationException x(e.what()); @@ -2616,7 +2616,7 @@ void MegasearchServiceProcessor::process_DescribeTable(int32_t seqid, ::apache:: } if (this->eventHandler_.get() != NULL) { - this->eventHandler_->preWrite(ctx, "MegasearchService.DescribeTable"); + this->eventHandler_->preWrite(ctx, "MilvusService.DescribeTable"); } oprot->writeMessageBegin("DescribeTable", ::apache::thrift::protocol::T_REPLY, seqid); @@ -2626,32 +2626,32 @@ void MegasearchServiceProcessor::process_DescribeTable(int32_t seqid, ::apache:: oprot->getTransport()->flush(); if (this->eventHandler_.get() != NULL) { - this->eventHandler_->postWrite(ctx, "MegasearchService.DescribeTable", bytes); + this->eventHandler_->postWrite(ctx, "MilvusService.DescribeTable", bytes); } } -void MegasearchServiceProcessor::process_GetTableRowCount(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext) +void MilvusServiceProcessor::process_GetTableRowCount(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext) { void* ctx = NULL; if (this->eventHandler_.get() != NULL) { - ctx = this->eventHandler_->getContext("MegasearchService.GetTableRowCount", callContext); + ctx = this->eventHandler_->getContext("MilvusService.GetTableRowCount", callContext); } - ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "MegasearchService.GetTableRowCount"); + ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "MilvusService.GetTableRowCount"); if (this->eventHandler_.get() != NULL) { - this->eventHandler_->preRead(ctx, "MegasearchService.GetTableRowCount"); + this->eventHandler_->preRead(ctx, "MilvusService.GetTableRowCount"); } - MegasearchService_GetTableRowCount_args args; + MilvusService_GetTableRowCount_args args; args.read(iprot); iprot->readMessageEnd(); uint32_t bytes = iprot->getTransport()->readEnd(); if (this->eventHandler_.get() != NULL) { - this->eventHandler_->postRead(ctx, "MegasearchService.GetTableRowCount", bytes); + this->eventHandler_->postRead(ctx, "MilvusService.GetTableRowCount", bytes); } - MegasearchService_GetTableRowCount_result result; + MilvusService_GetTableRowCount_result result; try { result.success = iface_->GetTableRowCount(args.table_name); result.__isset.success = true; @@ -2660,7 +2660,7 @@ void MegasearchServiceProcessor::process_GetTableRowCount(int32_t seqid, ::apach result.__isset.e = true; } catch (const std::exception& e) { if (this->eventHandler_.get() != NULL) { - this->eventHandler_->handlerError(ctx, "MegasearchService.GetTableRowCount"); + this->eventHandler_->handlerError(ctx, "MilvusService.GetTableRowCount"); } ::apache::thrift::TApplicationException x(e.what()); @@ -2673,7 +2673,7 @@ void MegasearchServiceProcessor::process_GetTableRowCount(int32_t seqid, ::apach } if (this->eventHandler_.get() != NULL) { - this->eventHandler_->preWrite(ctx, "MegasearchService.GetTableRowCount"); + this->eventHandler_->preWrite(ctx, "MilvusService.GetTableRowCount"); } oprot->writeMessageBegin("GetTableRowCount", ::apache::thrift::protocol::T_REPLY, seqid); @@ -2683,32 +2683,32 @@ void MegasearchServiceProcessor::process_GetTableRowCount(int32_t seqid, ::apach oprot->getTransport()->flush(); if (this->eventHandler_.get() != NULL) { - this->eventHandler_->postWrite(ctx, "MegasearchService.GetTableRowCount", bytes); + this->eventHandler_->postWrite(ctx, "MilvusService.GetTableRowCount", bytes); } } -void MegasearchServiceProcessor::process_ShowTables(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext) +void MilvusServiceProcessor::process_ShowTables(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext) { void* ctx = NULL; if (this->eventHandler_.get() != NULL) { - ctx = this->eventHandler_->getContext("MegasearchService.ShowTables", callContext); + ctx = this->eventHandler_->getContext("MilvusService.ShowTables", callContext); } - ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "MegasearchService.ShowTables"); + ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "MilvusService.ShowTables"); if (this->eventHandler_.get() != NULL) { - this->eventHandler_->preRead(ctx, "MegasearchService.ShowTables"); + this->eventHandler_->preRead(ctx, "MilvusService.ShowTables"); } - MegasearchService_ShowTables_args args; + MilvusService_ShowTables_args args; args.read(iprot); iprot->readMessageEnd(); uint32_t bytes = iprot->getTransport()->readEnd(); if (this->eventHandler_.get() != NULL) { - this->eventHandler_->postRead(ctx, "MegasearchService.ShowTables", bytes); + this->eventHandler_->postRead(ctx, "MilvusService.ShowTables", bytes); } - MegasearchService_ShowTables_result result; + MilvusService_ShowTables_result result; try { iface_->ShowTables(result.success); result.__isset.success = true; @@ -2717,7 +2717,7 @@ void MegasearchServiceProcessor::process_ShowTables(int32_t seqid, ::apache::thr result.__isset.e = true; } catch (const std::exception& e) { if (this->eventHandler_.get() != NULL) { - this->eventHandler_->handlerError(ctx, "MegasearchService.ShowTables"); + this->eventHandler_->handlerError(ctx, "MilvusService.ShowTables"); } ::apache::thrift::TApplicationException x(e.what()); @@ -2730,7 +2730,7 @@ void MegasearchServiceProcessor::process_ShowTables(int32_t seqid, ::apache::thr } if (this->eventHandler_.get() != NULL) { - this->eventHandler_->preWrite(ctx, "MegasearchService.ShowTables"); + this->eventHandler_->preWrite(ctx, "MilvusService.ShowTables"); } oprot->writeMessageBegin("ShowTables", ::apache::thrift::protocol::T_REPLY, seqid); @@ -2740,32 +2740,32 @@ void MegasearchServiceProcessor::process_ShowTables(int32_t seqid, ::apache::thr oprot->getTransport()->flush(); if (this->eventHandler_.get() != NULL) { - this->eventHandler_->postWrite(ctx, "MegasearchService.ShowTables", bytes); + this->eventHandler_->postWrite(ctx, "MilvusService.ShowTables", bytes); } } -void MegasearchServiceProcessor::process_Ping(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext) +void MilvusServiceProcessor::process_Ping(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext) { void* ctx = NULL; if (this->eventHandler_.get() != NULL) { - ctx = this->eventHandler_->getContext("MegasearchService.Ping", callContext); + ctx = this->eventHandler_->getContext("MilvusService.Ping", callContext); } - ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "MegasearchService.Ping"); + ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "MilvusService.Ping"); if (this->eventHandler_.get() != NULL) { - this->eventHandler_->preRead(ctx, "MegasearchService.Ping"); + this->eventHandler_->preRead(ctx, "MilvusService.Ping"); } - MegasearchService_Ping_args args; + MilvusService_Ping_args args; args.read(iprot); iprot->readMessageEnd(); uint32_t bytes = iprot->getTransport()->readEnd(); if (this->eventHandler_.get() != NULL) { - this->eventHandler_->postRead(ctx, "MegasearchService.Ping", bytes); + this->eventHandler_->postRead(ctx, "MilvusService.Ping", bytes); } - MegasearchService_Ping_result result; + MilvusService_Ping_result result; try { iface_->Ping(result.success, args.cmd); result.__isset.success = true; @@ -2774,7 +2774,7 @@ void MegasearchServiceProcessor::process_Ping(int32_t seqid, ::apache::thrift::p result.__isset.e = true; } catch (const std::exception& e) { if (this->eventHandler_.get() != NULL) { - this->eventHandler_->handlerError(ctx, "MegasearchService.Ping"); + this->eventHandler_->handlerError(ctx, "MilvusService.Ping"); } ::apache::thrift::TApplicationException x(e.what()); @@ -2787,7 +2787,7 @@ void MegasearchServiceProcessor::process_Ping(int32_t seqid, ::apache::thrift::p } if (this->eventHandler_.get() != NULL) { - this->eventHandler_->preWrite(ctx, "MegasearchService.Ping"); + this->eventHandler_->preWrite(ctx, "MilvusService.Ping"); } oprot->writeMessageBegin("Ping", ::apache::thrift::protocol::T_REPLY, seqid); @@ -2797,30 +2797,30 @@ void MegasearchServiceProcessor::process_Ping(int32_t seqid, ::apache::thrift::p oprot->getTransport()->flush(); if (this->eventHandler_.get() != NULL) { - this->eventHandler_->postWrite(ctx, "MegasearchService.Ping", bytes); + this->eventHandler_->postWrite(ctx, "MilvusService.Ping", bytes); } } -::apache::thrift::stdcxx::shared_ptr< ::apache::thrift::TProcessor > MegasearchServiceProcessorFactory::getProcessor(const ::apache::thrift::TConnectionInfo& connInfo) { - ::apache::thrift::ReleaseHandler< MegasearchServiceIfFactory > cleanup(handlerFactory_); - ::apache::thrift::stdcxx::shared_ptr< MegasearchServiceIf > handler(handlerFactory_->getHandler(connInfo), cleanup); - ::apache::thrift::stdcxx::shared_ptr< ::apache::thrift::TProcessor > processor(new MegasearchServiceProcessor(handler)); +::apache::thrift::stdcxx::shared_ptr< ::apache::thrift::TProcessor > MilvusServiceProcessorFactory::getProcessor(const ::apache::thrift::TConnectionInfo& connInfo) { + ::apache::thrift::ReleaseHandler< MilvusServiceIfFactory > cleanup(handlerFactory_); + ::apache::thrift::stdcxx::shared_ptr< MilvusServiceIf > handler(handlerFactory_->getHandler(connInfo), cleanup); + ::apache::thrift::stdcxx::shared_ptr< ::apache::thrift::TProcessor > processor(new MilvusServiceProcessor(handler)); return processor; } -void MegasearchServiceConcurrentClient::CreateTable(const TableSchema& param) +void MilvusServiceConcurrentClient::CreateTable(const TableSchema& param) { int32_t seqid = send_CreateTable(param); recv_CreateTable(seqid); } -int32_t MegasearchServiceConcurrentClient::send_CreateTable(const TableSchema& param) +int32_t MilvusServiceConcurrentClient::send_CreateTable(const TableSchema& param) { int32_t cseqid = this->sync_.generateSeqId(); ::apache::thrift::async::TConcurrentSendSentry sentry(&this->sync_); oprot_->writeMessageBegin("CreateTable", ::apache::thrift::protocol::T_CALL, cseqid); - MegasearchService_CreateTable_pargs args; + MilvusService_CreateTable_pargs args; args.param = ¶m; args.write(oprot_); @@ -2832,7 +2832,7 @@ int32_t MegasearchServiceConcurrentClient::send_CreateTable(const TableSchema& p return cseqid; } -void MegasearchServiceConcurrentClient::recv_CreateTable(const int32_t seqid) +void MilvusServiceConcurrentClient::recv_CreateTable(const int32_t seqid) { int32_t rseqid = 0; @@ -2870,7 +2870,7 @@ void MegasearchServiceConcurrentClient::recv_CreateTable(const int32_t seqid) using ::apache::thrift::protocol::TProtocolException; throw TProtocolException(TProtocolException::INVALID_DATA); } - MegasearchService_CreateTable_presult result; + MilvusService_CreateTable_presult result; result.read(iprot_); iprot_->readMessageEnd(); iprot_->getTransport()->readEnd(); @@ -2890,19 +2890,19 @@ void MegasearchServiceConcurrentClient::recv_CreateTable(const int32_t seqid) } // end while(true) } -void MegasearchServiceConcurrentClient::DeleteTable(const std::string& table_name) +void MilvusServiceConcurrentClient::DeleteTable(const std::string& table_name) { int32_t seqid = send_DeleteTable(table_name); recv_DeleteTable(seqid); } -int32_t MegasearchServiceConcurrentClient::send_DeleteTable(const std::string& table_name) +int32_t MilvusServiceConcurrentClient::send_DeleteTable(const std::string& table_name) { int32_t cseqid = this->sync_.generateSeqId(); ::apache::thrift::async::TConcurrentSendSentry sentry(&this->sync_); oprot_->writeMessageBegin("DeleteTable", ::apache::thrift::protocol::T_CALL, cseqid); - MegasearchService_DeleteTable_pargs args; + MilvusService_DeleteTable_pargs args; args.table_name = &table_name; args.write(oprot_); @@ -2914,7 +2914,7 @@ int32_t MegasearchServiceConcurrentClient::send_DeleteTable(const std::string& t return cseqid; } -void MegasearchServiceConcurrentClient::recv_DeleteTable(const int32_t seqid) +void MilvusServiceConcurrentClient::recv_DeleteTable(const int32_t seqid) { int32_t rseqid = 0; @@ -2952,7 +2952,7 @@ void MegasearchServiceConcurrentClient::recv_DeleteTable(const int32_t seqid) using ::apache::thrift::protocol::TProtocolException; throw TProtocolException(TProtocolException::INVALID_DATA); } - MegasearchService_DeleteTable_presult result; + MilvusService_DeleteTable_presult result; result.read(iprot_); iprot_->readMessageEnd(); iprot_->getTransport()->readEnd(); @@ -2972,19 +2972,19 @@ void MegasearchServiceConcurrentClient::recv_DeleteTable(const int32_t seqid) } // end while(true) } -void MegasearchServiceConcurrentClient::AddVector(std::vector & _return, const std::string& table_name, const std::vector & record_array) +void MilvusServiceConcurrentClient::AddVector(std::vector & _return, const std::string& table_name, const std::vector & record_array) { int32_t seqid = send_AddVector(table_name, record_array); recv_AddVector(_return, seqid); } -int32_t MegasearchServiceConcurrentClient::send_AddVector(const std::string& table_name, const std::vector & record_array) +int32_t MilvusServiceConcurrentClient::send_AddVector(const std::string& table_name, const std::vector & record_array) { int32_t cseqid = this->sync_.generateSeqId(); ::apache::thrift::async::TConcurrentSendSentry sentry(&this->sync_); oprot_->writeMessageBegin("AddVector", ::apache::thrift::protocol::T_CALL, cseqid); - MegasearchService_AddVector_pargs args; + MilvusService_AddVector_pargs args; args.table_name = &table_name; args.record_array = &record_array; args.write(oprot_); @@ -2997,7 +2997,7 @@ int32_t MegasearchServiceConcurrentClient::send_AddVector(const std::string& tab return cseqid; } -void MegasearchServiceConcurrentClient::recv_AddVector(std::vector & _return, const int32_t seqid) +void MilvusServiceConcurrentClient::recv_AddVector(std::vector & _return, const int32_t seqid) { int32_t rseqid = 0; @@ -3035,7 +3035,7 @@ void MegasearchServiceConcurrentClient::recv_AddVector(std::vector & _r using ::apache::thrift::protocol::TProtocolException; throw TProtocolException(TProtocolException::INVALID_DATA); } - MegasearchService_AddVector_presult result; + MilvusService_AddVector_presult result; result.success = &_return; result.read(iprot_); iprot_->readMessageEnd(); @@ -3061,19 +3061,19 @@ void MegasearchServiceConcurrentClient::recv_AddVector(std::vector & _r } // end while(true) } -void MegasearchServiceConcurrentClient::SearchVector(std::vector & _return, const std::string& table_name, const std::vector & query_record_array, const std::vector & query_range_array, const int64_t topk) +void MilvusServiceConcurrentClient::SearchVector(std::vector & _return, const std::string& table_name, const std::vector & query_record_array, const std::vector & query_range_array, const int64_t topk) { int32_t seqid = send_SearchVector(table_name, query_record_array, query_range_array, topk); recv_SearchVector(_return, seqid); } -int32_t MegasearchServiceConcurrentClient::send_SearchVector(const std::string& table_name, const std::vector & query_record_array, const std::vector & query_range_array, const int64_t topk) +int32_t MilvusServiceConcurrentClient::send_SearchVector(const std::string& table_name, const std::vector & query_record_array, const std::vector & query_range_array, const int64_t topk) { int32_t cseqid = this->sync_.generateSeqId(); ::apache::thrift::async::TConcurrentSendSentry sentry(&this->sync_); oprot_->writeMessageBegin("SearchVector", ::apache::thrift::protocol::T_CALL, cseqid); - MegasearchService_SearchVector_pargs args; + MilvusService_SearchVector_pargs args; args.table_name = &table_name; args.query_record_array = &query_record_array; args.query_range_array = &query_range_array; @@ -3088,7 +3088,7 @@ int32_t MegasearchServiceConcurrentClient::send_SearchVector(const std::string& return cseqid; } -void MegasearchServiceConcurrentClient::recv_SearchVector(std::vector & _return, const int32_t seqid) +void MilvusServiceConcurrentClient::recv_SearchVector(std::vector & _return, const int32_t seqid) { int32_t rseqid = 0; @@ -3126,7 +3126,7 @@ void MegasearchServiceConcurrentClient::recv_SearchVector(std::vectorreadMessageEnd(); @@ -3152,19 +3152,19 @@ void MegasearchServiceConcurrentClient::recv_SearchVector(std::vectorsync_.generateSeqId(); ::apache::thrift::async::TConcurrentSendSentry sentry(&this->sync_); oprot_->writeMessageBegin("DescribeTable", ::apache::thrift::protocol::T_CALL, cseqid); - MegasearchService_DescribeTable_pargs args; + MilvusService_DescribeTable_pargs args; args.table_name = &table_name; args.write(oprot_); @@ -3176,7 +3176,7 @@ int32_t MegasearchServiceConcurrentClient::send_DescribeTable(const std::string& return cseqid; } -void MegasearchServiceConcurrentClient::recv_DescribeTable(TableSchema& _return, const int32_t seqid) +void MilvusServiceConcurrentClient::recv_DescribeTable(TableSchema& _return, const int32_t seqid) { int32_t rseqid = 0; @@ -3214,7 +3214,7 @@ void MegasearchServiceConcurrentClient::recv_DescribeTable(TableSchema& _return, using ::apache::thrift::protocol::TProtocolException; throw TProtocolException(TProtocolException::INVALID_DATA); } - MegasearchService_DescribeTable_presult result; + MilvusService_DescribeTable_presult result; result.success = &_return; result.read(iprot_); iprot_->readMessageEnd(); @@ -3240,19 +3240,19 @@ void MegasearchServiceConcurrentClient::recv_DescribeTable(TableSchema& _return, } // end while(true) } -int64_t MegasearchServiceConcurrentClient::GetTableRowCount(const std::string& table_name) +int64_t MilvusServiceConcurrentClient::GetTableRowCount(const std::string& table_name) { int32_t seqid = send_GetTableRowCount(table_name); return recv_GetTableRowCount(seqid); } -int32_t MegasearchServiceConcurrentClient::send_GetTableRowCount(const std::string& table_name) +int32_t MilvusServiceConcurrentClient::send_GetTableRowCount(const std::string& table_name) { int32_t cseqid = this->sync_.generateSeqId(); ::apache::thrift::async::TConcurrentSendSentry sentry(&this->sync_); oprot_->writeMessageBegin("GetTableRowCount", ::apache::thrift::protocol::T_CALL, cseqid); - MegasearchService_GetTableRowCount_pargs args; + MilvusService_GetTableRowCount_pargs args; args.table_name = &table_name; args.write(oprot_); @@ -3264,7 +3264,7 @@ int32_t MegasearchServiceConcurrentClient::send_GetTableRowCount(const std::stri return cseqid; } -int64_t MegasearchServiceConcurrentClient::recv_GetTableRowCount(const int32_t seqid) +int64_t MilvusServiceConcurrentClient::recv_GetTableRowCount(const int32_t seqid) { int32_t rseqid = 0; @@ -3303,7 +3303,7 @@ int64_t MegasearchServiceConcurrentClient::recv_GetTableRowCount(const int32_t s throw TProtocolException(TProtocolException::INVALID_DATA); } int64_t _return; - MegasearchService_GetTableRowCount_presult result; + MilvusService_GetTableRowCount_presult result; result.success = &_return; result.read(iprot_); iprot_->readMessageEnd(); @@ -3328,19 +3328,19 @@ int64_t MegasearchServiceConcurrentClient::recv_GetTableRowCount(const int32_t s } // end while(true) } -void MegasearchServiceConcurrentClient::ShowTables(std::vector & _return) +void MilvusServiceConcurrentClient::ShowTables(std::vector & _return) { int32_t seqid = send_ShowTables(); recv_ShowTables(_return, seqid); } -int32_t MegasearchServiceConcurrentClient::send_ShowTables() +int32_t MilvusServiceConcurrentClient::send_ShowTables() { int32_t cseqid = this->sync_.generateSeqId(); ::apache::thrift::async::TConcurrentSendSentry sentry(&this->sync_); oprot_->writeMessageBegin("ShowTables", ::apache::thrift::protocol::T_CALL, cseqid); - MegasearchService_ShowTables_pargs args; + MilvusService_ShowTables_pargs args; args.write(oprot_); oprot_->writeMessageEnd(); @@ -3351,7 +3351,7 @@ int32_t MegasearchServiceConcurrentClient::send_ShowTables() return cseqid; } -void MegasearchServiceConcurrentClient::recv_ShowTables(std::vector & _return, const int32_t seqid) +void MilvusServiceConcurrentClient::recv_ShowTables(std::vector & _return, const int32_t seqid) { int32_t rseqid = 0; @@ -3389,7 +3389,7 @@ void MegasearchServiceConcurrentClient::recv_ShowTables(std::vector using ::apache::thrift::protocol::TProtocolException; throw TProtocolException(TProtocolException::INVALID_DATA); } - MegasearchService_ShowTables_presult result; + MilvusService_ShowTables_presult result; result.success = &_return; result.read(iprot_); iprot_->readMessageEnd(); @@ -3415,19 +3415,19 @@ void MegasearchServiceConcurrentClient::recv_ShowTables(std::vector } // end while(true) } -void MegasearchServiceConcurrentClient::Ping(std::string& _return, const std::string& cmd) +void MilvusServiceConcurrentClient::Ping(std::string& _return, const std::string& cmd) { int32_t seqid = send_Ping(cmd); recv_Ping(_return, seqid); } -int32_t MegasearchServiceConcurrentClient::send_Ping(const std::string& cmd) +int32_t MilvusServiceConcurrentClient::send_Ping(const std::string& cmd) { int32_t cseqid = this->sync_.generateSeqId(); ::apache::thrift::async::TConcurrentSendSentry sentry(&this->sync_); oprot_->writeMessageBegin("Ping", ::apache::thrift::protocol::T_CALL, cseqid); - MegasearchService_Ping_pargs args; + MilvusService_Ping_pargs args; args.cmd = &cmd; args.write(oprot_); @@ -3439,7 +3439,7 @@ int32_t MegasearchServiceConcurrentClient::send_Ping(const std::string& cmd) return cseqid; } -void MegasearchServiceConcurrentClient::recv_Ping(std::string& _return, const int32_t seqid) +void MilvusServiceConcurrentClient::recv_Ping(std::string& _return, const int32_t seqid) { int32_t rseqid = 0; @@ -3477,7 +3477,7 @@ void MegasearchServiceConcurrentClient::recv_Ping(std::string& _return, const in using ::apache::thrift::protocol::TProtocolException; throw TProtocolException(TProtocolException::INVALID_DATA); } - MegasearchService_Ping_presult result; + MilvusService_Ping_presult result; result.success = &_return; result.read(iprot_); iprot_->readMessageEnd(); diff --git a/cpp/src/thrift/gen-cpp/MegasearchService.h b/cpp/src/thrift/gen-cpp/MilvusService.h similarity index 55% rename from cpp/src/thrift/gen-cpp/MegasearchService.h rename to cpp/src/thrift/gen-cpp/MilvusService.h index 60f1ddff62..873857ae78 100644 --- a/cpp/src/thrift/gen-cpp/MegasearchService.h +++ b/cpp/src/thrift/gen-cpp/MilvusService.h @@ -4,23 +4,23 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -#ifndef MegasearchService_H -#define MegasearchService_H +#ifndef MilvusService_H +#define MilvusService_H #include #include -#include "megasearch_types.h" +#include "milvus_types.h" -namespace megasearch { namespace thrift { +namespace milvus { namespace thrift { #ifdef _MSC_VER #pragma warning( push ) #pragma warning (disable : 4250 ) //inheriting methods via dominance #endif -class MegasearchServiceIf { +class MilvusServiceIf { public: - virtual ~MegasearchServiceIf() {} + virtual ~MilvusServiceIf() {} /** * @brief Create table method @@ -128,33 +128,33 @@ class MegasearchServiceIf { virtual void Ping(std::string& _return, const std::string& cmd) = 0; }; -class MegasearchServiceIfFactory { +class MilvusServiceIfFactory { public: - typedef MegasearchServiceIf Handler; + typedef MilvusServiceIf Handler; - virtual ~MegasearchServiceIfFactory() {} + virtual ~MilvusServiceIfFactory() {} - virtual MegasearchServiceIf* getHandler(const ::apache::thrift::TConnectionInfo& connInfo) = 0; - virtual void releaseHandler(MegasearchServiceIf* /* handler */) = 0; + virtual MilvusServiceIf* getHandler(const ::apache::thrift::TConnectionInfo& connInfo) = 0; + virtual void releaseHandler(MilvusServiceIf* /* handler */) = 0; }; -class MegasearchServiceIfSingletonFactory : virtual public MegasearchServiceIfFactory { +class MilvusServiceIfSingletonFactory : virtual public MilvusServiceIfFactory { public: - MegasearchServiceIfSingletonFactory(const ::apache::thrift::stdcxx::shared_ptr& iface) : iface_(iface) {} - virtual ~MegasearchServiceIfSingletonFactory() {} + MilvusServiceIfSingletonFactory(const ::apache::thrift::stdcxx::shared_ptr& iface) : iface_(iface) {} + virtual ~MilvusServiceIfSingletonFactory() {} - virtual MegasearchServiceIf* getHandler(const ::apache::thrift::TConnectionInfo&) { + virtual MilvusServiceIf* getHandler(const ::apache::thrift::TConnectionInfo&) { return iface_.get(); } - virtual void releaseHandler(MegasearchServiceIf* /* handler */) {} + virtual void releaseHandler(MilvusServiceIf* /* handler */) {} protected: - ::apache::thrift::stdcxx::shared_ptr iface_; + ::apache::thrift::stdcxx::shared_ptr iface_; }; -class MegasearchServiceNull : virtual public MegasearchServiceIf { +class MilvusServiceNull : virtual public MilvusServiceIf { public: - virtual ~MegasearchServiceNull() {} + virtual ~MilvusServiceNull() {} void CreateTable(const TableSchema& /* param */) { return; } @@ -182,37 +182,37 @@ class MegasearchServiceNull : virtual public MegasearchServiceIf { } }; -typedef struct _MegasearchService_CreateTable_args__isset { - _MegasearchService_CreateTable_args__isset() : param(false) {} +typedef struct _MilvusService_CreateTable_args__isset { + _MilvusService_CreateTable_args__isset() : param(false) {} bool param :1; -} _MegasearchService_CreateTable_args__isset; +} _MilvusService_CreateTable_args__isset; -class MegasearchService_CreateTable_args { +class MilvusService_CreateTable_args { public: - MegasearchService_CreateTable_args(const MegasearchService_CreateTable_args&); - MegasearchService_CreateTable_args& operator=(const MegasearchService_CreateTable_args&); - MegasearchService_CreateTable_args() { + MilvusService_CreateTable_args(const MilvusService_CreateTable_args&); + MilvusService_CreateTable_args& operator=(const MilvusService_CreateTable_args&); + MilvusService_CreateTable_args() { } - virtual ~MegasearchService_CreateTable_args() throw(); + virtual ~MilvusService_CreateTable_args() throw(); TableSchema param; - _MegasearchService_CreateTable_args__isset __isset; + _MilvusService_CreateTable_args__isset __isset; void __set_param(const TableSchema& val); - bool operator == (const MegasearchService_CreateTable_args & rhs) const + bool operator == (const MilvusService_CreateTable_args & rhs) const { if (!(param == rhs.param)) return false; return true; } - bool operator != (const MegasearchService_CreateTable_args &rhs) const { + bool operator != (const MilvusService_CreateTable_args &rhs) const { return !(*this == rhs); } - bool operator < (const MegasearchService_CreateTable_args & ) const; + bool operator < (const MilvusService_CreateTable_args & ) const; uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; @@ -220,103 +220,103 @@ class MegasearchService_CreateTable_args { }; -class MegasearchService_CreateTable_pargs { +class MilvusService_CreateTable_pargs { public: - virtual ~MegasearchService_CreateTable_pargs() throw(); + virtual ~MilvusService_CreateTable_pargs() throw(); const TableSchema* param; uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; }; -typedef struct _MegasearchService_CreateTable_result__isset { - _MegasearchService_CreateTable_result__isset() : e(false) {} +typedef struct _MilvusService_CreateTable_result__isset { + _MilvusService_CreateTable_result__isset() : e(false) {} bool e :1; -} _MegasearchService_CreateTable_result__isset; +} _MilvusService_CreateTable_result__isset; -class MegasearchService_CreateTable_result { +class MilvusService_CreateTable_result { public: - MegasearchService_CreateTable_result(const MegasearchService_CreateTable_result&); - MegasearchService_CreateTable_result& operator=(const MegasearchService_CreateTable_result&); - MegasearchService_CreateTable_result() { + MilvusService_CreateTable_result(const MilvusService_CreateTable_result&); + MilvusService_CreateTable_result& operator=(const MilvusService_CreateTable_result&); + MilvusService_CreateTable_result() { } - virtual ~MegasearchService_CreateTable_result() throw(); + virtual ~MilvusService_CreateTable_result() throw(); Exception e; - _MegasearchService_CreateTable_result__isset __isset; + _MilvusService_CreateTable_result__isset __isset; void __set_e(const Exception& val); - bool operator == (const MegasearchService_CreateTable_result & rhs) const + bool operator == (const MilvusService_CreateTable_result & rhs) const { if (!(e == rhs.e)) return false; return true; } - bool operator != (const MegasearchService_CreateTable_result &rhs) const { + bool operator != (const MilvusService_CreateTable_result &rhs) const { return !(*this == rhs); } - bool operator < (const MegasearchService_CreateTable_result & ) const; + bool operator < (const MilvusService_CreateTable_result & ) const; uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; }; -typedef struct _MegasearchService_CreateTable_presult__isset { - _MegasearchService_CreateTable_presult__isset() : e(false) {} +typedef struct _MilvusService_CreateTable_presult__isset { + _MilvusService_CreateTable_presult__isset() : e(false) {} bool e :1; -} _MegasearchService_CreateTable_presult__isset; +} _MilvusService_CreateTable_presult__isset; -class MegasearchService_CreateTable_presult { +class MilvusService_CreateTable_presult { public: - virtual ~MegasearchService_CreateTable_presult() throw(); + virtual ~MilvusService_CreateTable_presult() throw(); Exception e; - _MegasearchService_CreateTable_presult__isset __isset; + _MilvusService_CreateTable_presult__isset __isset; uint32_t read(::apache::thrift::protocol::TProtocol* iprot); }; -typedef struct _MegasearchService_DeleteTable_args__isset { - _MegasearchService_DeleteTable_args__isset() : table_name(false) {} +typedef struct _MilvusService_DeleteTable_args__isset { + _MilvusService_DeleteTable_args__isset() : table_name(false) {} bool table_name :1; -} _MegasearchService_DeleteTable_args__isset; +} _MilvusService_DeleteTable_args__isset; -class MegasearchService_DeleteTable_args { +class MilvusService_DeleteTable_args { public: - MegasearchService_DeleteTable_args(const MegasearchService_DeleteTable_args&); - MegasearchService_DeleteTable_args& operator=(const MegasearchService_DeleteTable_args&); - MegasearchService_DeleteTable_args() : table_name() { + MilvusService_DeleteTable_args(const MilvusService_DeleteTable_args&); + MilvusService_DeleteTable_args& operator=(const MilvusService_DeleteTable_args&); + MilvusService_DeleteTable_args() : table_name() { } - virtual ~MegasearchService_DeleteTable_args() throw(); + virtual ~MilvusService_DeleteTable_args() throw(); std::string table_name; - _MegasearchService_DeleteTable_args__isset __isset; + _MilvusService_DeleteTable_args__isset __isset; void __set_table_name(const std::string& val); - bool operator == (const MegasearchService_DeleteTable_args & rhs) const + bool operator == (const MilvusService_DeleteTable_args & rhs) const { if (!(table_name == rhs.table_name)) return false; return true; } - bool operator != (const MegasearchService_DeleteTable_args &rhs) const { + bool operator != (const MilvusService_DeleteTable_args &rhs) const { return !(*this == rhs); } - bool operator < (const MegasearchService_DeleteTable_args & ) const; + bool operator < (const MilvusService_DeleteTable_args & ) const; uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; @@ -324,97 +324,97 @@ class MegasearchService_DeleteTable_args { }; -class MegasearchService_DeleteTable_pargs { +class MilvusService_DeleteTable_pargs { public: - virtual ~MegasearchService_DeleteTable_pargs() throw(); + virtual ~MilvusService_DeleteTable_pargs() throw(); const std::string* table_name; uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; }; -typedef struct _MegasearchService_DeleteTable_result__isset { - _MegasearchService_DeleteTable_result__isset() : e(false) {} +typedef struct _MilvusService_DeleteTable_result__isset { + _MilvusService_DeleteTable_result__isset() : e(false) {} bool e :1; -} _MegasearchService_DeleteTable_result__isset; +} _MilvusService_DeleteTable_result__isset; -class MegasearchService_DeleteTable_result { +class MilvusService_DeleteTable_result { public: - MegasearchService_DeleteTable_result(const MegasearchService_DeleteTable_result&); - MegasearchService_DeleteTable_result& operator=(const MegasearchService_DeleteTable_result&); - MegasearchService_DeleteTable_result() { + MilvusService_DeleteTable_result(const MilvusService_DeleteTable_result&); + MilvusService_DeleteTable_result& operator=(const MilvusService_DeleteTable_result&); + MilvusService_DeleteTable_result() { } - virtual ~MegasearchService_DeleteTable_result() throw(); + virtual ~MilvusService_DeleteTable_result() throw(); Exception e; - _MegasearchService_DeleteTable_result__isset __isset; + _MilvusService_DeleteTable_result__isset __isset; void __set_e(const Exception& val); - bool operator == (const MegasearchService_DeleteTable_result & rhs) const + bool operator == (const MilvusService_DeleteTable_result & rhs) const { if (!(e == rhs.e)) return false; return true; } - bool operator != (const MegasearchService_DeleteTable_result &rhs) const { + bool operator != (const MilvusService_DeleteTable_result &rhs) const { return !(*this == rhs); } - bool operator < (const MegasearchService_DeleteTable_result & ) const; + bool operator < (const MilvusService_DeleteTable_result & ) const; uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; }; -typedef struct _MegasearchService_DeleteTable_presult__isset { - _MegasearchService_DeleteTable_presult__isset() : e(false) {} +typedef struct _MilvusService_DeleteTable_presult__isset { + _MilvusService_DeleteTable_presult__isset() : e(false) {} bool e :1; -} _MegasearchService_DeleteTable_presult__isset; +} _MilvusService_DeleteTable_presult__isset; -class MegasearchService_DeleteTable_presult { +class MilvusService_DeleteTable_presult { public: - virtual ~MegasearchService_DeleteTable_presult() throw(); + virtual ~MilvusService_DeleteTable_presult() throw(); Exception e; - _MegasearchService_DeleteTable_presult__isset __isset; + _MilvusService_DeleteTable_presult__isset __isset; uint32_t read(::apache::thrift::protocol::TProtocol* iprot); }; -typedef struct _MegasearchService_AddVector_args__isset { - _MegasearchService_AddVector_args__isset() : table_name(false), record_array(false) {} +typedef struct _MilvusService_AddVector_args__isset { + _MilvusService_AddVector_args__isset() : table_name(false), record_array(false) {} bool table_name :1; bool record_array :1; -} _MegasearchService_AddVector_args__isset; +} _MilvusService_AddVector_args__isset; -class MegasearchService_AddVector_args { +class MilvusService_AddVector_args { public: - MegasearchService_AddVector_args(const MegasearchService_AddVector_args&); - MegasearchService_AddVector_args& operator=(const MegasearchService_AddVector_args&); - MegasearchService_AddVector_args() : table_name() { + MilvusService_AddVector_args(const MilvusService_AddVector_args&); + MilvusService_AddVector_args& operator=(const MilvusService_AddVector_args&); + MilvusService_AddVector_args() : table_name() { } - virtual ~MegasearchService_AddVector_args() throw(); + virtual ~MilvusService_AddVector_args() throw(); std::string table_name; std::vector record_array; - _MegasearchService_AddVector_args__isset __isset; + _MilvusService_AddVector_args__isset __isset; void __set_table_name(const std::string& val); void __set_record_array(const std::vector & val); - bool operator == (const MegasearchService_AddVector_args & rhs) const + bool operator == (const MilvusService_AddVector_args & rhs) const { if (!(table_name == rhs.table_name)) return false; @@ -422,11 +422,11 @@ class MegasearchService_AddVector_args { return false; return true; } - bool operator != (const MegasearchService_AddVector_args &rhs) const { + bool operator != (const MilvusService_AddVector_args &rhs) const { return !(*this == rhs); } - bool operator < (const MegasearchService_AddVector_args & ) const; + bool operator < (const MilvusService_AddVector_args & ) const; uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; @@ -434,11 +434,11 @@ class MegasearchService_AddVector_args { }; -class MegasearchService_AddVector_pargs { +class MilvusService_AddVector_pargs { public: - virtual ~MegasearchService_AddVector_pargs() throw(); + virtual ~MilvusService_AddVector_pargs() throw(); const std::string* table_name; const std::vector * record_array; @@ -446,31 +446,31 @@ class MegasearchService_AddVector_pargs { }; -typedef struct _MegasearchService_AddVector_result__isset { - _MegasearchService_AddVector_result__isset() : success(false), e(false) {} +typedef struct _MilvusService_AddVector_result__isset { + _MilvusService_AddVector_result__isset() : success(false), e(false) {} bool success :1; bool e :1; -} _MegasearchService_AddVector_result__isset; +} _MilvusService_AddVector_result__isset; -class MegasearchService_AddVector_result { +class MilvusService_AddVector_result { public: - MegasearchService_AddVector_result(const MegasearchService_AddVector_result&); - MegasearchService_AddVector_result& operator=(const MegasearchService_AddVector_result&); - MegasearchService_AddVector_result() { + MilvusService_AddVector_result(const MilvusService_AddVector_result&); + MilvusService_AddVector_result& operator=(const MilvusService_AddVector_result&); + MilvusService_AddVector_result() { } - virtual ~MegasearchService_AddVector_result() throw(); + virtual ~MilvusService_AddVector_result() throw(); std::vector success; Exception e; - _MegasearchService_AddVector_result__isset __isset; + _MilvusService_AddVector_result__isset __isset; void __set_success(const std::vector & val); void __set_e(const Exception& val); - bool operator == (const MegasearchService_AddVector_result & rhs) const + bool operator == (const MilvusService_AddVector_result & rhs) const { if (!(success == rhs.success)) return false; @@ -478,60 +478,60 @@ class MegasearchService_AddVector_result { return false; return true; } - bool operator != (const MegasearchService_AddVector_result &rhs) const { + bool operator != (const MilvusService_AddVector_result &rhs) const { return !(*this == rhs); } - bool operator < (const MegasearchService_AddVector_result & ) const; + bool operator < (const MilvusService_AddVector_result & ) const; uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; }; -typedef struct _MegasearchService_AddVector_presult__isset { - _MegasearchService_AddVector_presult__isset() : success(false), e(false) {} +typedef struct _MilvusService_AddVector_presult__isset { + _MilvusService_AddVector_presult__isset() : success(false), e(false) {} bool success :1; bool e :1; -} _MegasearchService_AddVector_presult__isset; +} _MilvusService_AddVector_presult__isset; -class MegasearchService_AddVector_presult { +class MilvusService_AddVector_presult { public: - virtual ~MegasearchService_AddVector_presult() throw(); + virtual ~MilvusService_AddVector_presult() throw(); std::vector * success; Exception e; - _MegasearchService_AddVector_presult__isset __isset; + _MilvusService_AddVector_presult__isset __isset; uint32_t read(::apache::thrift::protocol::TProtocol* iprot); }; -typedef struct _MegasearchService_SearchVector_args__isset { - _MegasearchService_SearchVector_args__isset() : table_name(false), query_record_array(false), query_range_array(false), topk(false) {} +typedef struct _MilvusService_SearchVector_args__isset { + _MilvusService_SearchVector_args__isset() : table_name(false), query_record_array(false), query_range_array(false), topk(false) {} bool table_name :1; bool query_record_array :1; bool query_range_array :1; bool topk :1; -} _MegasearchService_SearchVector_args__isset; +} _MilvusService_SearchVector_args__isset; -class MegasearchService_SearchVector_args { +class MilvusService_SearchVector_args { public: - MegasearchService_SearchVector_args(const MegasearchService_SearchVector_args&); - MegasearchService_SearchVector_args& operator=(const MegasearchService_SearchVector_args&); - MegasearchService_SearchVector_args() : table_name(), topk(0) { + MilvusService_SearchVector_args(const MilvusService_SearchVector_args&); + MilvusService_SearchVector_args& operator=(const MilvusService_SearchVector_args&); + MilvusService_SearchVector_args() : table_name(), topk(0) { } - virtual ~MegasearchService_SearchVector_args() throw(); + virtual ~MilvusService_SearchVector_args() throw(); std::string table_name; std::vector query_record_array; std::vector query_range_array; int64_t topk; - _MegasearchService_SearchVector_args__isset __isset; + _MilvusService_SearchVector_args__isset __isset; void __set_table_name(const std::string& val); @@ -541,7 +541,7 @@ class MegasearchService_SearchVector_args { void __set_topk(const int64_t val); - bool operator == (const MegasearchService_SearchVector_args & rhs) const + bool operator == (const MilvusService_SearchVector_args & rhs) const { if (!(table_name == rhs.table_name)) return false; @@ -553,11 +553,11 @@ class MegasearchService_SearchVector_args { return false; return true; } - bool operator != (const MegasearchService_SearchVector_args &rhs) const { + bool operator != (const MilvusService_SearchVector_args &rhs) const { return !(*this == rhs); } - bool operator < (const MegasearchService_SearchVector_args & ) const; + bool operator < (const MilvusService_SearchVector_args & ) const; uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; @@ -565,11 +565,11 @@ class MegasearchService_SearchVector_args { }; -class MegasearchService_SearchVector_pargs { +class MilvusService_SearchVector_pargs { public: - virtual ~MegasearchService_SearchVector_pargs() throw(); + virtual ~MilvusService_SearchVector_pargs() throw(); const std::string* table_name; const std::vector * query_record_array; const std::vector * query_range_array; @@ -579,31 +579,31 @@ class MegasearchService_SearchVector_pargs { }; -typedef struct _MegasearchService_SearchVector_result__isset { - _MegasearchService_SearchVector_result__isset() : success(false), e(false) {} +typedef struct _MilvusService_SearchVector_result__isset { + _MilvusService_SearchVector_result__isset() : success(false), e(false) {} bool success :1; bool e :1; -} _MegasearchService_SearchVector_result__isset; +} _MilvusService_SearchVector_result__isset; -class MegasearchService_SearchVector_result { +class MilvusService_SearchVector_result { public: - MegasearchService_SearchVector_result(const MegasearchService_SearchVector_result&); - MegasearchService_SearchVector_result& operator=(const MegasearchService_SearchVector_result&); - MegasearchService_SearchVector_result() { + MilvusService_SearchVector_result(const MilvusService_SearchVector_result&); + MilvusService_SearchVector_result& operator=(const MilvusService_SearchVector_result&); + MilvusService_SearchVector_result() { } - virtual ~MegasearchService_SearchVector_result() throw(); + virtual ~MilvusService_SearchVector_result() throw(); std::vector success; Exception e; - _MegasearchService_SearchVector_result__isset __isset; + _MilvusService_SearchVector_result__isset __isset; void __set_success(const std::vector & val); void __set_e(const Exception& val); - bool operator == (const MegasearchService_SearchVector_result & rhs) const + bool operator == (const MilvusService_SearchVector_result & rhs) const { if (!(success == rhs.success)) return false; @@ -611,68 +611,68 @@ class MegasearchService_SearchVector_result { return false; return true; } - bool operator != (const MegasearchService_SearchVector_result &rhs) const { + bool operator != (const MilvusService_SearchVector_result &rhs) const { return !(*this == rhs); } - bool operator < (const MegasearchService_SearchVector_result & ) const; + bool operator < (const MilvusService_SearchVector_result & ) const; uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; }; -typedef struct _MegasearchService_SearchVector_presult__isset { - _MegasearchService_SearchVector_presult__isset() : success(false), e(false) {} +typedef struct _MilvusService_SearchVector_presult__isset { + _MilvusService_SearchVector_presult__isset() : success(false), e(false) {} bool success :1; bool e :1; -} _MegasearchService_SearchVector_presult__isset; +} _MilvusService_SearchVector_presult__isset; -class MegasearchService_SearchVector_presult { +class MilvusService_SearchVector_presult { public: - virtual ~MegasearchService_SearchVector_presult() throw(); + virtual ~MilvusService_SearchVector_presult() throw(); std::vector * success; Exception e; - _MegasearchService_SearchVector_presult__isset __isset; + _MilvusService_SearchVector_presult__isset __isset; uint32_t read(::apache::thrift::protocol::TProtocol* iprot); }; -typedef struct _MegasearchService_DescribeTable_args__isset { - _MegasearchService_DescribeTable_args__isset() : table_name(false) {} +typedef struct _MilvusService_DescribeTable_args__isset { + _MilvusService_DescribeTable_args__isset() : table_name(false) {} bool table_name :1; -} _MegasearchService_DescribeTable_args__isset; +} _MilvusService_DescribeTable_args__isset; -class MegasearchService_DescribeTable_args { +class MilvusService_DescribeTable_args { public: - MegasearchService_DescribeTable_args(const MegasearchService_DescribeTable_args&); - MegasearchService_DescribeTable_args& operator=(const MegasearchService_DescribeTable_args&); - MegasearchService_DescribeTable_args() : table_name() { + MilvusService_DescribeTable_args(const MilvusService_DescribeTable_args&); + MilvusService_DescribeTable_args& operator=(const MilvusService_DescribeTable_args&); + MilvusService_DescribeTable_args() : table_name() { } - virtual ~MegasearchService_DescribeTable_args() throw(); + virtual ~MilvusService_DescribeTable_args() throw(); std::string table_name; - _MegasearchService_DescribeTable_args__isset __isset; + _MilvusService_DescribeTable_args__isset __isset; void __set_table_name(const std::string& val); - bool operator == (const MegasearchService_DescribeTable_args & rhs) const + bool operator == (const MilvusService_DescribeTable_args & rhs) const { if (!(table_name == rhs.table_name)) return false; return true; } - bool operator != (const MegasearchService_DescribeTable_args &rhs) const { + bool operator != (const MilvusService_DescribeTable_args &rhs) const { return !(*this == rhs); } - bool operator < (const MegasearchService_DescribeTable_args & ) const; + bool operator < (const MilvusService_DescribeTable_args & ) const; uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; @@ -680,42 +680,42 @@ class MegasearchService_DescribeTable_args { }; -class MegasearchService_DescribeTable_pargs { +class MilvusService_DescribeTable_pargs { public: - virtual ~MegasearchService_DescribeTable_pargs() throw(); + virtual ~MilvusService_DescribeTable_pargs() throw(); const std::string* table_name; uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; }; -typedef struct _MegasearchService_DescribeTable_result__isset { - _MegasearchService_DescribeTable_result__isset() : success(false), e(false) {} +typedef struct _MilvusService_DescribeTable_result__isset { + _MilvusService_DescribeTable_result__isset() : success(false), e(false) {} bool success :1; bool e :1; -} _MegasearchService_DescribeTable_result__isset; +} _MilvusService_DescribeTable_result__isset; -class MegasearchService_DescribeTable_result { +class MilvusService_DescribeTable_result { public: - MegasearchService_DescribeTable_result(const MegasearchService_DescribeTable_result&); - MegasearchService_DescribeTable_result& operator=(const MegasearchService_DescribeTable_result&); - MegasearchService_DescribeTable_result() { + MilvusService_DescribeTable_result(const MilvusService_DescribeTable_result&); + MilvusService_DescribeTable_result& operator=(const MilvusService_DescribeTable_result&); + MilvusService_DescribeTable_result() { } - virtual ~MegasearchService_DescribeTable_result() throw(); + virtual ~MilvusService_DescribeTable_result() throw(); TableSchema success; Exception e; - _MegasearchService_DescribeTable_result__isset __isset; + _MilvusService_DescribeTable_result__isset __isset; void __set_success(const TableSchema& val); void __set_e(const Exception& val); - bool operator == (const MegasearchService_DescribeTable_result & rhs) const + bool operator == (const MilvusService_DescribeTable_result & rhs) const { if (!(success == rhs.success)) return false; @@ -723,68 +723,68 @@ class MegasearchService_DescribeTable_result { return false; return true; } - bool operator != (const MegasearchService_DescribeTable_result &rhs) const { + bool operator != (const MilvusService_DescribeTable_result &rhs) const { return !(*this == rhs); } - bool operator < (const MegasearchService_DescribeTable_result & ) const; + bool operator < (const MilvusService_DescribeTable_result & ) const; uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; }; -typedef struct _MegasearchService_DescribeTable_presult__isset { - _MegasearchService_DescribeTable_presult__isset() : success(false), e(false) {} +typedef struct _MilvusService_DescribeTable_presult__isset { + _MilvusService_DescribeTable_presult__isset() : success(false), e(false) {} bool success :1; bool e :1; -} _MegasearchService_DescribeTable_presult__isset; +} _MilvusService_DescribeTable_presult__isset; -class MegasearchService_DescribeTable_presult { +class MilvusService_DescribeTable_presult { public: - virtual ~MegasearchService_DescribeTable_presult() throw(); + virtual ~MilvusService_DescribeTable_presult() throw(); TableSchema* success; Exception e; - _MegasearchService_DescribeTable_presult__isset __isset; + _MilvusService_DescribeTable_presult__isset __isset; uint32_t read(::apache::thrift::protocol::TProtocol* iprot); }; -typedef struct _MegasearchService_GetTableRowCount_args__isset { - _MegasearchService_GetTableRowCount_args__isset() : table_name(false) {} +typedef struct _MilvusService_GetTableRowCount_args__isset { + _MilvusService_GetTableRowCount_args__isset() : table_name(false) {} bool table_name :1; -} _MegasearchService_GetTableRowCount_args__isset; +} _MilvusService_GetTableRowCount_args__isset; -class MegasearchService_GetTableRowCount_args { +class MilvusService_GetTableRowCount_args { public: - MegasearchService_GetTableRowCount_args(const MegasearchService_GetTableRowCount_args&); - MegasearchService_GetTableRowCount_args& operator=(const MegasearchService_GetTableRowCount_args&); - MegasearchService_GetTableRowCount_args() : table_name() { + MilvusService_GetTableRowCount_args(const MilvusService_GetTableRowCount_args&); + MilvusService_GetTableRowCount_args& operator=(const MilvusService_GetTableRowCount_args&); + MilvusService_GetTableRowCount_args() : table_name() { } - virtual ~MegasearchService_GetTableRowCount_args() throw(); + virtual ~MilvusService_GetTableRowCount_args() throw(); std::string table_name; - _MegasearchService_GetTableRowCount_args__isset __isset; + _MilvusService_GetTableRowCount_args__isset __isset; void __set_table_name(const std::string& val); - bool operator == (const MegasearchService_GetTableRowCount_args & rhs) const + bool operator == (const MilvusService_GetTableRowCount_args & rhs) const { if (!(table_name == rhs.table_name)) return false; return true; } - bool operator != (const MegasearchService_GetTableRowCount_args &rhs) const { + bool operator != (const MilvusService_GetTableRowCount_args &rhs) const { return !(*this == rhs); } - bool operator < (const MegasearchService_GetTableRowCount_args & ) const; + bool operator < (const MilvusService_GetTableRowCount_args & ) const; uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; @@ -792,42 +792,42 @@ class MegasearchService_GetTableRowCount_args { }; -class MegasearchService_GetTableRowCount_pargs { +class MilvusService_GetTableRowCount_pargs { public: - virtual ~MegasearchService_GetTableRowCount_pargs() throw(); + virtual ~MilvusService_GetTableRowCount_pargs() throw(); const std::string* table_name; uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; }; -typedef struct _MegasearchService_GetTableRowCount_result__isset { - _MegasearchService_GetTableRowCount_result__isset() : success(false), e(false) {} +typedef struct _MilvusService_GetTableRowCount_result__isset { + _MilvusService_GetTableRowCount_result__isset() : success(false), e(false) {} bool success :1; bool e :1; -} _MegasearchService_GetTableRowCount_result__isset; +} _MilvusService_GetTableRowCount_result__isset; -class MegasearchService_GetTableRowCount_result { +class MilvusService_GetTableRowCount_result { public: - MegasearchService_GetTableRowCount_result(const MegasearchService_GetTableRowCount_result&); - MegasearchService_GetTableRowCount_result& operator=(const MegasearchService_GetTableRowCount_result&); - MegasearchService_GetTableRowCount_result() : success(0) { + MilvusService_GetTableRowCount_result(const MilvusService_GetTableRowCount_result&); + MilvusService_GetTableRowCount_result& operator=(const MilvusService_GetTableRowCount_result&); + MilvusService_GetTableRowCount_result() : success(0) { } - virtual ~MegasearchService_GetTableRowCount_result() throw(); + virtual ~MilvusService_GetTableRowCount_result() throw(); int64_t success; Exception e; - _MegasearchService_GetTableRowCount_result__isset __isset; + _MilvusService_GetTableRowCount_result__isset __isset; void __set_success(const int64_t val); void __set_e(const Exception& val); - bool operator == (const MegasearchService_GetTableRowCount_result & rhs) const + bool operator == (const MilvusService_GetTableRowCount_result & rhs) const { if (!(success == rhs.success)) return false; @@ -835,57 +835,57 @@ class MegasearchService_GetTableRowCount_result { return false; return true; } - bool operator != (const MegasearchService_GetTableRowCount_result &rhs) const { + bool operator != (const MilvusService_GetTableRowCount_result &rhs) const { return !(*this == rhs); } - bool operator < (const MegasearchService_GetTableRowCount_result & ) const; + bool operator < (const MilvusService_GetTableRowCount_result & ) const; uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; }; -typedef struct _MegasearchService_GetTableRowCount_presult__isset { - _MegasearchService_GetTableRowCount_presult__isset() : success(false), e(false) {} +typedef struct _MilvusService_GetTableRowCount_presult__isset { + _MilvusService_GetTableRowCount_presult__isset() : success(false), e(false) {} bool success :1; bool e :1; -} _MegasearchService_GetTableRowCount_presult__isset; +} _MilvusService_GetTableRowCount_presult__isset; -class MegasearchService_GetTableRowCount_presult { +class MilvusService_GetTableRowCount_presult { public: - virtual ~MegasearchService_GetTableRowCount_presult() throw(); + virtual ~MilvusService_GetTableRowCount_presult() throw(); int64_t* success; Exception e; - _MegasearchService_GetTableRowCount_presult__isset __isset; + _MilvusService_GetTableRowCount_presult__isset __isset; uint32_t read(::apache::thrift::protocol::TProtocol* iprot); }; -class MegasearchService_ShowTables_args { +class MilvusService_ShowTables_args { public: - MegasearchService_ShowTables_args(const MegasearchService_ShowTables_args&); - MegasearchService_ShowTables_args& operator=(const MegasearchService_ShowTables_args&); - MegasearchService_ShowTables_args() { + MilvusService_ShowTables_args(const MilvusService_ShowTables_args&); + MilvusService_ShowTables_args& operator=(const MilvusService_ShowTables_args&); + MilvusService_ShowTables_args() { } - virtual ~MegasearchService_ShowTables_args() throw(); + virtual ~MilvusService_ShowTables_args() throw(); - bool operator == (const MegasearchService_ShowTables_args & /* rhs */) const + bool operator == (const MilvusService_ShowTables_args & /* rhs */) const { return true; } - bool operator != (const MegasearchService_ShowTables_args &rhs) const { + bool operator != (const MilvusService_ShowTables_args &rhs) const { return !(*this == rhs); } - bool operator < (const MegasearchService_ShowTables_args & ) const; + bool operator < (const MilvusService_ShowTables_args & ) const; uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; @@ -893,41 +893,41 @@ class MegasearchService_ShowTables_args { }; -class MegasearchService_ShowTables_pargs { +class MilvusService_ShowTables_pargs { public: - virtual ~MegasearchService_ShowTables_pargs() throw(); + virtual ~MilvusService_ShowTables_pargs() throw(); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; }; -typedef struct _MegasearchService_ShowTables_result__isset { - _MegasearchService_ShowTables_result__isset() : success(false), e(false) {} +typedef struct _MilvusService_ShowTables_result__isset { + _MilvusService_ShowTables_result__isset() : success(false), e(false) {} bool success :1; bool e :1; -} _MegasearchService_ShowTables_result__isset; +} _MilvusService_ShowTables_result__isset; -class MegasearchService_ShowTables_result { +class MilvusService_ShowTables_result { public: - MegasearchService_ShowTables_result(const MegasearchService_ShowTables_result&); - MegasearchService_ShowTables_result& operator=(const MegasearchService_ShowTables_result&); - MegasearchService_ShowTables_result() { + MilvusService_ShowTables_result(const MilvusService_ShowTables_result&); + MilvusService_ShowTables_result& operator=(const MilvusService_ShowTables_result&); + MilvusService_ShowTables_result() { } - virtual ~MegasearchService_ShowTables_result() throw(); + virtual ~MilvusService_ShowTables_result() throw(); std::vector success; Exception e; - _MegasearchService_ShowTables_result__isset __isset; + _MilvusService_ShowTables_result__isset __isset; void __set_success(const std::vector & val); void __set_e(const Exception& val); - bool operator == (const MegasearchService_ShowTables_result & rhs) const + bool operator == (const MilvusService_ShowTables_result & rhs) const { if (!(success == rhs.success)) return false; @@ -935,68 +935,68 @@ class MegasearchService_ShowTables_result { return false; return true; } - bool operator != (const MegasearchService_ShowTables_result &rhs) const { + bool operator != (const MilvusService_ShowTables_result &rhs) const { return !(*this == rhs); } - bool operator < (const MegasearchService_ShowTables_result & ) const; + bool operator < (const MilvusService_ShowTables_result & ) const; uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; }; -typedef struct _MegasearchService_ShowTables_presult__isset { - _MegasearchService_ShowTables_presult__isset() : success(false), e(false) {} +typedef struct _MilvusService_ShowTables_presult__isset { + _MilvusService_ShowTables_presult__isset() : success(false), e(false) {} bool success :1; bool e :1; -} _MegasearchService_ShowTables_presult__isset; +} _MilvusService_ShowTables_presult__isset; -class MegasearchService_ShowTables_presult { +class MilvusService_ShowTables_presult { public: - virtual ~MegasearchService_ShowTables_presult() throw(); + virtual ~MilvusService_ShowTables_presult() throw(); std::vector * success; Exception e; - _MegasearchService_ShowTables_presult__isset __isset; + _MilvusService_ShowTables_presult__isset __isset; uint32_t read(::apache::thrift::protocol::TProtocol* iprot); }; -typedef struct _MegasearchService_Ping_args__isset { - _MegasearchService_Ping_args__isset() : cmd(false) {} +typedef struct _MilvusService_Ping_args__isset { + _MilvusService_Ping_args__isset() : cmd(false) {} bool cmd :1; -} _MegasearchService_Ping_args__isset; +} _MilvusService_Ping_args__isset; -class MegasearchService_Ping_args { +class MilvusService_Ping_args { public: - MegasearchService_Ping_args(const MegasearchService_Ping_args&); - MegasearchService_Ping_args& operator=(const MegasearchService_Ping_args&); - MegasearchService_Ping_args() : cmd() { + MilvusService_Ping_args(const MilvusService_Ping_args&); + MilvusService_Ping_args& operator=(const MilvusService_Ping_args&); + MilvusService_Ping_args() : cmd() { } - virtual ~MegasearchService_Ping_args() throw(); + virtual ~MilvusService_Ping_args() throw(); std::string cmd; - _MegasearchService_Ping_args__isset __isset; + _MilvusService_Ping_args__isset __isset; void __set_cmd(const std::string& val); - bool operator == (const MegasearchService_Ping_args & rhs) const + bool operator == (const MilvusService_Ping_args & rhs) const { if (!(cmd == rhs.cmd)) return false; return true; } - bool operator != (const MegasearchService_Ping_args &rhs) const { + bool operator != (const MilvusService_Ping_args &rhs) const { return !(*this == rhs); } - bool operator < (const MegasearchService_Ping_args & ) const; + bool operator < (const MilvusService_Ping_args & ) const; uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; @@ -1004,42 +1004,42 @@ class MegasearchService_Ping_args { }; -class MegasearchService_Ping_pargs { +class MilvusService_Ping_pargs { public: - virtual ~MegasearchService_Ping_pargs() throw(); + virtual ~MilvusService_Ping_pargs() throw(); const std::string* cmd; uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; }; -typedef struct _MegasearchService_Ping_result__isset { - _MegasearchService_Ping_result__isset() : success(false), e(false) {} +typedef struct _MilvusService_Ping_result__isset { + _MilvusService_Ping_result__isset() : success(false), e(false) {} bool success :1; bool e :1; -} _MegasearchService_Ping_result__isset; +} _MilvusService_Ping_result__isset; -class MegasearchService_Ping_result { +class MilvusService_Ping_result { public: - MegasearchService_Ping_result(const MegasearchService_Ping_result&); - MegasearchService_Ping_result& operator=(const MegasearchService_Ping_result&); - MegasearchService_Ping_result() : success() { + MilvusService_Ping_result(const MilvusService_Ping_result&); + MilvusService_Ping_result& operator=(const MilvusService_Ping_result&); + MilvusService_Ping_result() : success() { } - virtual ~MegasearchService_Ping_result() throw(); + virtual ~MilvusService_Ping_result() throw(); std::string success; Exception e; - _MegasearchService_Ping_result__isset __isset; + _MilvusService_Ping_result__isset __isset; void __set_success(const std::string& val); void __set_e(const Exception& val); - bool operator == (const MegasearchService_Ping_result & rhs) const + bool operator == (const MilvusService_Ping_result & rhs) const { if (!(success == rhs.success)) return false; @@ -1047,43 +1047,43 @@ class MegasearchService_Ping_result { return false; return true; } - bool operator != (const MegasearchService_Ping_result &rhs) const { + bool operator != (const MilvusService_Ping_result &rhs) const { return !(*this == rhs); } - bool operator < (const MegasearchService_Ping_result & ) const; + bool operator < (const MilvusService_Ping_result & ) const; uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; }; -typedef struct _MegasearchService_Ping_presult__isset { - _MegasearchService_Ping_presult__isset() : success(false), e(false) {} +typedef struct _MilvusService_Ping_presult__isset { + _MilvusService_Ping_presult__isset() : success(false), e(false) {} bool success :1; bool e :1; -} _MegasearchService_Ping_presult__isset; +} _MilvusService_Ping_presult__isset; -class MegasearchService_Ping_presult { +class MilvusService_Ping_presult { public: - virtual ~MegasearchService_Ping_presult() throw(); + virtual ~MilvusService_Ping_presult() throw(); std::string* success; Exception e; - _MegasearchService_Ping_presult__isset __isset; + _MilvusService_Ping_presult__isset __isset; uint32_t read(::apache::thrift::protocol::TProtocol* iprot); }; -class MegasearchServiceClient : virtual public MegasearchServiceIf { +class MilvusServiceClient : virtual public MilvusServiceIf { public: - MegasearchServiceClient(apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) { + MilvusServiceClient(apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) { setProtocol(prot); } - MegasearchServiceClient(apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) { + MilvusServiceClient(apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) { setProtocol(iprot,oprot); } private: @@ -1134,12 +1134,12 @@ class MegasearchServiceClient : virtual public MegasearchServiceIf { ::apache::thrift::protocol::TProtocol* oprot_; }; -class MegasearchServiceProcessor : public ::apache::thrift::TDispatchProcessor { +class MilvusServiceProcessor : public ::apache::thrift::TDispatchProcessor { protected: - ::apache::thrift::stdcxx::shared_ptr iface_; + ::apache::thrift::stdcxx::shared_ptr iface_; virtual bool dispatchCall(::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, const std::string& fname, int32_t seqid, void* callContext); private: - typedef void (MegasearchServiceProcessor::*ProcessFunction)(int32_t, ::apache::thrift::protocol::TProtocol*, ::apache::thrift::protocol::TProtocol*, void*); + typedef void (MilvusServiceProcessor::*ProcessFunction)(int32_t, ::apache::thrift::protocol::TProtocol*, ::apache::thrift::protocol::TProtocol*, void*); typedef std::map ProcessMap; ProcessMap processMap_; void process_CreateTable(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext); @@ -1151,41 +1151,41 @@ class MegasearchServiceProcessor : public ::apache::thrift::TDispatchProcessor { void process_ShowTables(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext); void process_Ping(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext); public: - MegasearchServiceProcessor(::apache::thrift::stdcxx::shared_ptr iface) : + MilvusServiceProcessor(::apache::thrift::stdcxx::shared_ptr iface) : iface_(iface) { - processMap_["CreateTable"] = &MegasearchServiceProcessor::process_CreateTable; - processMap_["DeleteTable"] = &MegasearchServiceProcessor::process_DeleteTable; - processMap_["AddVector"] = &MegasearchServiceProcessor::process_AddVector; - processMap_["SearchVector"] = &MegasearchServiceProcessor::process_SearchVector; - processMap_["DescribeTable"] = &MegasearchServiceProcessor::process_DescribeTable; - processMap_["GetTableRowCount"] = &MegasearchServiceProcessor::process_GetTableRowCount; - processMap_["ShowTables"] = &MegasearchServiceProcessor::process_ShowTables; - processMap_["Ping"] = &MegasearchServiceProcessor::process_Ping; + processMap_["CreateTable"] = &MilvusServiceProcessor::process_CreateTable; + processMap_["DeleteTable"] = &MilvusServiceProcessor::process_DeleteTable; + processMap_["AddVector"] = &MilvusServiceProcessor::process_AddVector; + processMap_["SearchVector"] = &MilvusServiceProcessor::process_SearchVector; + processMap_["DescribeTable"] = &MilvusServiceProcessor::process_DescribeTable; + processMap_["GetTableRowCount"] = &MilvusServiceProcessor::process_GetTableRowCount; + processMap_["ShowTables"] = &MilvusServiceProcessor::process_ShowTables; + processMap_["Ping"] = &MilvusServiceProcessor::process_Ping; } - virtual ~MegasearchServiceProcessor() {} + virtual ~MilvusServiceProcessor() {} }; -class MegasearchServiceProcessorFactory : public ::apache::thrift::TProcessorFactory { +class MilvusServiceProcessorFactory : public ::apache::thrift::TProcessorFactory { public: - MegasearchServiceProcessorFactory(const ::apache::thrift::stdcxx::shared_ptr< MegasearchServiceIfFactory >& handlerFactory) : + MilvusServiceProcessorFactory(const ::apache::thrift::stdcxx::shared_ptr< MilvusServiceIfFactory >& handlerFactory) : handlerFactory_(handlerFactory) {} ::apache::thrift::stdcxx::shared_ptr< ::apache::thrift::TProcessor > getProcessor(const ::apache::thrift::TConnectionInfo& connInfo); protected: - ::apache::thrift::stdcxx::shared_ptr< MegasearchServiceIfFactory > handlerFactory_; + ::apache::thrift::stdcxx::shared_ptr< MilvusServiceIfFactory > handlerFactory_; }; -class MegasearchServiceMultiface : virtual public MegasearchServiceIf { +class MilvusServiceMultiface : virtual public MilvusServiceIf { public: - MegasearchServiceMultiface(std::vector >& ifaces) : ifaces_(ifaces) { + MilvusServiceMultiface(std::vector >& ifaces) : ifaces_(ifaces) { } - virtual ~MegasearchServiceMultiface() {} + virtual ~MilvusServiceMultiface() {} protected: - std::vector > ifaces_; - MegasearchServiceMultiface() {} - void add(::apache::thrift::stdcxx::shared_ptr iface) { + std::vector > ifaces_; + MilvusServiceMultiface() {} + void add(::apache::thrift::stdcxx::shared_ptr iface) { ifaces_.push_back(iface); } public: @@ -1271,12 +1271,12 @@ class MegasearchServiceMultiface : virtual public MegasearchServiceIf { // The 'concurrent' client is a thread safe client that correctly handles // out of order responses. It is slower than the regular client, so should // only be used when you need to share a connection among multiple threads -class MegasearchServiceConcurrentClient : virtual public MegasearchServiceIf { +class MilvusServiceConcurrentClient : virtual public MilvusServiceIf { public: - MegasearchServiceConcurrentClient(apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) { + MilvusServiceConcurrentClient(apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) { setProtocol(prot); } - MegasearchServiceConcurrentClient(apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) { + MilvusServiceConcurrentClient(apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) { setProtocol(iprot,oprot); } private: diff --git a/cpp/src/thrift/gen-cpp/MegasearchService_server.skeleton.cpp b/cpp/src/thrift/gen-cpp/MilvusService_server.skeleton.cpp similarity index 93% rename from cpp/src/thrift/gen-cpp/MegasearchService_server.skeleton.cpp rename to cpp/src/thrift/gen-cpp/MilvusService_server.skeleton.cpp index 14b9e6f39a..d27ad2177c 100644 --- a/cpp/src/thrift/gen-cpp/MegasearchService_server.skeleton.cpp +++ b/cpp/src/thrift/gen-cpp/MilvusService_server.skeleton.cpp @@ -1,7 +1,7 @@ // This autogenerated skeleton file illustrates how to build a server. // You should copy it to another filename to avoid overwriting it. -#include "MegasearchService.h" +#include "MilvusService.h" #include #include #include @@ -12,11 +12,11 @@ using namespace ::apache::thrift::protocol; using namespace ::apache::thrift::transport; using namespace ::apache::thrift::server; -using namespace ::megasearch::thrift; +using namespace ::milvus::thrift; -class MegasearchServiceHandler : virtual public MegasearchServiceIf { +class MilvusServiceHandler : virtual public MilvusServiceIf { public: - MegasearchServiceHandler() { + MilvusServiceHandler() { // Your initialization goes here } @@ -153,8 +153,8 @@ class MegasearchServiceHandler : virtual public MegasearchServiceIf { int main(int argc, char **argv) { int port = 9090; - ::apache::thrift::stdcxx::shared_ptr handler(new MegasearchServiceHandler()); - ::apache::thrift::stdcxx::shared_ptr processor(new MegasearchServiceProcessor(handler)); + ::apache::thrift::stdcxx::shared_ptr handler(new MilvusServiceHandler()); + ::apache::thrift::stdcxx::shared_ptr processor(new MilvusServiceProcessor(handler)); ::apache::thrift::stdcxx::shared_ptr serverTransport(new TServerSocket(port)); ::apache::thrift::stdcxx::shared_ptr transportFactory(new TBufferedTransportFactory()); ::apache::thrift::stdcxx::shared_ptr protocolFactory(new TBinaryProtocolFactory()); diff --git a/cpp/src/thrift/gen-cpp/megasearch_constants.cpp b/cpp/src/thrift/gen-cpp/megasearch_constants.cpp deleted file mode 100644 index 4e22e9616c..0000000000 --- a/cpp/src/thrift/gen-cpp/megasearch_constants.cpp +++ /dev/null @@ -1,17 +0,0 @@ -/** - * Autogenerated by Thrift Compiler (0.12.0) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ -#include "megasearch_constants.h" - -namespace megasearch { namespace thrift { - -const megasearchConstants g_megasearch_constants; - -megasearchConstants::megasearchConstants() { -} - -}} // namespace - diff --git a/cpp/src/thrift/gen-cpp/megasearch_constants.h b/cpp/src/thrift/gen-cpp/megasearch_constants.h deleted file mode 100644 index 7f31ad1a96..0000000000 --- a/cpp/src/thrift/gen-cpp/megasearch_constants.h +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Autogenerated by Thrift Compiler (0.12.0) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ -#ifndef megasearch_CONSTANTS_H -#define megasearch_CONSTANTS_H - -#include "megasearch_types.h" - -namespace megasearch { namespace thrift { - -class megasearchConstants { - public: - megasearchConstants(); - -}; - -extern const megasearchConstants g_megasearch_constants; - -}} // namespace - -#endif diff --git a/cpp/src/thrift/gen-cpp/milvus_constants.cpp b/cpp/src/thrift/gen-cpp/milvus_constants.cpp new file mode 100644 index 0000000000..00f0b4f060 --- /dev/null +++ b/cpp/src/thrift/gen-cpp/milvus_constants.cpp @@ -0,0 +1,17 @@ +/** + * Autogenerated by Thrift Compiler (0.12.0) + * + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated + */ +#include "milvus_constants.h" + +namespace milvus { namespace thrift { + +const milvusConstants g_milvus_constants; + +milvusConstants::milvusConstants() { +} + +}} // namespace + diff --git a/cpp/src/thrift/gen-cpp/milvus_constants.h b/cpp/src/thrift/gen-cpp/milvus_constants.h new file mode 100644 index 0000000000..36dbf70485 --- /dev/null +++ b/cpp/src/thrift/gen-cpp/milvus_constants.h @@ -0,0 +1,24 @@ +/** + * Autogenerated by Thrift Compiler (0.12.0) + * + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated + */ +#ifndef milvus_CONSTANTS_H +#define milvus_CONSTANTS_H + +#include "milvus_types.h" + +namespace milvus { namespace thrift { + +class milvusConstants { + public: + milvusConstants(); + +}; + +extern const milvusConstants g_milvus_constants; + +}} // namespace + +#endif diff --git a/cpp/src/thrift/gen-cpp/megasearch_types.cpp b/cpp/src/thrift/gen-cpp/milvus_types.cpp similarity index 99% rename from cpp/src/thrift/gen-cpp/megasearch_types.cpp rename to cpp/src/thrift/gen-cpp/milvus_types.cpp index 13e0bed5fb..203faa2e52 100644 --- a/cpp/src/thrift/gen-cpp/megasearch_types.cpp +++ b/cpp/src/thrift/gen-cpp/milvus_types.cpp @@ -4,14 +4,14 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -#include "megasearch_types.h" +#include "milvus_types.h" #include #include #include -namespace megasearch { namespace thrift { +namespace milvus { namespace thrift { int _kErrorCodeValues[] = { ErrorCode::SUCCESS, diff --git a/cpp/src/thrift/gen-cpp/megasearch_types.h b/cpp/src/thrift/gen-cpp/milvus_types.h similarity index 98% rename from cpp/src/thrift/gen-cpp/megasearch_types.h rename to cpp/src/thrift/gen-cpp/milvus_types.h index 8ef19d02c8..ea4178aa99 100644 --- a/cpp/src/thrift/gen-cpp/megasearch_types.h +++ b/cpp/src/thrift/gen-cpp/milvus_types.h @@ -4,8 +4,8 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -#ifndef megasearch_TYPES_H -#define megasearch_TYPES_H +#ifndef milvus_TYPES_H +#define milvus_TYPES_H #include @@ -18,7 +18,7 @@ #include -namespace megasearch { namespace thrift { +namespace milvus { namespace thrift { struct ErrorCode { enum type { diff --git a/cpp/src/thrift/megasearch.thrift b/cpp/src/thrift/milvus.thrift similarity index 92% rename from cpp/src/thrift/megasearch.thrift rename to cpp/src/thrift/milvus.thrift index 0f15695e65..bc57a4304c 100644 --- a/cpp/src/thrift/megasearch.thrift +++ b/cpp/src/thrift/milvus.thrift @@ -3,15 +3,15 @@ * Unauthorized copying of this file, via any medium is strictly prohibited. * Proprietary and confidential. ******************************************************************************/ -namespace cpp megasearch.thrift -namespace py megasearch.thrift -namespace d megasearch.thrift -namespace dart megasearch.thrift -namespace java megasearch.thrift -namespace perl megasearch.thrift -namespace php megasearch.thrift -namespace haxe megasearch.thrift -namespace netcore megasearch.thrift +namespace cpp milvus.thrift +namespace py milvus.thrift +namespace d milvus.thrift +namespace dart milvus.thrift +namespace java milvus.thrift +namespace perl milvus.thrift +namespace php milvus.thrift +namespace haxe milvus.thrift +namespace netcore milvus.thrift enum ErrorCode { SUCCESS = 0, @@ -69,7 +69,7 @@ struct TopKQueryResult { 1: list query_result_arrays; ///< TopK query result } -service MegasearchService { +service MilvusService { /** * @brief Create table method * diff --git a/cpp/start_server.sh b/cpp/start_server.sh index 15b5be4367..50bf8b84a8 100755 --- a/cpp/start_server.sh +++ b/cpp/start_server.sh @@ -1,4 +1,4 @@ #!/bin/bash -./cmake_build/src/vecwise_server -c ./conf/server_config.yaml -l ./conf/vecwise_engine_log.conf & +./cmake_build/src/milvus_server -c ./conf/server_config.yaml -l ./conf/log_config.conf & diff --git a/cpp/stop_server.sh b/cpp/stop_server.sh index 89bd9398e0..f15e48a954 100755 --- a/cpp/stop_server.sh +++ b/cpp/stop_server.sh @@ -7,10 +7,10 @@ function kill_progress() sleep 2 } -STATUS=$(kill_progress "vecwise_server" ) +STATUS=$(kill_progress "milvus_server" ) if [[ ${STATUS} == "false" ]];then - echo "vecwise_server closed abnormally!" + echo "Milvus server closed abnormally!" else - echo "vecwise_server closed successfully!" + echo "Milvus server closed successfully!" fi diff --git a/cpp/unittest/CMakeLists.txt b/cpp/unittest/CMakeLists.txt index e636ff97cf..f2fa5db0e0 100644 --- a/cpp/unittest/CMakeLists.txt +++ b/cpp/unittest/CMakeLists.txt @@ -5,14 +5,13 @@ #------------------------------------------------------------------------------- link_directories( "${CMAKE_BINARY_DIR}/lib" - #"${VECWISE_THIRD_PARTY_BUILD}/lib" "${GTEST_PREFIX}/lib/" ) message(STATUS "GTEST LIB: ${GTEST_PREFIX}/lib") set(unittest_srcs - ${CMAKE_CURRENT_SOURCE_DIR}/vecwise_test.cpp) + ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp) #${EASYLOGGINGPP_INCLUDE_DIR}/easylogging++.cc) set(unittest_libs diff --git a/cpp/unittest/db/meta_tests.cpp b/cpp/unittest/db/meta_tests.cpp index 36efff2905..147ab38595 100644 --- a/cpp/unittest/db/meta_tests.cpp +++ b/cpp/unittest/db/meta_tests.cpp @@ -93,7 +93,7 @@ TEST_F(MetaTest, table_file_TEST) { TEST_F(MetaTest, ARCHIVE_TEST_DAYS) { srand(time(0)); DBMetaOptions options; - options.path = "/tmp/vecwise_test"; + options.path = "/tmp/milvus_test"; int days_num = rand() % 100; std::stringstream ss; ss << "days:" << days_num; @@ -142,7 +142,7 @@ TEST_F(MetaTest, ARCHIVE_TEST_DAYS) { TEST_F(MetaTest, ARCHIVE_TEST_DISK) { DBMetaOptions options; - options.path = "/tmp/vecwise_test"; + options.path = "/tmp/milvus_test"; options.archive_conf = ArchiveConf("delete", "disk:11"); auto impl = meta::DBMetaImpl(options); diff --git a/cpp/unittest/db/utils.cpp b/cpp/unittest/db/utils.cpp index 32c2ba71ce..0de876b39c 100644 --- a/cpp/unittest/db/utils.cpp +++ b/cpp/unittest/db/utils.cpp @@ -31,7 +31,7 @@ void DBTest::InitLog() { engine::Options DBTest::GetOptions() { auto options = engine::OptionsFactory::Build(); - options.meta.path = "/tmp/vecwise_test"; + options.meta.path = "/tmp/milvus_test"; return options; } @@ -43,12 +43,12 @@ void DBTest::SetUp() { void DBTest::TearDown() { delete db_; - boost::filesystem::remove_all("/tmp/vecwise_test"); + boost::filesystem::remove_all("/tmp/milvus_test"); } engine::Options DBTest2::GetOptions() { auto options = engine::OptionsFactory::Build(); - options.meta.path = "/tmp/vecwise_test"; + options.meta.path = "/tmp/milvus_test"; options.meta.archive_conf = engine::ArchiveConf("delete", "disk:1"); return options; } diff --git a/cpp/unittest/license/license_check_test.cpp b/cpp/unittest/license/license_check_test.cpp index b0d6e26290..2621ff58ae 100644 --- a/cpp/unittest/license/license_check_test.cpp +++ b/cpp/unittest/license/license_check_test.cpp @@ -17,7 +17,7 @@ TEST(LicenseLibraryTest, CHECK_TEST) { server::ServerError err; // 1. Set license file name - std::string license_file_path("/tmp/megasearch/abc.license"); + std::string license_file_path("/tmp/milvus/abc.license"); // 2. Legality check err = server::LicenseCheck::LegalityCheck(license_file_path); @@ -29,7 +29,7 @@ TEST(LicenseLibraryTest, CHECK_ERROR1_TEST){ server::ServerError err; // 1. Set license file name - std::string license_file_path("/tmp/megasearch/abc"); + std::string license_file_path("/tmp/milvus/abc"); // 2. Legality check err = server::LicenseCheck::LegalityCheck(license_file_path); @@ -40,7 +40,7 @@ TEST(LicenseLibraryTest, CHECK_ERROR2_TEST){ server::ServerError err; // 1. Set license file name - std::string license_file_path("/tmp/megasearch/abc.license"); + std::string license_file_path("/tmp/milvus/abc.license"); // 2. Define output var int device_count; @@ -74,7 +74,7 @@ TEST(LicenseLibraryTest, CHECK_ERROR3_TEST){ server::ServerError err; // 1. Set license file name - std::string license_file_path("/tmp/megasearch/abc.license"); + std::string license_file_path("/tmp/milvus/abc.license"); // 2. Define output var int device_count; @@ -108,7 +108,7 @@ TEST(LicenseLibraryTest, CHECK_ERROR4_1_TEST){ server::ServerError err; // 1. Set license file name - std::string license_file_path("/tmp/megasearch/abc.license"); + std::string license_file_path("/tmp/milvus/abc.license"); // 2. Define output var int device_count; @@ -147,7 +147,7 @@ TEST(LicenseLibraryTest, CHECK_ERROR4_2_TEST){ server::ServerError err; // 1. Set license file name - std::string license_file_path("/tmp/megasearch/abc.license"); + std::string license_file_path("/tmp/milvus/abc.license"); // 2. Define output var int device_count; diff --git a/cpp/unittest/license/license_library_tests.cpp b/cpp/unittest/license/license_library_tests.cpp index 329d8f1939..406fd863c1 100644 --- a/cpp/unittest/license/license_library_tests.cpp +++ b/cpp/unittest/license/license_library_tests.cpp @@ -93,7 +93,7 @@ TEST(LicenseLibraryTest, LICENSE_FILE_TEST) { } // 5.GPU_info File - std::string GPU_info_file_path("/tmp/megasearch.info"); + std::string GPU_info_file_path("/tmp/milvus.info"); // 6. Generate GPU_info File @@ -118,7 +118,7 @@ TEST(LicenseLibraryTest, LICENSE_FILE_TEST) { } // 9. Set license file name - std::string license_file_path("/tmp/megasearch.license"); + std::string license_file_path("/tmp/milvus.license"); // 10. Get System Time/starting_time ans End Time time_t sysyem_time; @@ -179,7 +179,7 @@ TEST(LicenseLibraryTest, LICENSE_FILE_TEST) { // // 17. Generate Secret File -// std::string secret_file_path("/tmp/megasearch.secret"); +// std::string secret_file_path("/tmp/milvus.secret"); // err = server::LicenseLibrary::SecretFileSerialization(secret_file_path, // update_time, // file_size, diff --git a/cpp/unittest/vecwise_test.cpp b/cpp/unittest/main.cpp similarity index 100% rename from cpp/unittest/vecwise_test.cpp rename to cpp/unittest/main.cpp diff --git a/cpp/unittest/server/common_test.cpp b/cpp/unittest/server/common_test.cpp index 27fb96c69c..27d8c522e5 100644 --- a/cpp/unittest/server/common_test.cpp +++ b/cpp/unittest/server/common_test.cpp @@ -11,7 +11,7 @@ using namespace zilliz::milvus; TEST(CommonTest, COMMON_TEST) { - std::string path1 = "/tmp/vecwise_test/"; + std::string path1 = "/tmp/milvus_test/"; std::string path2 = path1 + "common_test_12345/"; std::string path3 = path2 + "abcdef"; server::ServerError err = server::CommonUtil::CreateDirectory(path3); diff --git a/cpp/unittest/server/log_test.cpp b/cpp/unittest/server/log_test.cpp index d4d66cc95a..22410f78c9 100644 --- a/cpp/unittest/server/log_test.cpp +++ b/cpp/unittest/server/log_test.cpp @@ -9,7 +9,7 @@ class LogTest: public testing::Test { protected: void SetUp() override { - el::Configurations conf("../../../conf/vecwise_engine_log.conf"); + el::Configurations conf("../../../conf/log_config.conf"); el::Loggers::reconfigureAllLoggers(conf); } }; diff --git a/cpp/version.h.macro b/cpp/version.h.macro index a1d61cb271..2463407a0d 100644 --- a/cpp/version.h.macro +++ b/cpp/version.h.macro @@ -1,5 +1,5 @@ #pragma once -#define MEGASEARCH_VERSION "@MEGASEARCH_VERSION@" +#define MILVUS_VERSION "@MILVUS_VERSION@" #define BUILD_TYPE "@BUILD_TYPE@" #define BUILD_TIME @BUILD_TIME@ \ No newline at end of file From d8f4dfcf9d9ec133852210665c286ee2cb64b2b1 Mon Sep 17 00:00:00 2001 From: groot Date: Fri, 14 Jun 2019 18:08:25 +0800 Subject: [PATCH 2/3] fix a bug Former-commit-id: cbf14a38d42b41c58f687078e8310a4a968af8cf --- cpp/src/db/DBMetaImpl.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cpp/src/db/DBMetaImpl.cpp b/cpp/src/db/DBMetaImpl.cpp index 26185b84b3..864926b6c1 100644 --- a/cpp/src/db/DBMetaImpl.cpp +++ b/cpp/src/db/DBMetaImpl.cpp @@ -455,7 +455,8 @@ Status DBMetaImpl::FilesToSearch(const std::string &table_id, &TableFileSchema::file_id_, &TableFileSchema::file_type_, &TableFileSchema::size_, - &TableFileSchema::date_), + &TableFileSchema::date_, + &TableFileSchema::engine_type_), where(c(&TableFileSchema::table_id_) == table_id and in(&TableFileSchema::date_, partition) and (c(&TableFileSchema::file_type_) == (int) TableFileSchema::RAW or @@ -482,6 +483,7 @@ Status DBMetaImpl::FilesToSearch(const std::string &table_id, table_file.file_type_ = std::get<3>(file); table_file.size_ = std::get<4>(file); table_file.date_ = std::get<5>(file); + table_file.engine_type_ = std::get<6>(file); table_file.dimension_ = table_schema.dimension_; GetTableFilePath(table_file); auto dateItr = files.find(table_file.date_); From c2c2509573b2c65d74fcaa5bcc1f1e8b96fe4003 Mon Sep 17 00:00:00 2001 From: groot Date: Fri, 14 Jun 2019 19:00:28 +0800 Subject: [PATCH 3/3] dont delete table in sdk sample Former-commit-id: 3732321a43fa1c62c130a459ec6ce6bcf90490e2 --- cpp/src/sdk/examples/simple/src/ClientTest.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cpp/src/sdk/examples/simple/src/ClientTest.cpp b/cpp/src/sdk/examples/simple/src/ClientTest.cpp index 27f6ed1490..b25785f4ad 100644 --- a/cpp/src/sdk/examples/simple/src/ClientTest.cpp +++ b/cpp/src/sdk/examples/simple/src/ClientTest.cpp @@ -194,10 +194,10 @@ ClientTest::Test(const std::string& address, const std::string& port) { PrintSearchResult(topk_query_result_array); } - {//delete table - Status stat = conn->DeleteTable(TABLE_NAME); - std::cout << "DeleteTable function call status: " << stat.ToString() << std::endl; - } +// {//delete table +// Status stat = conn->DeleteTable(TABLE_NAME); +// std::cout << "DeleteTable function call status: " << stat.ToString() << std::endl; +// } {//server status std::string status = conn->ServerStatus();