fix vesoft-inc#4489

critical27 · Aug 8, 2022 · c59f833 · c59f833
1 parent f56a986
commit c59f833
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 17 deletions.
diff --git a/src/clients/meta/MetaClient.cpp b/src/clients/meta/MetaClient.cpp
@@ -955,6 +955,12 @@ Status MetaClient::handleResponse(const RESP& resp) {
       return Status::Error("Backup table failure!");
     case nebula::cpp2::ErrorCode::E_SESSION_NOT_FOUND:
       return Status::Error("Session not existed!");
+    case nebula::cpp2::ErrorCode::E_SCHEMA_NAME_EXISTS:
+      return Status::Error("Schema with same name exists");
+    case nebula::cpp2::ErrorCode::E_RELATED_INDEX_EXISTS:
+      return Status::Error("Related index exists, please drop index first");
+    case nebula::cpp2::ErrorCode::E_RELATED_SPACE_EXISTS:
+      return Status::Error("There are still space on the host");
     default:
       return Status::Error("Unknown error!");
   }

diff --git a/src/interface/common.thrift b/src/interface/common.thrift
@@ -357,6 +357,9 @@ enum ErrorCode {
     E_WRONGCLUSTER                    = -2010,  // Wrong cluster
     E_ZONE_NOT_ENOUGH                 = -2011,  // Listener conflicts
     E_ZONE_IS_EMPTY                   = -2012,  // Host not exist
+    E_SCHEMA_NAME_EXISTS              = -2013,  // Schema name alreay exists
+    E_RELATED_INDEX_EXISTS            = -2014,  // There are stil indexes related to tag or edge, cannot drop it
+    E_RELATED_SPACE_EXISTS            = -2015,  // There are still some spaec on the host, cannot drop it
 
     E_STORE_FAILURE                   = -2021,  // Failed to store data
     E_STORE_SEGMENT_ILLEGAL           = -2022,  // Illegal storage segment

diff --git a/src/meta/processors/schema/CreateEdgeProcessor.cpp b/src/meta/processors/schema/CreateEdgeProcessor.cpp
@@ -21,7 +21,7 @@ void CreateEdgeProcessor::process(const cpp2::CreateEdgeReq& req) {
     LOG(INFO) << "Failed to create edge `" << edgeName
               << "': some tag with the same name already exists.";
     resp_.id_ref() = to(nebula::value(conflictRet), EntryType::EDGE);
-    handleErrorCode(nebula::cpp2::ErrorCode::E_CONFLICT);
+    handleErrorCode(nebula::cpp2::ErrorCode::E_SCHEMA_NAME_EXISTS);
     onFinished();
     return;
   } else {

diff --git a/src/meta/processors/schema/DropEdgeProcessor.cpp b/src/meta/processors/schema/DropEdgeProcessor.cpp
@@ -50,7 +50,7 @@ void DropEdgeProcessor::process(const cpp2::DropEdgeReq& req) {
   }
   if (!nebula::value(indexes).empty()) {
     LOG(INFO) << "Drop edge error, index conflict, please delete index first.";
-    handleErrorCode(nebula::cpp2::ErrorCode::E_CONFLICT);
+    handleErrorCode(nebula::cpp2::ErrorCode::E_RELATED_INDEX_EXISTS);
     onFinished();
     return;
   }
@@ -59,7 +59,7 @@ void DropEdgeProcessor::process(const cpp2::DropEdgeReq& req) {
   if (nebula::ok(ftIdxRet)) {
     LOG(INFO) << "Drop edge error, fulltext index conflict, "
               << "please delete fulltext index first.";
-    handleErrorCode(nebula::cpp2::ErrorCode::E_CONFLICT);
+    handleErrorCode(nebula::cpp2::ErrorCode::E_RELATED_INDEX_EXISTS);
     onFinished();
     return;
   }

diff --git a/src/meta/processors/schema/DropTagProcessor.cpp b/src/meta/processors/schema/DropTagProcessor.cpp
@@ -50,7 +50,7 @@ void DropTagProcessor::process(const cpp2::DropTagReq& req) {
   }
   if (!nebula::value(indexes).empty()) {
     LOG(INFO) << "Drop tag error, index conflict, please delete index first.";
-    handleErrorCode(nebula::cpp2::ErrorCode::E_CONFLICT);
+    handleErrorCode(nebula::cpp2::ErrorCode::E_RELATED_INDEX_EXISTS);
     onFinished();
     return;
   }
@@ -59,7 +59,7 @@ void DropTagProcessor::process(const cpp2::DropTagReq& req) {
   if (nebula::ok(ftIdxRet)) {
     LOG(INFO) << "Drop tag error, fulltext index conflict, "
               << "please delete fulltext index first.";
-    handleErrorCode(nebula::cpp2::ErrorCode::E_CONFLICT);
+    handleErrorCode(nebula::cpp2::ErrorCode::E_RELATED_INDEX_EXISTS);
     onFinished();
     return;
   }

diff --git a/src/meta/processors/zone/DropHostsProcessor.cpp b/src/meta/processors/zone/DropHostsProcessor.cpp
@@ -54,7 +54,7 @@ void DropHostsProcessor::process(const cpp2::DropHostsReq& req) {
       for (auto& h : partHosts) {
         if (std::find(hosts.begin(), hosts.end(), h) != hosts.end()) {
           LOG(INFO) << h << " is related with partition";
-          code = nebula::cpp2::ErrorCode::E_CONFLICT;
+          code = nebula::cpp2::ErrorCode::E_RELATED_SPACE_EXISTS;
           break;
         }
       }

diff --git a/src/meta/processors/zone/DropZoneProcessor.cpp b/src/meta/processors/zone/DropZoneProcessor.cpp
@@ -86,7 +86,7 @@ nebula::cpp2::ErrorCode DropZoneProcessor::checkSpaceReplicaZone() {
     size_t replicaFactor = properties.get_replica_factor();
     if (replicaFactor == spaceZones.size()) {
       LOG(INFO) << "Space " << spaceId << " replica factor and zone size are the same";
-      code = nebula::cpp2::ErrorCode::E_CONFLICT;
+      code = nebula::cpp2::ErrorCode::E_ZONE_NOT_ENOUGH;
       break;
     }
     iter->next();
@@ -121,7 +121,7 @@ nebula::cpp2::ErrorCode DropZoneProcessor::checkHostPartition(const HostAddr& ad
       for (auto& host : hosts) {
         if (host == address) {
           LOG(INFO) << "Host " << address << " have partition on it";
-          code = nebula::cpp2::ErrorCode::E_CONFLICT;
+          code = nebula::cpp2::ErrorCode::E_RELATED_SPACE_EXISTS;
           break;
         }
       }

diff --git a/src/meta/test/IndexProcessorTest.cpp b/src/meta/test/IndexProcessorTest.cpp
@@ -1179,7 +1179,7 @@ TEST(IndexProcessorTest, IndexCheckDropEdgeTest) {
     auto f = processor->getFuture();
     processor->process(req);
     auto resp = std::move(f).get();
-    ASSERT_EQ(nebula::cpp2::ErrorCode::E_CONFLICT, resp.get_code());
+    ASSERT_EQ(nebula::cpp2::ErrorCode::E_RELATED_INDEX_EXISTS, resp.get_code());
   }
 }
 
@@ -1211,7 +1211,7 @@ TEST(IndexProcessorTest, IndexCheckDropTagTest) {
     auto f = processor->getFuture();
     processor->process(req);
     auto resp = std::move(f).get();
-    ASSERT_EQ(nebula::cpp2::ErrorCode::E_CONFLICT, resp.get_code());
+    ASSERT_EQ(nebula::cpp2::ErrorCode::E_RELATED_INDEX_EXISTS, resp.get_code());
   }
 }
 
@@ -1934,7 +1934,7 @@ TEST(IndexProcessorTest, DropWithFTIndexTest) {
     auto f = processor->getFuture();
     processor->process(req);
     auto resp = std::move(f).get();
-    ASSERT_EQ(nebula::cpp2::ErrorCode::E_CONFLICT, resp.get_code());
+    ASSERT_EQ(nebula::cpp2::ErrorCode::E_RELATED_INDEX_EXISTS, resp.get_code());
   }
   {
     cpp2::DropEdgeReq req;
@@ -1944,7 +1944,7 @@ TEST(IndexProcessorTest, DropWithFTIndexTest) {
     auto f = processor->getFuture();
     processor->process(req);
     auto resp = std::move(f).get();
-    ASSERT_EQ(nebula::cpp2::ErrorCode::E_CONFLICT, resp.get_code());
+    ASSERT_EQ(nebula::cpp2::ErrorCode::E_RELATED_INDEX_EXISTS, resp.get_code());
   }
 }
 

diff --git a/src/meta/test/ProcessorTest.cpp b/src/meta/test/ProcessorTest.cpp
@@ -640,7 +640,7 @@ TEST(ProcessorTest, CreateTagTest) {
     auto f = processor->getFuture();
     processor->process(req);
     auto resp = std::move(f).get();
-    ASSERT_EQ(nebula::cpp2::ErrorCode::E_CONFLICT, resp.get_code());
+    ASSERT_EQ(nebula::cpp2::ErrorCode::E_SCHEMA_NAME_EXISTS, resp.get_code());
   }
   {
     // Set schema ttl property
@@ -3596,7 +3596,7 @@ TEST(ProcessorTest, DropHostsTest) {
     auto f = processor->getFuture();
     processor->process(req);
     auto resp = std::move(f).get();
-    ASSERT_EQ(nebula::cpp2::ErrorCode::E_CONFLICT, resp.get_code());
+    ASSERT_EQ(nebula::cpp2::ErrorCode::E_RELATED_SPACE_EXISTS, resp.get_code());
   }
   {
     // Drop hosts which hold partition.
@@ -3607,7 +3607,7 @@ TEST(ProcessorTest, DropHostsTest) {
     auto f = processor->getFuture();
     processor->process(req);
     auto resp = std::move(f).get();
-    ASSERT_EQ(nebula::cpp2::ErrorCode::E_CONFLICT, resp.get_code());
+    ASSERT_EQ(nebula::cpp2::ErrorCode::E_RELATED_SPACE_EXISTS, resp.get_code());
   }
   {
     cpp2::DropSpaceReq req;
@@ -4665,7 +4665,7 @@ TEST(ProcessorTest, DropZoneTest) {
     auto f = processor->getFuture();
     processor->process(req);
     auto resp = std::move(f).get();
-    ASSERT_EQ(nebula::cpp2::ErrorCode::E_CONFLICT, resp.get_code());
+    ASSERT_EQ(nebula::cpp2::ErrorCode::E_ZONE_NOT_ENOUGH, resp.get_code());
   }
   {
     cpp2::DropSpaceReq req;
@@ -4699,7 +4699,7 @@ TEST(ProcessorTest, DropZoneTest) {
     auto f = processor->getFuture();
     processor->process(req);
     auto resp = std::move(f).get();
-    ASSERT_EQ(nebula::cpp2::ErrorCode::E_CONFLICT, resp.get_code());
+    ASSERT_EQ(nebula::cpp2::ErrorCode::E_RELATED_SPACE_EXISTS, resp.get_code());
   }
 }