Unify the go exit entry.

vesoft-inc · May 27, 2020 · fbe28b7 · fbe28b7
1 parent 4f0c557
commit fbe28b7
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/src/graph/GoExecutor.cpp b/src/graph/GoExecutor.cpp
@@ -576,24 +576,27 @@ void GoExecutor::stepOut() {
     std::move(future).via(runner).thenValue(cb).thenError(error);
 }
 
+#define GO_EXIT() \
+    do { \
+        if (records_.empty()) { \
+            onEmptyInputs(); \
+            return; \
+        } else { \
+            maybeFinishExecution(); \
+            return; \
+        } \
+    } while (0);
 
 void GoExecutor::onStepOutResponse(RpcResponse &&rpcResp) {
     joinResp(std::move(rpcResp));
 
     if (isFinalStep()) {
-        maybeFinishExecution();
-        return;
+        GO_EXIT();
     } else {
         auto dsts = getDstIdsFromResps(records_.end() - 1, records_.end());
         starts_ = std::move(dsts);
         if (starts_.empty()) {
-            if (curStep_ < recordFrom_) {
-                onEmptyInputs();
-                return;
-            } else {
-                maybeFinishExecution();
-                return;
-            }
+            GO_EXIT();
         }
         curStep_++;
         stepOut();