diff --git a/src/client/src/tscLocalMerge.c b/src/client/src/tscLocalMerge.c
index 19395d6af887eb63bfcd6a40d99b6773698646b2..bc3c33423f85fcc9c81e122b9a4e3904f598410a 100644
--- a/src/client/src/tscLocalMerge.c
+++ b/src/client/src/tscLocalMerge.c
@@ -440,9 +440,9 @@ int32_t saveToBuffer(tExtMemBuffer *pMemoryBuf, tOrderDescriptor *pDesc, tFilePa
 
   // current buffer is full, need to flushed to disk
   assert(pPage->num == pModel->capacity);
-  int32_t ret = tscFlushTmpBuffer(pMemoryBuf, pDesc, pPage, orderType);
-  if (ret != 0) {
-    return -1;
+  int32_t code = tscFlushTmpBuffer(pMemoryBuf, pDesc, pPage, orderType);
+  if (code != 0) {
+    return code;
   }
 
   int32_t remain = numOfRows - numOfRemainEntries;
@@ -458,8 +458,8 @@ int32_t saveToBuffer(tExtMemBuffer *pMemoryBuf, tOrderDescriptor *pDesc, tFilePa
     tColModelAppend(pModel, pPage, data, numOfRows - remain, numOfWriteElems, numOfRows);
 
     if (pPage->num == pModel->capacity) {
-      if (tscFlushTmpBuffer(pMemoryBuf, pDesc, pPage, orderType) != TSDB_CODE_SUCCESS) {
-        return -1;
+      if ((code = tscFlushTmpBuffer(pMemoryBuf, pDesc, pPage, orderType)) != TSDB_CODE_SUCCESS) {
+        return code;
       }
     } else {
       pPage->num = numOfWriteElems;
diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index 425010649cba4328442127e5ad473db7109cc7a6..a05be259bcd8872150b33f976e776bdf903c2eb5 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -1501,7 +1501,6 @@ static void tscAbortFurtherRetryRetrieval(SRetrieveSupport *trsupport, TAOS_RES
   trsupport->numOfRetry = MAX_NUM_OF_SUBQUERY_RETRY;
   
   pthread_mutex_unlock(&trsupport->queryMutex);
-  
   tscHandleSubqueryError(trsupport, tres, pParentSql->res.code);
 }
 
@@ -1630,9 +1629,9 @@ static void tscAllDataRetrievedFromDnode(SRetrieveSupport *trsupport, SSqlObj* p
   
   // each result for a vnode is ordered as an independant list,
   // then used as an input of loser tree for disk-based merge routine
-  int32_t ret = tscFlushTmpBuffer(trsupport->pExtMemBuffer[idx], pDesc, trsupport->localBuffer, pQueryInfo->groupbyExpr.orderType);
-  if (ret != 0) { // set no disk space error info, and abort retry
-    return tscAbortFurtherRetryRetrieval(trsupport, pSql, ret);
+  int32_t code = tscFlushTmpBuffer(trsupport->pExtMemBuffer[idx], pDesc, trsupport->localBuffer, pQueryInfo->groupbyExpr.orderType);
+  if (code != 0) { // set no disk space error info, and abort retry
+    return tscAbortFurtherRetryRetrieval(trsupport, pSql, code);
   }
   
   int32_t remain = -1;