diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index d20d133bd15e94800e8d7c0deb0a2d2d32dcaa59..80138b9d740d790c8e459118d2fb1f6872515682 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -2000,14 +2000,6 @@ void tscFirstRoundRetrieveCallback(void* param, TAOS_RES* tres, int numOfRows) {
 
   taos_free_result(pSql);
 
-/*
-  if (pSql->cmd.command == TSDB_SQL_RETRIEVE_EMPTY_RESULT) {
-    pParent->cmd.command = TSDB_SQL_RETRIEVE_EMPTY_RESULT;
-    (*pParent->fp)(pParent->param, pParent, 0);
-    return;
-  }
-*/
-
   if (resRows == 0) {
     pParent->cmd.command = TSDB_SQL_RETRIEVE_EMPTY_RESULT;
     (*pParent->fp)(pParent->param, pParent, 0);
@@ -2525,14 +2517,6 @@ static void tscAllDataRetrievedFromDnode(SRetrieveSupport *trsupport, SSqlObj* p
   tscFreeRetrieveSup(pSql);
 
   // set the command flag must be after the semaphore been correctly set.
-  /*
-  if (pParentSql->cmd.command != TSDB_SQL_RETRIEVE_EMPTY_RESULT) {
-    pParentSql->cmd.command = TSDB_SQL_RETRIEVE_LOCALMERGE;
-  } else {
-    pParentSql->res.completed = true;
-  }
-  */
-
   pParentSql->cmd.command = TSDB_SQL_RETRIEVE_LOCALMERGE;
   if (pParentSql->res.code == TSDB_CODE_SUCCESS) {
     (*pParentSql->fp)(pParentSql->param, pParentSql, 0);