From 897b0264e84a2df99aa7505a50466de45a984917 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 31 Dec 2020 18:45:14 +0800
Subject: [PATCH] [TD-225]refactor codes.

---
 src/query/src/qExecutor.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 6d2f99dbf7..89060bbf4b 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -5448,7 +5448,7 @@ static void sequentialTableProcess(SQInfo *pQInfo) {
   }
 }
 
-static void doSaveContext(SQInfo *pQInfo) {
+static int32_t doSaveContext(SQInfo *pQInfo) {
   SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv;
   SQuery *          pQuery = pRuntimeEnv->pQuery;
 
@@ -5474,9 +5474,7 @@ static void doSaveContext(SQInfo *pQInfo) {
 
   pRuntimeEnv->prevGroupId = INT32_MIN;
   pRuntimeEnv->pSecQueryHandle = tsdbQueryTables(pQInfo->tsdb, &cond, &pQInfo->tableGroupInfo, pQInfo, &pQInfo->memRef);
-  if (pRuntimeEnv->pSecQueryHandle == NULL) {
-    longjmp(pRuntimeEnv->env, terrno);
-  }
+  return (pRuntimeEnv->pSecQueryHandle == NULL)? -1:0;
 }
 
 static void doRestoreContext(SQInfo *pQInfo) {
@@ -5549,12 +5547,14 @@ static void multiTableQueryProcess(SQInfo *pQInfo) {
   doCloseAllTimeWindowAfterScan(pQInfo);
 
   if (needReverseScan(pQuery)) {
-    doSaveContext(pQInfo);
-
-    el = scanMultiTableDataBlocks(pQInfo);
-    qDebug("QInfo:%p reversed scan completed, elapsed time: %" PRId64 "ms", pQInfo, el);
-
-    doRestoreContext(pQInfo);
+    int32_t code = doSaveContext(pQInfo);
+    if (code == TSDB_CODE_SUCCESS) {
+      el = scanMultiTableDataBlocks(pQInfo);
+      qDebug("QInfo:%p reversed scan completed, elapsed time: %" PRId64 "ms", pQInfo, el);
+      doRestoreContext(pQInfo);
+    } else {
+      pQInfo->code = code;
+    }
   } else {
     qDebug("QInfo:%p no need to do reversed scan, query completed", pQInfo);
   }
-- 
GitLab