Automerge1 (#1984)

* [skip ci] remove auto-merge git-action

Signed-off-by: jinhai <hai.jin@zilliz.com>

* [skip ci] update CHANGELOG.md

Signed-off-by: jinhai <hai.jin@zilliz.com>

* Stop strip the binary

Signed-off-by: jinhai <hai.jin@zilliz.com>

* Improve code

Signed-off-by: jinhai <hai.jin@zilliz.com>

* Fix compiling error

Signed-off-by: JinHai-CN <hai.jin@zilliz.com>

* Fix warning

Signed-off-by: JinHai-CN <hai.jin@zilliz.com>

.github/workflows/automerge.yml

@@ -1,27 +0,0 @@
-name: Automerge
-on:
-  pull_request:
-    types:
-      - labeled
-      - unlabeled
-      - synchronize
-      - opened
-      - edited
-      - ready_for_review
-      - reopened
-      - unlocked
-  pull_request_review:
-    types:
-      - submitted
-  status: {}
-jobs:
-  automerge:
-    runs-on: ubuntu-latest
-    steps:
-      - name: automerge
-        uses: "pascalgn/automerge-action@629929da409181990e4e638dcf84a74e11d3af66"
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          MERGE_LABELS: "automerge,!work in progress"
-          MERGE_METHOD: "squash"
-          MERGE_COMMIT_MESSAGE: "pull-request-title"

CHANGELOG.md

@@ -701,7 +701,7 @@ Please mark all change in change log and use the issue from GitHub
 -   MS-34 Fix prometheus-cpp thirdparty
 -   MS-67 Fix license check bug
 -   MS-76 Fix pipeline crash bug
--   MS-100 cmake: fix AWS build issue
+-   MS-100 CMake: fix AWS build issue
 -   MS-101 Change AWS build type to Release
 
 ## Improvement

core/build.sh

@@ -154,11 +154,6 @@ if [[ ${RUN_CPPLINT} == "ON" ]]; then
 #    echo "clang-tidy check passed!"
 else
 
-  # strip binary symbol
-  if [[ ${BUILD_TYPE} != "Debug" ]]; then
-    strip src/milvus_server
-  fi
-
   # compile and build
   make -j 8 install || exit 1
 fi

core/src/main.cpp

@@ -77,7 +77,6 @@ main(int argc, char* argv[]) {
     std::string app_name = argv[0];
 
     milvus::server::Server& server = milvus::server::Server::GetInstance();
-    milvus::Status s;
 
     if (argc < 2) {
         print_help(app_name);
@@ -133,8 +132,7 @@ main(int argc, char* argv[]) {
 
     server.Init(start_daemonized, pid_filename, config_filename, log_config_file);
 
-    s = server.Start();
-    if (s.ok()) {
+    if (server.Start().ok()) {
         std::cout << "Milvus server started successfully!" << std::endl;
     } else {
         goto FAIL;

core/src/server/grpc_impl/GrpcRequestHandler.cpp

@@ -292,7 +292,7 @@ GrpcRequestHandler::OnPreSendMessage(::grpc::experimental::ServerRpcInfo* server
     context_map_.erase(request_id);
 }
 
-const std::shared_ptr<Context>&
+std::shared_ptr<Context>
 GrpcRequestHandler::GetContext(::grpc::ServerContext* server_context) {
     std::lock_guard<std::mutex> lock(context_map_mutex_);
     auto request_id = get_request_id(server_context);

core/src/server/grpc_impl/GrpcRequestHandler.h

@@ -71,7 +71,7 @@ class GrpcRequestHandler final : public ::milvus::grpc::MilvusService::Service,
     OnPreSendMessage(::grpc::experimental::ServerRpcInfo* server_rpc_info,
                      ::grpc::experimental::InterceptorBatchMethods* interceptor_batch_methods) override;
 
-    const std::shared_ptr<Context>&
+    std::shared_ptr<Context>
     GetContext(::grpc::ServerContext* server_context);
 
     void

sdk/build.sh

@@ -84,12 +84,6 @@ if [[ ${RUN_CPPLINT} == "ON" ]]; then
 #    fi
 #    echo "clang-tidy check passed!"
 else
-
-  # strip binary symbol
-  if [[ ${BUILD_TYPE} != "Debug" ]]; then
-    strip src/milvus_server
-  fi
-
   # compile and build
   make -j 8  || exit 1
 fi