Merge pull request #5543 from taosdata/feature/TD-1380

[TD-3274]<test> add case for TD-3274

tests/pytest/fulltest.sh

@@ -213,6 +213,8 @@ python3 ./test.py -f query/bug2119.py
 python3 ./test.py -f query/isNullTest.py
 python3 ./test.py -f query/queryWithTaosdKilled.py
 python3 ./test.py -f query/floatCompare.py
+python3 ./test.py -f query/query1970YearsAf.py
+python3 ./test.py -f query/bug3351.py
 python3 ./test.py -f query/bug3375.py
 
 

tests/pytest/query/bug3351.py

+###################################################################
+#           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
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+        tdSql.execute("drop database if exists db")
+        tdSql.execute("create database  if not exists db keep 36500")
+        tdSql.execute("use db")
+        tdLog.printNoPrefix("==========step1:create table && insert data")
+
+        tdSql.execute(
+            "create table stb1 (ts timestamp, c1 int) TAGS(t1 int)"
+        )
+        tdSql.execute("create table t0 using stb1 tags(1)")
+        tdSql.execute("insert into t0 values (-865000000, 1)")
+        tdSql.execute("insert into t0 values (-864000000, 2)")
+        tdSql.execute("insert into t0 values (-863000000, 3)")
+        tdSql.execute("insert into t0 values (-15230000, 4)")
+        tdSql.execute("insert into t0 values (-15220000, 5)")
+        tdSql.execute("insert into t0 values (-15210000, 6)")
+
+        tdLog.printNoPrefix("==========step2:query")
+        # bug1:when ts > -864000000, return 0 rows;
+        # bug2:when ts = -15220000, return 0 rows.
+        tdSql.query('select * from t0 where ts < -864000000')
+        tdSql.checkRows(1)
+        tdSql.query('select * from t0 where ts <= -864000000')
+        tdSql.checkRows(2)
+        tdSql.query('select * from t0 where ts = -864000000')
+        tdSql.checkRows(1)
+        tdSql.query('select * from t0 where ts > -864000000')
+        tdSql.checkRows(4)
+        tdSql.query('select * from t0 where ts >= -864000000')
+        tdSql.checkRows(5)
+        tdSql.query('select * from t0 where ts < -15220000')
+        tdSql.checkRows(4)
+        tdSql.query('select * from t0 where ts <= -15220000')
+        tdSql.checkRows(5)
+        tdSql.query('select * from t0 where ts = -15220000')
+        tdSql.checkRows(1)
+        tdSql.query('select * from t0 where ts > -15220000')
+        tdSql.checkRows(1)
+        tdSql.query('select * from t0 where ts >= -15220000')
+        tdSql.checkRows(2)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
\ No newline at end of file

tests/pytest/query/query1970YearsAf.py

@@ -22,25 +22,34 @@ import datetime
 from util.log import *
 from util.sql import *
 from util.cases import *
+from util.dnodes import *
+from util.dnodes import TDDnode
 
 class TDTestCase:
 
+    def __init__(self):
+        self.path = ""
+
     def init(self, conn, logSql):
         tdLog.debug(f"start to excute {__file__}")
         tdSql.init(conn.cursor())
 
-    def getCfgDir(self, path):
+    def getcfgPath(self, path):
         binPath = os.path.dirname(os.path.realpath(__file__))
         binPath = binPath + "/../../../debug/"
-        tdLog.debug("binPath %s" % (binPath))
+        tdLog.debug(f"binPath {binPath}")
         binPath = os.path.realpath(binPath)
-        tdLog.debug("binPath real path %s" % (binPath))
+        tdLog.debug(f"binPath real path {binPath}")
+
         if path == "":
             self.path = os.path.abspath(binPath + "../../")
         else:
             self.path = os.path.realpath(path)
+        return self.path
 
-        self.cfgDir = "%s/sim/psim/cfg" % (self.path)
+    def getCfgDir(self):
+        self.getcfgPath(self.path)
+        self.cfgDir = f"{self.path}/sim/psim/cfg"
         return self.cfgDir
 
     def creatcfg(self):
@@ -63,7 +72,7 @@ class TDTestCase:
             "update": 0
         }
 
-        # 设置创建的超级表格式
+        # set stable schema
         stable1 = {
             "name": "stb2",
             "child_table_exists": "no",
@@ -75,35 +84,49 @@ class TDTestCase:
             "insert_rows": 5000,
             "multi_thread_write_one_tbl": "no",
             "number_of_tbl_in_one_sql": 0,
-            "rows_per_tbl": 1000,
+            "rows_per_tbl": 1,
             "max_sql_len": 65480,
             "disorder_ratio": 0,
             "disorder_range": 1000,
-            "timestamp_step": 19000000,
-            "start_timestamp": "1969-01-01 00:00:00.000",
+            "timestamp_step": 20000,
+            "start_timestamp": "1969-12-31 00:00:00.000",
             "sample_format": "csv",
             "sample_file": "./sample.csv",
             "tags_file": "",
             "columns": [
-                {"type": "INT"},
-                {"type": "DOUBLE", "count": 10},
-                {"type": "BINARY", "len": 16, "count": 3},
-                {"type": "BINARY", "len": 32, "count": 6}
+                {"type": "INT", "count": 2},
+                {"type": "DOUBLE", "count": 2},
+                {"type": "BIGINT", "count": 2},
+                {"type": "FLOAT", "count": 2},
+                {"type": "SMALLINT", "count": 2},
+                {"type": "TINYINT", "count": 2},
+                {"type": "BOOL", "count": 2},
+                {"type": "NCHAR", "len": 3, "count": 1},
+                {"type": "BINARY", "len": 8, "count": 1}
+
             ],
             "tags": [
+                {"type": "INT", "count": 2},
+                {"type": "DOUBLE", "count": 2},
+                {"type": "BIGINT", "count": 2},
+                {"type": "FLOAT", "count": 2},
+                {"type": "SMALLINT", "count": 2},
                 {"type": "TINYINT", "count": 2},
-                {"type": "BINARY", "len": 16, "count": 5}
+                {"type": "BOOL", "count": 2},
+                {"type": "NCHAR", "len": 3, "count": 1},
+                {"type": "BINARY", "len": 8, "count": 1}
             ]
         }
 
-        # 需要创建多个超级表时，只需创建不同的超级表格式并添加至super_tables
-        super_tables = [stable1]
+        # create different stables like stable1 and add to list super_tables
+        super_tables = []
+        super_tables.append(stable1)
         database = {
             "dbinfo": dbinfo,
             "super_tables": super_tables
         }
 
-        cfgdir = self.getCfgDir("")
+        cfgdir = self.getCfgDir()
         create_table = {
             "filetype": "insert",
             "cfgdir": cfgdir,
@@ -121,105 +144,110 @@ class TDTestCase:
         }
         return create_table
 
-    def inserttable(self):
+    def createinsertfile(self):
         create_table = self.creatcfg()
         date = datetime.datetime.now().strftime("%Y%m%d%H%M")
         file_create_table = f"/tmp/insert_{date}.json"
 
         with open(file_create_table, 'w') as f:
             json.dump(create_table, f)
+        return file_create_table
 
-        create_table_cmd = f"taosdemo -f {file_create_table}"
+    def inserttable(self, filepath):
+        create_table_cmd = f"taosdemo -f {filepath}  > /dev/null 2>&1"
         _ = subprocess.check_output(create_table_cmd, shell=True).decode("utf-8")
 
-
-    def run(self):
-        s = 'reset query cache'
-        tdSql.execute(s)
-        s = 'create database if not exists db'
-        tdSql.execute(s)
-        s = 'use db'
-        tdSql.execute(s)
-
-        tdLog.info("==========step1:create table stable and child table,then insert data automatically")
-        self.inserttable()
-        # tdSql.execute(
-        #     '''create table if not exists supt
-        #     (ts timestamp, c1 int, c2 float, c3 bigint, c4 double, c5 smallint, c6 tinyint)
-        #     tags(location binary(64), type int, isused bool , family nchar(64))'''
-        # )
-        # tdSql.execute("create table t1 using supt tags('beijing', 1, 1, '自行车')")
-        # tdSql.execute("create table t2 using supt tags('shanghai', 2, 0, '拖拉机')")
-        # tdSql.execute(
-        #     f"insert into t1 values (-31564800000, 6, 5, 4, 3, 2, 1)"
-        # )
-
-
-
-        tdLog.info("==========step2:query join")
-
+    def sqlsquery(self):
         # stable query
         tdSql.query(
             "select * from stb2 where stb2.ts < '1970-01-01 00:00:00.000' "
         )
-        tdSql.checkRows(16600)
+        tdSql.checkRows(43200)
 
         tdSql.query(
             "select * from stb2 where stb2.ts >= '1970-01-01 00:00:00.000' "
         )
-        tdSql.checkRows(33400)
+        tdSql.checkRows(6800)
 
         tdSql.query(
-            "select * from stb2 where stb2.ts > '1969-12-01 00:00:00.000' and stb2.ts <'1970-01-31 00:00:00.000' "
+            "select * from stb2 where stb2.ts > '1969-12-31 23:00:00.000' and stb2.ts <'1970-01-01 01:00:00.000' "
         )
-        tdSql.checkRows(2780)
+        tdSql.checkRows(3590)
 
-        # child-table query
+        # child-tables query
         tdSql.query(
             "select * from t0 where t0.ts < '1970-01-01 00:00:00.000' "
         )
-        tdSql.checkRows(1660)
+        tdSql.checkRows(4320)
 
         tdSql.query(
             "select * from t1 where t1.ts >= '1970-01-01 00:00:00.000' "
         )
-        tdSql.checkRows(3340)
+        tdSql.checkRows(680)
 
         tdSql.query(
-            "select * from t9 where t9.ts > '1969-12-01 00:00:00.000' and t9.ts <'1970-01-31 00:00:00.000' "
+            "select * from t9 where t9.ts > '1969-12-31 22:00:00.000' and t9.ts <'1970-01-01 02:00:00.000' "
         )
-        tdSql.checkRows(278)
-
+        tdSql.checkRows(719)
+        
         tdSql.query(
             "select * from t0,t1 where t0.ts=t1.ts and t1.ts >= '1970-01-01 00:00:00.000' "
         )
-        tdSql.checkRows(3340)
-
+        tdSql.checkRows(680)
+        
         tdSql.query(
             "select diff(col1) from t0 where t0.ts >= '1970-01-01 00:00:00.000' "
         )
-        tdSql.checkRows(3339)
+        tdSql.checkRows(679)
 
         tdSql.query(
             "select t0,col1 from stb2 where stb2.ts < '1970-01-01 00:00:00.000' order by ts"
         )
-        tdSql.checkRows(16600)
+        tdSql.checkRows(43200)
 
         # query with timestamp in 'where ...'
         tdSql.query(
             "select * from stb2 where stb2.ts > -28800000 "
         )
-        tdSql.checkRows(33400)
+        tdSql.checkRows(6790)
 
         tdSql.query(
             "select * from stb2 where stb2.ts > -28800000 and stb2.ts < '1970-01-01 08:00:00.000' "
         )
-        tdSql.checkRows(20)
+        tdSql.checkRows(6790)
 
         tdSql.query(
-            "select * from stb2 where stb2.ts < -28800000 and stb2.ts > '1969-12-31 16:00:00.000' "
+            "select * from stb2 where stb2.ts < -28800000 and stb2.ts > '1969-12-31 22:00:00.000' "
         )
+        tdSql.checkRows(3590)
+
+    def run(self):
+        s = 'reset query cache'
+        tdSql.execute(s)
+        s = 'create database if not exists db'
+        tdSql.execute(s)
+        s = 'use db'
+        tdSql.execute(s)
+
+        tdLog.info("==========step1:create table stable and child table,then insert data automatically")
+        insertfile = self.createinsertfile()
+        self.inserttable(insertfile)
+
+        tdLog.info("==========step2:query join")
+        self.sqlsquery()
+
+        # after wal and sync, check again
+        tdSql.query("show dnodes")
+        index = tdSql.getData(0, 0)
+        tdDnodes.stop(index)
+        tdDnodes.start(index)
+
+        tdLog.info("==========step3: query join again")
+        self.sqlsquery()
 
+        # delete temporary file
+        rm_cmd = f"rm -f /tmp/insert* > /dev/null 2>&1"
+        _ = subprocess.check_output(rm_cmd, shell=True).decode("utf-8")
 
     def stop(self):
         tdSql.close()