Minor enhancement about error message (vesoft-inc#1943)

* Minor enhancement about error message * fix conflict * resolve conflicts Co-authored-by: Doodle <[email protected]> Co-authored-by: Sophie <[email protected]>
yixinglu · Dec 19, 2022 · 4a5ab97 · 4a5ab97
1 parent 3885f74
commit 4a5ab97
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 38 deletions.
diff --git a/src/clients/meta/MetaClient.cpp b/src/clients/meta/MetaClient.cpp
@@ -1098,7 +1098,7 @@ Status MetaClient::handleResponse(const RESP& resp) {
     case nebula::cpp2::ErrorCode::E_FAIL_TO_CONNECT:
       return Status::Error("Fail to connect!");
     case nebula::cpp2::ErrorCode::E_RPC_FAILURE:
-      return Status::Error("Rpc failure!");
+      return Status::Error("Rpc failure, probably timeout!");
     case nebula::cpp2::ErrorCode::E_LEADER_CHANGED:
       return Status::LeaderChanged("Leader changed!");
     case nebula::cpp2::ErrorCode::E_NO_HOSTS:
@@ -1145,8 +1145,6 @@ Status MetaClient::handleResponse(const RESP& resp) {
       return Status::Error("The balancer is running!");
     case nebula::cpp2::ErrorCode::E_CONFIG_IMMUTABLE:
       return Status::Error("Config immutable!");
-    case nebula::cpp2::ErrorCode::E_CONFLICT:
-      return Status::Error("Conflict!");
     case nebula::cpp2::ErrorCode::E_INVALID_PARM:
       return Status::Error("Invalid param!");
     case nebula::cpp2::ErrorCode::E_WRONGCLUSTER:
@@ -1274,6 +1272,8 @@ Status MetaClient::handleResponse(const RESP& resp) {
       return Status::Error("User privilege need basic role!");
     case nebula::cpp2::ErrorCode::E_PRIVILEGE_ACTION_INVALID:
       return Status::Error("User privilege action invalid!");
+    case nebula::cpp2::ErrorCode::E_RELATED_FULLTEXT_INDEX_EXISTS:
+      return Status::Error("Related fulltext index exists, please drop it first");
     default:
       return Status::Error("Unknown error!");
   }

diff --git a/src/clients/storage/StorageClientBase-inl.h b/src/clients/storage/StorageClientBase-inl.h
@@ -205,7 +205,7 @@ folly::Future<StatusOr<Response>> StorageClientBase<ClientType, ClientManagerTyp
           invalidLeader(spaceId, partsId);
           LOG(ERROR) << "Request to " << host << " failed: " << ex->what();
         }
-        return Status::Error("RPC failure in StorageClient: %s", ex->what());
+        return Status::Error("RPC failure in StorageClient, probably timeout: %s", ex->what());
       });
 }
 

diff --git a/src/graph/executor/StorageAccessExecutor.h b/src/graph/executor/StorageAccessExecutor.h
@@ -56,6 +56,8 @@ class StorageAccessExecutor : public Executor {
 
   Status handleErrorCode(nebula::cpp2::ErrorCode code, PartitionID partId) const {
     switch (code) {
+      case nebula::cpp2::ErrorCode::E_RPC_FAILURE:
+        return Status::Error("Storage Error: RPC failure, probably timeout.");
       case nebula::cpp2::ErrorCode::E_KEY_NOT_FOUND:
         return Status::Error("Storage Error: Vertex or edge not found.");
       case nebula::cpp2::ErrorCode::E_DATA_TYPE_MISMATCH: {

diff --git a/src/interface/common.thrift b/src/interface/common.thrift
@@ -387,6 +387,7 @@ enum ErrorCode {
     E_SCHEMA_NAME_EXISTS              = -2014,  // Schema name already exists
     E_RELATED_INDEX_EXISTS            = -2015,  // There are still indexes related to tag or edge, cannot drop it
     E_RELATED_SPACE_EXISTS            = -2016,  // There are still some space on the host, cannot drop it
+    E_RELATED_FULLTEXT_INDEX_EXISTS   = -2017,  // There are still fulltext index on tag/edge
 
     E_STORE_FAILURE                   = -2021,  // Failed to store data
     E_STORE_SEGMENT_ILLEGAL           = -2022,  // Illegal storage segment

diff --git a/src/meta/processors/BaseProcessor-inl.h b/src/meta/processors/BaseProcessor-inl.h
@@ -469,7 +469,7 @@ nebula::cpp2::ErrorCode BaseProcessor<RESP>::indexCheck(
           if (it != indexCols.end()) {
             LOG(INFO) << "Index conflict, index :" << index.get_index_name()
                       << ", column : " << tCol.name;
-            return nebula::cpp2::ErrorCode::E_CONFLICT;
+            return nebula::cpp2::ErrorCode::E_RELATED_INDEX_EXISTS;
           }
         }
       }
@@ -490,7 +490,7 @@ nebula::cpp2::ErrorCode BaseProcessor<RESP>::ftIndexCheck(
             std::find_if(cols.begin(), cols.end(), [&](const auto& c) { return c == iCol.name; });
         if (it != cols.end()) {
           LOG(INFO) << "fulltext index conflict";
-          return nebula::cpp2::ErrorCode::E_CONFLICT;
+          return nebula::cpp2::ErrorCode::E_RELATED_FULLTEXT_INDEX_EXISTS;
         }
       }
     }

diff --git a/src/meta/processors/BaseProcessor.h b/src/meta/processors/BaseProcessor.h
@@ -351,7 +351,7 @@ class BaseProcessor {
    * @tparam RESP
    * @param items
    * @param alterItems
-   * @return ErrorCode::E_CONFLICT if contains
+   * @return ErrorCode::E_RELATED_INDEX_EXISTS if contains
    */
   nebula::cpp2::ErrorCode indexCheck(const std::vector<cpp2::IndexItem>& items,
                                      const std::vector<cpp2::AlterSchemaItem>& alterItems);
@@ -362,7 +362,7 @@ class BaseProcessor {
    * @tparam RESP
    * @param cols
    * @param alterItems
-   * @return nebula::cpp2::ErrorCode
+   * @return ErrorCode::E_RELATED_FULLTEXT_INDEX_EXISTS if contains
    */
   nebula::cpp2::ErrorCode ftIndexCheck(const std::vector<std::string>& cols,
                                        const std::vector<cpp2::AlterSchemaItem>& alterItems);

diff --git a/src/meta/processors/index/CreateEdgeIndexProcessor.cpp b/src/meta/processors/index/CreateEdgeIndexProcessor.cpp
@@ -24,15 +24,15 @@ void CreateEdgeIndexProcessor::process(const cpp2::CreateEdgeIndexReq& req) {
   }
   if (fields.size() != columnSet.size()) {
     LOG(INFO) << "Conflict field in the edge index.";
-    handleErrorCode(nebula::cpp2::ErrorCode::E_CONFLICT);
+    handleErrorCode(nebula::cpp2::ErrorCode::E_INVALID_PARM);
     onFinished();
     return;
   }
 
   // A maximum of 16 columns are allowed in the index
   if (columnSet.size() > maxIndexLimit) {
     LOG(INFO) << "The number of index columns exceeds maximum limit " << maxIndexLimit;
-    handleErrorCode(nebula::cpp2::ErrorCode::E_CONFLICT);
+    handleErrorCode(nebula::cpp2::ErrorCode::E_INVALID_PARM);
     onFinished();
     return;
   }

diff --git a/src/meta/processors/index/CreateTagIndexProcessor.cpp b/src/meta/processors/index/CreateTagIndexProcessor.cpp
@@ -24,15 +24,15 @@ void CreateTagIndexProcessor::process(const cpp2::CreateTagIndexReq& req) {
   }
   if (fields.size() != columnSet.size()) {
     LOG(INFO) << "Conflict field in the tag index.";
-    handleErrorCode(nebula::cpp2::ErrorCode::E_CONFLICT);
+    handleErrorCode(nebula::cpp2::ErrorCode::E_INVALID_PARM);
     onFinished();
     return;
   }
 
   // A maximum of 16 columns are allowed in the index.
   if (columnSet.size() > maxIndexLimit) {
     LOG(INFO) << "The number of index columns exceeds maximum limit " << maxIndexLimit;
-    handleErrorCode(nebula::cpp2::ErrorCode::E_CONFLICT);
+    handleErrorCode(nebula::cpp2::ErrorCode::E_INVALID_PARM);
     onFinished();
     return;
   }

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

diff --git a/src/meta/test/IndexProcessorTest.cpp b/src/meta/test/IndexProcessorTest.cpp
@@ -301,7 +301,7 @@ TEST(IndexProcessorTest, TagIndexTest) {
     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_INVALID_PARM, resp.get_code());
   }
   {
     cpp2::CreateTagIndexReq req;
@@ -665,7 +665,7 @@ TEST(IndexProcessorTest, EdgeIndexTest) {
     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_INVALID_PARM, resp.get_code());
   }
   {
     cpp2::CreateEdgeIndexReq req;
@@ -834,7 +834,7 @@ TEST(IndexProcessorTest, EdgeIndexTest) {
     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_INVALID_PARM, resp.get_code());
   }
   {
     cpp2::CreateEdgeIndexReq req;
@@ -846,7 +846,7 @@ TEST(IndexProcessorTest, EdgeIndexTest) {
     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_INVALID_PARM, resp.get_code());
   }
 }
 
@@ -1001,7 +1001,7 @@ TEST(IndexProcessorTest, IndexCheckAlterEdgeTest) {
     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());
   }
   // Verify ErrorCode of drop
   {
@@ -1024,7 +1024,7 @@ TEST(IndexProcessorTest, IndexCheckAlterEdgeTest) {
     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());
   }
 }
 
@@ -1128,7 +1128,7 @@ TEST(IndexProcessorTest, IndexCheckAlterTagTest) {
     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::AlterTagReq req;
@@ -1149,7 +1149,7 @@ TEST(IndexProcessorTest, IndexCheckAlterTagTest) {
     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());
   }
 }
 
@@ -1997,7 +1997,7 @@ TEST(IndexProcessorTest, AlterWithFTIndexTest) {
     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_FULLTEXT_INDEX_EXISTS, resp.get_code());
   }
   {
     cpp2::AlterTagReq req;
@@ -2018,7 +2018,7 @@ TEST(IndexProcessorTest, AlterWithFTIndexTest) {
     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_FULLTEXT_INDEX_EXISTS, resp.get_code());
   }
   {
     cpp2::AlterTagReq req;
@@ -2060,7 +2060,7 @@ TEST(IndexProcessorTest, AlterWithFTIndexTest) {
     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_FULLTEXT_INDEX_EXISTS, resp.get_code());
   }
   {
     cpp2::AlterEdgeReq req;
@@ -2081,7 +2081,7 @@ TEST(IndexProcessorTest, AlterWithFTIndexTest) {
     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_FULLTEXT_INDEX_EXISTS, resp.get_code());
   }
   {
     cpp2::AlterEdgeReq req;

diff --git a/src/meta/test/ProcessorTest.cpp b/src/meta/test/ProcessorTest.cpp
@@ -850,7 +850,7 @@ TEST(ProcessorTest, CreateEdgeTest) {
     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

diff --git a/src/tools/db-dump/CMakeLists.txt b/src/tools/db-dump/CMakeLists.txt
@@ -19,15 +19,15 @@ nebula_add_executable(
         curl
 )
 
-install(
-    TARGETS
-        db_dump
-    PERMISSIONS
-        OWNER_EXECUTE OWNER_WRITE OWNER_READ
-        GROUP_EXECUTE GROUP_READ
-        WORLD_EXECUTE WORLD_READ
-    DESTINATION
-        bin
-    COMPONENT
-        tool
-)
+#install(
+#    TARGETS
+#        db_dump
+#    PERMISSIONS
+#        OWNER_EXECUTE OWNER_WRITE OWNER_READ
+#        GROUP_EXECUTE GROUP_READ
+#        WORLD_EXECUTE WORLD_READ
+#    DESTINATION
+#        bin
+#    COMPONENT
+#        tool
+#)