From 380a84e237102a2e7d04df0cebc74d1c2b1f89a8 Mon Sep 17 00:00:00 2001
From: Cary Xu <klxu@taosdata.com>
Date: Fri, 25 Mar 2022 16:52:32 +0800
Subject: [PATCH] update

---
 source/dnode/vnode/src/tsdb/tsdbSma.c   | 12 ++++--------
 source/dnode/vnode/test/tsdbSmaTest.cpp |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbSma.c b/source/dnode/vnode/src/tsdb/tsdbSma.c
index ff102dc8b9..421b7f499b 100644
--- a/source/dnode/vnode/src/tsdb/tsdbSma.c
+++ b/source/dnode/vnode/src/tsdb/tsdbSma.c
@@ -81,6 +81,7 @@ struct SSmaStat {
 
 // expired window
 static int32_t  tsdbUpdateExpiredWindowImpl(STsdb *pTsdb, const char *msg);
+static int32_t  tsdbSetExpiredWindow(STsdb *pTsdb, SHashObj *pItemsHash, int64_t indexUid, int64_t winSKey);
 static int32_t  tsdbInitSmaStat(SSmaStat **pSmaStat);
 static void    *tsdbFreeSmaStatItem(SSmaStatItem *pSmaStatItem);
 static int32_t  tsdbDestroySmaState(SSmaStat *pSmaStat);
@@ -384,12 +385,6 @@ static int32_t tsdbCheckAndInitSmaEnv(STsdb *pTsdb, int8_t smaType) {
   return TSDB_CODE_SUCCESS;
 };
 
-static STimeWindow getActiveTimeWindowX(int64_t ts, SInterval* pInterval) {
-  STimeWindow tw = {0};
-  tw.skey = 100;
-  tw.ekey = 1000;
-  return tw;
-}
 
 static int32_t tsdbSetExpiredWindow(STsdb *pTsdb, SHashObj *pItemsHash, int64_t indexUid, int64_t winSKey) {
   SSmaStatItem *pItem = taosHashGet(pItemsHash, &indexUid, sizeof(indexUid));
@@ -544,8 +539,9 @@ int32_t tsdbUpdateExpiredWindowImpl(STsdb *pTsdb, const char *msg) {
       interval.sliding = pTSma->sliding;
       interval.slidingUnit = pTSma->slidingUnit;
 
-      STimeWindow tw = getActiveTimeWindowX(TD_ROW_KEY(row), &interval);
-      tsdbSetExpiredWindow(pTsdb, pItemsHash, pTSma->indexUid, TD_ROW_KEY(row));
+      TSKEY winSKey = taosTimeTruncate(TD_ROW_KEY(row), &interval, interval.precision);
+
+      tsdbSetExpiredWindow(pTsdb, pItemsHash, pTSma->indexUid, winSKey);
     }
   }
 
diff --git a/source/dnode/vnode/test/tsdbSmaTest.cpp b/source/dnode/vnode/test/tsdbSmaTest.cpp
index 003529d387..1f101b1364 100644
--- a/source/dnode/vnode/test/tsdbSmaTest.cpp
+++ b/source/dnode/vnode/test/tsdbSmaTest.cpp
@@ -302,7 +302,7 @@ TEST(testCase, tSma_Data_Insert_Query_Test) {
   tSma.intervalUnit = TIME_UNIT_DAY;
   tSma.interval = 1;
   tSma.slidingUnit = TIME_UNIT_HOUR;
-  tSma.sliding = 0;
+  tSma.sliding = 1; // sliding = interval when it's convert window
   tSma.indexUid = indexUid1;
   tstrncpy(tSma.indexName, smaIndexName1, TSDB_INDEX_NAME_LEN);
   tSma.timezoneInt = timezone;