test: move TS_5105 to queryBugs

tests/army/query/queryBugs.py

@@ -28,7 +28,6 @@ from frame import *
 
 
 class TDTestCase(TBase):
-
     # fix
     def FIX_TD_30686(self):
         tdLog.info("check bug TD_30686 ...\n")
@@ -49,6 +48,32 @@ class TDTestCase(TBase):
         ]
         tdSql.checkDataMem(sql, results)
 
+    def FIX_TS_5105(self):
+        tdLog.info("check bug TS_5105 ...\n")
+        ts1 = "2024-07-03 10:00:00.000"
+        ts2 = "2024-07-03 13:00:00.000"
+        sqls = [
+            "drop database if exists ts_5105",
+            "create database ts_5105 cachemodel 'both';",
+            "use ts_5105;",
+            "CREATE STABLE meters (ts timestamp, current float) TAGS (location binary(64), groupId int);",
+            "CREATE TABLE d1001 USING meters TAGS ('California.B', 2);",
+            "CREATE TABLE d1002 USING meters TAGS ('California.S', 3);",
+            f"INSERT INTO d1001 VALUES ('{ts1}', 10);",
+            f"INSERT INTO d1002 VALUES ('{ts2}', 13);",
+        ]
+        tdSql.executes(sqls)
+
+        sql = "select last(ts), last_row(ts) from meters;"
+
+        # 执行多次，有些时候last_row(ts)会返回错误的值，详见TS-5105
+        for i in range(1, 10):
+            tdLog.debug(f"{i}th execute sql: {sql}")
+            tdSql.query(sql)
+            tdSql.checkRows(1)
+            tdSql.checkData(0, 0, ts2)
+            tdSql.checkData(0, 1, ts2)
+
     # run
     def run(self):
         tdLog.debug(f"start to excute {__file__}")
@@ -57,11 +82,10 @@ class TDTestCase(TBase):
         self.FIX_TD_30686()
 
         # TS BUGS
-        
+        self.FIX_TS_5105()
 
         tdLog.success(f"{__file__} successfully executed")
 
 
-
 tdCases.addLinux(__file__, TDTestCase())
 tdCases.addWindows(__file__, TDTestCase())

tests/army/query/query_last_row_repeatly.py

@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from frame.log import *
-from frame.cases import *
-from frame.sql import *
-from frame.caseBase import *
-from frame import *
-
-
-class TDTestCase(TBase):
-    def init(self, conn, logSql, replicaVar=1):
-        self.replicaVar = int(replicaVar)
-        tdLog.debug("start to execute %s" % __file__)
-        tdSql.init(conn.cursor(), logSql)
-
-    def run(self):
-        sqls = [
-            "drop database if exists ts_5101",
-            "create database ts_5101 cachemodel 'both';",
-            "use ts_5101;",
-            "CREATE STABLE meters (ts timestamp, current float) TAGS (location binary(64), groupId int);",
-            "CREATE TABLE d1001 USING meters TAGS ('California.B', 2);",
-            "CREATE TABLE d1002 USING meters TAGS ('California.S', 3);",
-            "INSERT INTO d1001 VALUES ('2024-07-03 10:00:00.000', 10);",
-            "INSERT INTO d1002 VALUES ('2024-07-03 13:00:00.000', 13);",
-        ]
-        tdSql.executes(sqls)
-
-        # 执行多次，有些时候last_row(ts)会返回错误的值，详见TS-5105
-        for i in range(1, 10):
-            sql = "select last(ts), last_row(ts) from meters;"
-            tdLog.debug(f"{i}th execute sql: {sql}")
-            tdSql.query(sql)
-            tdSql.checkRows(1)
-            tdSql.checkData(0, 0, "2024-07-03 13:00:00.000")
-            tdSql.checkData(0, 1, "2024-07-03 13:00:00.000")
-
-    def stop(self):
-        tdSql.close()
-        tdLog.success("%s successfully executed" % __file__)
-
-
-tdCases.addWindows(__file__, TDTestCase())
-tdCases.addLinux(__file__, TDTestCase())

tests/parallel_test/cases.task

@@ -20,7 +20,6 @@
 ,,y,army,./pytest.sh python3 ./test.py -f insert/test_column_tag_boundary.py
 ,,y,army,./pytest.sh python3 ./test.py -f query/fill/fill_desc.py -N 3 -L 3 -D 2
 ,,y,army,./pytest.sh python3 ./test.py -f query/fill/fill_null.py
-,,y,army,./pytest.sh python3 ./test.py -f query/query_last_row_repeatly.py
 ,,y,army,./pytest.sh python3 ./test.py -f cluster/incSnapshot.py -N 3
 ,,y,army,./pytest.sh python3 ./test.py -f query/query_basic.py -N 3
 ,,y,army,./pytest.sh python3 ./test.py -f query/accuracy/test_query_accuracy.py