From d2fafd71f72726c632da22a47e35923247550dc1 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Wed, 12 Aug 2020 15:11:15 +0800 Subject: [PATCH 1/2] [td-225] add some test cases. --- tests/script/general/parser/lastrow_query.sim | 4 ++++ tests/script/general/parser/testSuite.sim | 2 ++ 2 files changed, 6 insertions(+) diff --git a/tests/script/general/parser/lastrow_query.sim b/tests/script/general/parser/lastrow_query.sim index e43cc15173..72e8b4de95 100644 --- a/tests/script/general/parser/lastrow_query.sim +++ b/tests/script/general/parser/lastrow_query.sim @@ -51,3 +51,7 @@ if $data09 != NCHAR then return -1 endi +sql select count(*) from lr_tb1 where ts>'2018-09-18 08:45:00.1' and ts<'2018-09-18 08:45:00.2' +if $row != 0 then + return -1 +endi diff --git a/tests/script/general/parser/testSuite.sim b/tests/script/general/parser/testSuite.sim index dd4faee959..ccd1aa9940 100644 --- a/tests/script/general/parser/testSuite.sim +++ b/tests/script/general/parser/testSuite.sim @@ -97,6 +97,8 @@ run general/parser/topbot.sim sleep 2000 run general/parser/union.sim sleep 2000 +run general/parser/bug.sim +sleep 2000 run general/parser/sliding.sim #sleep 2000 From d7d840cc977059aafc1f59592b4c72e7984e95a2 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Wed, 12 Aug 2020 22:49:52 +0800 Subject: [PATCH 2/2] [td-225] remove invalid assert --- src/client/src/tscLocalMerge.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/client/src/tscLocalMerge.c b/src/client/src/tscLocalMerge.c index 8436777ddf..0733593284 100644 --- a/src/client/src/tscLocalMerge.c +++ b/src/client/src/tscLocalMerge.c @@ -1349,7 +1349,6 @@ static bool doHandleLastRemainData(SSqlObj *pSql) { ((pRes->numOfRowsGroup < pQueryInfo->limit.limit && pQueryInfo->limit.limit > 0) || (pQueryInfo->limit.limit < 0))) { int64_t etime = (pQueryInfo->window.skey < pQueryInfo->window.ekey) ? pQueryInfo->window.ekey : pQueryInfo->window.skey; - assert(pFillInfo->numOfRows == 0); int32_t rows = (int32_t)getFilledNumOfRes(pFillInfo, etime, pLocalReducer->resColModel->capacity); if (rows > 0) { // do interpo doFillResult(pSql, pLocalReducer, true);