From 2df734a5e34411281d513229e578541010569a20 Mon Sep 17 00:00:00 2001
From: Bomin Zhang <bmzhang@taosdata.com>
Date: Tue, 29 Dec 2020 08:31:20 +0000
Subject: [PATCH] [TD-2585]<test>:migrate 4 sim cases to python to improve
 speed

---
 tests/pytest/fulltest.sh                      |   4 +
 tests/pytest/pytest_1.sh                      |   4 +
 tests/pytest/stream/metric_n.py               | 123 +++++++
 tests/pytest/stream/sys.py                    |  59 ++++
 tests/pytest/stream/table_1.py                |  89 +++++
 tests/pytest/stream/table_n.py                | 143 ++++++++
 tests/script/fullGeneralSuite.sim             |   4 -
 tests/script/general/parser/stream_on_sys.sim |  62 ----
 tests/script/general/parser/testSuite.sim     |   2 -
 tests/script/general/stream/metrics_n.sim     | 262 ---------------
 tests/script/general/stream/table_1.sim       | 317 ------------------
 tests/script/general/stream/table_n.sim       | 293 ----------------
 tests/script/general/stream/testSuite.sim     |   3 -
 tests/script/jenkins/basic.txt                |   4 -
 tests/script/jenkins/basic_3.txt              |   4 -
 tests/script/jenkins/simple.txt               |   1 -
 tests/script/regressionSuite.sim              |   7 -
 17 files changed, 422 insertions(+), 959 deletions(-)
 create mode 100644 tests/pytest/stream/metric_n.py
 create mode 100644 tests/pytest/stream/sys.py
 create mode 100644 tests/pytest/stream/table_1.py
 create mode 100644 tests/pytest/stream/table_n.py
 delete mode 100644 tests/script/general/parser/stream_on_sys.sim
 delete mode 100644 tests/script/general/stream/metrics_n.sim
 delete mode 100644 tests/script/general/stream/table_1.sim
 delete mode 100644 tests/script/general/stream/table_n.sim

diff --git a/tests/pytest/fulltest.sh b/tests/pytest/fulltest.sh
index f197a95818..f0b3beacbe 100755
--- a/tests/pytest/fulltest.sh
+++ b/tests/pytest/fulltest.sh
@@ -178,11 +178,15 @@ python3 ./test.py -f query/floatCompare.py
 
 #stream
 python3 ./test.py -f stream/metric_1.py
+python3 ./test.py -f stream/metric_n.py
 python3 ./test.py -f stream/new.py
 python3 ./test.py -f stream/stream1.py
 python3 ./test.py -f stream/stream2.py
 #python3 ./test.py -f stream/parser.py
 python3 ./test.py -f stream/history.py
+python3 ./test.py -f stream/sys.py
+python3 ./test.py -f stream/table_1.py
+python3 ./test.py -f stream/table_n.py
 
 #alter table
 python3 ./test.py -f alter/alter_table_crash.py
diff --git a/tests/pytest/pytest_1.sh b/tests/pytest/pytest_1.sh
index 79815cb6c6..ad26c48004 100755
--- a/tests/pytest/pytest_1.sh
+++ b/tests/pytest/pytest_1.sh
@@ -178,11 +178,15 @@ python3 ./test.py -f query/floatCompare.py
 
 #stream
 python3 ./test.py -f stream/metric_1.py
+python3 ./test.py -f stream/metric_n.py
 python3 ./test.py -f stream/new.py
 python3 ./test.py -f stream/stream1.py
 python3 ./test.py -f stream/stream2.py
 #python3 ./test.py -f stream/parser.py
 python3 ./test.py -f stream/history.py
+python3 ./test.py -f stream/sys.py
+python3 ./test.py -f stream/table_1.py
+python3 ./test.py -f stream/table_n.py
 
 #alter table
 python3 ./test.py -f alter/alter_table_crash.py
diff --git a/tests/pytest/stream/metric_n.py b/tests/pytest/stream/metric_n.py
new file mode 100644
index 0000000000..d223fe81fc
--- /dev/null
+++ b/tests/pytest/stream/metric_n.py
@@ -0,0 +1,123 @@
+###################################################################
+#           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 time
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tbNum = 10
+        rowNum = 20
+        totalNum = tbNum * rowNum
+
+        tdSql.prepare()
+
+        tdLog.info("===== preparing data =====")
+        tdSql.execute(
+            "create table stb(ts timestamp, tbcol int, tbcol2 float) tags(tgcol int)")
+        for i in range(tbNum):
+            tdSql.execute("create table tb%d using stb tags(%d)" % (i, i))
+            for j in range(rowNum):
+                tdSql.execute(
+                    "insert into tb%d values (now - %dm, %d, %d)" %
+                    (i, 1440 - j, j, j))
+        time.sleep(0.1)
+
+        tdLog.info("===== step 1 =====")
+        tdSql.query("select count(*), count(tbcol), count(tbcol2) from stb interval(1d)")
+        tdSql.checkData(0, 1, totalNum)
+        tdSql.checkData(0, 2, totalNum)
+        tdSql.checkData(0, 3, totalNum)
+
+        tdLog.info("===== step 2 =====")
+        tdSql.execute("create table strm_c3 as select count(*), count(tbcol), count(tbcol2) from stb interval(1d)")
+
+        tdLog.info("===== step 3 =====")
+        tdSql.execute("create table strm_c32 as select count(*), count(tbcol) as c1, count(tbcol2) as c2, count(tbcol) as c3, count(tbcol) as c4, count(tbcol) as c5, count(tbcol) as c6, count(tbcol) as c7, count(tbcol) as c8, count(tbcol) as c9, count(tbcol) as c10, count(tbcol) as c11, count(tbcol) as c12, count(tbcol) as c13, count(tbcol) as c14, count(tbcol) as c15, count(tbcol) as c16, count(tbcol) as c17, count(tbcol) as c18, count(tbcol) as c19, count(tbcol) as c20, count(tbcol) as c21, count(tbcol) as c22, count(tbcol) as c23, count(tbcol) as c24, count(tbcol) as c25, count(tbcol) as c26, count(tbcol) as c27, count(tbcol) as c28, count(tbcol) as c29, count(tbcol) as c30 from stb interval(1d)")
+
+        tdLog.info("===== step 4 =====")
+        tdSql.query("select count(*), count(tbcol) as c1, count(tbcol2) as c2, count(tbcol) as c3, count(tbcol) as c4, count(tbcol) as c5, count(tbcol) as c6, count(tbcol) as c7, count(tbcol) as c8, count(tbcol) as c9, count(tbcol) as c10, count(tbcol) as c11, count(tbcol) as c12, count(tbcol) as c13, count(tbcol) as c14, count(tbcol) as c15, count(tbcol) as c16, count(tbcol) as c17, count(tbcol) as c18, count(tbcol) as c19, count(tbcol) as c20, count(tbcol) as c21, count(tbcol) as c22, count(tbcol) as c23, count(tbcol) as c24, count(tbcol) as c25, count(tbcol) as c26, count(tbcol) as c27, count(tbcol) as c28, count(tbcol) as c29, count(tbcol) as c30  from stb interval(1d)")
+        tdSql.checkData(0, 1, totalNum)
+        tdSql.checkData(0, 2, totalNum)
+        tdSql.checkData(0, 3, totalNum)
+
+        tdLog.info("===== step 5 =====")
+        tdSql.execute("create table strm_c31 as select count(*), count(tbcol) as c1, count(tbcol2) as c2, count(tbcol) as c3, count(tbcol) as c4, count(tbcol) as c5, count(tbcol) as c6, count(tbcol) as c7, count(tbcol) as c8, count(tbcol) as c9, count(tbcol) as c10, count(tbcol) as c11, count(tbcol) as c12, count(tbcol) as c13, count(tbcol) as c14, count(tbcol) as c15, count(tbcol) as c16, count(tbcol) as c17, count(tbcol) as c18, count(tbcol) as c19, count(tbcol) as c20, count(tbcol) as c21, count(tbcol) as c22, count(tbcol) as c23, count(tbcol) as c24, count(tbcol) as c25, count(tbcol) as c26, count(tbcol) as c27, count(tbcol) as c28, count(tbcol) as c29, count(tbcol) as c30 from stb interval(1d)")
+
+        tdLog.info("===== step 6 =====")
+        tdSql.query("select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol) from stb interval(1d)")
+        tdSql.checkData(0, 1, 9.5)
+        tdSql.checkData(0, 2, 1900)
+        tdSql.checkData(0, 3, 0)
+        tdSql.checkData(0, 4, 19)
+        tdSql.checkData(0, 5, 0)
+        tdSql.checkData(0, 6, 19)
+        tdSql.execute("create table strm_avg as select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol) from stb interval(1d)")
+
+        tdLog.info("===== step 7 =====")
+        tdSql.query("select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol), count(tbcol) from stb where ts < now + 4m interval(1d)")
+        tdSql.checkData(0, 1, 9.5)
+        tdSql.checkData(0, 2, 1900)
+        tdSql.checkData(0, 3, 0)
+        tdSql.checkData(0, 4, 19)
+        tdSql.checkData(0, 5, 0)
+        tdSql.checkData(0, 6, 19)
+        tdSql.checkData(0, 7, totalNum)
+
+        tdLog.info("===== step 8 =====")
+        tdSql.query("select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol), count(tbcol)  from stb where ts < now + 4m interval(1d)")
+        tdSql.checkData(0, 1, 9.5)
+        tdSql.checkData(0, 2, 1900)
+        tdSql.checkData(0, 3, 0)
+        tdSql.checkData(0, 4, 19)
+        tdSql.checkData(0, 5, 0)
+        tdSql.checkData(0, 6, 19)
+        tdSql.checkData(0, 7, totalNum)
+
+        tdLog.info("===== step 9 =====")
+        tdSql.waitedQuery("select * from strm_c3", 1, 120)
+        tdSql.checkData(0, 1, totalNum)
+        tdSql.checkData(0, 2, totalNum)
+        tdSql.checkData(0, 3, totalNum)
+
+        tdLog.info("===== step 10 =====")
+        tdSql.waitedQuery("select * from strm_c31", 1, 30)
+        for i in range(1, 10):
+            tdSql.checkData(0, i, totalNum)
+
+        tdLog.info("===== step 11 =====")
+        tdSql.waitedQuery("select * from strm_avg", 1, 20)
+        tdSql.checkData(0, 1, 9.5)
+        tdSql.checkData(0, 2, 1900)
+        tdSql.checkData(0, 3, 0)
+        tdSql.checkData(0, 4, 19)
+        tdSql.checkData(0, 5, 0)
+        tdSql.checkData(0, 6, 19)
+
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/stream/sys.py b/tests/pytest/stream/sys.py
new file mode 100644
index 0000000000..9202e2a9c0
--- /dev/null
+++ b/tests/pytest/stream/sys.py
@@ -0,0 +1,59 @@
+###################################################################
+#           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
+#
+###################################################################
+
+# migrated from 'stream_on_sys.sim'
+# -*- coding: utf-8 -*-
+import sys
+import time
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+
+    def run(self):
+        tdSql.execute("use log")
+
+        tdSql.execute("create table cpustrm as select count(*), avg(cpu_taosd), max(cpu_taosd), min(cpu_taosd), avg(cpu_system), max(cpu_cores), min(cpu_cores), last(cpu_cores) from log.dn1 interval(4s)")
+        tdSql.execute("create table memstrm as select count(*), avg(mem_taosd), max(mem_taosd), min(mem_taosd), avg(mem_system), first(mem_total), last(mem_total) from log.dn1 interval(4s)")
+        tdSql.execute("create table diskstrm as select count(*), avg(disk_used), last(disk_used), avg(disk_total), first(disk_total) from log.dn1 interval(4s)")
+        tdSql.execute("create table bandstrm as select count(*), avg(band_speed), last(band_speed) from log.dn1 interval(4s)")
+        tdSql.execute("create table reqstrm as select count(*), avg(req_http), last(req_http), avg(req_select), last(req_select), avg(req_insert), last(req_insert) from log.dn1 interval(4s)")
+        tdSql.execute("create table iostrm as select count(*), avg(io_read), last(io_read), avg(io_write), last(io_write) from log.dn1 interval(4s)")
+
+        sqls = [
+            "select * from cpustrm",
+            "select * from memstrm",
+            "select * from diskstrm",
+            "select * from bandstrm",
+            "select * from reqstrm",
+            "select * from iostrm",
+        ]
+        for sql in sqls:
+            (rows, _) = tdSql.waitedQuery(sql, 1, 120)
+            if rows < 1:
+                tdLog.exit("failed: sql:%s, expect at least one row" % sql)
+
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
+
diff --git a/tests/pytest/stream/table_1.py b/tests/pytest/stream/table_1.py
new file mode 100644
index 0000000000..a9fd573931
--- /dev/null
+++ b/tests/pytest/stream/table_1.py
@@ -0,0 +1,89 @@
+###################################################################
+#           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 time
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def createFuncStream(self, expr, suffix, value):
+        tbname = "strm_" + suffix
+        tdLog.info("create stream table %s" % tbname)
+        tdSql.query("select %s from tb1 interval(1d)" % expr)
+        tdSql.checkData(0, 1, value)
+        tdSql.execute("create table %s as select %s from tb1 interval(1d)" % (tbname, expr))
+
+    def checkStreamData(self, suffix, value):
+        sql = "select * from strm_" + suffix
+        tdSql.waitedQuery(sql, 1, 120)
+        tdSql.checkData(0, 1, value)
+
+    def run(self):
+        tbNum = 10
+        rowNum = 20
+
+        tdSql.prepare()
+
+        tdLog.info("===== step1 =====")
+        tdSql.execute(
+            "create table stb(ts timestamp, tbcol int, tbcol2 float) tags(tgcol int)")
+        for i in range(tbNum):
+            tdSql.execute("create table tb%d using stb tags(%d)" % (i, i))
+            for j in range(rowNum):
+                tdSql.execute(
+                    "insert into tb%d values (now - %dm, %d, %d)" %
+                    (i, 1440 - j, j, j))
+        time.sleep(0.1)
+
+        self.createFuncStream("count(*)", "c1", rowNum)
+        self.createFuncStream("count(tbcol)", "c2", rowNum)
+        self.createFuncStream("count(tbcol2)", "c3", rowNum)
+        self.createFuncStream("avg(tbcol)", "av", 9.5)
+        self.createFuncStream("sum(tbcol)", "su", 190)
+        self.createFuncStream("min(tbcol)", "mi", 0)
+        self.createFuncStream("max(tbcol)", "ma", 19)
+        self.createFuncStream("first(tbcol)", "fi", 0)
+        self.createFuncStream("last(tbcol)", "la", 19)
+        self.createFuncStream("stddev(tbcol)", "st", 5.766281297335398)
+        self.createFuncStream("percentile(tbcol, 1)", "pe", 0.19)
+        self.createFuncStream("count(tbcol)", "as", rowNum)
+
+        self.checkStreamData("c1", rowNum)
+        self.checkStreamData("c2", rowNum)
+        self.checkStreamData("c3", rowNum)
+        self.checkStreamData("av", 9.5)
+        self.checkStreamData("su", 190)
+        self.checkStreamData("mi", 0)
+        self.checkStreamData("ma", 19)
+        self.checkStreamData("fi", 0)
+        self.checkStreamData("la", 19)
+        self.checkStreamData("st", 5.766281297335398)
+        self.checkStreamData("pe", 0.19)
+        self.checkStreamData("as", rowNum)
+
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/stream/table_n.py b/tests/pytest/stream/table_n.py
new file mode 100644
index 0000000000..371af76977
--- /dev/null
+++ b/tests/pytest/stream/table_n.py
@@ -0,0 +1,143 @@
+###################################################################
+#           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 time
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tbNum = 10
+        rowNum = 20
+
+        tdSql.prepare()
+
+        tdLog.info("===== preparing data =====")
+        tdSql.execute(
+            "create table stb(ts timestamp, tbcol int, tbcol2 float) tags(tgcol int)")
+        for i in range(tbNum):
+            tdSql.execute("create table tb%d using stb tags(%d)" % (i, i))
+            for j in range(rowNum):
+                tdSql.execute(
+                    "insert into tb%d values (now - %dm, %d, %d)" %
+                    (i, 1440 - j, j, j))
+        time.sleep(0.1)
+
+        tdLog.info("===== step 1 =====")
+        tdSql.query("select count(*), count(tbcol), count(tbcol2) from tb1 interval(1d)")
+        tdSql.checkData(0, 1, rowNum)
+        tdSql.checkData(0, 2, rowNum)
+        tdSql.checkData(0, 3, rowNum)
+
+        tdLog.info("===== step 2 =====")
+        tdSql.execute("create table strm_c3 as select count(*), count(tbcol), count(tbcol2) from tb1 interval(1d)")
+
+        tdLog.info("===== step 3 =====")
+        tdSql.execute("create table strm_c32 as select count(*), count(tbcol) as c1, count(tbcol2) as c2, count(tbcol) as c3, count(tbcol) as c4, count(tbcol) as c5, count(tbcol) as c6, count(tbcol) as c7, count(tbcol) as c8, count(tbcol) as c9, count(tbcol) as c10, count(tbcol) as c11, count(tbcol) as c12, count(tbcol) as c13, count(tbcol) as c14, count(tbcol) as c15, count(tbcol) as c16, count(tbcol) as c17, count(tbcol) as c18, count(tbcol) as c19, count(tbcol) as c20, count(tbcol) as c21, count(tbcol) as c22, count(tbcol) as c23, count(tbcol) as c24, count(tbcol) as c25, count(tbcol) as c26, count(tbcol) as c27, count(tbcol) as c28, count(tbcol) as c29, count(tbcol) as c30 from tb1 interval(1d)")
+
+        tdLog.info("===== step 4 =====")
+        tdSql.query("select count(*), count(tbcol) as c1, count(tbcol2) as c2, count(tbcol) as c3, count(tbcol) as c4, count(tbcol) as c5, count(tbcol) as c6, count(tbcol) as c7, count(tbcol) as c8, count(tbcol) as c9, count(tbcol) as c10, count(tbcol) as c11, count(tbcol) as c12, count(tbcol) as c13, count(tbcol) as c14, count(tbcol) as c15, count(tbcol) as c16, count(tbcol) as c17, count(tbcol) as c18, count(tbcol) as c19, count(tbcol) as c20, count(tbcol) as c21, count(tbcol) as c22, count(tbcol) as c23, count(tbcol) as c24, count(tbcol) as c25, count(tbcol) as c26, count(tbcol) as c27, count(tbcol) as c28, count(tbcol) as c29, count(tbcol) as c30  from tb1 interval(1d)")
+        tdSql.checkData(0, 1, rowNum)
+        tdSql.checkData(0, 2, rowNum)
+        tdSql.checkData(0, 3, rowNum)
+
+        tdLog.info("===== step 5 =====")
+        tdSql.execute("create table strm_c31 as select count(*), count(tbcol) as c1, count(tbcol2) as c2, count(tbcol) as c3, count(tbcol) as c4, count(tbcol) as c5, count(tbcol) as c6, count(tbcol) as c7, count(tbcol) as c8, count(tbcol) as c9, count(tbcol) as c10, count(tbcol) as c11, count(tbcol) as c12, count(tbcol) as c13, count(tbcol) as c14, count(tbcol) as c15, count(tbcol) as c16, count(tbcol) as c17, count(tbcol) as c18, count(tbcol) as c19, count(tbcol) as c20, count(tbcol) as c21, count(tbcol) as c22, count(tbcol) as c23, count(tbcol) as c24, count(tbcol) as c25, count(tbcol) as c26, count(tbcol) as c27, count(tbcol) as c28, count(tbcol) as c29, count(tbcol) as c30 from tb1 interval(1d)")
+
+        tdLog.info("===== step 6 =====")
+        tdSql.query("select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol) from tb1 interval(1d)")
+        tdSql.checkData(0, 1, 9.5)
+        tdSql.checkData(0, 2, 190)
+        tdSql.checkData(0, 3, 0)
+        tdSql.checkData(0, 4, 19)
+        tdSql.checkData(0, 5, 0)
+        tdSql.checkData(0, 6, 19)
+        tdSql.execute("create table strm_avg as select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol) from tb1 interval(1d)")
+
+        tdLog.info("===== step 7 =====")
+        tdSql.query("select stddev(tbcol), leastsquares(tbcol, 1, 1), percentile(tbcol, 1) from tb1 interval(1d)")
+        tdSql.checkData(0, 1, 5.766281297335398)
+        tdSql.checkData(0, 3, 0.19)
+        tdSql.execute("create table strm_ot as select stddev(tbcol), leastsquares(tbcol, 1, 1), percentile(tbcol, 1) from tb1 interval(1d)")
+
+        tdLog.info("===== step 8 =====")
+        tdSql.query("select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol), stddev(tbcol), percentile(tbcol, 1), count(tbcol), leastsquares(tbcol, 1, 1) from tb1 interval(1d)")
+        tdSql.checkData(0, 1, 9.5)
+        tdSql.checkData(0, 2, 190)
+        tdSql.checkData(0, 3, 0)
+        tdSql.checkData(0, 4, 19)
+        tdSql.checkData(0, 5, 0)
+        tdSql.checkData(0, 6, 19)
+        tdSql.checkData(0, 7, 5.766281297335398)
+        tdSql.checkData(0, 8, 0.19)
+        tdSql.checkData(0, 9, rowNum)
+        tdSql.execute("create table strm_to as select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol), stddev(tbcol), percentile(tbcol, 1), count(tbcol), leastsquares(tbcol, 1, 1) from tb1 interval(1d)")
+
+        tdLog.info("===== step 9 =====")
+        tdSql.query("select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol), stddev(tbcol), percentile(tbcol, 1), count(tbcol), leastsquares(tbcol, 1, 1) from tb1 where ts < now + 4m interval(1d)")
+        tdSql.checkData(0, 9, rowNum)
+        tdSql.execute("create table strm_wh as select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol), stddev(tbcol), percentile(tbcol, 1), count(tbcol), leastsquares(tbcol, 1, 1) from tb1 where ts < now + 4m interval(1d)")
+
+        tdLog.info("===== step 10 =====")
+        tdSql.waitedQuery("select * from strm_c3", 1, 120)
+        tdSql.checkData(0, 1, rowNum)
+        tdSql.checkData(0, 2, rowNum)
+        tdSql.checkData(0, 3, rowNum)
+
+        tdLog.info("===== step 11 =====")
+        tdSql.waitedQuery("select * from strm_c31", 1, 30)
+        for i in range(1, 10):
+            tdSql.checkData(0, i, rowNum)
+
+        tdLog.info("===== step 12 =====")
+        tdSql.waitedQuery("select * from strm_avg", 1, 20)
+        tdSql.checkData(0, 1, 9.5)
+        tdSql.checkData(0, 2, 190)
+        tdSql.checkData(0, 3, 0)
+        tdSql.checkData(0, 4, 19)
+        tdSql.checkData(0, 5, 0)
+        tdSql.checkData(0, 6, 19)
+
+        tdLog.info("===== step 13 =====")
+        tdSql.waitedQuery("select * from strm_ot", 1, 20)
+        tdSql.checkData(0, 1, 5.766281297335398)
+        tdSql.checkData(0, 3, 0.19)
+
+        tdLog.info("===== step 14 =====")
+        tdSql.waitedQuery("select * from strm_to", 1, 20)
+        tdSql.checkData(0, 1, 9.5)
+        tdSql.checkData(0, 2, 190)
+        tdSql.checkData(0, 3, 0)
+        tdSql.checkData(0, 4, 19)
+        tdSql.checkData(0, 5, 0)
+        tdSql.checkData(0, 6, 19)
+        tdSql.checkData(0, 7, 5.766281297335398)
+        tdSql.checkData(0, 8, 0.19)
+        tdSql.checkData(0, 9, rowNum)
+
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/script/fullGeneralSuite.sim b/tests/script/fullGeneralSuite.sim
index 4dd3957f39..707869d115 100644
--- a/tests/script/fullGeneralSuite.sim
+++ b/tests/script/fullGeneralSuite.sim
@@ -134,7 +134,6 @@ run general/parser/tags_dynamically_specifiy.sim
 run general/parser/set_tag_vals.sim
 #unsupport run general/parser/repeatAlter.sim
 #unsupport run general/parser/slimit_alter_tags.sim
-#unsupport run general/parser/stream_on_sys.sim
 #unsupport run general/parser/repeatStream.sim
 run general/stable/disk.sim
 run general/stable/dnode3.sim
@@ -213,9 +212,6 @@ run general/vector/table_time.sim
 run general/stream/restart_stream.sim
 run general/stream/stream_3.sim
 run general/stream/stream_restart.sim
-run general/stream/table_1.sim
-run general/stream/table_n.sim
-run general/stream/metrics_n.sim
 run general/stream/table_del.sim
 run general/stream/metrics_del.sim
 run general/stream/table_replica1_vnoden.sim
diff --git a/tests/script/general/parser/stream_on_sys.sim b/tests/script/general/parser/stream_on_sys.sim
deleted file mode 100644
index 1c8eb82c79..0000000000
--- a/tests/script/general/parser/stream_on_sys.sim
+++ /dev/null
@@ -1,62 +0,0 @@
-system sh/stop_dnodes.sh
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 0
-system sh/cfg.sh -n dnode1 -c monitor       -v 1
-system sh/cfg.sh -n dnode1 -c monitorInterval     -v 1
-system sh/exec.sh -n dnode1 -s start
-
-sleep 500
-sql connect
-print ======================== stream_on_sys.sim
-
-$db = log
-$tb = tb
-$mt = mt
-$strm = strm
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-$i = 0
-
-sql use $db
-
-sql create table cpustrm as select count(*), avg(cpu_taosd), max(cpu_taosd), min(cpu_taosd), avg(cpu_system), max(cpu_cores), min(cpu_cores), last(cpu_cores) from log.dn1 interval(4s)
-sql create table memstrm as select count(*), avg(mem_taosd), max(mem_taosd), min(mem_taosd), avg(mem_system), first(mem_total), last(mem_total) from log.dn1 interval(4s)
-sql create table diskstrm as select count(*), avg(disk_used), last(disk_used), avg(disk_total), first(disk_total) from log.dn1 interval(4s)
-sql create table bandstrm as select count(*), avg(band_speed), last(band_speed) from log.dn1 interval(4s)
-sql create table reqstrm as select count(*), avg(req_http), last(req_http), avg(req_select), last(req_select), avg(req_insert), last(req_insert) from log.dn1 interval(4s)
-sql create table iostrm as select count(*), avg(io_read), last(io_read), avg(io_write), last(io_write) from log.dn1 interval(4s)
-sleep 120000
-sql select * from cpustrm
-if $rows <= 0 then
-  return -1
-endi
-
-sql select * from memstrm
-if $rows <= 0 then
-  return -1
-endi
-
-sql select * from diskstrm
-if $rows <= 0 then
-  return -1
-endi
-
-sql select * from bandstrm
-if $rows <= 0 then
-  return -1
-endi
-
-sql select * from reqstrm
-if $rows <= 0 then
-  return -1
-endi
-
-sql select * from iostrm
-if $rows <= 0 then
-  return -1
-endi
-
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/testSuite.sim b/tests/script/general/parser/testSuite.sim
index cea6d98679..971c103cf5 100644
--- a/tests/script/general/parser/testSuite.sim
+++ b/tests/script/general/parser/testSuite.sim
@@ -109,6 +109,4 @@ run general/parser/function.sim
 #sleep 500
 #run general/parser/repeatStream.sim
 #sleep 500
-#run general/parser/stream_on_sys.sim
-#sleep 500
 #run general/parser/stream.sim
\ No newline at end of file
diff --git a/tests/script/general/stream/metrics_n.sim b/tests/script/general/stream/metrics_n.sim
deleted file mode 100644
index 7fc08064b2..0000000000
--- a/tests/script/general/stream/metrics_n.sim
+++ /dev/null
@@ -1,262 +0,0 @@
-system sh/stop_dnodes.sh
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 0
-system sh/exec.sh -n dnode1 -s start
-
-sleep 3000
-sql connect
-
-print ======================== dnode1 start
-
-$dbPrefix = mn_db
-$tbPrefix = mn_tb
-$mtPrefix = mn_mt
-$stPrefix = mn_st
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step1
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-
-sql drop databae $db -x step1
-step1:
-sql create database $db
-sql use $db
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
-  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( $i )
-  
-  $x = -1440
-  $y = 0
-  while $y < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now $ms , $y , $y ) 
-    $x = $x + 1
-	$y = $y + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-
-sleep 100
-
-print =============== step2 c3
-$i = 1
-$tb = $tbPrefix . $i
-
-sql select count(*), count(tbcol), count(tbcol2) from $mt interval(1d)
-print select count(*), count(tbcol), count(tbcol2) from $mt interval(1d) ===> $data00 $data01 $data02, $data03
-if $data01 != 200 then 
-  return -1
-endi
-if $data02 != 200 then 
-  return -1
-endi
-if $data03 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . c3
-sql create table $st as select count(*), count(tbcol), count(tbcol2) from $mt interval(1d)
-
-print =============== step3 count32
-#total 32 count in select
-sql select count(*), count(tbcol) as c1, count(tbcol2) as c2, count(tbcol) as c3, count(tbcol) as c4, count(tbcol) as c5, count(tbcol) as c6, count(tbcol) as c7, count(tbcol) as c8, count(tbcol) as c9, count(tbcol) as c10, count(tbcol) as c11, count(tbcol) as c12, count(tbcol) as c13, count(tbcol) as c14, count(tbcol) as c15, count(tbcol) as c16, count(tbcol) as c17, count(tbcol) as c18, count(tbcol) as c19, count(tbcol) as c20, count(tbcol) as c21, count(tbcol) as c22, count(tbcol) as c23, count(tbcol) as c24, count(tbcol) as c25, count(tbcol) as c26, count(tbcol) as c27, count(tbcol) as c28, count(tbcol) as c29, count(tbcol) as c30 from $mt interval(1d) 
-
-# total 32 count in stream
-$st = $stPrefix . c32
-sql create table $st as select count(*), count(tbcol) as c1, count(tbcol2) as c2, count(tbcol) as c3, count(tbcol) as c4, count(tbcol) as c5, count(tbcol) as c6, count(tbcol) as c7, count(tbcol) as c8, count(tbcol) as c9, count(tbcol) as c10, count(tbcol) as c11, count(tbcol) as c12, count(tbcol) as c13, count(tbcol) as c14, count(tbcol) as c15, count(tbcol) as c16, count(tbcol) as c17, count(tbcol) as c18, count(tbcol) as c19, count(tbcol) as c20, count(tbcol) as c21, count(tbcol) as c22, count(tbcol) as c23, count(tbcol) as c24, count(tbcol) as c25, count(tbcol) as c26, count(tbcol) as c27, count(tbcol) as c28, count(tbcol) as c29, count(tbcol) as c30 from $mt interval(1d) 
-
-print =============== step4 count31
-
-#total 31 count in select
-sql select count(*), count(tbcol) as c1, count(tbcol2) as c2, count(tbcol) as c3, count(tbcol) as c4, count(tbcol) as c5, count(tbcol) as c6, count(tbcol) as c7, count(tbcol) as c8, count(tbcol) as c9, count(tbcol) as c10, count(tbcol) as c11, count(tbcol) as c12, count(tbcol) as c13, count(tbcol) as c14, count(tbcol) as c15, count(tbcol) as c16, count(tbcol) as c17, count(tbcol) as c18, count(tbcol) as c19, count(tbcol) as c20, count(tbcol) as c21, count(tbcol) as c22, count(tbcol) as c23, count(tbcol) as c24, count(tbcol) as c25, count(tbcol) as c26, count(tbcol) as c27, count(tbcol) as c28, count(tbcol) as c29, count(tbcol) as c30  from $mt interval(1d)
-print ===> $data00 $data01 $data02, $data03
-if $data01 != 200 then 
-  return -1
-endi
-if $data02 != 200 then 
-  return -1
-endi
-if $data03 != 200 then 
-  return -1
-endi
-
-# total 31 count in stream will crash, 32 will error
-$st = $stPrefix . c31
-sql create table $st as select count(*), count(tbcol) as c1, count(tbcol2) as c2, count(tbcol) as c3, count(tbcol) as c4, count(tbcol) as c5, count(tbcol) as c6, count(tbcol) as c7, count(tbcol) as c8, count(tbcol) as c9, count(tbcol) as c10, count(tbcol) as c11, count(tbcol) as c12, count(tbcol) as c13, count(tbcol) as c14, count(tbcol) as c15, count(tbcol) as c16, count(tbcol) as c17, count(tbcol) as c18, count(tbcol) as c19, count(tbcol) as c20, count(tbcol) as c21, count(tbcol) as c22, count(tbcol) as c23, count(tbcol) as c24, count(tbcol) as c25, count(tbcol) as c26, count(tbcol) as c27, count(tbcol) as c28, count(tbcol) as c29, count(tbcol) as c30 from $mt interval(1d)
-
-print =============== step5 avg ...
-sql select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol) from $mt interval(1d)
-print ===> $data01 $data02 $data03 $data04 $data05 $data06
-if $data01 != 9.500000000 then 
-  return -1
-endi
-if $data02 != 1900 then 
-  return -1
-endi
-if $data03 != 0 then 
-  return -1
-endi
-if $data04 != 19 then 
-  return -1
-endi
-if $data05 != 0 then 
-  return -1
-endi
-if $data06 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . avg
-sql create table $st as select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol) from $mt interval(1d)
-
-print =============== step6 others
-sql select stddev(tbcol), leastsquares(tbcol, 1, 1), percentile(tbcol, 1) from $mt interval(1d) -x step6
-  return -1
-step6:
-
-$st = $stPrefix . ot
-sql create table $st as select stddev(tbcol), leastsquares(tbcol, 1, 1), percentile(tbcol, 1) from $mt interval(1d) -x step61
-  return -1
-step61:
-
-print =============== step7 where
-sql select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol), count(tbcol)  from $mt where ts < now + 4m interval(1d)
-print select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol), count(tbcol)  from $mt where ts < now + 4m interval(1d)
-print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07
-if $data01 != 9.500000000 then 
-  return -1
-endi
-if $data02 != 1900 then 
-  return -1
-endi
-if $data03 != 0 then 
-  return -1
-endi
-if $data04 != 19 then 
-  return -1
-endi
-if $data05 != 0 then 
-  return -1
-endi
-if $data06 != 19 then 
-  return -1
-endi
-if $data07 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . wh
-#sql create table $st as select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol), count(tbcol) from $mt where ts < now + 4m interval(1d)
-
-print =============== step8 as
-sql select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol), count(tbcol)  from $mt where ts < now + 4m interval(1d)
-print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07 
-if $data01 != 9.500000000 then 
-  return -1
-endi
-if $data02 != 1900 then 
-  return -1
-endi
-if $data03 != 0 then 
-  return -1
-endi
-if $data04 != 19 then 
-  return -1
-endi
-if $data05 != 0 then 
-  return -1
-endi
-if $data06 != 19 then 
-  return -1
-endi
-if $data07 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . as
-#sql create table $st as select avg(tbcol) as a1, sum(tbcol) as a2, min(tbcol) as a3, max(tbcol) as a4,  first(tbcol) as a5, last(tbcol) as a6, count(tbcol) as a7, avg(tbcol) as a8, sum(tbcol) as a9, min(tbcol) as a3, max(tbcol) as a4,  first(tbcol) as a5, last(tbcol) as a6, count(tbcol) as a7 from $mt where ts < now + 4m interval(1d)
-
-print =============== step9
-print sleep 120 seconds
-sleep 120000 
-
-print =============== step10
-$st = $stPrefix . c3
-sql select * from $st
-print ===> select * from $st
-print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
-if $data01 != 200 then 
-  return -1
-endi
-if $data02 != 200 then 
-  return -1
-endi
-if $data03 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . c31
-sql select * from $st 
-if $data01 != 200 then 
-  return -1
-endi
-if $data02 != 200 then 
-  return -1
-endi
-if $data03 != 200 then 
-  return -1
-endi
-if $data04 != 200 then 
-  return -1
-endi
-if $data05 != 200 then 
-  return -1
-endi
-if $data06 != 200 then 
-  return -1
-endi
-if $data07 != 200 then 
-  return -1
-endi
-if $data08 != 200 then 
-  return -1
-endi
-if $data09 != 200 then 
-  return -1
-endi
-
-
-
-$st = $stPrefix . avg
-sql select * from $st
-print ===> select * from $st
-print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
-if $data01 != 9.500000000 then 
-  return -1
-endi
-if $data02 != 1900 then 
-  return -1
-endi
-if $data03 != 0 then 
-  return -1
-endi
-if $data04 != 19 then 
-  return -1
-endi
-if $data05 != 0 then 
-  return -1
-endi
-if $data06 != 19 then 
-  return -1
-endi
-
diff --git a/tests/script/general/stream/table_1.sim b/tests/script/general/stream/table_1.sim
deleted file mode 100644
index f028b1626d..0000000000
--- a/tests/script/general/stream/table_1.sim
+++ /dev/null
@@ -1,317 +0,0 @@
-system sh/stop_dnodes.sh
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 0
-system sh/exec.sh -n dnode1 -s start
-
-sleep 3000
-sql connect
-
-print ======================== dnode1 start
-
-$dbPrefix = t1_db
-$tbPrefix = t1_tb
-$mtPrefix = t1_mt
-$stPrefix = t1_st
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step1
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-
-sql drop databae $db -x step1
-step1:
-sql create database $db
-sql use $db
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
-  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( $i )
-  
-  $x = -1440
-  $y = 0
-  while $y < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now $ms , $y , $y ) 
-    $x = $x + 1
-	$y = $y + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-
-sleep 100
-
-print =============== step2 c1
-$i = 1
-$tb = $tbPrefix . $i
-
-sql select count(*) from $tb interval(1d)
-print select count(*) from $tb interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . c1
-sql create table $st as select count(*) from $tb interval(1d)
-
-print =============== step3 c2
-sql select count(tbcol) from $tb interval(1d)
-print select count(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . c2
-sql create table $st as select count(tbcol) from $tb interval(1d)
-
-print =============== step4 c3
-sql select count(tbcol2) from $tb interval(1d)
-print select count(tbcol2) from $tb interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . c3
-sql create table $st as select count(tbcol2) from $tb interval(1d)
-
-print =============== step5 avg
-sql select avg(tbcol) from $tb interval(1d)
-print select avg(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 9.500000000 then 
-  return -1
-endi
-
-$st = $stPrefix . av
-sql create table $st as select avg(tbcol) from $tb interval(1d)
-
-print =============== step6 su
-sql select sum(tbcol) from $tb interval(1d)
-print select sum(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 190 then 
-  return -1
-endi
-
-$st = $stPrefix . su
-sql create table $st as select sum(tbcol) from $tb interval(1d)
-
-print =============== step7 mi
-sql select min(tbcol) from $tb interval(1d)
-print select min(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . mi
-sql create table $st as select min(tbcol) from $tb interval(1d)
-
-print =============== step8 ma
-sql select max(tbcol) from $tb interval(1d)
-print select max(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . ma
-sql create table $st as select max(tbcol) from $tb interval(1d)
-
-print =============== step9 fi
-sql select first(tbcol) from $tb interval(1d)
-print select first(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . fi
-sql create table $st as select first(tbcol) from $tb interval(1d)
-
-print =============== step10 la
-sql select last(tbcol) from $tb interval(1d)
-print select last(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . la
-sql create table $st as select last(tbcol) from $tb interval(1d)
-
-print =============== step11 st
-sql select stddev(tbcol) from $tb interval(1d)
-print select stddev(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 5.766281297 then 
-  return -1
-endi
-
-$st = $stPrefix . std
-sql create table $st as select stddev(tbcol) from $tb interval(1d)
-
-print =============== step12 le
-sql select leastsquares(tbcol, 1, 1) from $tb interval(1d)
-print select leastsquares(tbcol, 1, 1) from $tb interval(1d) ===> $data00 $data01
-#if $data01 != @(0.000017, -25362055.126740)@ then 
-#  return -1
-#endi
-
-$st = $stPrefix . le
-sql create table $st as select leastsquares(tbcol, 1, 1) from $tb interval(1d)
-
-print =============== step13
-sql select top(tbcol, 1) from $tb interval(1d)
-
-print =============== step14
-sql select bottom(tbcol, 1) from $tb interval(1d)
-
-print =============== step15 pe
-
-sql select percentile(tbcol, 1) from $tb interval(1d)
-print select percentile(tbcol, 1) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 0.190000000 then 
-  return -1
-endi
-
-$st = $stPrefix . pe
-sql create table $st as select percentile(tbcol, 1) from $tb interval(1d)
-
-print =============== step16
-sql select diff(tbcol) from $tb interval(1d) -x step16
-  return -1
-step16:
-
-print =============== step17 wh
-sql select count(tbcol) from $tb where ts < now + 4m interval(1d)
-print select count(tbcol) from $tb where ts < now + 4m interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . wh
-#sql create table $st as select count(tbcol) from $tb where ts < now + 4m interval(1d)
-
-print =============== step18 as
-sql select count(tbcol) from $tb interval(1d)
-print select count(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . as
-sql create table $st as select count(tbcol) as c from $tb interval(1d)
-
-print =============== step19 gb
-sql select count(tbcol) from $tb interval(1d) group by tgcol -x step19
-  return -1
-step19:
-
-print =============== step20 x
-sql select count(tbcol) from $tb where ts < now + 4m interval(1d) group by tgcol -x step20
-  return -1
-step20:
-
-print =============== step21
-print sleep 120 seconds
-sleep 120000 
-
-print =============== step22
-$st = $stPrefix . c1
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . c2
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . c3
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . av
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 9.500000000 then 
-  return -1
-endi
-
-$st = $stPrefix . su
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 190 then 
-  return -1
-endi
-
-$st = $stPrefix . mi
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . ma
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . fi
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . la
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . std
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 5.766281297 then 
-  return -1
-endi
-
-$st = $stPrefix . le
-sql select * from $st
-#print ===> select * from $st ===> $data00 $data01
-#if $data01 != @(0.000017, -25270086.331047)@ then 
-#  return -1
-#endi
-
-$st = $stPrefix . pe
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0.190000000 then 
-  return -1
-endi
-
-#$st = $stPrefix . wh
-#sql select * from $st
-#print ===> select * from $st ===> $data00 $data01
-#if $data01 != $rowNum then 
-#  return -1
-#endi
-
-$st = $stPrefix . as
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
diff --git a/tests/script/general/stream/table_n.sim b/tests/script/general/stream/table_n.sim
deleted file mode 100644
index a336772a98..0000000000
--- a/tests/script/general/stream/table_n.sim
+++ /dev/null
@@ -1,293 +0,0 @@
-system sh/stop_dnodes.sh
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 0
-system sh/exec.sh -n dnode1 -s start
-
-sleep 3000
-sql connect
-
-print ======================== dnode1 start
-
-$dbPrefix = tn_db
-$tbPrefix = tn_tb
-$mtPrefix = tn_mt
-$stPrefix = tn_st
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step1
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-
-sql drop databae $db -x step1
-step1:
-sql create database $db
-sql use $db
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
-  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( $i )
-  
-  $x = -1440
-  $y = 0
-  while $y < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now $ms , $y , $y ) 
-    $x = $x + 1
-	$y = $y + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-
-sleep 100
-
-print =============== step2 c3
-$i = 1
-$tb = $tbPrefix . $i
-
-sql select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
-print select count(*), count(tbcol), count(tbcol2) from $tb interval(1d) ===> $data00 $data01 $data02, $data03
-if $data01 != $rowNum then 
-  return -1
-endi
-if $data02 != $rowNum then 
-  return -1
-endi
-if $data03 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . c3
-sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
-
-print =============== step3 count32
-#total 32 count in select
-sql select count(*), count(tbcol) as c1, count(tbcol2) as c2, count(tbcol) as c3, count(tbcol) as c4, count(tbcol) as c5, count(tbcol) as c6, count(tbcol) as c7, count(tbcol) as c8, count(tbcol) as c9, count(tbcol) as c10, count(tbcol) as c11, count(tbcol) as c12, count(tbcol) as c13, count(tbcol) as c14, count(tbcol) as c15, count(tbcol) as c16, count(tbcol) as c17, count(tbcol) as c18, count(tbcol) as c19, count(tbcol) as c20, count(tbcol) as c21, count(tbcol) as c22, count(tbcol) as c23, count(tbcol) as c24, count(tbcol) as c25, count(tbcol) as c26, count(tbcol) as c27, count(tbcol) as c28, count(tbcol) as c29, count(tbcol) as c30 from $tb interval(1d) 
-
-# total 32 count in stream
-$st = $stPrefix . c32
-sql create table $st as select count(*), count(tbcol) as c1, count(tbcol2) as c2, count(tbcol) as c3, count(tbcol) as c4, count(tbcol) as c5, count(tbcol) as c6, count(tbcol) as c7, count(tbcol) as c8, count(tbcol) as c9, count(tbcol) as c10, count(tbcol) as c11, count(tbcol) as c12, count(tbcol) as c13, count(tbcol) as c14, count(tbcol) as c15, count(tbcol) as c16, count(tbcol) as c17, count(tbcol) as c18, count(tbcol) as c19, count(tbcol) as c20, count(tbcol) as c21, count(tbcol) as c22, count(tbcol) as c23, count(tbcol) as c24, count(tbcol) as c25, count(tbcol) as c26, count(tbcol) as c27, count(tbcol) as c28, count(tbcol) as c29, count(tbcol) as c30 from $tb interval(1d) 
-
-print =============== step4 count31
-
-#total 31 count in select
-sql select count(*), count(tbcol) as c1, count(tbcol2) as c2, count(tbcol) as c3, count(tbcol) as c4, count(tbcol) as c5, count(tbcol) as c6, count(tbcol) as c7, count(tbcol) as c8, count(tbcol) as c9, count(tbcol) as c10, count(tbcol) as c11, count(tbcol) as c12, count(tbcol) as c13, count(tbcol) as c14, count(tbcol) as c15, count(tbcol) as c16, count(tbcol) as c17, count(tbcol) as c18, count(tbcol) as c19, count(tbcol) as c20, count(tbcol) as c21, count(tbcol) as c22, count(tbcol) as c23, count(tbcol) as c24, count(tbcol) as c25, count(tbcol) as c26, count(tbcol) as c27, count(tbcol) as c28, count(tbcol) as c29, count(tbcol) as c30  from $tb interval(1d)
-print ===> $data00 $data01 $data02, $data03
-if $data01 != $rowNum then 
-  return -1
-endi
-if $data02 != $rowNum then 
-  return -1
-endi
-if $data03 != $rowNum then 
-  return -1
-endi
-
-# total 31 count in stream will crash, 32 will error
-$st = $stPrefix . c31
-sql create table $st as select count(*), count(tbcol) as c1, count(tbcol2) as c2, count(tbcol) as c3, count(tbcol) as c4, count(tbcol) as c5, count(tbcol) as c6, count(tbcol) as c7, count(tbcol) as c8, count(tbcol) as c9, count(tbcol) as c10, count(tbcol) as c11, count(tbcol) as c12, count(tbcol) as c13, count(tbcol) as c14, count(tbcol) as c15, count(tbcol) as c16, count(tbcol) as c17, count(tbcol) as c18, count(tbcol) as c19, count(tbcol) as c20, count(tbcol) as c21, count(tbcol) as c22, count(tbcol) as c23, count(tbcol) as c24, count(tbcol) as c25, count(tbcol) as c26, count(tbcol) as c27, count(tbcol) as c28, count(tbcol) as c29, count(tbcol) as c30  from $tb interval(1d)
-
-print =============== step5 avg ...
-sql select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol) from $tb interval(1d)
-print ===> $data01 $data02 $data03 $data04 $data05 $data06
-if $data01 != 9.500000000 then 
-  return -1
-endi
-if $data02 != 190 then 
-  return -1
-endi
-if $data03 != 0 then 
-  return -1
-endi
-if $data04 != 19 then 
-  return -1
-endi
-if $data05 != 0 then 
-  return -1
-endi
-if $data06 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . avg
-sql create table $st as select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol) from $tb interval(1d)
-
-print =============== step6 others
-sql select stddev(tbcol), leastsquares(tbcol, 1, 1), percentile(tbcol, 1) from $tb interval(1d)
-print ===> $data01 $data02 $data03 
-if $data01 != 5.766281297 then 
-  return -1
-endi
-#if $data02 != @(0.000017, -25362055.126740)@ then 
-#  return -1
-#endi
-if $data03 != 0.190000000 then 
-  return -1
-endi
-
-$st = $stPrefix . ot
-sql create table $st as select stddev(tbcol), leastsquares(tbcol, 1, 1), percentile(tbcol, 1) from $tb interval(1d)
-
-print =============== step7 total ...
-sql select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol), stddev(tbcol), percentile(tbcol, 1), count(tbcol), leastsquares(tbcol, 1, 1) from $tb interval(1d)
-print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
-if $data01 != 9.500000000 then 
-  return -1
-endi
-if $data02 != 190 then 
-  return -1
-endi
-if $data03 != 0 then 
-  return -1
-endi
-if $data04 != 19 then 
-  return -1
-endi
-if $data05 != 0 then 
-  return -1
-endi
-if $data06 != 19 then 
-  return -1
-endi
-if $data07 != 5.766281297 then 
-  return -1
-endi
-if $data08 != 0.190000000 then 
-  return -1
-endi
-if $data09 != 20 then 
-  return -1
-endi
-
-$st = $stPrefix . to
-sql create table $st as select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol), stddev(tbcol), percentile(tbcol, 1), count(tbcol), leastsquares(tbcol, 1, 1) from $tb interval(1d)
-
-print =============== step8 where
-sql select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol), stddev(tbcol), percentile(tbcol, 1), count(tbcol), leastsquares(tbcol, 1, 1) from $tb where ts < now + 4m interval(1d)
-print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
-if $data09 != 20 then 
-  return -1
-endi
-
-$st = $stPrefix . wh
-sql create table $st as select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol), stddev(tbcol), percentile(tbcol, 1), count(tbcol), leastsquares(tbcol, 1, 1) from $tb where ts < now + 4m interval(1d) 
-
-
-print =============== step9 as
-sql select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol), stddev(tbcol), percentile(tbcol, 1), count(tbcol), leastsquares(tbcol, 1, 1) from $tb where ts < now + 4m interval(1d)
-print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
-if $data09 != 20 then 
-  return -1
-endi
-
-$st = $stPrefix . as
-#sql create table $st as select avg(tbcol) as a1, sum(tbcol) as a2, min(tbcol) as a3, max(tbcol) as a4,  first(tbcol) as a5, last(tbcol) as a6, stddev(tbcol) as a7, percentile(tbcol, 1) as a8, count(tbcol) as a9, leastsquares(tbcol, 1, 1) as a10 from $tb where ts < now + 4m interval(1d)
-
-print =============== step10
-print sleep 120 seconds
-sleep 120000 
-
-print =============== step11
-$st = $stPrefix . c3
-sql select * from $st
-print ===> select * from $st
-print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
-if $data01 != $rowNum then 
-  return -1
-endi
-if $data02 != $rowNum then 
-  return -1
-endi
-if $data03 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . c31
-sql select * from $st
-if $data01 != $rowNum then 
-  return -1
-endi
-if $data02 != $rowNum then 
-  return -1
-endi
-if $data03 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . avg
-sql select * from $st
-print ===> select * from $st
-print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
-if $data01 != 9.500000000 then 
-  return -1
-endi
-if $data02 != 190 then 
-  return -1
-endi
-if $data03 != 0 then 
-  return -1
-endi
-if $data04 != 19 then 
-  return -1
-endi
-if $data05 != 0 then 
-  return -1
-endi
-if $data06 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . ot
-sql select * from $st
-print ===> select * from $st 
-print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
-if $data01 != 5.766281297 then 
-  return -1
-endi
-#if $data02 != @(0.000017, -25362055.126740)@ then 
-#  return -1
-#endi
-if $data03 != 0.190000000 then 
-  return -1
-endi
-
-$st = $stPrefix . to
-sql select * from $st
-print ===> select * from $st
-print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
-if $data01 != 9.500000000 then 
-  return -1
-endi
-if $data02 != 190 then 
-  return -1
-endi
-if $data03 != 0 then 
-  return -1
-endi
-if $data04 != 19 then 
-  return -1
-endi
-if $data05 != 0 then 
-  return -1
-endi
-if $data06 != 19 then 
-  return -1
-endi
-if $data07 != 5.766281297 then 
-  return -1
-endi
-if $data08 != 0.190000000 then 
-  return -1
-endi
-if $data09 != 20 then 
-  return -1
-endi
-
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/stream/testSuite.sim b/tests/script/general/stream/testSuite.sim
index 44f886d02b..4a9912b848 100644
--- a/tests/script/general/stream/testSuite.sim
+++ b/tests/script/general/stream/testSuite.sim
@@ -1,8 +1,5 @@
 run general/stream/stream_3.sim
 run general/stream/stream_restart.sim
-run general/stream/table_1.sim
-run general/stream/table_n.sim
-run general/stream/metrics_n.sim
 run general/stream/table_del.sim
 run general/stream/metrics_del.sim
 run general/stream/table_replica1_vnoden.sim
diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index ccfed3da8d..363f4899b2 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -330,16 +330,12 @@ cd ../../../debug; make
 ./test.sh -f unique/vnode/replica3_repeat.sim
 ./test.sh -f unique/vnode/replica3_vgroup.sim
 
-./test.sh -f general/parser/stream_on_sys.sim
 ./test.sh -f general/stream/metrics_del.sim
-./test.sh -f general/stream/metrics_n.sim
 ./test.sh -f general/stream/metrics_replica1_vnoden.sim
 ./test.sh -f general/stream/restart_stream.sim
 ./test.sh -f general/stream/stream_3.sim
 ./test.sh -f general/stream/stream_restart.sim
-./test.sh -f general/stream/table_1.sim
 ./test.sh -f general/stream/table_del.sim
-./test.sh -f general/stream/table_n.sim
 ./test.sh -f general/stream/table_replica1_vnoden.sim
 
 ./test.sh -f unique/arbitrator/check_cluster_cfg_para.sim
diff --git a/tests/script/jenkins/basic_3.txt b/tests/script/jenkins/basic_3.txt
index 59ed486d20..d566766dc5 100644
--- a/tests/script/jenkins/basic_3.txt
+++ b/tests/script/jenkins/basic_3.txt
@@ -66,14 +66,10 @@
 ./test.sh -f unique/mnode/mgmt34.sim
 ./test.sh -f unique/mnode/mgmtr2.sim
 
-./test.sh -f general/parser/stream_on_sys.sim
 ./test.sh -f general/stream/metrics_del.sim
-./test.sh -f general/stream/metrics_n.sim
 ./test.sh -f general/stream/metrics_replica1_vnoden.sim
 ./test.sh -f general/stream/restart_stream.sim
 ./test.sh -f general/stream/stream_3.sim
 ./test.sh -f general/stream/stream_restart.sim
-./test.sh -f general/stream/table_1.sim
 ./test.sh -f general/stream/table_del.sim
-./test.sh -f general/stream/table_n.sim
 ./test.sh -f general/stream/table_replica1_vnoden.sim
diff --git a/tests/script/jenkins/simple.txt b/tests/script/jenkins/simple.txt
index 2fe364bf26..ec0a526774 100644
--- a/tests/script/jenkins/simple.txt
+++ b/tests/script/jenkins/simple.txt
@@ -147,7 +147,6 @@ cd ../../../debug; make
 ./test.sh -f general/parser/join_multivnode.sim
 ./test.sh -f general/parser/binary_escapeCharacter.sim
 ./test.sh -f general/parser/bug.sim
-#./test.sh -f general/parser/stream_on_sys.sim
 ./test.sh -f general/parser/repeatAlter.sim
 #./test.sh -f general/parser/repeatStream.sim
 
diff --git a/tests/script/regressionSuite.sim b/tests/script/regressionSuite.sim
index ff1f9f5355..6d1fd7aacb 100644
--- a/tests/script/regressionSuite.sim
+++ b/tests/script/regressionSuite.sim
@@ -134,7 +134,6 @@ run general/parser/tags_dynamically_specifiy.sim
 run general/parser/set_tag_vals.sim
 run general/parser/repeatAlter.sim
 ##unsupport run general/parser/slimit_alter_tags.sim
-##unsupport run general/parser/stream_on_sys.sim
 run general/parser/stream.sim
 #unsupport run general/parser/repeatStream.sim
 run general/stable/disk.sim
@@ -214,14 +213,8 @@ run general/vector/table_mix.sim
 run general/vector/table_query.sim
 run general/vector/table_time.sim
 run general/stream/restart_stream.sim
-run general/stream/stream_1.sim
-run general/stream/stream_2.sim
 run general/stream/stream_3.sim
 run general/stream/stream_restart.sim
-run general/stream/table_1.sim
-run general/stream/metrics_1.sim
-run general/stream/table_n.sim
-run general/stream/metrics_n.sim
 run general/stream/table_del.sim
 run general/stream/metrics_del.sim
 run general/stream/table_replica1_vnoden.sim
-- 
GitLab