diff --git a/tests/pytest/fulltest.sh b/tests/pytest/fulltest.sh
index f0b3beacbe27590fe4e3ea74974f0852a15e593a..65469307bad27edf26bce53bd82adadaf074c577 100755
--- a/tests/pytest/fulltest.sh
+++ b/tests/pytest/fulltest.sh
@@ -224,8 +224,10 @@ python3 ./test.py -f functions/function_twa_test2.py
 python3 queryCount.py
 python3 ./test.py -f query/queryGroupbyWithInterval.py
 python3 client/twoClients.py
-python3 test.py -f query/queryInterval.py
-python3 test.py -f query/queryFillTest.py
+python3 ./test.py -f query/queryInterval.py
+python3 ./test.py -f query/queryFillTest.py
+python3 ./test.py -f query/last_row_cache.py
+python3 ./test.py -f query/last_cache.py
 
 # tools
 python3 test.py -f tools/taosdemoTest.py
diff --git a/tests/pytest/query/last_cache.py b/tests/pytest/query/last_cache.py
new file mode 100644
index 0000000000000000000000000000000000000000..c31d9821e2695dd7883674519325c24f0e473bf2
--- /dev/null
+++ b/tests/pytest/query/last_cache.py
@@ -0,0 +1,133 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+from util.dnodes import tdDnodes
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+        self.tables = 10
+        self.rows = 20
+        self.perfix = 't'
+        self.ts = 1601481600000
+    
+    def insertData(self):
+        print("==============step1")        
+        tdSql.execute("create table st (ts timestamp, c1 int) tags(t1 int)")
+        
+        for i in range(self.tables):
+            tdSql.execute("create table %s%d using st tags(%d)" % (self.perfix, i, i))
+            for j in range(self.rows):
+                tc = self.ts + j * 60000
+                tdSql.execute("insert into %s%d values(%d, %d)" %(self.perfix, i, tc, j))
+
+    def executeQueries(self):
+        print("==============step2")
+        tdSql.query("select last(c1) from %s%d" % (self.perfix, 1))
+        tdSql.checkData(0, 0, 19)
+
+        tdSql.query("select last(c1) from %s%d where ts <= %d" % (self.perfix, 1, self.ts + 4 * 60000))
+        tdSql.checkData(0, 0, 4)
+
+        tdSql.query("select last(c1) as b from %s%d" % (self.perfix, 1))
+        tdSql.checkData(0, 0, 19)
+
+        tdSql.query("select last(c1) from %s%d interval(1m)" % (self.perfix, 1))
+        tdSql.checkData(1, 1, 1)
+
+        tdSql.query("select last(c1) from %s%d interval(1d)" % (self.perfix, 1))
+        tdSql.checkData(0, 1, 19)
+
+        tdSql.query("select last(c1) from %s%d where ts <= %d interval(1m)" % (self.perfix, 1, self.ts + 4 * 60000))
+        tdSql.checkRows(5)
+        tdSql.checkData(1, 1, 1)
+
+        tdSql.query("select last(c1) from st")
+        tdSql.checkData(0, 0, 19)
+
+        tdSql.query("select last(c1) as c from st where ts <= %d" % (self.ts + 4 * 60000))
+        tdSql.checkData(0, 0, 4)
+
+        tdSql.query("select last(c1) as c from st where t1 <= 5")
+        tdSql.checkData(0, 0, 19)
+
+        tdSql.query("select last(c1) as c from st where t1 <= 5 and ts <= %d" % (self.ts + 4 * 60000))
+        tdSql.checkData(0, 0, 4)
+
+        tdSql.query("select last(c1) from st interval(1m)")        
+        tdSql.checkData(1, 1, 1)
+
+        tdSql.query("select last(c1) from st interval(1d)")        
+        tdSql.checkData(0, 1, 19)
+
+        tdSql.query("select last(c1) from st group by t1")
+        tdSql.checkRows(10)
+        tdSql.checkData(0, 0, 19)
+
+        tdSql.query("select last(c1) as c from st where ts <= %d interval(1m) group by t1" % (self.ts + 4 * 60000))
+        tdSql.checkData(1, 1, 1)
+        tdSql.checkRows(50)
+
+    def run(self):
+        tdSql.prepare()
+
+        # last_cache_0.sim
+        tdSql.execute("create database test1 cachelast 0")
+        tdSql.execute("use test1")
+        self.insertData()
+        self.executeQueries()
+        
+        tdSql.execute("alter database test1 cachelast 1")        
+        self.executeQueries()
+        tdDnodes.stop(1)
+        tdDnodes.start(1)
+        self.executeQueries()
+
+        tdSql.execute("alter database test1 cachelast 0")        
+        self.executeQueries()
+        tdDnodes.stop(1)
+        tdDnodes.start(1)
+        self.executeQueries()
+
+        # last_cache_1.sim
+        tdSql.execute("create database test2 cachelast 1")
+        tdSql.execute("use test2")
+        self.insertData()
+        self.executeQueries()
+        
+        tdSql.execute("alter database test2 cachelast 0")        
+        self.executeQueries()
+        tdDnodes.stop(1)
+        tdDnodes.start(1)
+        self.executeQueries()
+
+        tdSql.execute("alter database test2 cachelast 1")        
+        self.executeQueries()
+        tdDnodes.stop(1)
+        tdDnodes.start(1)
+        self.executeQueries()
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/query/last_row_cache.py b/tests/pytest/query/last_row_cache.py
new file mode 100644
index 0000000000000000000000000000000000000000..d9e09dae7acdcd8c7401f1370da9f544c850872d
--- /dev/null
+++ b/tests/pytest/query/last_row_cache.py
@@ -0,0 +1,186 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+from util.dnodes import tdDnodes
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+        self.tables = 10
+        self.rows = 20
+        self.perfix = 't'
+        self.ts = 1601481600000
+    
+    def insertData(self):
+        print("==============step1")        
+        tdSql.execute("create table st (ts timestamp, c1 int) tags(t1 int)")
+        
+        for i in range(self.tables):
+            tdSql.execute("create table %s%d using st tags(%d)" % (self.perfix, i, i))
+            for j in range(self.rows):
+                tc = self.ts + j * 60000
+                tdSql.execute("insert into %s%d values(%d, %d)" %(self.perfix, i, tc, j))    
+
+    def executeQueries(self):
+        print("==============step2")
+        tdSql.query("select last_row(c1) from %s%d" % (self.perfix, 1))
+        tdSql.checkData(0, 0, 19)
+
+        tdSql.query("select last_row(c1) from %s%d where ts <= %d" % (self.perfix, 1, self.ts + 4 * 60000))
+        tdSql.checkData(0, 0, 4)
+
+        tdSql.query("select last_row(c1) as b from %s%d" % (self.perfix, 1))
+        tdSql.checkData(0, 0, 19)
+
+        tdSql.query("select last_row(c1) from st")
+        tdSql.checkData(0, 0, 19)
+
+        tdSql.query("select last_row(c1) as c from st where ts <= %d" % (self.ts + 4 * 60000))
+        tdSql.checkData(0, 0, 4)
+
+        tdSql.query("select last_row(c1) as c from st where t1 < 5")
+        tdSql.checkData(0, 0, 19)
+
+        tdSql.query("select last_row(c1) as c from st where t1 <= 5 and ts <= %d" % (self.ts + 4 * 60000))
+        tdSql.checkData(0, 0, 4)        
+
+        tdSql.query("select last_row(c1) as c from st group by t1")
+        tdSql.checkRows(10)
+        tdSql.checkData(0, 0, 19)        
+
+        tc = self.ts + 1 * 3600000
+        tdSql.execute("insert into %s%d values(%d, %d)" %(self.perfix, 1, tc, 10))
+
+        tc = self.ts + 3 * 3600000
+        tdSql.execute("insert into %s%d values(%d, null)" %(self.perfix, 1, tc))
+
+        tc = self.ts + 5 * 3600000
+        tdSql.execute("insert into %s%d values(%d, %d)" %(self.perfix, 1, tc, -1))
+
+        tc = self.ts + 7 * 3600000
+        tdSql.execute("insert into %s%d values(%d, null)" %(self.perfix, 1, tc))
+
+    def insertData2(self):
+        tc = self.ts + 1 * 3600000
+        tdSql.execute("insert into %s%d values(%d, %d)" %(self.perfix, 1, tc, 10))
+
+        tc = self.ts + 3 * 3600000
+        tdSql.execute("insert into %s%d values(%d, null)" %(self.perfix, 1, tc))
+
+        tc = self.ts + 5 * 3600000
+        tdSql.execute("insert into %s%d values(%d, %d)" %(self.perfix, 1, tc, -1))
+
+        tc = self.ts + 7 * 3600000
+        tdSql.execute("insert into %s%d values(%d, null)" %(self.perfix, 1, tc))
+
+    def executeQueries2(self): 
+        # For stable
+        tc = self.ts + 6 * 3600000
+        tdSql.query("select last_row(c1) from st where ts < %d " % tc)        
+        tdSql.checkData(0, 0, -1)
+
+        tc = self.ts + 8 * 3600000
+        tdSql.query("select last_row(*) from st where ts < %d " % tc)        
+        tdSql.checkData(0, 1, None)
+
+        tdSql.query("select last_row(*) from st")        
+        tdSql.checkData(0, 1, None)
+
+        tc = self.ts + 4 * 3600000
+        tdSql.query("select last_row(*) from st where ts < %d " % tc)        
+        tdSql.checkData(0, 1, None)
+
+        tc1 = self.ts + 1 * 3600000
+        tc2 = self.ts + 4 * 3600000
+        tdSql.query("select last_row(*) from st where ts > %d and ts <= %d" % (tc1, tc2))
+        tdSql.checkData(0, 1, None)
+
+        # For table
+        tc = self.ts + 6 * 3600000
+        tdSql.query("select last_row(*) from %s%d where ts <= %d" % (self.perfix, 1, tc))
+        tdSql.checkData(0, 1, -1)
+
+        tc = self.ts + 8 * 3600000
+        tdSql.query("select last_row(*) from %s%d where ts <= %d" % (self.perfix, 1, tc))
+        tdSql.checkData(0, 1, None)
+
+        tdSql.query("select last_row(*) from %s%d" % (self.perfix, 1))
+        tdSql.checkData(0, 1, None)
+
+        tc = self.ts + 4 * 3600000
+        tdSql.query("select last_row(*) from %s%d where ts <= %d" % (self.perfix, 1, tc))
+        tdSql.checkData(0, 1, None)
+
+        tc1 = self.ts + 1 * 3600000
+        tc2 = self.ts + 4 * 3600000
+        tdSql.query("select last_row(*) from st where ts > %d and ts <= %d" % (tc1, tc2))
+        tdSql.checkData(0, 1, None)
+        
+    def run(self):
+        tdSql.prepare()
+        
+        print("============== last_row_cache_0.sim")
+        tdSql.execute("create database test1 cachelast 0")
+        tdSql.execute("use test1")
+        self.insertData()
+        self.executeQueries()
+        self.insertData2()
+        self.executeQueries2()
+        
+        print("============== alter last cache")
+        tdSql.execute("alter database test1 cachelast 1")                
+        self.executeQueries2()
+        tdDnodes.stop(1)
+        tdDnodes.start(1)
+        self.executeQueries2()
+
+        tdSql.execute("alter database test1 cachelast 0")        
+        self.executeQueries2()
+        tdDnodes.stop(1)
+        tdDnodes.start(1)
+        self.executeQueries2()
+
+        print("============== last_row_cache_1.sim")
+        tdSql.execute("create database test2 cachelast 1")
+        tdSql.execute("use test2")
+        self.insertData()
+        self.executeQueries()
+        self.insertData2()
+        self.executeQueries2()
+        
+        tdSql.execute("alter database test2 cachelast 0")        
+        self.executeQueries2()
+        tdDnodes.stop(1)
+        tdDnodes.start(1)
+        self.executeQueries2()
+
+        tdSql.execute("alter database test2 cachelast 1")        
+        self.executeQueries2()
+        tdDnodes.stop(1)
+        tdDnodes.start(1)
+        self.executeQueries2()
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())