Skip to content

T
TDengine

taosdata / TDengine
1 年多 前同步成功

通知 1185
Star 22016
Fork 4786
T
TDengine
提交 0d7e1eb4 编写于 作者: G Ganlin Zhao
浏览文件
操作

fix(query): twa function output NULL if input has overlap timestamps 

TD-18224
上级 566af3ea
隐藏空白更改
内联 并排
Showing with 52 addition and 2 deletion
source/libs/function/src/builtinsimpl.c
浏览文件 @ 0d7e1eb4
...@@ -5398,8 +5398,8 @@ int32_t twaFunction(SqlFunctionCtx* pCtx) { ...@@ -5398,8 +5398,8 @@ int32_t twaFunction(SqlFunctionCtx* pCtx) {
int32_t i = pInput->startRowIndex; int32_t i = pInput->startRowIndex;
if (pCtx->start.key != INT64_MIN) { if (pCtx->start.key != INT64_MIN) {
ASSERT((pCtx->start.key < tsList[i] && pCtx->order == TSDB_ORDER_ASC) || //ASSERT((pCtx->start.key < tsList[i] && pCtx->order == TSDB_ORDER_ASC) ||
(pCtx->start.key > tsList[i] && pCtx->order == TSDB_ORDER_DESC)); // (pCtx->start.key > tsList[i] && pCtx->order == TSDB_ORDER_DESC));
ASSERT(last->key == INT64_MIN); ASSERT(last->key == INT64_MIN);
for (; i < pInput->numOfRows + pInput->startRowIndex; ++i) { for (; i < pInput->numOfRows + pInput->startRowIndex; ++i) {
...@@ -5446,6 +5446,11 @@ int32_t twaFunction(SqlFunctionCtx* pCtx) { ...@@ -5446,6 +5446,11 @@ int32_t twaFunction(SqlFunctionCtx* pCtx) {
} }
numOfElems++; numOfElems++;
if (pInfo->p.key == st.key) {
numOfElems = 0;
goto _twa_over;
}
INIT_INTP_POINT(st, tsList[i], val[i]); INIT_INTP_POINT(st, tsList[i], val[i]);
pInfo->dOutput += twa_get_area(pInfo->p, st); pInfo->dOutput += twa_get_area(pInfo->p, st);
pInfo->p = st; pInfo->p = st;
...@@ -5461,6 +5466,11 @@ int32_t twaFunction(SqlFunctionCtx* pCtx) { ...@@ -5461,6 +5466,11 @@ int32_t twaFunction(SqlFunctionCtx* pCtx) {
} }
numOfElems++; numOfElems++;
if (pInfo->p.key == st.key) {
numOfElems = 0;
goto _twa_over;
}
INIT_INTP_POINT(st, tsList[i], val[i]); INIT_INTP_POINT(st, tsList[i], val[i]);
pInfo->dOutput += twa_get_area(pInfo->p, st); pInfo->dOutput += twa_get_area(pInfo->p, st);
pInfo->p = st; pInfo->p = st;
...@@ -5475,6 +5485,11 @@ int32_t twaFunction(SqlFunctionCtx* pCtx) { ...@@ -5475,6 +5485,11 @@ int32_t twaFunction(SqlFunctionCtx* pCtx) {
} }
numOfElems++; numOfElems++;
if (pInfo->p.key == st.key) {
numOfElems = 0;
goto _twa_over;
}
INIT_INTP_POINT(st, tsList[i], val[i]); INIT_INTP_POINT(st, tsList[i], val[i]);
pInfo->dOutput += twa_get_area(pInfo->p, st); pInfo->dOutput += twa_get_area(pInfo->p, st);
pInfo->p = st; pInfo->p = st;
...@@ -5489,6 +5504,11 @@ int32_t twaFunction(SqlFunctionCtx* pCtx) { ...@@ -5489,6 +5504,11 @@ int32_t twaFunction(SqlFunctionCtx* pCtx) {
} }
numOfElems++; numOfElems++;
if (pInfo->p.key == st.key) {
numOfElems = 0;
goto _twa_over;
}
INIT_INTP_POINT(st, tsList[i], val[i]); INIT_INTP_POINT(st, tsList[i], val[i]);
pInfo->dOutput += twa_get_area(pInfo->p, st); pInfo->dOutput += twa_get_area(pInfo->p, st);
pInfo->p = st; pInfo->p = st;
...@@ -5503,6 +5523,11 @@ int32_t twaFunction(SqlFunctionCtx* pCtx) { ...@@ -5503,6 +5523,11 @@ int32_t twaFunction(SqlFunctionCtx* pCtx) {
} }
numOfElems++; numOfElems++;
if (pInfo->p.key == st.key) {
numOfElems = 0;
goto _twa_over;
}
INIT_INTP_POINT(st, tsList[i], val[i]); INIT_INTP_POINT(st, tsList[i], val[i]);
pInfo->dOutput += twa_get_area(pInfo->p, st); pInfo->dOutput += twa_get_area(pInfo->p, st);
pInfo->p = st; pInfo->p = st;
...@@ -5517,6 +5542,11 @@ int32_t twaFunction(SqlFunctionCtx* pCtx) { ...@@ -5517,6 +5542,11 @@ int32_t twaFunction(SqlFunctionCtx* pCtx) {
} }
numOfElems++; numOfElems++;
if (pInfo->p.key == st.key) {
numOfElems = 0;
goto _twa_over;
}
INIT_INTP_POINT(st, tsList[i], val[i]); INIT_INTP_POINT(st, tsList[i], val[i]);
pInfo->dOutput += twa_get_area(pInfo->p, st); pInfo->dOutput += twa_get_area(pInfo->p, st);
pInfo->p = st; pInfo->p = st;
...@@ -5531,6 +5561,11 @@ int32_t twaFunction(SqlFunctionCtx* pCtx) { ...@@ -5531,6 +5561,11 @@ int32_t twaFunction(SqlFunctionCtx* pCtx) {
} }
numOfElems++; numOfElems++;
if (pInfo->p.key == st.key) {
numOfElems = 0;
goto _twa_over;
}
INIT_INTP_POINT(st, tsList[i], val[i]); INIT_INTP_POINT(st, tsList[i], val[i]);
pInfo->dOutput += twa_get_area(pInfo->p, st); pInfo->dOutput += twa_get_area(pInfo->p, st);
pInfo->p = st; pInfo->p = st;
...@@ -5545,6 +5580,11 @@ int32_t twaFunction(SqlFunctionCtx* pCtx) { ...@@ -5545,6 +5580,11 @@ int32_t twaFunction(SqlFunctionCtx* pCtx) {
} }
numOfElems++; numOfElems++;
if (pInfo->p.key == st.key) {
numOfElems = 0;
goto _twa_over;
}
INIT_INTP_POINT(st, tsList[i], val[i]); INIT_INTP_POINT(st, tsList[i], val[i]);
pInfo->dOutput += twa_get_area(pInfo->p, st); pInfo->dOutput += twa_get_area(pInfo->p, st);
pInfo->p = st; pInfo->p = st;
...@@ -5559,6 +5599,11 @@ int32_t twaFunction(SqlFunctionCtx* pCtx) { ...@@ -5559,6 +5599,11 @@ int32_t twaFunction(SqlFunctionCtx* pCtx) {
} }
numOfElems++; numOfElems++;
if (pInfo->p.key == st.key) {
numOfElems = 0;
goto _twa_over;
}
INIT_INTP_POINT(st, tsList[i], val[i]); INIT_INTP_POINT(st, tsList[i], val[i]);
pInfo->dOutput += twa_get_area(pInfo->p, st); pInfo->dOutput += twa_get_area(pInfo->p, st);
pInfo->p = st; pInfo->p = st;
...@@ -5573,6 +5618,11 @@ int32_t twaFunction(SqlFunctionCtx* pCtx) { ...@@ -5573,6 +5618,11 @@ int32_t twaFunction(SqlFunctionCtx* pCtx) {
} }
numOfElems++; numOfElems++;
if (pInfo->p.key == st.key) {
numOfElems = 0;
goto _twa_over;
}
INIT_INTP_POINT(st, tsList[i], val[i]); INIT_INTP_POINT(st, tsList[i], val[i]);
pInfo->dOutput += twa_get_area(pInfo->p, st); pInfo->dOutput += twa_get_area(pInfo->p, st);
pInfo->p = st; pInfo->p = st;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或