Merge branch 'cherry-pick-3.2.1-0907' of github.com:vesoft-inc/nebula…

… into cherry-pick-3.2.1-0907
vesoft-inc · Sep 8, 2022 · 035ab3c · 035ab3c
2 parents 66386c6 + 53d92e4
commit 035ab3c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 73 deletions.
diff --git a/src/graph/executor/query/AppendVerticesExecutor.cpp b/src/graph/executor/query/AppendVerticesExecutor.cpp
@@ -31,14 +31,8 @@ folly::Future<Status> AppendVerticesExecutor::appendVertices() {
     return handleNullProp(av);
   }
 
-<<<<<<< HEAD
   DataSet vertices = buildRequestDataSet(av);
-=======
   StorageClient *storageClient = qctx()->getStorageClient();
-  auto res = buildRequestDataSet(av);
-  NG_RETURN_IF_ERROR(res);
-  auto vertices = std::move(res).value();
->>>>>>> decd85339 (Prune properties (#4523))
   if (vertices.rows.empty()) {
     return finish(ResultBuilder().value(Value(DataSet(av->colNames()))).build());
   }