From 59a6c1f87e081f43759810d9c6221b56e9065f8e Mon Sep 17 00:00:00 2001 From: jimingquan Date: Thu, 8 Sep 2022 14:53:10 +0800 Subject: [PATCH 1/2] Update AppendVerticesExecutor.cpp fix conflict --- src/graph/executor/query/AppendVerticesExecutor.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/graph/executor/query/AppendVerticesExecutor.cpp b/src/graph/executor/query/AppendVerticesExecutor.cpp index 86a152f6b17..5217d29ba4a 100644 --- a/src/graph/executor/query/AppendVerticesExecutor.cpp +++ b/src/graph/executor/query/AppendVerticesExecutor.cpp @@ -31,14 +31,11 @@ folly::Future 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(); ->>>>>>> fc434bbc4 (add unwind & check vidType when executing not validate (#4456)) if (vertices.rows.empty()) { return finish(ResultBuilder().value(Value(DataSet(av->colNames()))).build()); } From 8e35a86d0ccc0302b1fa68e098cbd1cabefd9d43 Mon Sep 17 00:00:00 2001 From: jimingquan Date: Thu, 8 Sep 2022 15:01:59 +0800 Subject: [PATCH 2/2] Update AppendVerticesExecutor.cpp --- src/graph/executor/query/AppendVerticesExecutor.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/graph/executor/query/AppendVerticesExecutor.cpp b/src/graph/executor/query/AppendVerticesExecutor.cpp index 5217d29ba4a..d4fe327e763 100644 --- a/src/graph/executor/query/AppendVerticesExecutor.cpp +++ b/src/graph/executor/query/AppendVerticesExecutor.cpp @@ -31,7 +31,6 @@ folly::Future AppendVerticesExecutor::appendVertices() { return handleNullProp(av); } - StorageClient *storageClient = qctx()->getStorageClient(); auto res = buildRequestDataSet(av); NG_RETURN_IF_ERROR(res);