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

[td-4529]

This commit is contained in:
Haojun Liao 2021-06-04 13:28:06 +08:00
parent e6072702eb
commit ae91d43a7f
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3273,6 +3273,16 @@ SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, __async_cb_func_t
pNewQueryInfo->pTableMetaInfo = NULL; pNewQueryInfo->pTableMetaInfo = NULL;
pNewQueryInfo->bufLen = pQueryInfo->bufLen; pNewQueryInfo->bufLen = pQueryInfo->bufLen;
pNewQueryInfo->projectionQuery = pQueryInfo->projectionQuery;
pNewQueryInfo->hasFilter = pQueryInfo->hasFilter;
pNewQueryInfo->simpleAgg = pQueryInfo->simpleAgg;
pNewQueryInfo->onlyTagQuery = pQueryInfo->onlyTagQuery;
pNewQueryInfo->groupbyColumn = pQueryInfo->groupbyColumn;
pNewQueryInfo->arithmeticOnAgg = pQueryInfo->arithmeticOnAgg;
pNewQueryInfo->orderProjectQuery = pQueryInfo->orderProjectQuery;
pNewQueryInfo->diffQuery = pQueryInfo->diffQuery;
pNewQueryInfo->buf = malloc(pQueryInfo->bufLen); pNewQueryInfo->buf = malloc(pQueryInfo->bufLen);
if (pNewQueryInfo->buf == NULL) { if (pNewQueryInfo->buf == NULL) {
terrno = TSDB_CODE_TSC_OUT_OF_MEMORY; terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;

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

@ -4275,7 +4275,7 @@ static SSDataBlock* doTableScanImpl(void* param, bool* newgroup) {
doTableQueryInfoTimeWindowCheck(pQueryAttr, *pTableQueryInfo); doTableQueryInfoTimeWindowCheck(pQueryAttr, *pTableQueryInfo);
if (pTableScanInfo->prevGroupId != -1 && pTableScanInfo->prevGroupId != (*pTableQueryInfo)->groupIndex) { if (pTableScanInfo->prevGroupId != -1 && pTableScanInfo->prevGroupId != (*pTableQueryInfo)->groupIndex) {
*newgroup = true; *newgroup = false;
} }
pTableScanInfo->prevGroupId = (*pTableQueryInfo)->groupIndex; pTableScanInfo->prevGroupId = (*pTableQueryInfo)->groupIndex;