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

[td-225]fix memory leak

This commit is contained in:
Haojun Liao 2021-04-25 13:43:45 +08:00
parent c4f03061d2
commit 747db68a2e
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -566,7 +566,6 @@ static int32_t tscLaunchRealSubqueries(SSqlObj* pSql) {
break; break;
} }
tscClearSubqueryInfo(&pNew->cmd); tscClearSubqueryInfo(&pNew->cmd);
pSql->pSubs[i] = pNew; pSql->pSubs[i] = pNew;
@ -1878,6 +1877,7 @@ int32_t tscCreateJoinSubquery(SSqlObj *pSql, int16_t tableIndex, SJoinSupporter
pNewQueryInfo->limit.limit = -1; pNewQueryInfo->limit.limit = -1;
pNewQueryInfo->limit.offset = 0; pNewQueryInfo->limit.offset = 0;
taosArrayDestroy(pNewQueryInfo->pUpstream);
pNewQueryInfo->order.orderColId = INT32_MIN; pNewQueryInfo->order.orderColId = INT32_MIN;

7
src/query/src/qExecutor.c
View File

@ -6447,6 +6447,7 @@ int32_t createQueryFunc(SQueriedTableInfo* pTableInfo, int32_t numOfOutput, SExp
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
// todo refactor
int32_t createIndirectQueryFuncExprFromMsg(SQueryTableMsg* pQueryMsg, int32_t numOfOutput, SExprInfo** pExprInfo, int32_t createIndirectQueryFuncExprFromMsg(SQueryTableMsg* pQueryMsg, int32_t numOfOutput, SExprInfo** pExprInfo,
SSqlExpr** pExpr, SExprInfo* prevExpr) { SSqlExpr** pExpr, SExprInfo* prevExpr) {
*pExprInfo = NULL; *pExprInfo = NULL;
@ -6461,6 +6462,12 @@ int32_t createIndirectQueryFuncExprFromMsg(SQueryTableMsg* pQueryMsg, int32_t nu
for (int32_t i = 0; i < numOfOutput; ++i) { for (int32_t i = 0; i < numOfOutput; ++i) {
pExprs[i].base = *pExpr[i]; pExprs[i].base = *pExpr[i];
memset(pExprs[i].base.param, 0, sizeof(tVariant) * tListLen(pExprs[i].base.param));
for (int32_t j = 0; j < pExpr[i]->numOfParams; ++j) {
tVariantAssign(&pExprs[i].base.param[j], &pExpr[i]->param[j]);
}
pExprs[i].base.resType = 0; pExprs[i].base.resType = 0;
int16_t type = 0; int16_t type = 0;