xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix bug

This commit is contained in:
wpan 2021-08-17 10:11:11 +08:00
parent af641899eb
commit 44be3ee34d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/client/src/tscSubquery.c
View File

@ -2737,6 +2737,9 @@ void tscHandleSubqueryError(SRetrieveSupport *trsupport, SSqlObj *pSql, int numO
SSqlObj *userSql = ((SRetrieveSupport*)pParentSql->param)->pParentSql; SSqlObj *userSql = ((SRetrieveSupport*)pParentSql->param)->pParentSql;
doCleanupSubqueries(userSql, userSql->subState.numOfSub);
userSql->subState.numOfSub = 0;
code = tsParseSql(userSql, true); code = tsParseSql(userSql, true);
if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) { if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
return; return;
@ -2748,9 +2751,6 @@ void tscHandleSubqueryError(SRetrieveSupport *trsupport, SSqlObj *pSql, int numO
return; return;
} }
doCleanupSubqueries(userSql, userSql->subState.numOfSub);
userSql->subState.numOfSub = 0;
pQueryInfo = tscGetQueryInfo(&userSql->cmd); pQueryInfo = tscGetQueryInfo(&userSql->cmd);
executeQuery(userSql, pQueryInfo); executeQuery(userSql, pQueryInfo);
} else { } else {

6
src/client/src/tscUtil.c
View File

@ -3773,6 +3773,9 @@ static void tscSubqueryCompleteCallback(void* param, TAOS_RES* tres, int code) {
SSqlObj *userSql = ((SRetrieveSupport*)pParentSql->param)->pParentSql; SSqlObj *userSql = ((SRetrieveSupport*)pParentSql->param)->pParentSql;
doCleanupSubqueries(userSql, userSql->subState.numOfSub);
userSql->subState.numOfSub = 0;
code = tsParseSql(userSql, true); code = tsParseSql(userSql, true);
if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) { if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
return; return;
@ -3786,9 +3789,6 @@ static void tscSubqueryCompleteCallback(void* param, TAOS_RES* tres, int code) {
SQueryInfo *pQueryInfo = tscGetQueryInfo(&userSql->cmd); SQueryInfo *pQueryInfo = tscGetQueryInfo(&userSql->cmd);
doCleanupSubqueries(userSql, userSql->subState.numOfSub);
userSql->subState.numOfSub = 0;
executeQuery(userSql, pQueryInfo); executeQuery(userSql, pQueryInfo);
return; return;
} }