Cherry pick v3.0.0 0126 1 (#3829)

* Add gflag validator for client_idle_timeout_secs (#3807) Co-authored-by: Sophie <[email protected]> * Fix the promise/future. (#3814) Co-authored-by: jimingquan <[email protected]> Co-authored-by: Yichen Wang <[email protected]> Co-authored-by: cpw <[email protected]> Co-authored-by: jimingquan <[email protected]>
vesoft-inc · Jan 26, 2022 · b21f1e4 · b21f1e4
1 parent ed1f9b1
commit b21f1e4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/src/graph/executor/query/TraverseExecutor.cpp b/src/graph/executor/query/TraverseExecutor.cpp
@@ -80,11 +80,10 @@ folly::Future<Status> TraverseExecutor::traverse() {
     DataSet emptyResult;
     return finish(ResultBuilder().value(Value(std::move(emptyResult))).build());
   }
-  getNeighbors();
-  return promise_.getFuture();
+  return getNeighbors();
 }
 
-void TraverseExecutor::getNeighbors() {
+folly::Future<Status> TraverseExecutor::getNeighbors() {
   currentStep_++;
   time::Duration getNbrTime;
   StorageClient* storageClient = qctx_->getStorageClient();
@@ -93,7 +92,7 @@ void TraverseExecutor::getNeighbors() {
                                           qctx()->rctx()->session()->id(),
                                           qctx()->plan()->id(),
                                           qctx()->plan()->isProfileEnabled());
-  storageClient
+  return storageClient
       ->getNeighbors(param,
                      reqDs_.colNames,
                      std::move(reqDs_.rows),
@@ -112,7 +111,7 @@ void TraverseExecutor::getNeighbors() {
       .thenValue([this, getNbrTime](StorageRpcResponse<GetNeighborsResponse>&& resp) mutable {
         SCOPED_TIMER(&execTime_);
         addStats(resp, getNbrTime.elapsedInUSec());
-        handleResponse(resp);
+        return handleResponse(std::move(resp));
       });
 }
 
@@ -140,11 +139,11 @@ void TraverseExecutor::addStats(RpcResponse& resp, int64_t getNbrTimeInUSec) {
   otherStats_.emplace(folly::sformat("step {}", currentStep_), ss.str());
 }
 
-void TraverseExecutor::handleResponse(RpcResponse& resps) {
+folly::Future<Status> TraverseExecutor::handleResponse(RpcResponse&& resps) {
   SCOPED_TIMER(&execTime_);
   auto result = handleCompleteness(resps, FLAGS_accept_partial_success);
   if (!result.ok()) {
-    promise_.setValue(std::move(result).status());
+    return folly::makeFuture<Status>(std::move(result).status());
   }
 
   auto& responses = resps.responses();
@@ -162,21 +161,20 @@ void TraverseExecutor::handleResponse(RpcResponse& resps) {
 
   auto status = buildInterimPath(iter.get());
   if (!status.ok()) {
-    promise_.setValue(status);
-    return;
+    return folly::makeFuture<Status>(std::move(status));
   }
   if (!isFinalStep()) {
     if (reqDs_.rows.empty()) {
       if (range_ != nullptr) {
-        promise_.setValue(buildResult());
+        return folly::makeFuture<Status>(buildResult());
       } else {
-        promise_.setValue(Status::OK());
+        return folly::makeFuture<Status>(Status::OK());
       }
     } else {
-      getNeighbors();
+      return getNeighbors();
     }
   } else {
-    promise_.setValue(buildResult());
+    return folly::makeFuture<Status>(buildResult());
   }
 }
 

diff --git a/src/graph/executor/query/TraverseExecutor.h b/src/graph/executor/query/TraverseExecutor.h
@@ -41,9 +41,9 @@ class TraverseExecutor final : public StorageAccessExecutor {
 
   void addStats(RpcResponse& resps, int64_t getNbrTimeInUSec);
 
-  void getNeighbors();
+  folly::Future<Status> getNeighbors();
 
-  void handleResponse(RpcResponse& resps);
+  folly::Future<Status> handleResponse(RpcResponse&& resps);
 
   Status buildInterimPath(GetNeighborsIter* iter);
 
@@ -74,7 +74,6 @@ class TraverseExecutor final : public StorageAccessExecutor {
  private:
   DataSet reqDs_;
   const Traverse* traverse_{nullptr};
-  folly::Promise<Status> promise_;
   MatchStepRange* range_{nullptr};
   size_t currentStep_{0};
   std::list<std::unordered_map<Value, Paths>> paths_;

diff --git a/src/graph/service/GraphFlags.cpp b/src/graph/service/GraphFlags.cpp
@@ -84,3 +84,4 @@ static bool ValidateSessIdleTimeout(const char* flagname, int32_t value) {
   return false;
 }
 DEFINE_validator(session_idle_timeout_secs, &ValidateSessIdleTimeout);
+DEFINE_validator(client_idle_timeout_secs, &ValidateSessIdleTimeout);