third revision

vesoft-inc · Oct 28, 2024 · 96d43e4 · 96d43e4
1 parent 83fb894
commit 96d43e4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 43 deletions.
diff --git a/src/graph/executor/mutate/UpdateExecutor.cpp b/src/graph/executor/mutate/UpdateExecutor.cpp
@@ -13,31 +13,6 @@ using nebula::storage::StorageClient;
 namespace nebula {
 namespace graph {
 
-StatusOr<DataSet> UpdateBaseExecutor::handleResult(DataSet &&data) {
-  if (data.colNames.size() <= 1) {
-    if (yieldNames_.empty()) {
-      return Status::OK();
-    }
-    return Status::Error("Empty return props");
-  }
-
-  if (yieldNames_.size() != data.colNames.size() - 1) {
-    LOG(WARNING) << "Expect colName size is " << yieldNames_.size() << ", return colName size is "
-                 << data.colNames.size() - 1;
-    return Status::Error("Wrong return prop size");
-  }
-  DataSet result;
-  result.colNames = yieldNames_;
-  for (auto &row : data.rows) {
-    std::vector<Value> columns;
-    for (auto i = 1u; i < row.values.size(); i++) {
-      columns.emplace_back(std::move(row.values[i]));
-    }
-    result.rows.emplace_back(std::move(columns));
-  }
-  return result;
-}
-
 Status UpdateBaseExecutor::handleMultiResult(DataSet &result, DataSet &&data) {
   if (data.colNames.size() <= 1) {
     if (yieldNames_.empty()) {
@@ -72,12 +47,6 @@ folly::Future<Status> UpdateVertexExecutor::execute() {
 
   if (vidRef != nullptr) {
     auto inputVar = urvNode->inputVar();
-    if (inputVar.empty()) {
-      DCHECK(urvNode->dep() != nullptr);
-      auto *gn = static_cast<const SingleInputNode *>(urvNode->dep())->dep();
-      DCHECK(gn != nullptr);
-      inputVar = static_cast<const SingleInputNode *>(gn)->inputVar();
-    }
     DCHECK(!inputVar.empty());
     auto &inputResult = ectx_->getResult(inputVar);
     auto iter = inputResult.iter();
@@ -188,9 +157,6 @@ folly::Future<Status> UpdateEdgeExecutor::execute() {
   QueryExpressionContext ctx(ectx_);
   for (; iter->valid(); iter->next()) {
     auto srcId = Expression::eval(edgeKeyRef->srcid(), ctx(iter.get()));
-    if (srcId.isNull() || srcId.empty()) {
-      continue;
-    }
     if (!SchemaUtil::isValidVid(srcId, *spaceInfo.spaceDesc.vid_type_ref())) {
       std::stringstream ss;
       ss << "Wrong srcId type `" << srcId.type() << "`, value `" << srcId.toString() << "'";

diff --git a/src/graph/executor/mutate/UpdateExecutor.h b/src/graph/executor/mutate/UpdateExecutor.h
@@ -18,8 +18,6 @@ class UpdateBaseExecutor : public StorageAccessExecutor {
   virtual ~UpdateBaseExecutor() {}
 
  protected:
-  StatusOr<DataSet> handleResult(DataSet &&data);
-
   Status handleMultiResult(DataSet &result, DataSet &&data);
 
  protected:

diff --git a/src/graph/validator/MutateValidator.h b/src/graph/validator/MutateValidator.h
@@ -206,9 +206,6 @@ class UpdateEdgeValidator final : public UpdateValidator {
   Status buildEdgeKeyRef();
 
  private:
-  Value srcId_;
-  Value dstId_;
-  EdgeRanking rank_{0};
   EdgeType edgeType_{-1};
 
   std::vector<EdgeId> edgeIds_;

diff --git a/src/graph/validator/test/MutateValidatorTest.cpp b/src/graph/validator/test/MutateValidatorTest.cpp
@@ -186,7 +186,7 @@ TEST_F(MutateValidatorTest, UpdateVertexTest) {
         "SET person.age = $^.person.age + 1 "
         "WHEN $^.person.age == 18 "
         "YIELD $^.person.name AS name, $^.person.age AS age";
-    ASSERT_TRUE(checkResult(cmd, {PK::kUpdateVertex, PK::kStart}));
+    ASSERT_TRUE(checkResult(cmd, {PK::kUpdateVertex, PK::kDedup, PK::kStart}));
   }
   // 2.0 syntax succeed
   {
@@ -195,7 +195,7 @@ TEST_F(MutateValidatorTest, UpdateVertexTest) {
         "SET age = age + 1 "
         "WHEN age == 18 "
         "YIELD name AS name, age AS age";
-    ASSERT_TRUE(checkResult(cmd, {PK::kUpdateVertex, PK::kStart}));
+    ASSERT_TRUE(checkResult(cmd, {PK::kUpdateVertex, PK::kDedup, PK::kStart}));
   }
 }
 
@@ -221,7 +221,7 @@ TEST_F(MutateValidatorTest, UpdateEdgeTest) {
         "SET end = like.end + 1 "
         "WHEN like.start >= 2010 "
         "YIELD like.start AS start, like.end AS end";
-    ASSERT_TRUE(checkResult(cmd, {PK::kUpdateEdge, PK::kUpdateEdge, PK::kStart}));
+    ASSERT_TRUE(checkResult(cmd, {PK::kUpdateEdge, PK::kDedup, PK::kStart}));
   }
   // 2.0 syntax succeed
   {
@@ -230,7 +230,7 @@ TEST_F(MutateValidatorTest, UpdateEdgeTest) {
         "SET end = end + 1 "
         "WHEN start >= 2010 "
         "YIELD start AS start, end AS end";
-    ASSERT_TRUE(checkResult(cmd, {PK::kUpdateEdge, PK::kUpdateEdge, PK::kStart}));
+    ASSERT_TRUE(checkResult(cmd, {PK::kUpdateEdge, PK::kDedup, PK::kStart}));
   }
 }
 }  // namespace graph