提交 b37281d5 编写于 作者: wmmhello's avatar wmmhello

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

上级 2a45714d
...@@ -3645,15 +3645,16 @@ void copyTsColoum(SSDataBlock* pRes, SQLFunctionCtx* pCtx, int32_t numOfOutput) ...@@ -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++;
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册