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

[td-3662]fix bug found by regression test.

This commit is contained in:
Haojun Liao 2021-04-04 11:16:15 +08:00
parent 3aa657e3e7
commit 3fda7a8647
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/client/src/tscLocalMerge.c
View File

@ -351,6 +351,8 @@ void tscCreateLocalMerger(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tOrde
} }
assert(finalmodel->rowSize > 0 && finalmodel->rowSize <= pReducer->rowSize); assert(finalmodel->rowSize > 0 && finalmodel->rowSize <= pReducer->rowSize);
printf("------xxxx:%d\n", pReducer->rowSize * pReducer->resColModel->capacity);
pReducer->pFinalRes = calloc(1, pReducer->rowSize * pReducer->resColModel->capacity); pReducer->pFinalRes = calloc(1, pReducer->rowSize * pReducer->resColModel->capacity);
if (pReducer->pTempBuffer == NULL || pReducer->discardData == NULL || pReducer->pResultBuf == NULL || if (pReducer->pTempBuffer == NULL || pReducer->discardData == NULL || pReducer->pResultBuf == NULL ||
@ -942,6 +944,7 @@ static void genFinalResWithoutFill(SSqlRes* pRes, SLocalMerger *pLocalMerge, SQu
savePrevRecordAndSetupFillInfo(pLocalMerge, pQueryInfo, pLocalMerge->pFillInfo); savePrevRecordAndSetupFillInfo(pLocalMerge, pQueryInfo, pLocalMerge->pFillInfo);
} }
printf("size: %d\n", pRes->numOfRows * pLocalMerge->finalModel->rowSize);
memcpy(pRes->data, pBeforeFillData->data, (size_t)(pRes->numOfRows * pLocalMerge->finalModel->rowSize)); memcpy(pRes->data, pBeforeFillData->data, (size_t)(pRes->numOfRows * pLocalMerge->finalModel->rowSize));
pRes->numOfClauseTotal += pRes->numOfRows; pRes->numOfClauseTotal += pRes->numOfRows;

3
tests/script/general/parser/select_with_tags.sim
View File

@ -159,6 +159,9 @@ if $data03 != @abc15@ then
return -1 return -1
endi endi
sql select top(c6, 3) from select_tags_mt0 interval(10a)
sql select top(c1, 100), tbname, t1, t2 from select_tags_mt0; sql select top(c1, 100), tbname, t1, t2 from select_tags_mt0;
if $rows != 100 then if $rows != 100 then
return -1 return -1