From 5e037e420fb0e1f785a350cd54a6ed79edcae2d6 Mon Sep 17 00:00:00 2001 From: "zirui.chen" Date: Thu, 5 Sep 2019 16:42:33 +0800 Subject: [PATCH] MS-470 Drop index success, which table not created Former-commit-id: 8ec6d5e60b2095d418446324530ca8e5a84ba8ba --- cpp/CHANGELOG.md | 1 + cpp/src/server/grpc_impl/GrpcRequestTask.cpp | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md index c9247d970e..66da23829b 100644 --- a/cpp/CHANGELOG.md +++ b/cpp/CHANGELOG.md @@ -24,6 +24,7 @@ Please mark all change in change log and use the ticket from JIRA. - MS-462 - Run milvus server twices, should display error - MS-463 - Search timeout - MS-467 - mysql db test failed +- MS-470 - Drop index success, which table not created - MS-471 - code coverage run failed ## Improvement diff --git a/cpp/src/server/grpc_impl/GrpcRequestTask.cpp b/cpp/src/server/grpc_impl/GrpcRequestTask.cpp index 1b9bc935fa..d9b0d0496b 100644 --- a/cpp/src/server/grpc_impl/GrpcRequestTask.cpp +++ b/cpp/src/server/grpc_impl/GrpcRequestTask.cpp @@ -960,8 +960,15 @@ DropIndexTask::OnExecute() { return SetError(res, "Invalid table name: " + table_name_); } - //step 2: check table existence - engine::Status stat = DBWrapper::DB()->DropIndex(table_name_); + //step 2:check index existence + engine::TableIndex index; + engine::Status stat = DBWrapper::DB()->DescribeIndex(table_name_, index); + if (index.engine_type_ == 1) { + return SetError(SERVER_UNEXPECTED_ERROR, "index not existed"); + } + + //step 3: check table existence + stat = DBWrapper::DB()->DropIndex(table_name_); if (!stat.ok()) { return SetError(DB_META_TRANSACTION_FAILED, stat.ToString()); }