Merge branch 'branch-0.4.0' into 'branch-0.4.0'

modify build.sh to make thrift on

See merge request megasearch/milvus!330

Former-commit-id: 956f04cd563d9c46a464d7703fcae73eb4e0e315

cpp/build.sh

@@ -11,7 +11,7 @@ PROFILING="OFF"
 BUILD_FAISS_WITH_MKL="OFF"
 USE_JFROG_CACHE="OFF"
 KNOWHERE_OPTS=""
-MILVUS_WITH_THRIFT="OFF"
+MILVUS_WITH_THRIFT="ON"
 
 while getopts "p:d:t:uhlrcgmj" arg
 do

cpp/src/CMakeLists.txt

@@ -198,33 +198,33 @@ set(knowhere_libs
         )
 
 #if (MILVUS_WITH_THRIFT STREQUAL "ON")
-    add_executable(milvus_thrift_server
-            ${config_files}
-            ${server_files}
-            ${thriftserver_files}
-            ${utils_files}
-            ${thrift_service_files}
-            ${metrics_files}
-            )
+#    add_executable(milvus_thrift_server
+#            ${config_files}
+#            ${server_files}
+#            ${thriftserver_files}
+#            ${utils_files}
+#            ${thrift_service_files}
+#            ${metrics_files}
+#            )
 #else()
-    add_executable(milvus_grpc_server
-            ${config_files}
-            ${server_files}
-            ${grpcserver_files}
-            ${utils_files}
-            ${grpc_service_files}
-            ${metrics_files}
-            )
+#    add_executable(milvus_grpc_server
+#            ${config_files}
+#            ${server_files}
+#            ${grpcserver_files}
+#            ${utils_files}
+#            ${grpc_service_files}
+#            ${metrics_files}
+#            )
 #endif()
-    add_executable(milvus_server
-            ${config_files}
-            ${server_files}
-            ${thriftserver_files}
-            ${grpcserver_files}
-            ${utils_files}
-            ${thrift_service_files}
-            ${grpc_service_files}
-            ${metrics_files})
+add_executable(milvus_server
+        ${config_files}
+        ${server_files}
+        ${thriftserver_files}
+        ${grpcserver_files}
+        ${utils_files}
+        ${thrift_service_files}
+        ${grpc_service_files}
+        ${metrics_files})
 
 if (ENABLE_LICENSE STREQUAL "ON")
 	add_executable(get_sys_info ${get_sys_info_files})
@@ -234,25 +234,25 @@ if (ENABLE_LICENSE STREQUAL "ON")
 	target_link_libraries(license_generator ${license_libs} ${third_party_libs})
 
 #    if(MILVUS_WITH_THRIFT STREQUAL "ON")
-        target_link_libraries(milvus_thrift_server ${server_libs} license_check ${knowhere_libs} ${third_party_libs})
+#        target_link_libraries(milvus_thrift_server ${server_libs} license_check ${knowhere_libs} ${third_party_libs})
 #    else()
-        target_link_libraries(milvus_grpc_server ${server_libs} license_check ${knowhere_libs} ${third_party_libs})
+#        target_link_libraries(milvus_grpc_server ${server_libs} license_check ${knowhere_libs} ${third_party_libs})
 #    endif()
     target_link_libraries(milvus_server ${server_libs} license_check ${knowhere_libs} ${third_party_libs})
 
 else ()
 #    if(MILVUS_WITH_THRIFT STREQUAL "ON")
-        target_link_libraries(milvus_thrift_server ${server_libs} ${knowhere_libs} ${third_party_libs})
+#        target_link_libraries(milvus_thrift_server ${server_libs} ${knowhere_libs} ${third_party_libs})
 #    else()
-        target_link_libraries(milvus_grpc_server ${server_libs} ${knowhere_libs} ${third_party_libs})
+#        target_link_libraries(milvus_grpc_server ${server_libs} ${knowhere_libs} ${third_party_libs})
 #    endif()
         target_link_libraries(milvus_server ${server_libs} ${knowhere_libs} ${third_party_libs})
 endif()
 
 #if (MILVUS_WITH_THRIFT STREQUAL "ON")
-    install(TARGETS milvus_thrift_server DESTINATION bin)
+#    install(TARGETS milvus_thrift_server DESTINATION bin)
 #else()
-    install(TARGETS milvus_grpc_server DESTINATION bin)
+#    install(TARGETS milvus_grpc_server DESTINATION bin)
 #endif()
     install(TARGETS milvus_server DESTINATION bin)
 

cpp/src/server/Server.cpp

@@ -229,9 +229,6 @@ Server::StartService() {
     std::thread grpc_thread = std::thread(&grpc::GrpcMilvusServer::StartService);
     thrift_thread.join();
     grpc_thread.join();
-//
-//    MilvusServer::StartService();
-//    grpc::GrpcMilvusServer::StartService();
 }
 
 void

cpp/src/server/thrift_impl/MilvusServer.cpp

@@ -96,14 +96,9 @@ MilvusServer::StartService() {
 
 void
 MilvusServer::StopService() {
-    auto stop_server_worker = [&]{
-        if(s_server != nullptr) {
-            s_server->stop();
-        }
-    };
-
-    std::shared_ptr<std::thread> stop_thread = std::make_shared<std::thread>(stop_server_worker);
-    stop_thread->join();
+    if(s_server != nullptr) {
+        s_server->stop();
+    }
 }
 
 }