From e5ceaa2a9051e3002b81e14746bc2deded6e0b48 Mon Sep 17 00:00:00 2001
From: shenglian zhou <slzhou@taosdata.com>
Date: Tue, 10 Aug 2021 14:37:19 +0800
Subject: [PATCH] [TD-5931]<fix>:invalidate time range when no tables after
 trimTableGroup

---
 src/tsdb/src/tsdbRead.c                | 14 +++++++++++++-
 tests/script/general/parser/interp.sim | 13 ++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c
index 795d446f4d..4735efceb8 100644
--- a/src/tsdb/src/tsdbRead.c
+++ b/src/tsdb/src/tsdbRead.c
@@ -670,7 +670,7 @@ static STableGroupInfo* trimTableGroup(STimeWindow* window, STableGroupInfo* pGr
     SArray* px = taosArrayInit(4, sizeof(STableKeyInfo));
     for (int32_t j = 0; j < numOfTables; ++j) {
       STableKeyInfo* pInfo = (STableKeyInfo*)taosArrayGet(oneGroup, j);
-      if (window->skey <= pInfo->lastKey) {
+      if (window->skey <= pInfo->lastKey && ((STable*)pInfo->pTable)->lastKey != TSKEY_INITIAL_VAL) {
         taosArrayPush(px, pInfo);
         pNew->numOfTables += 1;
         break;
@@ -691,6 +691,18 @@ static STableGroupInfo* trimTableGroup(STimeWindow* window, STableGroupInfo* pGr
 TsdbQueryHandleT tsdbQueryRowsInExternalWindow(STsdbRepo *tsdb, STsdbQueryCond* pCond, STableGroupInfo *groupList, uint64_t qId, SMemRef* pRef) {
   STableGroupInfo* pNew = trimTableGroup(&pCond->twindow, groupList);
 
+  if (pNew->numOfTables == 0) {
+    tsdbDebug("update query time range to invalidate time window");
+
+    assert(taosArrayGetSize(pNew->pGroupList) == 0);
+    bool asc = ASCENDING_TRAVERSE(pCond->order);
+    if (asc) {
+      pCond->twindow.ekey = pCond->twindow.skey - 1;
+    } else {
+      pCond->twindow.skey = pCond->twindow.ekey - 1;
+    }
+  }
+
   STsdbQueryHandle *pQueryHandle = (STsdbQueryHandle*) tsdbQueryTables(tsdb, pCond, pNew, qId, pRef);
   pQueryHandle->loadExternalRow = true;
   pQueryHandle->currentLoadExternalRows = true;
diff --git a/tests/script/general/parser/interp.sim b/tests/script/general/parser/interp.sim
index 3fb91e36c6..2dd3204e57 100644
--- a/tests/script/general/parser/interp.sim
+++ b/tests/script/general/parser/interp.sim
@@ -65,4 +65,15 @@ print ================== server restart completed
 
 run general/parser/interp_test.sim
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+print ================= TD-5931
+sql create stable st5931(ts timestamp, f int) tags(t int)
+sql create table ct5931 using st5931 tags(1)
+sql create table nt5931(ts timestamp, f int)
+sql select interp(*) from nt5931 where ts=now
+sql select interp(*) from st5931 where ts=now
+sql select interp(*) from ct5931 where ts=now
+if $rows != 0 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT