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

[td-225]fix compiler error.

This commit is contained in:
Haojun Liao 2021-05-26 14:22:28 +08:00
parent 649669ec44
commit 7fa9ecbd47
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -909,7 +909,7 @@ SOperatorInfo* createJoinOperator(SOperatorInfo** pUpstream, int32_t numOfUpstre
SRspResultInfo* pResInfo = &pInfo->resultInfo; SRspResultInfo* pResInfo = &pInfo->resultInfo;
pResInfo->capacity = 4096; pResInfo->capacity = 4096;
pResInfo->threshold = 4096 * 0.8; pResInfo->threshold = (int32_t) (4096 * 0.8);
pInfo->pRes = calloc(1, sizeof(SSDataBlock)); pInfo->pRes = calloc(1, sizeof(SSDataBlock));
pInfo->pRes->info.numOfCols = numOfOutput; pInfo->pRes->info.numOfCols = numOfOutput;
@ -992,7 +992,7 @@ void handleDownstreamOperator(SSqlObj** pSqlObjList, int32_t numOfUpstream, SQue
SOperatorInfo** p = calloc(px->numOfTables, POINTER_BYTES); SOperatorInfo** p = calloc(px->numOfTables, POINTER_BYTES);
p[0] = pSourceOperator; p[0] = pSourceOperator;
int32_t num = taosArrayGetSize(px->colList); int32_t num = (int32_t) taosArrayGetSize(px->colList);
schema = calloc(num, sizeof(SSchema)); schema = calloc(num, sizeof(SSchema));
memcpy(schema, pSchema, numOfCol1*sizeof(SSchema)); memcpy(schema, pSchema, numOfCol1*sizeof(SSchema));
@ -1011,8 +1011,7 @@ void handleDownstreamOperator(SSqlObj** pSqlObjList, int32_t numOfUpstream, SQue
pSourceOperator = createJoinOperator(p, px->numOfTables, schema, num); pSourceOperator = createJoinOperator(p, px->numOfTables, schema, num);
tfree(p); tfree(p);
} else { } else {
int32_t num = taosArrayGetSize(px->colList); size_t num = taosArrayGetSize(px->colList);
schema = calloc(num, sizeof(SSchema)); schema = calloc(num, sizeof(SSchema));
memcpy(schema, pSchema, numOfCol1*sizeof(SSchema)); memcpy(schema, pSchema, numOfCol1*sizeof(SSchema));
} }
@ -1080,7 +1079,7 @@ void tscFreeQueryInfo(SSqlCmd* pCmd, bool removeMeta) {
while(pQueryInfo != NULL) { while(pQueryInfo != NULL) {
SQueryInfo* p = pQueryInfo->sibling; SQueryInfo* p = pQueryInfo->sibling;
int32_t numOfUpstream = taosArrayGetSize(pQueryInfo->pUpstream); size_t numOfUpstream = taosArrayGetSize(pQueryInfo->pUpstream);
for(int32_t i = 0; i < numOfUpstream; ++i) { for(int32_t i = 0; i < numOfUpstream; ++i) {
SQueryInfo* pUpQueryInfo = taosArrayGetP(pQueryInfo->pUpstream, i); SQueryInfo* pUpQueryInfo = taosArrayGetP(pQueryInfo->pUpstream, i);
freeQueryInfoImpl(pUpQueryInfo); freeQueryInfoImpl(pUpQueryInfo);
@ -3353,7 +3352,7 @@ void executeQuery(SSqlObj* pSql, SQueryInfo* pQueryInfo) {
} }
if (taosArrayGetSize(pQueryInfo->pUpstream) > 0) { // nest query. do execute it firstly if (taosArrayGetSize(pQueryInfo->pUpstream) > 0) { // nest query. do execute it firstly
pSql->subState.numOfSub = taosArrayGetSize(pQueryInfo->pUpstream); pSql->subState.numOfSub = (int32_t) taosArrayGetSize(pQueryInfo->pUpstream);
pSql->pSubs = calloc(pSql->subState.numOfSub, POINTER_BYTES); pSql->pSubs = calloc(pSql->subState.numOfSub, POINTER_BYTES);
pSql->subState.states = calloc(pSql->subState.numOfSub, sizeof(int8_t)); pSql->subState.states = calloc(pSql->subState.numOfSub, sizeof(int8_t));