fixed bug for delete vertex without edge (vesoft-inc#2001)

* When deleting a vertex, if the edge does not exist, then we should continue to delete the vertex instead of reporting an error. * added the testcase for delete vertex without edge.
tong-hao · Mar 31, 2020 · 8b7c7ae · 8b7c7ae
1 parent 56385c4
commit 8b7c7ae
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 12 deletions.
diff --git a/src/graph/DeleteVerticesExecutor.cpp b/src/graph/DeleteVerticesExecutor.cpp
@@ -111,20 +111,18 @@ void DeleteVerticesExecutor::execute() {
         for (auto& response : rpcResp) {
             std::unordered_map<EdgeType, std::shared_ptr<ResultSchemaProvider>> edgeSchema;
             auto *eschema = response.get_edge_schema();
-            if (eschema != nullptr) {
-                std::transform(eschema->cbegin(), eschema->cend(),
-                               std::inserter(edgeSchema, edgeSchema.begin()), [](auto &schema) {
-                                   return std::make_pair(
-                                       schema.first,
-                                       std::make_shared<ResultSchemaProvider>(schema.second));
-                               });
+            if (eschema == nullptr || eschema->empty()) {
+                continue;
             }
 
-            if (edgeSchema.empty()) {
-                LOG(ERROR) << "Can't find edge's schema";
-                doError(Status::Error("Can't find edge's schema"));
-                return;
-            }
+            std::transform(eschema->cbegin(),
+                           eschema->cend(),
+                           std::inserter(edgeSchema, edgeSchema.begin()),
+                           [](auto &schema) {
+                               return std::make_pair(
+                                   schema.first,
+                                   std::make_shared<ResultSchemaProvider>(schema.second));
+                           });
 
             for (auto &vdata : response.vertices) {
                 auto src = vdata.get_vertex_id();

diff --git a/src/graph/test/DeleteVerticesTest.cpp b/src/graph/test/DeleteVerticesTest.cpp
@@ -423,5 +423,35 @@ TEST_F(DeleteVerticesTest, DeleteWithUUID) {
     }
 }
 
+TEST_F(DeleteVerticesTest, DeleteNoEdges) {
+    {
+        cpp2::ExecutionResponse resp;
+        auto query = "create space deletenoedges_space";
+        auto code = client_->execute(query, resp);
+        ASSERT_EQ(cpp2::ErrorCode::SUCCEEDED, code);
+
+        query = "use deletenoedges_space";
+        code = client_->execute(query, resp);
+        ASSERT_EQ(cpp2::ErrorCode::SUCCEEDED, code);
+
+        query = "CREATE TAG person(name string, age int)";
+        code = client_->execute(query, resp);
+        ASSERT_EQ(cpp2::ErrorCode::SUCCEEDED, code);
+        sleep(2);
+        query = "INSERT VERTEX person(name, age) VALUES 101:(\"Tony Parker\", 36)";
+        code = client_->execute(query, resp);
+        ASSERT_EQ(cpp2::ErrorCode::SUCCEEDED, code);
+        query = "DELETE VERTEX 101";
+        code = client_->execute(query, resp);
+        ASSERT_EQ(cpp2::ErrorCode::SUCCEEDED, code);
+
+        query = "FETCH PROP ON person 101 yield person.name, person.age";
+        code = client_->execute(query, resp);
+        ASSERT_EQ(cpp2::ErrorCode::SUCCEEDED, code);
+        std::vector<std::tuple<std::string, int64_t>> expected = {};
+        ASSERT_TRUE(verifyResult(resp, expected));
+    }
+}
+
 }  // namespace graph
 }  // namespace nebula