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 00:57:24 +08:00
parent bdc6409e77
commit 43a6843dba
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3644,22 +3644,20 @@ void clearOutputBuf(SOptrBasicInfo* pBInfo, int32_t *bufCapacity) {
void copyTsColoum(SSDataBlock* pRes, SQLFunctionCtx* pCtx, int32_t numOfOutput) {
bool needCopyTs = false;
int32_t tsNum = 0;
char *src = NULL;
for (int32_t i = 0; i < numOfOutput; i++) {
int32_t functionId = pCtx[i].functionId;
if (functionId == TSDB_FUNC_DIFF || functionId == TSDB_FUNC_DERIVATIVE) {
needCopyTs = true;
}else if(functionId == TSDB_FUNC_TS_COMP) {
}else if(functionId == TSDB_FUNC_TS_DUMMY) {
SColumnInfoData* pColRes = taosArrayGet(pRes->pDataBlock, i);
if (strlen(pColRes->pData) != 0) {
src = pColRes->pData; // find ts data
}
tsNum++;
}
}
char *src = NULL;
for (int32_t col = 0; col < numOfOutput; ++col) {
SColumnInfoData* pColRes = taosArrayGet(pRes->pDataBlock, col);
if (strlen(pColRes->pData) != 0) {
src = pColRes->pData; // find ts data
}
}
if (!needCopyTs) return;
if (tsNum < 2) return;
if (src == NULL) return;