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

[TD-6046]<fix> fix ts derivative error

This commit is contained in:
wangmm0220 2021-08-17 12:08:58 +08:00
parent 2a45714d95
commit b37281d5d7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3645,15 +3645,16 @@ void copyTsColoum(SSDataBlock* pRes, SQLFunctionCtx* pCtx, int32_t numOfOutput)
bool needCopyTs = false; bool needCopyTs = false;
int32_t tsNum = 0; int32_t tsNum = 0;
char *src = NULL; char *src = NULL;
int32_t preFunctionId = TSDB_FUNC_TS_DUMMY;
for (int32_t i = 0; i < numOfOutput; i++) { for (int32_t i = 0; i < numOfOutput; i++) {
int32_t functionId = pCtx[i].functionId; int32_t functionId = pCtx[i].functionId;
if (functionId == TSDB_FUNC_DIFF || functionId == TSDB_FUNC_DERIVATIVE) { if (functionId == TSDB_FUNC_DIFF || functionId == TSDB_FUNC_DERIVATIVE) {
needCopyTs = true; needCopyTs = true;
}else if(functionId == TSDB_FUNC_TS_DUMMY) { if (i > 0 && pCtx[i-1].functionId == TSDB_FUNC_TS_DUMMY){
SColumnInfoData* pColRes = taosArrayGet(pRes->pDataBlock, i); SColumnInfoData* pColRes = taosArrayGet(pRes->pDataBlock, i - 1); // find ts data
if (strlen(pColRes->pData) != 0) { src = pColRes->pData;
src = pColRes->pData; // find ts data
} }
}else if(functionId == TSDB_FUNC_TS_DUMMY) {
tsNum++; tsNum++;
} }
} }