From f6f029468450012ef4ae2bf866415ce60cbd4540 Mon Sep 17 00:00:00 2001 From: dapan1121 Date: Wed, 12 Feb 2025 13:58:09 +0800 Subject: [PATCH] fix: add test cases and fix error message --- source/libs/parser/src/parTranslater.c | 36 +- tests/army/query/function/ans/interp.csv | 540 +++++++++++------------ tests/army/query/function/test_interp.py | 6 +- 3 files changed, 290 insertions(+), 292 deletions(-) diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c index 17c9d315bc..c5798b3674 100755 --- a/source/libs/parser/src/parTranslater.c +++ b/source/libs/parser/src/parTranslater.c @@ -5484,7 +5484,7 @@ static int32_t doCheckFillValues(STranslateContext* pCxt, SFillNode* pFill, SNod SNodeListNode* pFillValues = (SNodeListNode*)pFill->pValues; SNode* pProject = NULL; if (!pFillValues) - return generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_WRONG_VALUE_TYPE, "Filled values number mismatch"); + return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_WRONG_VALUE_TYPE, "Filled values number mismatch"); FOREACH(pProject, pProjectionList) { if (needFill(pProject)) { if (fillNo >= LIST_LENGTH(pFillValues->pNodeList)) { @@ -6418,16 +6418,16 @@ static int32_t translateInterpAround(STranslateContext* pCxt, SSelectStmt* pSele if (nodeType(pAround->pInterval) == QUERY_NODE_VALUE && ((SValueNode*)pAround->pInterval)->flag & VALUE_FLAG_IS_DURATION) { SValueNode* pVal = (SValueNode*)pAround->pInterval; if (pVal->datum.i == 0) { - return generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_FILL_TIME_RANGE, + return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_SYNTAX_ERROR, "Range interval cannot be 0"); } int8_t unit = pVal->unit; if (unit == TIME_UNIT_YEAR || unit == TIME_UNIT_MONTH) { - return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_WRONG_VALUE_TYPE, + return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_SYNTAX_ERROR, "Unsupported time unit in RANGE clause"); } } else { - return generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_FILL_TIME_RANGE, "Invalid range interval"); + return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_SYNTAX_ERROR, "Invalid range interval"); } } } @@ -6465,31 +6465,27 @@ static int32_t translateInterp(STranslateContext* pCxt, SSelectStmt* pSelect) { return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_STREAM_QUERY, "Missing EVERY clause or FILL clause"); } - } else { - if (!pSelect->pRangeAround) { - if (NULL == pSelect->pRange || NULL == pSelect->pEvery || NULL == pSelect->pFill) { - if (pSelect->pRange != NULL && QUERY_NODE_OPERATOR == nodeType(pSelect->pRange) && pSelect->pEvery == NULL) { - // single point interp every can be omitted - } else { - return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_INTERP_CLAUSE, - "Missing RANGE clause, EVERY clause or FILL clause"); - } - } - } else if (!pSelect->pFill) { - return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_INTERP_CLAUSE, "Missing FILL clause"); + } else if (NULL == pSelect->pRange || NULL == pSelect->pEvery || NULL == pSelect->pFill) { + if (pSelect->pRange != NULL && QUERY_NODE_OPERATOR == nodeType(pSelect->pRange) && pSelect->pEvery == NULL) { + // single point interp every can be omitted + } else { + return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_INTERP_CLAUSE, + "Missing RANGE clause, EVERY clause or FILL clause"); } } - code = translateExpr(pCxt, &pSelect->pRange); + if (TSDB_CODE_SUCCESS == code) { + code = translateInterpAround(pCxt, pSelect); + } + if (TSDB_CODE_SUCCESS == code) { + code = translateExpr(pCxt, &pSelect->pRange); + } if (TSDB_CODE_SUCCESS == code) { code = translateInterpEvery(pCxt, &pSelect->pEvery); } if (TSDB_CODE_SUCCESS == code) { code = translateInterpFill(pCxt, pSelect); } - if (TSDB_CODE_SUCCESS == code) { - code = translateInterpAround(pCxt, pSelect); - } if (TSDB_CODE_SUCCESS == code) { code = checkInterpForStream(pCxt, pSelect); } diff --git a/tests/army/query/function/ans/interp.csv b/tests/army/query/function/ans/interp.csv index 66e4fdc3c6..8af73074f3 100644 --- a/tests/army/query/function/ans/interp.csv +++ b/tests/army/query/function/ans/interp.csv @@ -1463,19 +1463,19 @@ taos> select _isfilled, _irowts_origin, _irowts, interp(c1), tbname from test.td taos> select interp(c1), interp(c4) from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(prev, 99, 98); interp(c1) | interp(c4) | ========================================= - 5 | 5.000000000000000 | - 99 | 98.000000000000000 | - 10 | 10.000000000000000 | - 99 | 98.000000000000000 | - 99 | 98.000000000000000 | - 15 | 15.000000000000000 | - 99 | 98.000000000000000 | - 99 | 98.000000000000000 | - 99 | 98.000000000000000 | - 99 | 98.000000000000000 | - 99 | 98.000000000000000 | - 99 | 98.000000000000000 | - 99 | 98.000000000000000 | + 5 | 5 | + 99 | 98 | + 10 | 10 | + 99 | 98 | + 99 | 98 | + 15 | 15 | + 99 | 98 | + 99 | 98 | + 99 | 98 | + 99 | 98 | + 99 | 98 | + 99 | 98 | + 99 | 98 | taos> select interp(c1), _isfilled, interp(c6) from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(prev, 99, false); interp(c1) | _isfilled | interp(c6) | @@ -1497,29 +1497,29 @@ taos> select interp(c1), _isfilled, interp(c6) from test.td32727 range('2020-02- taos> select _isfilled, _irowts, interp(c1), interp(c5) from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(prev, 99, 98); _isfilled | _irowts | interp(c1) | interp(c5) | ========================================================================== - true | 2020-02-01 00:00:06.000 | 5 | 5.0000000 | - true | 2020-02-01 00:00:08.000 | 99 | 98.0000000 | - false | 2020-02-01 00:00:10.000 | 10 | 10.0000000 | - true | 2020-02-01 00:00:12.000 | 99 | 98.0000000 | - true | 2020-02-01 00:00:14.000 | 99 | 98.0000000 | - true | 2020-02-01 00:00:16.000 | 15 | 15.0000000 | - true | 2020-02-01 00:00:18.000 | 99 | 98.0000000 | - true | 2020-02-01 00:00:20.000 | 99 | 98.0000000 | - true | 2020-02-01 00:00:22.000 | 99 | 98.0000000 | - true | 2020-02-01 00:00:24.000 | 99 | 98.0000000 | - true | 2020-02-01 00:00:26.000 | 99 | 98.0000000 | - true | 2020-02-01 00:00:28.000 | 99 | 98.0000000 | - true | 2020-02-01 00:00:30.000 | 99 | 98.0000000 | + true | 2020-02-01 00:00:06.000 | 5 | 5 | + true | 2020-02-01 00:00:08.000 | 99 | 98 | + false | 2020-02-01 00:00:10.000 | 10 | 10 | + true | 2020-02-01 00:00:12.000 | 99 | 98 | + true | 2020-02-01 00:00:14.000 | 99 | 98 | + true | 2020-02-01 00:00:16.000 | 15 | 15 | + true | 2020-02-01 00:00:18.000 | 99 | 98 | + true | 2020-02-01 00:00:20.000 | 99 | 98 | + true | 2020-02-01 00:00:22.000 | 99 | 98 | + true | 2020-02-01 00:00:24.000 | 99 | 98 | + true | 2020-02-01 00:00:26.000 | 99 | 98 | + true | 2020-02-01 00:00:28.000 | 99 | 98 | + true | 2020-02-01 00:00:30.000 | 99 | 98 | taos> select interp(c1), interp(c4) from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(prev, 99, NULL) order by _irowts; interp(c1) | interp(c4) | ========================================= - 5 | 5.000000000000000 | + 5 | 5 | 99 | NULL | - 10 | 10.000000000000000 | + 10 | 10 | 99 | NULL | 99 | NULL | - 15 | 15.000000000000000 | + 15 | 15 | 99 | NULL | 99 | NULL | 99 | NULL | @@ -1548,36 +1548,36 @@ taos> select interp(c1), interp(c6) from test.td32727 range('2020-02-01 00:00:00 taos> select interp(c1), _irowts_origin, interp(c4) from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(prev, 99, 'a'); interp(c1) | _irowts_origin | interp(c4) | =================================================================== - 5 | 2020-02-01 00:00:05.000 | 5.000000000000000 | - 99 | NULL | 0.000000000000000 | - 10 | 2020-02-01 00:00:10.000 | 10.000000000000000 | - 99 | NULL | 0.000000000000000 | - 99 | NULL | 0.000000000000000 | - 15 | 2020-02-01 00:00:15.000 | 15.000000000000000 | - 99 | NULL | 0.000000000000000 | - 99 | NULL | 0.000000000000000 | - 99 | NULL | 0.000000000000000 | - 99 | NULL | 0.000000000000000 | - 99 | NULL | 0.000000000000000 | - 99 | NULL | 0.000000000000000 | - 99 | NULL | 0.000000000000000 | + 5 | 2020-02-01 00:00:05.000 | 5 | + 99 | NULL | 0 | + 10 | 2020-02-01 00:00:10.000 | 10 | + 99 | NULL | 0 | + 99 | NULL | 0 | + 15 | 2020-02-01 00:00:15.000 | 15 | + 99 | NULL | 0 | + 99 | NULL | 0 | + 99 | NULL | 0 | + 99 | NULL | 0 | + 99 | NULL | 0 | + 99 | NULL | 0 | + 99 | NULL | 0 | taos> select interp(c1), interp(c4), interp(c5) from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(prev, 99, 9.9, 9) order by _irowts_origin; interp(c1) | interp(c4) | interp(c5) | ================================================================ - 99 | 9.900000000000000 | 9.0000000 | - 99 | 9.900000000000000 | 9.0000000 | - 99 | 9.900000000000000 | 9.0000000 | - 99 | 9.900000000000000 | 9.0000000 | - 99 | 9.900000000000000 | 9.0000000 | - 99 | 9.900000000000000 | 9.0000000 | - 99 | 9.900000000000000 | 9.0000000 | - 99 | 9.900000000000000 | 9.0000000 | - 99 | 9.900000000000000 | 9.0000000 | - 99 | 9.900000000000000 | 9.0000000 | - 5 | 5.000000000000000 | 5.0000000 | - 10 | 10.000000000000000 | 10.0000000 | - 15 | 15.000000000000000 | 15.0000000 | + 99 | 9.9 | 9 | + 99 | 9.9 | 9 | + 99 | 9.9 | 9 | + 99 | 9.9 | 9 | + 99 | 9.9 | 9 | + 99 | 9.9 | 9 | + 99 | 9.9 | 9 | + 99 | 9.9 | 9 | + 99 | 9.9 | 9 | + 99 | 9.9 | 9 | + 5 | 5 | 5 | + 10 | 10 | 10 | + 15 | 15 | 15 | taos> select interp(c1), interp(c2) from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(prev, 99, 9) order by _irowts_origin desc; interp(c1) | interp(c2) | @@ -1616,19 +1616,19 @@ taos> select interp(c6), interp(c1) from test.td32727 range('2020-02-01 00:00:00 taos> select interp(c1), interp(c4) from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(prev, 100, 99) order by _irowts desc, _irowts_origin; interp(c1) | interp(c4) | ========================================= - 100 | 99.000000000000000 | - 100 | 99.000000000000000 | - 100 | 99.000000000000000 | - 100 | 99.000000000000000 | - 100 | 99.000000000000000 | - 100 | 99.000000000000000 | - 100 | 99.000000000000000 | - 15 | 15.000000000000000 | - 100 | 99.000000000000000 | - 100 | 99.000000000000000 | - 10 | 10.000000000000000 | - 100 | 99.000000000000000 | - 5 | 5.000000000000000 | + 100 | 99 | + 100 | 99 | + 100 | 99 | + 100 | 99 | + 100 | 99 | + 100 | 99 | + 100 | 99 | + 15 | 15 | + 100 | 99 | + 100 | 99 | + 10 | 10 | + 100 | 99 | + 5 | 5 | taos> select _irowts_origin, interp(c1), _irowts, interp(c6) from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(prev, 99, 0); _irowts_origin | interp(c1) | _irowts | interp(c6) | @@ -1667,36 +1667,36 @@ taos> select _irowts_origin, interp(c6), interp(c1) from test.td32727 range('202 taos> select _irowts_origin, interp(c4), interp(c1), _irowts from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(prev, 99, 9) order by _irowts_origin desc, _irowts; _irowts_origin | interp(c4) | interp(c1) | _irowts | ============================================================================================= - 2020-02-01 00:00:15.000 | 15.000000000000000 | 15 | 2020-02-01 00:00:16.000 | - 2020-02-01 00:00:10.000 | 10.000000000000000 | 10 | 2020-02-01 00:00:10.000 | - 2020-02-01 00:00:05.000 | 5.000000000000000 | 5 | 2020-02-01 00:00:06.000 | - NULL | 99.000000000000000 | 9 | 2020-02-01 00:00:08.000 | - NULL | 99.000000000000000 | 9 | 2020-02-01 00:00:12.000 | - NULL | 99.000000000000000 | 9 | 2020-02-01 00:00:14.000 | - NULL | 99.000000000000000 | 9 | 2020-02-01 00:00:18.000 | - NULL | 99.000000000000000 | 9 | 2020-02-01 00:00:20.000 | - NULL | 99.000000000000000 | 9 | 2020-02-01 00:00:22.000 | - NULL | 99.000000000000000 | 9 | 2020-02-01 00:00:24.000 | - NULL | 99.000000000000000 | 9 | 2020-02-01 00:00:26.000 | - NULL | 99.000000000000000 | 9 | 2020-02-01 00:00:28.000 | - NULL | 99.000000000000000 | 9 | 2020-02-01 00:00:30.000 | + 2020-02-01 00:00:15.000 | 15 | 15 | 2020-02-01 00:00:16.000 | + 2020-02-01 00:00:10.000 | 10 | 10 | 2020-02-01 00:00:10.000 | + 2020-02-01 00:00:05.000 | 5 | 5 | 2020-02-01 00:00:06.000 | + NULL | 99 | 9 | 2020-02-01 00:00:08.000 | + NULL | 99 | 9 | 2020-02-01 00:00:12.000 | + NULL | 99 | 9 | 2020-02-01 00:00:14.000 | + NULL | 99 | 9 | 2020-02-01 00:00:18.000 | + NULL | 99 | 9 | 2020-02-01 00:00:20.000 | + NULL | 99 | 9 | 2020-02-01 00:00:22.000 | + NULL | 99 | 9 | 2020-02-01 00:00:24.000 | + NULL | 99 | 9 | 2020-02-01 00:00:26.000 | + NULL | 99 | 9 | 2020-02-01 00:00:28.000 | + NULL | 99 | 9 | 2020-02-01 00:00:30.000 | taos> select _isfilled, interp(c4), _irowts_origin, _irowts, interp(c1), tbname from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(prev, 99, 1) order by _irowts_origin desc, _irowts desc; _isfilled | interp(c4) | _irowts_origin | _irowts | interp(c1) | tbname | ========================================================================================================================================== - true | 15.000000000000000 | 2020-02-01 00:00:15.000 | 2020-02-01 00:00:16.000 | 15 | td32727 | - false | 10.000000000000000 | 2020-02-01 00:00:10.000 | 2020-02-01 00:00:10.000 | 10 | td32727 | - true | 5.000000000000000 | 2020-02-01 00:00:05.000 | 2020-02-01 00:00:06.000 | 5 | td32727 | - true | 99.000000000000000 | NULL | 2020-02-01 00:00:30.000 | 1 | td32727 | - true | 99.000000000000000 | NULL | 2020-02-01 00:00:28.000 | 1 | td32727 | - true | 99.000000000000000 | NULL | 2020-02-01 00:00:26.000 | 1 | td32727 | - true | 99.000000000000000 | NULL | 2020-02-01 00:00:24.000 | 1 | td32727 | - true | 99.000000000000000 | NULL | 2020-02-01 00:00:22.000 | 1 | td32727 | - true | 99.000000000000000 | NULL | 2020-02-01 00:00:20.000 | 1 | td32727 | - true | 99.000000000000000 | NULL | 2020-02-01 00:00:18.000 | 1 | td32727 | - true | 99.000000000000000 | NULL | 2020-02-01 00:00:14.000 | 1 | td32727 | - true | 99.000000000000000 | NULL | 2020-02-01 00:00:12.000 | 1 | td32727 | - true | 99.000000000000000 | NULL | 2020-02-01 00:00:08.000 | 1 | td32727 | + true | 15 | 2020-02-01 00:00:15.000 | 2020-02-01 00:00:16.000 | 15 | td32727 | + false | 10 | 2020-02-01 00:00:10.000 | 2020-02-01 00:00:10.000 | 10 | td32727 | + true | 5 | 2020-02-01 00:00:05.000 | 2020-02-01 00:00:06.000 | 5 | td32727 | + true | 99 | NULL | 2020-02-01 00:00:30.000 | 1 | td32727 | + true | 99 | NULL | 2020-02-01 00:00:28.000 | 1 | td32727 | + true | 99 | NULL | 2020-02-01 00:00:26.000 | 1 | td32727 | + true | 99 | NULL | 2020-02-01 00:00:24.000 | 1 | td32727 | + true | 99 | NULL | 2020-02-01 00:00:22.000 | 1 | td32727 | + true | 99 | NULL | 2020-02-01 00:00:20.000 | 1 | td32727 | + true | 99 | NULL | 2020-02-01 00:00:18.000 | 1 | td32727 | + true | 99 | NULL | 2020-02-01 00:00:14.000 | 1 | td32727 | + true | 99 | NULL | 2020-02-01 00:00:12.000 | 1 | td32727 | + true | 99 | NULL | 2020-02-01 00:00:08.000 | 1 | td32727 | taos> select interp(c1) from test.td32861 range('2020-01-01 00:00:00.000', '2020-01-01 00:00:30.000', 1s) every(2s) fill(next, 99); interp(c1) | @@ -1956,14 +1956,14 @@ taos> select _isfilled, _irowts_origin, _irowts, interp(c1), tbname from test.td taos> select interp(c1), interp(c4) from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(next, 99, 98); interp(c1) | interp(c4) | ========================================= - 99 | 98.000000000000000 | - 99 | 98.000000000000000 | - 5 | 5.000000000000000 | - 99 | 98.000000000000000 | - 99 | 98.000000000000000 | - 10 | 10.000000000000000 | - 99 | 98.000000000000000 | - 15 | 15.000000000000000 | + 99 | 98 | + 99 | 98 | + 5 | 5 | + 99 | 98 | + 99 | 98 | + 10 | 10 | + 99 | 98 | + 15 | 15 | taos> select interp(c1), _isfilled, interp(c6) from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(next, 99, false); interp(c1) | _isfilled | interp(c6) | @@ -1980,26 +1980,26 @@ taos> select interp(c1), _isfilled, interp(c6) from test.td32727 range('2020-02- taos> select _isfilled, _irowts, interp(c1), interp(c5) from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(next, 99, 98); _isfilled | _irowts | interp(c1) | interp(c5) | ========================================================================== - true | 2020-02-01 00:00:00.000 | 99 | 98.0000000 | - true | 2020-02-01 00:00:02.000 | 99 | 98.0000000 | - true | 2020-02-01 00:00:04.000 | 5 | 5.0000000 | - true | 2020-02-01 00:00:06.000 | 99 | 98.0000000 | - true | 2020-02-01 00:00:08.000 | 99 | 98.0000000 | - false | 2020-02-01 00:00:10.000 | 10 | 10.0000000 | - true | 2020-02-01 00:00:12.000 | 99 | 98.0000000 | - true | 2020-02-01 00:00:14.000 | 15 | 15.0000000 | + true | 2020-02-01 00:00:00.000 | 99 | 98 | + true | 2020-02-01 00:00:02.000 | 99 | 98 | + true | 2020-02-01 00:00:04.000 | 5 | 5 | + true | 2020-02-01 00:00:06.000 | 99 | 98 | + true | 2020-02-01 00:00:08.000 | 99 | 98 | + false | 2020-02-01 00:00:10.000 | 10 | 10 | + true | 2020-02-01 00:00:12.000 | 99 | 98 | + true | 2020-02-01 00:00:14.000 | 15 | 15 | taos> select interp(c1), interp(c4) from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(next, 99, NULL) order by _irowts; interp(c1) | interp(c4) | ========================================= 99 | NULL | 99 | NULL | - 5 | 5.000000000000000 | + 5 | 5 | 99 | NULL | 99 | NULL | - 10 | 10.000000000000000 | + 10 | 10 | 99 | NULL | - 15 | 15.000000000000000 | + 15 | 15 | taos> select interp(c1), interp(c6) from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(next, 99, 0) order by _irowts desc; interp(c1) | interp(c6) | @@ -2016,26 +2016,26 @@ taos> select interp(c1), interp(c6) from test.td32727 range('2020-02-01 00:00:00 taos> select interp(c1), _irowts_origin, interp(c4) from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(next, 99, 'a'); interp(c1) | _irowts_origin | interp(c4) | =================================================================== - 99 | NULL | 0.000000000000000 | - 99 | NULL | 0.000000000000000 | - 5 | 2020-02-01 00:00:05.000 | 5.000000000000000 | - 99 | NULL | 0.000000000000000 | - 99 | NULL | 0.000000000000000 | - 10 | 2020-02-01 00:00:10.000 | 10.000000000000000 | - 99 | NULL | 0.000000000000000 | - 15 | 2020-02-01 00:00:15.000 | 15.000000000000000 | + 99 | NULL | 0 | + 99 | NULL | 0 | + 5 | 2020-02-01 00:00:05.000 | 5 | + 99 | NULL | 0 | + 99 | NULL | 0 | + 10 | 2020-02-01 00:00:10.000 | 10 | + 99 | NULL | 0 | + 15 | 2020-02-01 00:00:15.000 | 15 | taos> select interp(c1), interp(c4), interp(c5) from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(next, 99, 9.9, 9) order by _irowts_origin; interp(c1) | interp(c4) | interp(c5) | ================================================================ - 99 | 9.900000000000000 | 9.0000000 | - 99 | 9.900000000000000 | 9.0000000 | - 99 | 9.900000000000000 | 9.0000000 | - 99 | 9.900000000000000 | 9.0000000 | - 99 | 9.900000000000000 | 9.0000000 | - 5 | 5.000000000000000 | 5.0000000 | - 10 | 10.000000000000000 | 10.0000000 | - 15 | 15.000000000000000 | 15.0000000 | + 99 | 9.9 | 9 | + 99 | 9.9 | 9 | + 99 | 9.9 | 9 | + 99 | 9.9 | 9 | + 99 | 9.9 | 9 | + 5 | 5 | 5 | + 10 | 10 | 10 | + 15 | 15 | 15 | taos> select interp(c1), interp(c2) from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(next, 99, 9) order by _irowts_origin desc; interp(c1) | interp(c2) | @@ -2064,14 +2064,14 @@ taos> select interp(c6), interp(c1) from test.td32727 range('2020-02-01 00:00:00 taos> select interp(c1), interp(c4) from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(next, 100, 99) order by _irowts desc, _irowts_origin; interp(c1) | interp(c4) | ========================================= - 15 | 15.000000000000000 | - 100 | 99.000000000000000 | - 10 | 10.000000000000000 | - 100 | 99.000000000000000 | - 100 | 99.000000000000000 | - 5 | 5.000000000000000 | - 100 | 99.000000000000000 | - 100 | 99.000000000000000 | + 15 | 15 | + 100 | 99 | + 10 | 10 | + 100 | 99 | + 100 | 99 | + 5 | 5 | + 100 | 99 | + 100 | 99 | taos> select _irowts_origin, interp(c1), _irowts, interp(c6) from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(next, 99, 0); _irowts_origin | interp(c1) | _irowts | interp(c6) | @@ -2100,26 +2100,26 @@ taos> select _irowts_origin, interp(c6), interp(c1) from test.td32727 range('202 taos> select _irowts_origin, interp(c4), interp(c1), _irowts from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(next, 99, 9) order by _irowts_origin desc, _irowts; _irowts_origin | interp(c4) | interp(c1) | _irowts | ============================================================================================= - 2020-02-01 00:00:15.000 | 15.000000000000000 | 15 | 2020-02-01 00:00:14.000 | - 2020-02-01 00:00:10.000 | 10.000000000000000 | 10 | 2020-02-01 00:00:10.000 | - 2020-02-01 00:00:05.000 | 5.000000000000000 | 5 | 2020-02-01 00:00:04.000 | - NULL | 99.000000000000000 | 9 | 2020-02-01 00:00:00.000 | - NULL | 99.000000000000000 | 9 | 2020-02-01 00:00:02.000 | - NULL | 99.000000000000000 | 9 | 2020-02-01 00:00:06.000 | - NULL | 99.000000000000000 | 9 | 2020-02-01 00:00:08.000 | - NULL | 99.000000000000000 | 9 | 2020-02-01 00:00:12.000 | + 2020-02-01 00:00:15.000 | 15 | 15 | 2020-02-01 00:00:14.000 | + 2020-02-01 00:00:10.000 | 10 | 10 | 2020-02-01 00:00:10.000 | + 2020-02-01 00:00:05.000 | 5 | 5 | 2020-02-01 00:00:04.000 | + NULL | 99 | 9 | 2020-02-01 00:00:00.000 | + NULL | 99 | 9 | 2020-02-01 00:00:02.000 | + NULL | 99 | 9 | 2020-02-01 00:00:06.000 | + NULL | 99 | 9 | 2020-02-01 00:00:08.000 | + NULL | 99 | 9 | 2020-02-01 00:00:12.000 | taos> select _isfilled, interp(c4), _irowts_origin, _irowts, interp(c1), tbname from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(next, 99, 1) order by _irowts_origin desc, _irowts desc; _isfilled | interp(c4) | _irowts_origin | _irowts | interp(c1) | tbname | ========================================================================================================================================== - true | 15.000000000000000 | 2020-02-01 00:00:15.000 | 2020-02-01 00:00:14.000 | 15 | td32727 | - false | 10.000000000000000 | 2020-02-01 00:00:10.000 | 2020-02-01 00:00:10.000 | 10 | td32727 | - true | 5.000000000000000 | 2020-02-01 00:00:05.000 | 2020-02-01 00:00:04.000 | 5 | td32727 | - true | 99.000000000000000 | NULL | 2020-02-01 00:00:12.000 | 1 | td32727 | - true | 99.000000000000000 | NULL | 2020-02-01 00:00:08.000 | 1 | td32727 | - true | 99.000000000000000 | NULL | 2020-02-01 00:00:06.000 | 1 | td32727 | - true | 99.000000000000000 | NULL | 2020-02-01 00:00:02.000 | 1 | td32727 | - true | 99.000000000000000 | NULL | 2020-02-01 00:00:00.000 | 1 | td32727 | + true | 15 | 2020-02-01 00:00:15.000 | 2020-02-01 00:00:14.000 | 15 | td32727 | + false | 10 | 2020-02-01 00:00:10.000 | 2020-02-01 00:00:10.000 | 10 | td32727 | + true | 5 | 2020-02-01 00:00:05.000 | 2020-02-01 00:00:04.000 | 5 | td32727 | + true | 99 | NULL | 2020-02-01 00:00:12.000 | 1 | td32727 | + true | 99 | NULL | 2020-02-01 00:00:08.000 | 1 | td32727 | + true | 99 | NULL | 2020-02-01 00:00:06.000 | 1 | td32727 | + true | 99 | NULL | 2020-02-01 00:00:02.000 | 1 | td32727 | + true | 99 | NULL | 2020-02-01 00:00:00.000 | 1 | td32727 | taos> select interp(c1) from test.td32861 range('2020-01-01 00:00:00.000', '2020-01-01 00:00:30.000', 1s) every(2s) fill(near, 99); interp(c1) | @@ -2464,22 +2464,22 @@ taos> select _isfilled, _irowts_origin, _irowts, interp(c1), tbname from test.td taos> select interp(c1), interp(c4) from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(near, 99, 98); interp(c1) | interp(c4) | ========================================= - 99 | 98.000000000000000 | - 99 | 98.000000000000000 | - 5 | 5.000000000000000 | - 5 | 5.000000000000000 | - 99 | 98.000000000000000 | - 10 | 10.000000000000000 | - 99 | 98.000000000000000 | - 15 | 15.000000000000000 | - 15 | 15.000000000000000 | - 99 | 98.000000000000000 | - 99 | 98.000000000000000 | - 99 | 98.000000000000000 | - 99 | 98.000000000000000 | - 99 | 98.000000000000000 | - 99 | 98.000000000000000 | - 99 | 98.000000000000000 | + 99 | 98 | + 99 | 98 | + 5 | 5 | + 5 | 5 | + 99 | 98 | + 10 | 10 | + 99 | 98 | + 15 | 15 | + 15 | 15 | + 99 | 98 | + 99 | 98 | + 99 | 98 | + 99 | 98 | + 99 | 98 | + 99 | 98 | + 99 | 98 | taos> select interp(c1), _isfilled, interp(c6) from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(near, 99, false); interp(c1) | _isfilled | interp(c6) | @@ -2504,35 +2504,35 @@ taos> select interp(c1), _isfilled, interp(c6) from test.td32727 range('2020-02- taos> select _isfilled, _irowts, interp(c1), interp(c5) from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(near, 99, 98); _isfilled | _irowts | interp(c1) | interp(c5) | ========================================================================== - true | 2020-02-01 00:00:00.000 | 99 | 98.0000000 | - true | 2020-02-01 00:00:02.000 | 99 | 98.0000000 | - true | 2020-02-01 00:00:04.000 | 5 | 5.0000000 | - true | 2020-02-01 00:00:06.000 | 5 | 5.0000000 | - true | 2020-02-01 00:00:08.000 | 99 | 98.0000000 | - false | 2020-02-01 00:00:10.000 | 10 | 10.0000000 | - true | 2020-02-01 00:00:12.000 | 99 | 98.0000000 | - true | 2020-02-01 00:00:14.000 | 15 | 15.0000000 | - true | 2020-02-01 00:00:16.000 | 15 | 15.0000000 | - true | 2020-02-01 00:00:18.000 | 99 | 98.0000000 | - true | 2020-02-01 00:00:20.000 | 99 | 98.0000000 | - true | 2020-02-01 00:00:22.000 | 99 | 98.0000000 | - true | 2020-02-01 00:00:24.000 | 99 | 98.0000000 | - true | 2020-02-01 00:00:26.000 | 99 | 98.0000000 | - true | 2020-02-01 00:00:28.000 | 99 | 98.0000000 | - true | 2020-02-01 00:00:30.000 | 99 | 98.0000000 | + true | 2020-02-01 00:00:00.000 | 99 | 98 | + true | 2020-02-01 00:00:02.000 | 99 | 98 | + true | 2020-02-01 00:00:04.000 | 5 | 5 | + true | 2020-02-01 00:00:06.000 | 5 | 5 | + true | 2020-02-01 00:00:08.000 | 99 | 98 | + false | 2020-02-01 00:00:10.000 | 10 | 10 | + true | 2020-02-01 00:00:12.000 | 99 | 98 | + true | 2020-02-01 00:00:14.000 | 15 | 15 | + true | 2020-02-01 00:00:16.000 | 15 | 15 | + true | 2020-02-01 00:00:18.000 | 99 | 98 | + true | 2020-02-01 00:00:20.000 | 99 | 98 | + true | 2020-02-01 00:00:22.000 | 99 | 98 | + true | 2020-02-01 00:00:24.000 | 99 | 98 | + true | 2020-02-01 00:00:26.000 | 99 | 98 | + true | 2020-02-01 00:00:28.000 | 99 | 98 | + true | 2020-02-01 00:00:30.000 | 99 | 98 | taos> select interp(c1), interp(c4) from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(near, 99, NULL) order by _irowts; interp(c1) | interp(c4) | ========================================= 99 | NULL | 99 | NULL | - 5 | 5.000000000000000 | - 5 | 5.000000000000000 | + 5 | 5 | + 5 | 5 | 99 | NULL | - 10 | 10.000000000000000 | + 10 | 10 | 99 | NULL | - 15 | 15.000000000000000 | - 15 | 15.000000000000000 | + 15 | 15 | + 15 | 15 | 99 | NULL | 99 | NULL | 99 | NULL | @@ -2564,42 +2564,42 @@ taos> select interp(c1), interp(c6) from test.td32727 range('2020-02-01 00:00:00 taos> select interp(c1), _irowts_origin, interp(c4) from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(near, 99, 'a'); interp(c1) | _irowts_origin | interp(c4) | =================================================================== - 99 | NULL | 0.000000000000000 | - 99 | NULL | 0.000000000000000 | - 5 | 2020-02-01 00:00:05.000 | 5.000000000000000 | - 5 | 2020-02-01 00:00:05.000 | 5.000000000000000 | - 99 | NULL | 0.000000000000000 | - 10 | 2020-02-01 00:00:10.000 | 10.000000000000000 | - 99 | NULL | 0.000000000000000 | - 15 | 2020-02-01 00:00:15.000 | 15.000000000000000 | - 15 | 2020-02-01 00:00:15.000 | 15.000000000000000 | - 99 | NULL | 0.000000000000000 | - 99 | NULL | 0.000000000000000 | - 99 | NULL | 0.000000000000000 | - 99 | NULL | 0.000000000000000 | - 99 | NULL | 0.000000000000000 | - 99 | NULL | 0.000000000000000 | - 99 | NULL | 0.000000000000000 | + 99 | NULL | 0 | + 99 | NULL | 0 | + 5 | 2020-02-01 00:00:05.000 | 5 | + 5 | 2020-02-01 00:00:05.000 | 5 | + 99 | NULL | 0 | + 10 | 2020-02-01 00:00:10.000 | 10 | + 99 | NULL | 0 | + 15 | 2020-02-01 00:00:15.000 | 15 | + 15 | 2020-02-01 00:00:15.000 | 15 | + 99 | NULL | 0 | + 99 | NULL | 0 | + 99 | NULL | 0 | + 99 | NULL | 0 | + 99 | NULL | 0 | + 99 | NULL | 0 | + 99 | NULL | 0 | taos> select interp(c1), interp(c4), interp(c5) from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(near, 99, 9.9, 9) order by _irowts_origin; interp(c1) | interp(c4) | interp(c5) | ================================================================ - 99 | 9.900000000000000 | 9.0000000 | - 99 | 9.900000000000000 | 9.0000000 | - 99 | 9.900000000000000 | 9.0000000 | - 99 | 9.900000000000000 | 9.0000000 | - 99 | 9.900000000000000 | 9.0000000 | - 99 | 9.900000000000000 | 9.0000000 | - 99 | 9.900000000000000 | 9.0000000 | - 99 | 9.900000000000000 | 9.0000000 | - 99 | 9.900000000000000 | 9.0000000 | - 99 | 9.900000000000000 | 9.0000000 | - 99 | 9.900000000000000 | 9.0000000 | - 5 | 5.000000000000000 | 5.0000000 | - 5 | 5.000000000000000 | 5.0000000 | - 10 | 10.000000000000000 | 10.0000000 | - 15 | 15.000000000000000 | 15.0000000 | - 15 | 15.000000000000000 | 15.0000000 | + 99 | 9.9 | 9 | + 99 | 9.9 | 9 | + 99 | 9.9 | 9 | + 99 | 9.9 | 9 | + 99 | 9.9 | 9 | + 99 | 9.9 | 9 | + 99 | 9.9 | 9 | + 99 | 9.9 | 9 | + 99 | 9.9 | 9 | + 99 | 9.9 | 9 | + 99 | 9.9 | 9 | + 5 | 5 | 5 | + 5 | 5 | 5 | + 10 | 10 | 10 | + 15 | 15 | 15 | + 15 | 15 | 15 | taos> select interp(c1), interp(c2) from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(near, 99, 9) order by _irowts_origin desc; interp(c1) | interp(c2) | @@ -2644,22 +2644,22 @@ taos> select interp(c6), interp(c1) from test.td32727 range('2020-02-01 00:00:00 taos> select interp(c1), interp(c4) from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(near, 100, 99) order by _irowts desc, _irowts_origin; interp(c1) | interp(c4) | ========================================= - 100 | 99.000000000000000 | - 100 | 99.000000000000000 | - 100 | 99.000000000000000 | - 100 | 99.000000000000000 | - 100 | 99.000000000000000 | - 100 | 99.000000000000000 | - 100 | 99.000000000000000 | - 15 | 15.000000000000000 | - 15 | 15.000000000000000 | - 100 | 99.000000000000000 | - 10 | 10.000000000000000 | - 100 | 99.000000000000000 | - 5 | 5.000000000000000 | - 5 | 5.000000000000000 | - 100 | 99.000000000000000 | - 100 | 99.000000000000000 | + 100 | 99 | + 100 | 99 | + 100 | 99 | + 100 | 99 | + 100 | 99 | + 100 | 99 | + 100 | 99 | + 15 | 15 | + 15 | 15 | + 100 | 99 | + 10 | 10 | + 100 | 99 | + 5 | 5 | + 5 | 5 | + 100 | 99 | + 100 | 99 | taos> select _irowts_origin, interp(c1), _irowts, interp(c6) from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(near, 99, 0); _irowts_origin | interp(c1) | _irowts | interp(c6) | @@ -2704,40 +2704,40 @@ taos> select _irowts_origin, interp(c6), interp(c1) from test.td32727 range('202 taos> select _irowts_origin, interp(c4), interp(c1), _irowts from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(near, 99, 9) order by _irowts_origin desc, _irowts; _irowts_origin | interp(c4) | interp(c1) | _irowts | ============================================================================================= - 2020-02-01 00:00:15.000 | 15.000000000000000 | 15 | 2020-02-01 00:00:14.000 | - 2020-02-01 00:00:15.000 | 15.000000000000000 | 15 | 2020-02-01 00:00:16.000 | - 2020-02-01 00:00:10.000 | 10.000000000000000 | 10 | 2020-02-01 00:00:10.000 | - 2020-02-01 00:00:05.000 | 5.000000000000000 | 5 | 2020-02-01 00:00:04.000 | - 2020-02-01 00:00:05.000 | 5.000000000000000 | 5 | 2020-02-01 00:00:06.000 | - NULL | 99.000000000000000 | 9 | 2020-02-01 00:00:00.000 | - NULL | 99.000000000000000 | 9 | 2020-02-01 00:00:02.000 | - NULL | 99.000000000000000 | 9 | 2020-02-01 00:00:08.000 | - NULL | 99.000000000000000 | 9 | 2020-02-01 00:00:12.000 | - NULL | 99.000000000000000 | 9 | 2020-02-01 00:00:18.000 | - NULL | 99.000000000000000 | 9 | 2020-02-01 00:00:20.000 | - NULL | 99.000000000000000 | 9 | 2020-02-01 00:00:22.000 | - NULL | 99.000000000000000 | 9 | 2020-02-01 00:00:24.000 | - NULL | 99.000000000000000 | 9 | 2020-02-01 00:00:26.000 | - NULL | 99.000000000000000 | 9 | 2020-02-01 00:00:28.000 | - NULL | 99.000000000000000 | 9 | 2020-02-01 00:00:30.000 | + 2020-02-01 00:00:15.000 | 15 | 15 | 2020-02-01 00:00:14.000 | + 2020-02-01 00:00:15.000 | 15 | 15 | 2020-02-01 00:00:16.000 | + 2020-02-01 00:00:10.000 | 10 | 10 | 2020-02-01 00:00:10.000 | + 2020-02-01 00:00:05.000 | 5 | 5 | 2020-02-01 00:00:04.000 | + 2020-02-01 00:00:05.000 | 5 | 5 | 2020-02-01 00:00:06.000 | + NULL | 99 | 9 | 2020-02-01 00:00:00.000 | + NULL | 99 | 9 | 2020-02-01 00:00:02.000 | + NULL | 99 | 9 | 2020-02-01 00:00:08.000 | + NULL | 99 | 9 | 2020-02-01 00:00:12.000 | + NULL | 99 | 9 | 2020-02-01 00:00:18.000 | + NULL | 99 | 9 | 2020-02-01 00:00:20.000 | + NULL | 99 | 9 | 2020-02-01 00:00:22.000 | + NULL | 99 | 9 | 2020-02-01 00:00:24.000 | + NULL | 99 | 9 | 2020-02-01 00:00:26.000 | + NULL | 99 | 9 | 2020-02-01 00:00:28.000 | + NULL | 99 | 9 | 2020-02-01 00:00:30.000 | taos> select _isfilled, interp(c4), _irowts_origin, _irowts, interp(c1), tbname from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(near, 99, 1) order by _irowts_origin desc, _irowts desc; _isfilled | interp(c4) | _irowts_origin | _irowts | interp(c1) | tbname | ========================================================================================================================================== - true | 15.000000000000000 | 2020-02-01 00:00:15.000 | 2020-02-01 00:00:16.000 | 15 | td32727 | - true | 15.000000000000000 | 2020-02-01 00:00:15.000 | 2020-02-01 00:00:14.000 | 15 | td32727 | - false | 10.000000000000000 | 2020-02-01 00:00:10.000 | 2020-02-01 00:00:10.000 | 10 | td32727 | - true | 5.000000000000000 | 2020-02-01 00:00:05.000 | 2020-02-01 00:00:06.000 | 5 | td32727 | - true | 5.000000000000000 | 2020-02-01 00:00:05.000 | 2020-02-01 00:00:04.000 | 5 | td32727 | - true | 99.000000000000000 | NULL | 2020-02-01 00:00:30.000 | 1 | td32727 | - true | 99.000000000000000 | NULL | 2020-02-01 00:00:28.000 | 1 | td32727 | - true | 99.000000000000000 | NULL | 2020-02-01 00:00:26.000 | 1 | td32727 | - true | 99.000000000000000 | NULL | 2020-02-01 00:00:24.000 | 1 | td32727 | - true | 99.000000000000000 | NULL | 2020-02-01 00:00:22.000 | 1 | td32727 | - true | 99.000000000000000 | NULL | 2020-02-01 00:00:20.000 | 1 | td32727 | - true | 99.000000000000000 | NULL | 2020-02-01 00:00:18.000 | 1 | td32727 | - true | 99.000000000000000 | NULL | 2020-02-01 00:00:12.000 | 1 | td32727 | - true | 99.000000000000000 | NULL | 2020-02-01 00:00:08.000 | 1 | td32727 | - true | 99.000000000000000 | NULL | 2020-02-01 00:00:02.000 | 1 | td32727 | - true | 99.000000000000000 | NULL | 2020-02-01 00:00:00.000 | 1 | td32727 | + true | 15 | 2020-02-01 00:00:15.000 | 2020-02-01 00:00:16.000 | 15 | td32727 | + true | 15 | 2020-02-01 00:00:15.000 | 2020-02-01 00:00:14.000 | 15 | td32727 | + false | 10 | 2020-02-01 00:00:10.000 | 2020-02-01 00:00:10.000 | 10 | td32727 | + true | 5 | 2020-02-01 00:00:05.000 | 2020-02-01 00:00:06.000 | 5 | td32727 | + true | 5 | 2020-02-01 00:00:05.000 | 2020-02-01 00:00:04.000 | 5 | td32727 | + true | 99 | NULL | 2020-02-01 00:00:30.000 | 1 | td32727 | + true | 99 | NULL | 2020-02-01 00:00:28.000 | 1 | td32727 | + true | 99 | NULL | 2020-02-01 00:00:26.000 | 1 | td32727 | + true | 99 | NULL | 2020-02-01 00:00:24.000 | 1 | td32727 | + true | 99 | NULL | 2020-02-01 00:00:22.000 | 1 | td32727 | + true | 99 | NULL | 2020-02-01 00:00:20.000 | 1 | td32727 | + true | 99 | NULL | 2020-02-01 00:00:18.000 | 1 | td32727 | + true | 99 | NULL | 2020-02-01 00:00:12.000 | 1 | td32727 | + true | 99 | NULL | 2020-02-01 00:00:08.000 | 1 | td32727 | + true | 99 | NULL | 2020-02-01 00:00:02.000 | 1 | td32727 | + true | 99 | NULL | 2020-02-01 00:00:00.000 | 1 | td32727 | diff --git a/tests/army/query/function/test_interp.py b/tests/army/query/function/test_interp.py index ffbadd6e7e..64e380a542 100644 --- a/tests/army/query/function/test_interp.py +++ b/tests/army/query/function/test_interp.py @@ -76,18 +76,20 @@ class TDTestCase(TBase): tdSql.error("select interp(c1), interp(c4) from test.td32727 range('2020-02-01 00:00:00.000', '2020-02-01 00:00:30.000', 1s) every(2s) fill(prev, 99);") tdSql.error("select _irowts from test.td32861 range('2020-01-01 00:00:00.000', '2020-01-01 00:00:30.000', 1s) every(2s) fill(near);") tdSql.error("select interp(c1) from test.td32861 range('2020-01-01 00:00:00.000', '2020-01-01 00:00:30.000', 1s) every(2s);") - tdSql.error("select interp(c1) from test.td32861 range('2020-01-01 00:00:00.000', '2020-01-01 00:00:30.000', 1s) fill(near);") + tdSql.error("select interp(c1) from test.td32861 range('2020-01-01 00:00:00.000', '2020-01-01 00:00:30.000', 1s) fill(near, 2);") tdSql.error("select interp(c1) from test.td32861 range('2020-01-01 00:00:00.000', '2020-01-01 00:00:30.000', 1s) every(2s) fill(near);") tdSql.error("select interp(c1) from test.td32861 range('2020-01-01 00:00:00.000', '2020-01-01 00:00:30.000', 1s) every(2s) fill(near, c1);") tdSql.error("select interp(c1) from test.td32861 range('2020-01-01 00:00:00.000', 1s, '2020-01-01 00:00:30.000') every(2s) fill(near, 99);") + tdSql.error("select interp(c1) from test.td32861 range('2020-01-01 00:00:00.000', '2020-01-01 00:00:30.000', '1s') every(2s) fill(near, 99);") tdSql.error("select interp(c1) from test.td32861 range('2020-01-01 00:00:00.000', '2020-01-01 00:00:30.000', 1s) every(2s) fill(linear, 99);") tdSql.error("select interp(c1) from test.td32861 range('2020-01-01 00:00:00.000', '2020-01-01 00:00:30.000', 1s) every(2s) fill(value, 99);") tdSql.error("select interp(c1) from test.td32861 range('2020-01-01 00:00:00.000', '2020-01-01 00:00:30.000', 1s) every(2s) fill(value_f, 99);") tdSql.error("select interp(c1) from test.td32861 range('2020-01-01 00:00:00.000', '2020-01-01 00:00:30.000', 1s) every(2s) fill(null, 99);") tdSql.error("select interp(c1) from test.td32861 range('2020-01-01 00:00:00.000', '2020-01-01 00:00:30.000', 1s) every(2s) fill(null_f, 99);") - tdSql.error("select interp(c1) from test.td32861 range('2020-01-01 00:00:00.000', '2020-01-01 00:00:30.000', '1s') every(2s) fill(prev, 99);") tdSql.error("select interp(c1) from test.td32861 range('2020-01-01 00:00:00.000', '2020-01-01 00:00:30.000', 1n) every(2s) fill(prev, 99);") tdSql.error("select interp(c1) from test.td32861 range('2020-01-01 00:00:00.000', '2020-01-01 00:00:30.000', 1y) every(2s) fill(prev, 99);") + tdSql.error("select interp(c1) from test.td32861 range('2020-01-01 00:00:00.000', '2020-01-01 00:00:30.000', 1) every(2s) fill(prev, 99);") + tdSql.error("create stream s1 trigger force_window_close into test.s1res as select _irowts, interp(c1), interp(c2)from test.td32727 partition by tbname range('2020-01-01 00:00:00.000', '2020-01-01 00:00:30.000', 1s) every(1s) fill(near, 1, 1);") def test_interp(self): self.test_normal_query_new("interp")