提交 3fda7a86 编写于 作者: H Haojun Liao

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

上级 3aa657e3
...@@ -351,6 +351,8 @@ void tscCreateLocalMerger(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tOrde ...@@ -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 ...@@ -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;
......
...@@ -159,6 +159,9 @@ if $data03 != @abc15@ then ...@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册