diff --git a/include/util/taoserror.h b/include/util/taoserror.h
index b091d870ec..b8098cc96e 100644
--- a/include/util/taoserror.h
+++ b/include/util/taoserror.h
@@ -914,6 +914,7 @@ int32_t  taosGetErrSize();
 #define TSDB_CODE_TSMA_UNSUPPORTED_FUNC          TAOS_DEF_ERROR_CODE(0, 0x3109)
 #define TSDB_CODE_TSMA_MUST_BE_DROPPED           TAOS_DEF_ERROR_CODE(0, 0x3110)
 #define TSDB_CODE_TSMA_NAME_TOO_LONG             TAOS_DEF_ERROR_CODE(0, 0x3111)
+#define TSDB_CODE_TSMA_INVALID_RECURSIVE_INTERVAL TAOS_DEF_ERROR_CODE(0, 0x3112)
 
 //rsma
 #define TSDB_CODE_RSMA_INVALID_ENV               TAOS_DEF_ERROR_CODE(0, 0x3150)
diff --git a/source/dnode/vnode/src/tsdb/tsdbReadUtil.c b/source/dnode/vnode/src/tsdb/tsdbReadUtil.c
index 4dabffc10a..1fba59c9b2 100644
--- a/source/dnode/vnode/src/tsdb/tsdbReadUtil.c
+++ b/source/dnode/vnode/src/tsdb/tsdbReadUtil.c
@@ -957,6 +957,7 @@ int32_t loadMemTombData(SArray** ppMemDelData, STbData* pMemTbData, STbData* piM
       if (p->version <= ver) {
         void* px = taosArrayPush(pMemDelData, p);
         if (px == NULL) {
+          taosRUnLockLatch(&pMemTbData->lock);
           return terrno;
         }
       }
@@ -1430,4 +1431,4 @@ bool overlapWithDelSkylineWithoutVer(STableBlockScanInfo* pBlockScanInfo, const
 
     return doCheckDatablockOverlapWithoutVersion(pBlockScanInfo, pRecord, index);
   }
-}
\ No newline at end of file
+}
diff --git a/source/libs/executor/src/tfill.c b/source/libs/executor/src/tfill.c
index 3158c85987..e6c2ea1b45 100644
--- a/source/libs/executor/src/tfill.c
+++ b/source/libs/executor/src/tfill.c
@@ -331,8 +331,9 @@ static void copyCurrentRowIntoBuf(SFillInfo* pFillInfo, int32_t rowIndex, SRowVa
   for (int32_t i = 0; i < pFillInfo->numOfCols; ++i) {
     int32_t type = pFillInfo->pFillCol[i].pExpr->pExpr->nodeType;
     if (type == QUERY_NODE_COLUMN || type == QUERY_NODE_OPERATOR || type == QUERY_NODE_FUNCTION) {
-      if (!pFillInfo->pFillCol[i].notFillCol && pFillInfo->type != TSDB_FILL_NEXT) {
-        continue;
+      if (!pFillInfo->pFillCol[i].notFillCol) {
+        if (FILL_IS_ASC_FILL(pFillInfo) && pFillInfo->type != TSDB_FILL_NEXT) continue;
+        if (!FILL_IS_ASC_FILL(pFillInfo) && pFillInfo->type != TSDB_FILL_PREV) continue;
       }
       int32_t srcSlotId = GET_DEST_SLOT_ID(&pFillInfo->pFillCol[i]);
 
diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index 03c3355920..c86e2d4874 100755
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -11864,7 +11864,7 @@ static int32_t buildCreateTSMAReq(STranslateContext* pCxt, SCreateTSMAStmt* pStm
         if (checkRecursiveTsmaInterval(pRecursiveTsma->interval, pRecursiveTsma->unit, pInterval->datum.i,
               pInterval->unit, pDbInfo.precision, true)) {
         } else {
-          code = TSDB_CODE_TSMA_INVALID_INTERVAL;
+          code = TSDB_CODE_TSMA_INVALID_RECURSIVE_INTERVAL;
         }
       }
     }
diff --git a/source/util/src/terror.c b/source/util/src/terror.c
index 7b9d48eb58..2f4414cd03 100644
--- a/source/util/src/terror.c
+++ b/source/util/src/terror.c
@@ -759,6 +759,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_TSMA_INVALID_FUNC_PARAM,        "Invalid tsma func p
 TAOS_DEFINE_ERROR(TSDB_CODE_TSMA_UNSUPPORTED_FUNC,          "Tsma func not supported")
 TAOS_DEFINE_ERROR(TSDB_CODE_TSMA_MUST_BE_DROPPED,           "Tsma must be dropped first")
 TAOS_DEFINE_ERROR(TSDB_CODE_TSMA_NAME_TOO_LONG,             "Tsma name too long")
+TAOS_DEFINE_ERROR(TSDB_CODE_TSMA_INVALID_RECURSIVE_INTERVAL,"Invalid recursive tsma interval")
 
 //rsma
 TAOS_DEFINE_ERROR(TSDB_CODE_RSMA_INVALID_ENV,               "Invalid rsma env")
diff --git a/tests/system-test/2-query/tsma.py b/tests/system-test/2-query/tsma.py
index 2bf908e250..1b52302503 100644
--- a/tests/system-test/2-query/tsma.py
+++ b/tests/system-test/2-query/tsma.py
@@ -1476,18 +1476,18 @@ class TDTestCase:
         tdSql.error(sql, -2147473920)  # syntax error 
 
         sql = 'create recursive tsma tsma2 on test.tsma1 interval(1m)'
-        tdSql.error(sql, -2147471097)  # invalid tsma interval
+        tdSql.error(sql, -2147471086)  # invalid tsma interval
 
         sql = 'create recursive tsma tsma2 on test.tsma1 interval(7m)'
-        tdSql.error(sql, -2147471097)  # invalid tsma interval
+        tdSql.error(sql, -2147471086)  # invalid tsma interval
 
         sql = 'create recursive tsma tsma2 on test.tsma1 interval(11m)'
-        tdSql.error(sql, -2147471097)  # invalid tsma interval
+        tdSql.error(sql, -2147471086)  # invalid tsma interval
 
         self.create_recursive_tsma('tsma1', 'tsma2', 'test', '20m', 'meters')
 
         sql = 'create recursive tsma tsma3 on test.tsma2 interval(30m)'
-        tdSql.error(sql, -2147471097)  # invalid tsma interval
+        tdSql.error(sql, -2147471086)  # invalid tsma interval
 
         self.create_recursive_tsma('tsma2', 'tsma3', 'test', '40m', 'meters')
 
diff --git a/tests/system-test/2-query/tsma2.py b/tests/system-test/2-query/tsma2.py
index 404fb3f00c..f53b578012 100644
--- a/tests/system-test/2-query/tsma2.py
+++ b/tests/system-test/2-query/tsma2.py
@@ -852,7 +852,7 @@ class TDTestCase:
                 ]
         tdSql.execute('use db')
         for (i, ri, ret) in examples:
-            self.test_create_recursive_tsma_interval(db, tb, func, i, ri, ret, -2147471097)
+            self.test_create_recursive_tsma_interval(db, tb, func, i, ri, ret, -2147471086)
 
         self.create_tsma('tsma1', db, tb, func, '1h')
         self.create_recursive_tsma('tsma1', 'tsma2', db, '1n', tb, func)