diff --git a/tests/pytest/tools/taosdemoAllTest/moredemo-insert-offset.py b/tests/pytest/tools/taosdemoAllTest/moredemo-insert-offset.py
deleted file mode 100644
index 955545ac2cb2578089b705e67a97d99678182154..0000000000000000000000000000000000000000
--- a/tests/pytest/tools/taosdemoAllTest/moredemo-insert-offset.py
+++ /dev/null
@@ -1,72 +0,0 @@
-###################################################################
-#           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 os
-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 getBuildPath(self):
-        selfPath = os.path.dirname(os.path.realpath(__file__))
-
-        if ("community" in selfPath):
-            projPath = selfPath[:selfPath.find("community")]
-        else:
-            projPath = selfPath[:selfPath.find("tests")]
-
-        for root, dirs, files in os.walk(projPath):
-            if ("taosd" in files):
-                rootRealPath = os.path.dirname(os.path.realpath(root))
-                if ("packaging" not in rootRealPath):
-                    buildPath = root[:len(root)-len("/build/bin")]
-                    break
-        return buildPath
-        
-    def run(self):
-        buildPath = self.getBuildPath()
-        if (buildPath == ""):
-            tdLog.exit("taosd not found!")
-        else:
-            tdLog.info("taosd found in %s" % buildPath)
-        binPath = buildPath+ "/build/bin/"      
-        
-        # insert: drop and child_table_exists combination test
-        # insert: using parament "childtable_offset and childtable_limit" to control  table'offset point and offset 
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/moredemo-offset-newdb.json" % binPath)
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/moredemo-offset-limit1.json & " % binPath)
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/moredemo-offset-limit94.json & " % binPath)
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/moredemo-offset-limit5.json & " % binPath)
-        sleep(15)
-        tdSql.execute("use db")             
-        tdSql.query("select count(*) from stb0")
-        tdSql.checkData(0, 0, 1000000) 
-
-        os.system("rm -rf ./insert_res.txt")
-        os.system("rm -rf tools/taosdemoAllTest/moredemo-insert-offset.py.sql")        
-        
-    
-    def stop(self):
-        tdSql.close()
-        tdLog.success("%s successfully executed" % __file__)
-
-
-tdCases.addWindows(__file__, TDTestCase())
-tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/system-test/5-taos-tools/taosbenchmark/NanoTestCase/taosdemoTestInsertTime_step.py b/tests/system-test/5-taos-tools/taosbenchmark/NanoTestCase/taosdemoTestInsertTime_step.py
deleted file mode 100644
index 36221e4b7ff21b82ccf72451cfea8472952b622d..0000000000000000000000000000000000000000
--- a/tests/system-test/5-taos-tools/taosbenchmark/NanoTestCase/taosdemoTestInsertTime_step.py
+++ /dev/null
@@ -1,115 +0,0 @@
-###################################################################
-#           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 os
-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 getBuildPath(self):
-        selfPath = os.path.dirname(os.path.realpath(__file__))
-
-        if ("community" in selfPath):
-            projPath = selfPath[:selfPath.find("community")]
-        else:
-            projPath = selfPath[:selfPath.find("tests")]
-
-        for root, dirs, files in os.walk(projPath):
-            if ("taosd" in files):
-                rootRealPath = os.path.dirname(os.path.realpath(root))
-                if ("packaging" not in rootRealPath):
-                    buildPath = root[:len(root)-len("/build/bin")]
-                    break
-        return buildPath
-
-    def run(self):
-        buildPath = self.getBuildPath()
-        if (buildPath == ""):
-            tdLog.exit("taosd not found!")
-        else:
-            tdLog.info("taosd found in %s" % buildPath)
-        binPath = buildPath+ "/build/bin/"
-
-        # insert: create one  or mutiple tables per sql and insert multiple rows per sql
-        
-        # check the params of taosdemo about time_step is nano
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/NanoTestCase/taosdemoInsertNanoDB.json -y " % binPath)
-        tdSql.execute("use testdb1")
-        tdSql.query("show stables")
-        tdSql.checkData(0, 4, 100)
-        tdSql.query("select count (tbname) from stb0")
-        tdSql.checkData(0, 0, 100)
-        tdSql.query("select count(*) from tb0_0")
-        tdSql.checkData(0, 0, 100)
-        tdSql.query("select count(*) from stb0")
-        tdSql.checkData(0, 0, 10000)
-        tdSql.query("describe stb0")
-        tdSql.getData(9, 1)
-        tdSql.checkDataType(9, 1,"TIMESTAMP")
-        tdSql.query("select last(ts) from stb0")
-        tdSql.checkData(0, 0,"2021-07-01 00:00:00.000099000") 
-
-        # check the params of taosdemo about time_step is us
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/NanoTestCase/taosdemoInsertUSDB.json -y " % binPath)
-        tdSql.execute("use testdb2")
-        tdSql.query("show stables")
-        tdSql.checkData(0, 4, 100)
-        tdSql.query("select count (tbname) from stb0")
-        tdSql.checkData(0, 0, 100)
-        tdSql.query("select count(*) from tb0_0")
-        tdSql.checkData(0, 0, 100)
-        tdSql.query("select count(*) from stb0")
-        tdSql.checkData(0, 0, 10000)
-        tdSql.query("describe stb0")
-        tdSql.getData(9, 1)
-        tdSql.checkDataType(9, 1,"TIMESTAMP")
-        tdSql.query("select last(ts) from stb0")
-        tdSql.checkData(0, 0,"2021-07-01 00:00:00.099000") 
-
-        # check the params of taosdemo about time_step is ms
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/NanoTestCase/taosdemoInsertMSDB.json -y " % binPath)
-        tdSql.execute("use testdb3")
-        tdSql.query("show stables")
-        tdSql.checkData(0, 4, 100)
-        tdSql.query("select count (tbname) from stb0")
-        tdSql.checkData(0, 0, 100)
-        tdSql.query("select count(*) from tb0_0")
-        tdSql.checkData(0, 0, 100)
-        tdSql.query("select count(*) from stb0")
-        tdSql.checkData(0, 0, 10000)
-        tdSql.query("describe stb0")
-        tdSql.checkDataType(9, 1,"TIMESTAMP")
-        tdSql.query("select last(ts) from stb0")
-        tdSql.checkData(0, 0,"2021-07-01 00:01:39.000") 
-
-      
-        os.system("rm -rf ./res.txt")
-        os.system("rm -rf ./*.py.sql")
-      
-       
-
-    def stop(self):
-        tdSql.close()
-        tdLog.success("%s successfully executed" % __file__)
-
-
-tdCases.addWindows(__file__, TDTestCase())
-tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/system-test/5-taos-tools/taosbenchmark/NanoTestCase/taosdemoTestSupportNanoQuery.py b/tests/system-test/5-taos-tools/taosbenchmark/NanoTestCase/taosdemoTestSupportNanoQuery.py
deleted file mode 100644
index 137cbe724310260254591c874e7bc0362f1e7f2f..0000000000000000000000000000000000000000
--- a/tests/system-test/5-taos-tools/taosbenchmark/NanoTestCase/taosdemoTestSupportNanoQuery.py
+++ /dev/null
@@ -1,157 +0,0 @@
-''###################################################################
-#           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 os
-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 getBuildPath(self):
-        selfPath = os.path.dirname(os.path.realpath(__file__))
-
-        if ("community" in selfPath):
-            projPath = selfPath[:selfPath.find("community")]
-        else:
-            projPath = selfPath[:selfPath.find("tests")]
-
-        for root, dirs, files in os.walk(projPath):
-            if ("taosd" in files):
-                rootRealPath = os.path.dirname(os.path.realpath(root))
-                if ("packaging" not in rootRealPath):
-                    buildPath = root[:len(root)-len("/build/bin")]
-                    break
-        return buildPath
-
-    def run(self):
-        buildPath = self.getBuildPath()
-        if (buildPath == ""):
-            tdLog.exit("taosd not found!")
-        else:
-            tdLog.info("taosd found in %s" % buildPath)
-        binPath = buildPath+ "/build/bin/"
-
-       # query: query test for nanoSecond  with where and max min groupby order 
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/NanoTestCase/taosdemoTestNanoDatabase.json -y " % binPath)
-
-        tdSql.execute("use nsdb")
-
-        # use where to filter 
-        
-        tdSql.query("select count(*) from stb0 where ts>\"2021-07-01 00:00:00.590000000 \" ")
-        tdSql.checkData(0, 0, 4000)
-        tdSql.query("select count(*) from stb0 where ts>\"2021-07-01 00:00:00.000000000\" and ts <=\"2021-07-01 00:00:00.590000000\" ")
-        tdSql.checkData(0, 0, 5900)
-
-        tdSql.query("select count(*) from tb0_0 where ts>\"2021-07-01 00:00:00.590000000 \" ;")
-        tdSql.checkData(0, 0, 40)
-        tdSql.query("select count(*) from tb0_0 where ts>\"2021-07-01 00:00:00.000000000\" and ts <=\"2021-07-01 00:00:00.590000000\" ")
-        tdSql.checkData(0, 0, 59)
-
-
-        # select max min avg from special col
-        tdSql.query("select max(c10) from stb0;")
-        print("select max(c10) from stb0 : " , tdSql.getData(0, 0))
-
-        tdSql.query("select max(c10) from tb0_0;")
-        print("select max(c10) from tb0_0 : " , tdSql.getData(0, 0))
-       
-
-        tdSql.query("select min(c1) from stb0;")
-        print( "select min(c1) from stb0 : " , tdSql.getData(0, 0))
-
-        tdSql.query("select min(c1) from tb0_0;")
-        print( "select min(c1) from tb0_0 : " , tdSql.getData(0, 0))
-
-        tdSql.query("select avg(c1) from stb0;")
-        print( "select avg(c1) from stb0 : " , tdSql.getData(0, 0))
-
-        tdSql.query("select avg(c1) from tb0_0;")
-        print( "select avg(c1) from tb0_0 : " , tdSql.getData(0, 0))
-
-        tdSql.query("select count(*) from stb0 group by tbname;")
-        tdSql.checkData(0, 0, 100)
-        tdSql.checkData(10, 0, 100)
-
-         #  query : query above sqls by taosdemo and continuously
-
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/NanoTestCase/taosdemoTestSupportNanoQuery.json -y " % binPath)
-
-
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/NanoTestCase/taosdemoTestNanoDatabasecsv.json  -y " % binPath)
-        tdSql.execute("use nsdbcsv")
-        tdSql.query("show stables")
-        tdSql.checkData(0, 4, 100)
-        tdSql.query("select count(*) from stb0")
-        tdSql.checkData(0, 0, 10000)
-        tdSql.query("describe stb0")
-        tdSql.checkDataType(3, 1, "TIMESTAMP")
-        tdSql.query("select count(*) from stb0 where ts >\"2021-07-01 00:00:00.490000000\"")
-        tdSql.checkData(0, 0, 5000)
-        tdSql.query("select count(*) from stb0 where ts <now -1d-1h-3s")
-        tdSql.checkData(0, 0, 10000)
-        tdSql.query("select count(*) from stb0 where ts < 1626918583000000000")
-        tdSql.checkData(0, 0, 10000)
-        tdSql.execute('select count(*) from stb0 where c2 >  162687012800000000')
-        tdSql.execute('select count(*) from stb0 where c2 <  162687012800000000')
-        tdSql.execute('select count(*) from stb0 where c2 =  162687012800000000')
-        tdSql.execute('select count(*) from stb0 where c2 != 162687012800000000')
-        tdSql.execute('select count(*) from stb0 where c2 <> 162687012800000000')
-        tdSql.execute('select count(*) from stb0 where c2 >  "2021-07-21 20:22:08.248246976"')
-        tdSql.execute('select count(*) from stb0 where c2 <  "2021-07-21 20:22:08.248246976"')
-        tdSql.execute('select count(*) from stb0 where c2 =  "2021-07-21 20:22:08.248246976"')
-        tdSql.execute('select count(*) from stb0 where c2 != "2021-07-21 20:22:08.248246976"')
-        tdSql.execute('select count(*) from stb0 where c2 <> "2021-07-21 20:22:08.248246976"')
-        tdSql.execute('select count(*) from stb0 where ts between "2021-07-01 00:00:00.000000000" and "2021-07-01 00:00:00.990000000"')
-        tdSql.execute('select count(*) from stb0 where ts between 1625068800000000000 and 1625068801000000000')
-        tdSql.query('select avg(c0) from stb0 interval(5000000000b)')
-        tdSql.checkRows(1)
-
-        tdSql.query('select avg(c0) from stb0 interval(100000000b)')
-        tdSql.checkRows(10)
-
-        tdSql.error('select avg(c0) from stb0 interval(1b)')
-        tdSql.error('select avg(c0) from stb0 interval(999b)')
-
-        tdSql.query('select avg(c0) from stb0 interval(1000b)')
-        tdSql.checkRows(100)
-
-        tdSql.query('select avg(c0) from stb0 interval(1u)')
-        tdSql.checkRows(100)
-
-        tdSql.query('select avg(c0) from stb0 interval(100000000b) sliding (100000000b)')
-        tdSql.checkRows(10)
-
-        #  query : query above sqls by taosdemo and continuously
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/NanoTestCase/taosdemoTestSupportNanoQuerycsv.json -y " % binPath)
-
-        os.system("rm -rf ./query_res*.txt*")
-        os.system("rm -rf tools/taosdemoAllTest/NanoTestCase/*.py.sql")
- 
-
-
-
-    def stop(self):
-        tdSql.close()
-        tdLog.success("%s successfully executed" % __file__)
-
-
-tdCases.addWindows(__file__, TDTestCase())
-tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/system-test/5-taos-tools/taosbenchmark/TD-10539/create_taosdemo.py b/tests/system-test/5-taos-tools/taosbenchmark/TD-10539/create_taosdemo.py
deleted file mode 100644
index 8f28f214090dd4ac528e3408ae133da3ed67c545..0000000000000000000000000000000000000000
--- a/tests/system-test/5-taos-tools/taosbenchmark/TD-10539/create_taosdemo.py
+++ /dev/null
@@ -1,185 +0,0 @@
-###################################################################
-#           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
-import time
-import os
-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 getBuildPath(self):
-        selfPath = os.path.dirname(os.path.realpath(__file__))
-
-        if ("community" in selfPath):
-            projPath = selfPath[:selfPath.find("community")]
-        else:
-            projPath = selfPath[:selfPath.find("tests")]
-
-        for root, dirs, files in os.walk(projPath):
-            if ("taosd" in files):
-                rootRealPath = os.path.dirname(os.path.realpath(root))
-                if ("packaging" not in rootRealPath):
-                    buildPath = root[:len(root)-len("/build/bin")]
-                    break
-        return buildPath
-
-    def run(self):
-        buildPath = self.getBuildPath()
-        if (buildPath == ""):
-            tdLog.exit("taosd not found!")
-        else:
-            tdLog.info("taosd found in %s" % buildPath)
-        binPath = buildPath+ "/build/bin/"
-
-        os.system("rm -rf tools/taosdemoAllTest/TD-10539/create_taosdemo.py.sql")
-        tdSql.prepare()
-
-        #print("==============taosdemo,#create stable,table; insert table; show table; select table; drop table")
-        self.tsdemo = "tsdemo~!.@#$%^*[]-_=+{,?.}"
-        #this escape character is not support in shell  . include  & () <> | /
-        os.system("%staosBenchmark -d test -E -m %s -t 10 -n 100 -l 10 -y " % (binPath,self.tsdemo))
-        tdSql.execute("use test ;" )
-        tdSql.query("select count(*) from meters")
-        tdSql.checkData(0, 0, 1000)
-        tdSql.query("show test.tables like 'tsdemo%'" )
-        tdSql.checkRows(10)
-        tdSql.query("show test.tables like '%s_'" %self.tsdemo)
-        tdSql.checkRows(10)
-        tdSql.query("select _block_dist() from `%s1`" %self.tsdemo)
-        tdSql.checkRows(1)
-        tdSql.query("describe test.`%s1` ; " %self.tsdemo)
-        tdSql.checkRows(13)
-        tdSql.query("show create table test.`%s1` ; " %self.tsdemo)
-        tdSql.checkData(0, 0, self.tsdemo+str(1))
-        tdSql.checkData(0, 1, "CREATE TABLE `%s1` USING `meters` TAGS (1,\"beijing\")" %self.tsdemo)
-
-        print("==============drop table\stable")
-        try:
-            tdSql.execute("drop table test.`%s1` ; " %self.tsdemo)
-        except Exception as e:
-            tdLog.exit(e)
-
-        tdSql.error("select * from test.`%s1` ; " %self.tsdemo)
-        tdSql.query("show test.tables like '%s_'" %self.tsdemo)
-        tdSql.checkRows(9)
-
-        try:
-            tdSql.execute("drop table test.meters ")
-        except Exception as e:
-            tdLog.exit(e)
-
-        tdSql.error("select * from test.meters ")
-        tdSql.error("select * from test.`%s2` ; " %self.tsdemo)
-
-        # Exception
-        os.system("%staosBenchmark -d test -m %s -t 10 -n 100 -l 10 -y " % (binPath,self.tsdemo))
-        tdSql.query("show test.tables ")
-        tdSql.checkRows(0)
-
-        #print("==============taosdemo,#create regular table; insert table; show table; select table; drop table")
-        self.tsdemo = "tsdemo~!.@#$%^*[]-_=+{,?.}"
-        #this escape character is not support in shell  . include  & () <> | /
-        os.system("%staosBenchmark -N -E -m %s -t 10 -n 100 -l 10 -y " % (binPath,self.tsdemo))
-        tdSql.execute("use test ;" )
-        tdSql.query("select count(*) from `%s1`" %self.tsdemo)
-        tdSql.checkData(0, 0, 100)
-        tdSql.query("show test.tables like 'tsdemo%'" )
-        tdSql.checkRows(10)
-        tdSql.query("show test.tables like '%s_'" %self.tsdemo)
-        tdSql.checkRows(10)
-        tdSql.query("select _block_dist() from `%s1`" %self.tsdemo)
-        tdSql.checkRows(1)
-        tdSql.query("describe test.`%s1` ; " %self.tsdemo)
-        tdSql.checkRows(11)
-        tdSql.query("show create table test.`%s1` ; " %self.tsdemo)
-        tdSql.checkData(0, 0, self.tsdemo+str(1))
-        tdSql.checkData(0, 1, "CREATE TABLE `%s1` (ts TIMESTAMP,c0 FLOAT,c1 INT,c2 FLOAT,c3 INT,c4 INT,c5 INT,c6 INT,c7 INT,c8 INT,c9 INT)" %self.tsdemo)
-
-        print("==============drop table\stable")
-        try:
-            tdSql.execute("drop table test.`%s1` ; " %self.tsdemo)
-        except Exception as e:
-            tdLog.exit(e)
-
-        tdSql.error("select * from test.`%s1` ; " %self.tsdemo)
-        tdSql.query("show test.tables like '%s_'" %self.tsdemo)
-        tdSql.checkRows(9)
-
-        # Exception
-        os.system("%staosBenchmark -N -m %s -t 10 -n 100 -l 10 -y " % (binPath,self.tsdemo))
-        tdSql.query("show test.tables ")
-        tdSql.checkRows(0)
-
-
-        #print("==============taosdemo——json_yes,#create stable,table; insert table; show table; select table; drop table")
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/TD-10539/create_taosdemo_yes.json -y " % binPath)
-        tdSql.execute("use dbyes")
-
-        self.tsdemo_stable = "tsdemo_stable~!.@#$%^*[]-_=+{,?.}"
-        self.tsdemo = "tsdemo~!.@#$%^*[]-_=+{,?.}"
-
-        tdSql.query("select count(*) from dbyes.`%s`" %self.tsdemo_stable)
-        tdSql.checkData(0, 0, 1000)
-        tdSql.query("show dbyes.tables like 'tsdemo%'" )
-        tdSql.checkRows(10)
-        tdSql.query("show dbyes.tables like '%s_'" %self.tsdemo)
-        tdSql.checkRows(10)
-        tdSql.query("select _block_dist() from `%s1`" %self.tsdemo)
-        tdSql.checkRows(1)
-        tdSql.query("describe dbyes.`%s1` ; " %self.tsdemo)
-        tdSql.checkRows(13)
-        tdSql.query("show create table dbyes.`%s1` ; " %self.tsdemo)
-        tdSql.checkData(0, 0, self.tsdemo+str(1))
-        tdSql.checkData(0, 1, "CREATE TABLE `%s1` USING `%s` TAGS (1,1)" %(self.tsdemo,self.tsdemo_stable))
-
-        print("==============drop table\stable")
-        try:
-            tdSql.execute("drop table dbyes.`%s1` ; " %self.tsdemo)
-        except Exception as e:
-            tdLog.exit(e)
-
-        tdSql.error("select * from dbyes.`%s1` ; " %self.tsdemo)
-        tdSql.query("show dbyes.tables like '%s_'" %self.tsdemo)
-        tdSql.checkRows(9)
-
-        try:
-            tdSql.execute("drop table dbyes.`%s` ; " %self.tsdemo_stable)
-        except Exception as e:
-            tdLog.exit(e)
-
-        tdSql.error("select * from dbyes.`%s` ; " %self.tsdemo_stable)
-        tdSql.error("select * from dbyes.`%s2` ; " %self.tsdemo)
-       
-        #print("==============taosdemo——json_no,#create stable,table; insert table; show table; select table; drop table")
-
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/TD-10539/create_taosdemo_no.json -y " % binPath) 
-        tdSql.query("show dbno.tables;")
-        tdSql.checkRows(0)
-        
-
-    def stop(self):
-        tdSql.close()
-        tdLog.success("%s successfully executed" % __file__)
-
-
-tdCases.addWindows(__file__, TDTestCase())
-tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/system-test/5-taos-tools/taosbenchmark/TD-10539/create_taosdemo_no.json b/tests/system-test/5-taos-tools/taosbenchmark/TD-10539/create_taosdemo_no.json
deleted file mode 100644
index 759a437b448c8c65bf252e859345dd9557cc51c5..0000000000000000000000000000000000000000
--- a/tests/system-test/5-taos-tools/taosbenchmark/TD-10539/create_taosdemo_no.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-    "filetype": "insert",
-    "cfgdir": "/etc/taos",
-    "host": "127.0.0.1",
-    "port": 6030,
-    "user": "root",
-    "password": "taosdata",
-    "thread_count": 10,
-    "thread_count_create_tbl": 10,
-    "result_file": "./insert_res.txt",
-    "confirm_parameter_prompt": "no",
-    "insert_interval": 0,
-    "interlace_rows": 10,
-    "num_of_records_per_req": 1,
-    "max_sql_len": 1024000,
-    "databases": [{
-        "dbinfo": {
-            "name": "dbno",
-            "drop": "yes",
-            "replica": 1,
-            "days": 10,
-            "cache": 50,
-            "blocks": 8,
-            "precision": "ms",
-            "keep": 36500,
-            "minRows": 100,
-            "maxRows": 4096,
-            "comp":2,
-            "walLevel":1,
-            "cachelast":0,
-            "quorum":1,
-            "fsync":3000,
-            "update": 0
-        },
-        "super_tables": [{
-            "name": "meters",
-            "child_table_exists":"no",
-            "childtable_count": 10,
-            "childtable_prefix": "tsdemo~!.@#$%^*[]-_=+{,?.}",
-            "escape_character": "no",
-            "auto_create_table": "no",
-            "batch_create_tbl_num": 1,
-            "data_source": "rand",
-            "insert_mode": "taosc",
-            "insert_rows": 100,
-            "childtable_limit": 0,
-            "childtable_offset":0,
-            "multi_thread_write_one_tbl": "no",
-            "interlace_rows": 0,
-            "insert_interval":0,
-            "max_sql_len": 1024000,
-            "disorder_ratio": 0,
-            "disorder_range": 1000,
-            "timestamp_step": 1,
-            "start_timestamp": "2020-10-01 00:00:00.000",
-            "sample_format": "csv",
-            "sample_file": "",
-            "tags_file": "",
-            "columns": [{"type": "INT","count":9}, {"type": "BINARY", "len": 16, "count":1}],
-            "tags": [{"type": "INT", "count":2}]
-        }]
-    }]
-}
diff --git a/tests/system-test/5-taos-tools/taosbenchmark/TD-10539/create_taosdemo_yes.json b/tests/system-test/5-taos-tools/taosbenchmark/TD-10539/create_taosdemo_yes.json
deleted file mode 100644
index aafc79215fc0b94d037da3a9b229a2f967b51613..0000000000000000000000000000000000000000
--- a/tests/system-test/5-taos-tools/taosbenchmark/TD-10539/create_taosdemo_yes.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-    "filetype": "insert",
-    "cfgdir": "/etc/taos",
-    "host": "127.0.0.1",
-    "port": 6030,
-    "user": "root",
-    "password": "taosdata",
-    "thread_count": 5,
-    "thread_count_create_tbl": 10,
-    "result_file": "./insert_res.txt",
-    "confirm_parameter_prompt": "no",
-    "insert_interval": 0,
-    "interlace_rows": 10,
-    "num_of_records_per_req": 1,
-    "max_sql_len": 1024000,
-    "databases": [{
-        "dbinfo": {
-            "name": "dbyes",
-            "drop": "yes",
-            "replica": 1,
-            "days": 10,
-            "cache": 50,
-            "blocks": 8,
-            "precision": "ms",
-            "keep": 36500,
-            "minRows": 100,
-            "maxRows": 4096,
-            "comp":2,
-            "walLevel":1,
-            "cachelast":0,
-            "quorum":1,
-            "fsync":3000,
-            "update": 0
-        },
-        "super_tables": [{
-            "name": "tsdemo_stable~!.@#$%^*[]-_=+{,?.}",
-            "child_table_exists":"no",
-            "childtable_count": 10,
-            "childtable_prefix": "tsdemo~!.@#$%^*[]-_=+{,?.}",
-            "escape_character": "yes",
-            "auto_create_table": "no",
-            "batch_create_tbl_num": 1,
-            "data_source": "rand",
-            "insert_mode": "taosc",
-            "insert_rows": 100,
-            "childtable_limit": 0,
-            "childtable_offset":0,
-            "multi_thread_write_one_tbl": "no",
-            "interlace_rows": 0,
-            "insert_interval":0,
-            "max_sql_len": 1024000,
-            "disorder_ratio": 0,
-            "disorder_range": 1000,
-            "timestamp_step": 1,
-            "start_timestamp": "2020-10-01 00:00:00.000",
-            "sample_format": "csv",
-            "sample_file": "",
-            "tags_file": "",
-            "columns": [{"type": "INT","count":9}, {"type": "BINARY", "len": 16, "count":1}],
-            "tags": [{"type": "INT", "count":2}]
-        }]
-    }]
-}
diff --git a/tests/system-test/5-taos-tools/taosbenchmark/TD-3453/query-interrupt.py b/tests/system-test/5-taos-tools/taosbenchmark/TD-3453/query-interrupt.py
deleted file mode 100644
index e8e65b68b89c35f33e239b4121f4d99b84c796a0..0000000000000000000000000000000000000000
--- a/tests/system-test/5-taos-tools/taosbenchmark/TD-3453/query-interrupt.py
+++ /dev/null
@@ -1,89 +0,0 @@
-###################################################################
-#           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 os
-import subprocess
-import time
-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 getBuildPath(self):
-        selfPath = os.path.dirname(os.path.realpath(__file__))
-
-        if ("community" in selfPath):
-            projPath = selfPath[:selfPath.find("community")]
-        else:
-            projPath = selfPath[:selfPath.find("tests")]
-
-        for root, dirs, files in os.walk(projPath):
-            if ("taosd" in files):
-                rootRealPath = os.path.dirname(os.path.realpath(root))
-                if ("packaging" not in rootRealPath):
-                    buildPath = root[:len(root)-len("/build/bin")]
-                    break
-        return buildPath
-        
-    def run(self):
-        tdSql.prepare()
-        buildPath = self.getBuildPath()
-        if (buildPath == ""):
-            tdLog.exit("taosd not found!")
-        else:
-            tdLog.info("taosd found in %s" % buildPath)
-        binPath = buildPath+ "/build/bin/"
-
-        # # insert 1000w rows in stb0
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/TD-3453/query-interrupt.json -y " % binPath)
-        tdSql.execute("use db")
-        tdSql.query("select count (tbname) from stb0")
-        tdSql.checkData(0, 0,60)
-        tdSql.query("select count(*) from stb0")
-        tdSql.checkData(0, 0, 6000000) 
-        os.system('%staosBenchmark -f tools/taosdemoAllTest/TD-3453/queryall.json -y & ' % binPath)
-        time.sleep(2)
-        query_pid = int(subprocess.getstatusoutput('ps aux|grep "TD-3453/queryall.json" |grep -v "grep"|awk \'{print $2}\'')[1])
-        taosd_cpu_load_1 = float(subprocess.getstatusoutput('top -n 1 -b -p $(ps aux|grep "bin/taosd -c"|grep -v "grep" |awk \'{print $2}\')|awk \'END{print}\' |awk \'{print $9}\'')[1])    
-        if taosd_cpu_load_1 > 10.0 :
-            os.system("kill -9 %d" % query_pid)
-            time.sleep(5)
-            taosd_cpu_load_2 = float(subprocess.getstatusoutput('top -n 1 -b -p $(ps aux|grep "bin/taosd -c"|grep -v "grep" |awk \'{print $2}\')|awk \'END{print}\' |awk \'{print $9}\'')[1])
-            if taosd_cpu_load_2 < 10.0 :
-                suc_kill = 60
-            else:
-                suc_kill = 10
-                print("taosd_cpu_load is higher than 10%")
-        else:
-            suc_kill = 20
-            print("taosd_cpu_load is still  less than 10%")
-        tdSql.query("select count (tbname) from stb0")
-        tdSql.checkData(0, 0, "%d" % suc_kill)
-        os.system("rm -rf querySystemInfo*")
-        os.system("rm -rf insert_res.txt")
-        os.system("rm -rf query_res.txt")
-
-    def stop(self):
-        tdSql.close()
-        tdLog.success("%s successfully executed" % __file__)
-
-
-tdCases.addWindows(__file__, TDTestCase())
-tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/system-test/5-taos-tools/taosbenchmark/TD-4985/query-limit-offset.py b/tests/system-test/5-taos-tools/taosbenchmark/TD-4985/query-limit-offset.py
deleted file mode 100644
index 987dd1bfa4771b505023bdeab78994ba488d671a..0000000000000000000000000000000000000000
--- a/tests/system-test/5-taos-tools/taosbenchmark/TD-4985/query-limit-offset.py
+++ /dev/null
@@ -1,193 +0,0 @@
-###################################################################
-#           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 os
-import time
-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)
-
-        now = time.time()
-        self.ts = int(round(now * 1000))
-
-    def getBuildPath(self):
-        selfPath = os.path.dirname(os.path.realpath(__file__))
-
-        if ("community" in selfPath):
-            projPath = selfPath[:selfPath.find("community")]
-        else:
-            projPath = selfPath[:selfPath.find("tests")]
-
-        for root, dirs, files in os.walk(projPath):
-            if ("taosd" in files):
-                rootRealPath = os.path.dirname(os.path.realpath(root))
-                if ("packaging" not in rootRealPath):
-                    buildPath = root[:len(root)-len("/build/bin")]
-                    break
-        return buildPath
-
-    def run(self):
-        buildPath = self.getBuildPath()
-        if (buildPath == ""):
-            tdLog.exit("taosd not found!")
-        else:
-            tdLog.info("taosd found in %s" % buildPath)
-        binPath = buildPath+ "/build/bin/"
-
-        # insert: create one  or mutiple tables per sql and insert multiple rows per sql
-        # test case for https://jira.taosdata.com:18080/browse/TD-4985
-        os.system("rm -rf tools/taosdemoAllTest/TD-4985/query-limit-offset.py.sql")
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/TD-4985/query-limit-offset.json -y " % binPath)
-        tdSql.execute("use db")
-        tdSql.query("select count (tbname) from stb0")
-        tdSql.checkData(0, 0, 10000)
-
-        for i in range(1000):
-            tdSql.execute('''insert into stb00_9999 values(%d, %d, %d,'test99.%s')'''
-                            % (self.ts + i, i, -10000+i, i))
-            tdSql.execute('''insert into stb00_8888 values(%d, %d, %d,'test98.%s')'''
-                            % (self.ts + i, i, -10000+i, i))
-            tdSql.execute('''insert into stb00_7777 values(%d, %d, %d,'test97.%s')'''
-                            % (self.ts + i, i, -10000+i, i))
-            tdSql.execute('''insert into stb00_6666 values(%d, %d, %d,'test96.%s')'''
-                            % (self.ts + i, i, -10000+i, i))
-            tdSql.execute('''insert into stb00_5555 values(%d, %d, %d,'test95.%s')'''
-                            % (self.ts + i, i, -10000+i, i))
-            tdSql.execute('''insert into stb00_4444 values(%d, %d, %d,'test94.%s')'''
-                            % (self.ts + i, i, -10000+i, i))
-            tdSql.execute('''insert into stb00_3333 values(%d, %d, %d,'test93.%s')'''
-                            % (self.ts + i, i, -10000+i, i))
-            tdSql.execute('''insert into stb00_2222 values(%d, %d, %d,'test92.%s')'''
-                            % (self.ts + i, i, -10000+i, i))
-            tdSql.execute('''insert into stb00_1111 values(%d, %d, %d,'test91.%s')'''
-                            % (self.ts + i, i, -10000+i, i))
-            tdSql.execute('''insert into stb00_100 values(%d, %d, %d,'test90.%s')'''
-                            % (self.ts + i, i, -10000+i, i))
-        tdSql.query("select * from stb0 where c2 like 'test99%' ")
-        tdSql.checkRows(1000)
-
-        tdSql.query("select * from stb0 where  tbname like 'stb00_9999'  limit 10" )
-        tdSql.checkData(0, 1, 0)
-        tdSql.checkData(1, 1, 1)
-        tdSql.checkData(2, 1, 2)
-        tdSql.query("select * from stb0 where  tbname like 'stb00_9999'  limit 10 offset 5" )
-        tdSql.checkData(0, 1, 5)
-        tdSql.checkData(1, 1, 6)
-        tdSql.checkData(2, 1, 7)
-        tdSql.query("select *  from stb0 where c2 like 'test98%' ")
-        tdSql.checkRows(1000)
-        tdSql.query("select  *  from stb0 where tbname like 'stb00_8888' limit 10" )
-        tdSql.checkData(0, 1, 0)
-        tdSql.checkData(1, 1, 1)
-        tdSql.checkData(2, 1, 2)
-        tdSql.query("select *  from stb0 where tbname like 'stb00_8888' limit 10 offset 5" )
-        tdSql.checkData(0, 1, 5)
-        tdSql.checkData(1, 1, 6)
-        tdSql.checkData(2, 1, 7)
-        tdSql.query("select *  from stb0 where c2 like 'test97%' ")
-        tdSql.checkRows(1000)
-        tdSql.query("select  *  from stb0 where tbname like 'stb00_7777' limit 10" )
-        tdSql.checkData(0, 1, 0)
-        tdSql.checkData(1, 1, 1)
-        tdSql.checkData(2, 1, 2)
-        tdSql.query("select  *  from stb0 where tbname like 'stb00_7777' limit 10 offset 5" )
-        tdSql.checkData(0, 1, 5)
-        tdSql.checkData(1, 1, 6)
-        tdSql.checkData(2, 1, 7)
-        tdSql.query("select *  from stb0 where c2 like 'test96%' ")
-        tdSql.checkRows(1000)
-        tdSql.query("select  *  from stb0 where tbname like 'stb00_6666' limit 10" )
-        tdSql.checkData(0, 1, 0)
-        tdSql.checkData(1, 1, 1)
-        tdSql.checkData(2, 1, 2)
-        tdSql.query("select  *  from stb0 where tbname like 'stb00_6666' limit 10 offset 5" )
-        tdSql.checkData(0, 1, 5)
-        tdSql.checkData(1, 1, 6)
-        tdSql.checkData(2, 1, 7)
-        tdSql.query("select *  from stb0 where c2 like 'test95%' ")
-        tdSql.checkRows(1000)
-        tdSql.query("select  *  from stb0 where tbname like 'stb00_5555' limit 10" )
-        tdSql.checkData(0, 1, 0)
-        tdSql.checkData(1, 1, 1)
-        tdSql.checkData(2, 1, 2)
-        tdSql.query("select  *  from stb0 where tbname like 'stb00_5555' limit 10 offset 5" )
-        tdSql.checkData(0, 1, 5)
-        tdSql.checkData(1, 1, 6)
-        tdSql.checkData(2, 1, 7)
-        tdSql.query("select * from stb0 where c2 like 'test94%' ")
-        tdSql.checkRows(1000)
-        tdSql.query("select * from stb0 where tbname like 'stb00_4444' limit 10" )
-        tdSql.checkData(0, 1, 0)
-        tdSql.checkData(1, 1, 1)
-        tdSql.checkData(2, 1, 2)
-        tdSql.query("select * from stb0 where tbname like 'stb00_4444' limit 10 offset 5" )
-        tdSql.checkData(0, 1, 5)
-        tdSql.checkData(1, 1, 6)
-        tdSql.checkData(2, 1, 7)
-        tdSql.query("select *  from stb0 where c2 like 'test93%' ")
-        tdSql.checkRows(1000)
-        tdSql.query("select  *  from stb0 where tbname like 'stb00_3333' limit 100" )
-        tdSql.checkData(0, 1, 0)
-        tdSql.checkData(1, 1, 1)
-        tdSql.checkData(2, 1, 2)
-        tdSql.query("select *  from stb0 where tbname like 'stb00_3333' limit 100 offset 5" )
-        tdSql.checkData(0, 1, 5)
-        tdSql.checkData(1, 1, 6)
-        tdSql.checkData(2, 1, 7)
-        tdSql.query("select *  from stb0 where c2 like 'test92%' ")
-        tdSql.checkRows(1000)
-        tdSql.query("select  *  from stb0 where tbname like 'stb00_2222' limit 100" )
-        tdSql.checkData(0, 1, 0)
-        tdSql.checkData(1, 1, 1)
-        tdSql.checkData(2, 1, 2)
-        tdSql.query("select  *  from stb0 where tbname like 'stb00_2222' limit 100 offset 5" )
-        tdSql.checkData(0, 1, 5)
-        tdSql.checkData(1, 1, 6)
-        tdSql.checkData(2, 1, 7)
-        tdSql.query("select *  from stb0 where c2 like 'test91%' ")
-        tdSql.checkRows(1000)
-        tdSql.query("select  *  from stb0 where tbname like 'stb00_1111' limit 100" )
-        tdSql.checkData(0, 1, 0)
-        tdSql.checkData(1, 1, 1)
-        tdSql.checkData(2, 1, 2)
-        tdSql.query("select  *  from stb0 where tbname like 'stb00_1111' limit 100 offset 5" )
-        tdSql.checkData(0, 1, 5)
-        tdSql.checkData(1, 1, 6)
-        tdSql.checkData(2, 1, 7)
-        tdSql.query("select *  from stb0 where c2 like 'test90%' ")
-        tdSql.checkRows(1000)
-        tdSql.query("select  *  from stb0 where tbname like 'stb00_100' limit 100" )
-        tdSql.checkData(0, 1, 0)
-        tdSql.checkData(1, 1, 1)
-        tdSql.checkData(2, 1, 2)
-        tdSql.query("select  *  from stb0 where tbname like 'stb00_100' limit 100 offset 5" )
-        tdSql.checkData(0, 1, 5)
-        tdSql.checkData(1, 1, 6)
-        tdSql.checkData(2, 1, 7)
-        
-
-    def stop(self):
-        tdSql.close()
-        tdLog.success("%s successfully executed" % __file__)
-
-
-tdCases.addWindows(__file__, TDTestCase())
-tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/system-test/5-taos-tools/taosbenchmark/moredemo-insert-offset.py b/tests/system-test/5-taos-tools/taosbenchmark/moredemo-insert-offset.py
deleted file mode 100644
index 955545ac2cb2578089b705e67a97d99678182154..0000000000000000000000000000000000000000
--- a/tests/system-test/5-taos-tools/taosbenchmark/moredemo-insert-offset.py
+++ /dev/null
@@ -1,72 +0,0 @@
-###################################################################
-#           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 os
-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 getBuildPath(self):
-        selfPath = os.path.dirname(os.path.realpath(__file__))
-
-        if ("community" in selfPath):
-            projPath = selfPath[:selfPath.find("community")]
-        else:
-            projPath = selfPath[:selfPath.find("tests")]
-
-        for root, dirs, files in os.walk(projPath):
-            if ("taosd" in files):
-                rootRealPath = os.path.dirname(os.path.realpath(root))
-                if ("packaging" not in rootRealPath):
-                    buildPath = root[:len(root)-len("/build/bin")]
-                    break
-        return buildPath
-        
-    def run(self):
-        buildPath = self.getBuildPath()
-        if (buildPath == ""):
-            tdLog.exit("taosd not found!")
-        else:
-            tdLog.info("taosd found in %s" % buildPath)
-        binPath = buildPath+ "/build/bin/"      
-        
-        # insert: drop and child_table_exists combination test
-        # insert: using parament "childtable_offset and childtable_limit" to control  table'offset point and offset 
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/moredemo-offset-newdb.json" % binPath)
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/moredemo-offset-limit1.json & " % binPath)
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/moredemo-offset-limit94.json & " % binPath)
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/moredemo-offset-limit5.json & " % binPath)
-        sleep(15)
-        tdSql.execute("use db")             
-        tdSql.query("select count(*) from stb0")
-        tdSql.checkData(0, 0, 1000000) 
-
-        os.system("rm -rf ./insert_res.txt")
-        os.system("rm -rf tools/taosdemoAllTest/moredemo-insert-offset.py.sql")        
-        
-    
-    def stop(self):
-        tdSql.close()
-        tdLog.success("%s successfully executed" % __file__)
-
-
-tdCases.addWindows(__file__, TDTestCase())
-tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/system-test/5-taos-tools/taosbenchmark/query-interrupt.py b/tests/system-test/5-taos-tools/taosbenchmark/query-interrupt.py
deleted file mode 100644
index df021cbe3be5da9a0a28b78bbafef548c24697fa..0000000000000000000000000000000000000000
--- a/tests/system-test/5-taos-tools/taosbenchmark/query-interrupt.py
+++ /dev/null
@@ -1,88 +0,0 @@
-###################################################################
-#           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 os
-import subprocess
-import time
-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 getBuildPath(self):
-        selfPath = os.path.dirname(os.path.realpath(__file__))
-
-        if ("community" in selfPath):
-            projPath = selfPath[:selfPath.find("community")]
-        else:
-            projPath = selfPath[:selfPath.find("tests")]
-
-        for root, dirs, files in os.walk(projPath):
-            if ("taosd" in files):
-                rootRealPath = os.path.dirname(os.path.realpath(root))
-                if ("packaging" not in rootRealPath):
-                    buildPath = root[:len(root)-len("/build/bin")]
-                    break
-        return buildPath
-        
-    def run(self):
-        tdSql.prepare()
-        buildPath = self.getBuildPath()
-        if (buildPath == ""):
-            tdLog.exit("taosd not found!")
-        else:
-            tdLog.info("taosd found in %s" % buildPath)
-        binPath = buildPath+ "/build/bin/"
-
-        # # insert 1000w rows in stb0
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/query-interrupt.json -y " % binPath)
-        tdSql.execute("use db")
-        tdSql.query("select count (tbname) from stb0")
-        tdSql.checkData(0, 0,60)
-        tdSql.query("select count(*) from stb0")
-        tdSql.checkData(0, 0, 6000000) 
-        os.system('%staosBenchmark -f tools/taosdemoAllTest/queryall.json -y & ' % binPath)
-        time.sleep(2)
-        query_pid = int(subprocess.getstatusoutput('ps aux|grep "taosdemoAllTest/queryall.json" |grep -v "grep"|awk \'{print $2}\'')[1])
-        taosd_cpu_load_1 = float(subprocess.getstatusoutput('top -n 1 -b -p $(ps aux|grep "bin/taosd -c"|grep -v "grep" |awk \'{print $2}\')|awk \'END{print}\' |awk \'{print $9}\'')[1])    
-        if taosd_cpu_load_1 > 10.0 :
-            os.system("kill -9 %d" % query_pid)
-            time.sleep(5)
-            taosd_cpu_load_2 = float(subprocess.getstatusoutput('top -n 1 -b -p $(ps aux|grep "bin/taosd -c"|grep -v "grep" |awk \'{print $2}\')|awk \'END{print}\' |awk \'{print $9}\'')[1])
-            if taosd_cpu_load_2 < 10.0 :
-                suc_kill = 60
-            else:
-                suc_kill = 10
-                print("taosd_cpu_load is higher than 10%")
-        else:
-            suc_kill = 20
-            print("taosd_cpu_load is still  less than 10%")
-        tdSql.query("select count (tbname) from stb0")
-        tdSql.checkData(0, 0, "%d" % suc_kill)
-        os.system("rm -rf querySystemInfo*")
-        os.system("rm -rf insert_res.txt")
-
-    def stop(self):
-        tdSql.close()
-        tdLog.success("%s successfully executed" % __file__)
-
-
-tdCases.addWindows(__file__, TDTestCase())
-tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/system-test/5-taos-tools/taosbenchmark/subscribeNoResult.py b/tests/system-test/5-taos-tools/taosbenchmark/subscribeNoResult.py
deleted file mode 100644
index e1a9f647fa2b5d1f561e50a06b9755d78bebfa79..0000000000000000000000000000000000000000
--- a/tests/system-test/5-taos-tools/taosbenchmark/subscribeNoResult.py
+++ /dev/null
@@ -1,82 +0,0 @@
-###################################################################
-#           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 os
-import time
-from util.log import *
-from util.cases import *
-from util.sql import *
-from util.dnodes import *
-import _thread
-
-class TDTestCase:
-    def init(self, conn, logSql):
-        tdLog.debug("start to execute %s" % __file__)
-        tdSql.init(conn.cursor(), logSql)
-        
-        self.ts = 1601481600000
-        self.numberOfRecords = 1100000
-    
-    def execCmdAndGetOutput(self, cmd):  
-        r = os.popen(cmd)  
-        text = r.read()  
-        r.close()  
-        return text
-
-    def getBuildPath(self):
-        selfPath = os.path.dirname(os.path.realpath(__file__))
-
-        if ("community" in selfPath):
-            projPath = selfPath[:selfPath.find("community")]
-        else:
-            projPath = selfPath[:selfPath.find("tests")]
-
-        for root, dirs, files in os.walk(projPath):
-            if ("taosd" in files):
-                rootRealPath = os.path.dirname(os.path.realpath(root))
-                if ("packaging" not in rootRealPath):
-                    buildPath = root[:len(root)-len("/build/bin")]
-                    break
-        return buildPath
-
-    def run(self):
-        buildPath = self.getBuildPath()
-        tdSql.prepare()
-        tdSql.execute("create table st(ts timestamp, c1 timestamp, c2 int, c3 bigint, c4 float, c5 double, c6 binary(8), c7 smallint, c8 tinyint, c9 bool, c10 nchar(8)) tags(t1 int)")
-        tdSql.execute("create table t1 using st tags(0)")
-        currts = self.ts
-        finish = 0
-        while(finish < self.numberOfRecords):
-            sql = "insert into t1 values"
-            for i in range(finish, self.numberOfRecords):
-                sql += "(%d, 1019774612, 29931, 1442173978, 165092.468750, 1128.643179, 'MOCq1pTu', 18405, 82, 0, 'g0A6S0Fu')" % (currts + i)
-                finish = i + 1
-                if (1048576 - len(sql)) < 16384:
-                 break
-            tdSql.execute(sql)
-        
-        binPath = buildPath+ "/build/bin/"
-
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/sub_no_result.json -g 2>&1 | tee sub_no_result.log" % binPath)
-        test_line = int(self.execCmdAndGetOutput("cat sub_no_result.log | wc -l"))
-        if(test_line < 1100024):
-            tdLog.exit("failed test subscribeNoResult: %d != expected(1100024)" % test_line)
-
-    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
diff --git a/tests/system-test/5-taos-tools/taosbenchmark/taosdemoTestInsertAllType.py b/tests/system-test/5-taos-tools/taosbenchmark/taosdemoTestInsertAllType.py
deleted file mode 100644
index 3bc2495f626e28017d55fc6d01f487ef239cd8b5..0000000000000000000000000000000000000000
--- a/tests/system-test/5-taos-tools/taosbenchmark/taosdemoTestInsertAllType.py
+++ /dev/null
@@ -1,151 +0,0 @@
-###################################################################
-#           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 os
-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 getBuildPath(self):
-        selfPath = os.path.dirname(os.path.realpath(__file__))
-
-        if ("community" in selfPath):
-            projPath = selfPath[:selfPath.find("community")]
-        else:
-            projPath = selfPath[:selfPath.find("tests")]
-
-        for root, dirs, files in os.walk(projPath):
-            if ("taosd" in files):
-                rootRealPath = os.path.dirname(os.path.realpath(root))
-                if ("packaging" not in rootRealPath):
-                    buildPath = root[:len(root)-len("/build/bin")]
-                    break
-        return buildPath
-
-    def run(self):
-        buildPath = self.getBuildPath()
-        if (buildPath == ""):
-            tdLog.exit("taosd not found!")
-        else:
-            tdLog.info("taosd found in %s" % buildPath)
-        binPath = buildPath+ "/build/bin/"
-
-        # taosc interface 
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-allDataType.json -y " % binPath)
-        tdSql.execute("use db")
-        tdSql.query("select count (tbname) from stb0")
-        tdSql.checkData(0, 0, 1000)
-        tdSql.query("select count (tbname) from stb1")
-        tdSql.checkData(0, 0, 1000)
-        tdSql.query("select count(*) from stb00_0")
-        tdSql.checkData(0, 0, 100)
-        tdSql.query("select count(*) from stb0")
-        tdSql.checkData(0, 0, 100000)
-        tdSql.query("select count(*) from stb01_1")
-        tdSql.checkData(0, 0, 200)
-        tdSql.query("select count(*) from stb1")
-        tdSql.checkData(0, 0, 200000)
-
-        # stmt interface   
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/stmt/insert-allDataType-stmt.json -y " % binPath)
-        tdSql.execute("use db")
-        tdSql.query("select count (tbname) from stb0")
-        tdSql.checkData(0, 0, 1000)
-        tdSql.query("select count (tbname) from stb1")
-        tdSql.checkData(0, 0, 1000)
-        tdSql.query("select count(*) from stb00_0")
-        tdSql.checkData(0, 0, 100)
-        tdSql.query("select count(*) from stb0")
-        tdSql.checkData(0, 0, 100000)
-        tdSql.query("select count(*) from stb01_1")
-        tdSql.checkData(0, 0, 200)
-        tdSql.query("select count(*) from stb1")
-        tdSql.checkData(0, 0, 200000)
-
-         # insert-interface: sml
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/sml/insert-allDataType-sml.json -y " % binPath)
-        tdSql.execute("use db")
-        tdSql.query("select count (tbname) from stb0")
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select count (tbname) from stb1")
-        tdSql.checkData(0, 0, 20)
-        # tdSql.query("select last(ts) from db.stb00_0")
-        # tdSql.checkData(0, 0, "2020-10-01 00:00:00.019000")   
-        tdSql.query("select count(*) from stb0")
-        tdSql.checkData(0, 0, 1000) 
-        # tdSql.query("select last(ts) from db.stb01_0")
-        # tdSql.checkData(0, 0, "2020-11-01 00:00:00.190000")   
-        tdSql.query("select count(*) from stb1")
-        tdSql.checkData(0, 0, 4000) 
-
-
-         # insert-interface: sml-json
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/sml/insert-sml-json-alltype.json -y " % binPath)
-        tdSql.execute("use db")
-        tdSql.query("show stables")
-        for i in range(13):
-            for  j in range(13):
-                if tdSql.queryResult[i][0] == 'stb%d'%j:
-                    # print(i,"stb%d"%j)
-                    tdSql.checkData(i, 4, j+1)
-
-
-        # insert-interface: sml-telnet
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/sml/insert-sml-telnet-alltype.json -y " % binPath)
-        tdSql.execute("use db")
-        tdSql.query("show stables")
-        for i in range(13):
-            for  j in range(13):
-                if tdSql.queryResult[i][0] == 'stb%d'%j:
-                    # print(i,"stb%d"%j)
-                    tdSql.checkData(i, 4, j+1)
-        for i in range(13):
-            tdSql.query("select count(*) from stb%d"%i)
-            tdSql.checkData(0, 0, (i+1)*10) 
-
-        # insert-interface: sml-telnet
-        assert os.system("%staosdemo -f tools/taosdemoAllTest/sml/insert-sml-timestamp.json -y " % binPath) !=0
-
-
-        # taosdemo command line
-        os.system("%staosBenchmark  -t 1000 -n 100 -T 10 -b INT,TIMESTAMP,BIGINT,FLOAT,DOUBLE,SMALLINT,TINYINT,BOOL,NCHAR,UINT,UBIGINT,UTINYINT,USMALLINT,BINARY  -y " % binPath)
-        tdSql.execute("use test")
-        tdSql.query("select count (tbname) from meters")
-        tdSql.checkData(0, 0, 1000)
-        tdSql.query("select count(*) from meters")
-        tdSql.checkData(0, 0, 100000)
-        tdSql.query("select count(*) from d100")
-        tdSql.checkData(0, 0, 100)
-
-        testcaseFilename = os.path.split(__file__)[-1]
-        os.system("rm -rf ./insert_res.txt")
-        os.system("rm -rf tools/taosdemoAllTest/%s.sql" % testcaseFilename )         
-        
-        
-        
-
-    def stop(self):
-        tdSql.close()
-        tdLog.success("%s successfully executed" % __file__)
-
-
-tdCases.addWindows(__file__, TDTestCase())
-tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/system-test/5-taos-tools/taosbenchmark/taosdemoTestInsertWithJsonStmtPerformance.py b/tests/system-test/5-taos-tools/taosbenchmark/taosdemoTestInsertWithJsonStmtPerformance.py
deleted file mode 100644
index ff22ffe5a56bf69559d77bc202f289d4349e1e38..0000000000000000000000000000000000000000
--- a/tests/system-test/5-taos-tools/taosbenchmark/taosdemoTestInsertWithJsonStmtPerformance.py
+++ /dev/null
@@ -1,92 +0,0 @@
-###################################################################
-#           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 os
-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 getBuildPath(self):
-        selfPath = os.path.dirname(os.path.realpath(__file__))
-
-        if ("community" in selfPath):
-            projPath = selfPath[:selfPath.find("community")]
-        else:
-            projPath = selfPath[:selfPath.find("tests")]
-
-        for root, dirs, files in os.walk(projPath):
-            if ("taosd" in files):
-                rootRealPath = os.path.dirname(os.path.realpath(root))
-                if ("packaging" not in rootRealPath):
-                    buildPath = root[:len(root)-len("/build/bin")]
-                    break
-        return buildPath
-        
-    def run(self):
-        buildPath = self.getBuildPath()
-        if (buildPath == ""):
-            tdLog.exit("taosd not found!")
-        else:
-            tdLog.info("taosd found in %s" % buildPath)
-        binPath = buildPath+ "/build/bin/"
-
-        # insert: create one  or mutiple tables per sql and insert multiple rows per sql 
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/stmt/1174-small-stmt-random.json -y " % binPath)
-        # sleep(60)
-
-        # os.system("%staosBenchmark -f tools/taosdemoAllTest/stmt/1174-small-taosc.json -y " % binPath)
-        # sleep(60)
-        # os.system("%staosBenchmark -f tools/taosdemoAllTest/stmt/1174-small-stmt.json -y " % binPath)
-        # sleep(60)
-        # os.system("%staosBenchmark -f tools/taosdemoAllTest/stmt/1174-large-taosc.json -y " % binPath)
-        # sleep(60)
-        # os.system("%staosBenchmark -f tools/taosdemoAllTest/stmt/1174-large-stmt.json -y " % binPath)
-
-        # tdSql.execute("use db")
-        # tdSql.query("select count (tbname) from stb0")
-        # tdSql.checkData(0, 0, 1000)
-        # tdSql.query("select count (tbname) from stb1")
-        # tdSql.checkData(0, 0, 1000)
-        # tdSql.query("select count(*) from stb00_0")
-        # tdSql.checkData(0, 0, 100)
-        # tdSql.query("select count(*) from stb0")
-        # tdSql.checkData(0, 0, 100000)
-        # tdSql.query("select count(*) from stb01_1")
-        # tdSql.checkData(0, 0, 200)
-        # tdSql.query("select count(*) from stb1")
-        # tdSql.checkData(0, 0, 200000)        
-
-
- 
-
-        testcaseFilename = os.path.split(__file__)[-1]
-        os.system("rm -rf ./insert_res.txt")
-        os.system("rm -rf tools/taosdemoAllTest/%s.sql" % testcaseFilename )     
-        
-        
-        
-    def stop(self):
-        tdSql.close()
-        tdLog.success("%s successfully executed" % __file__)
-
-
-tdCases.addWindows(__file__, TDTestCase())
-tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/system-test/5-taos-tools/taosbenchmark/taosdemoTestSubWithJson.py b/tests/system-test/5-taos-tools/taosbenchmark/taosdemoTestSubWithJson.py
deleted file mode 100644
index 265f50237bf2b5dae80eccc94aad885a7b84f5f2..0000000000000000000000000000000000000000
--- a/tests/system-test/5-taos-tools/taosbenchmark/taosdemoTestSubWithJson.py
+++ /dev/null
@@ -1,204 +0,0 @@
-###################################################################
-#           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 os
-from util.log import *
-from util.cases import *
-from util.sql import *
-from util.dnodes import *
-import time
-from datetime import datetime
-import subprocess
-
-
-class TDTestCase:
-    def init(self, conn, logSql):
-        tdLog.debug("start to execute %s" % __file__)
-        tdSql.init(conn.cursor(), logSql)
-        
-    def getBuildPath(self):
-        selfPath = os.path.dirname(os.path.realpath(__file__))
-
-        if ("community" in selfPath):
-            projPath = selfPath[:selfPath.find("community")]
-        else:
-            projPath = selfPath[:selfPath.find("tests")]
-
-        for root, dirs, files in os.walk(projPath):
-            if ("taosd" in files):
-                rootRealPath = os.path.dirname(os.path.realpath(root))
-                if ("packaging" not in rootRealPath):
-                    buildPath = root[:len(root)-len("/build/bin")]
-                    break
-        return buildPath
-
-    # get the number of subscriptions
-    def subTimes(self,filename):
-        self.filename = filename
-        command = 'cat %s |wc -l'% filename
-        times = int(subprocess.getstatusoutput(command)[1]) 
-        return times
-    
-    # assert results
-    def assertCheck(self,filename,subResult,expectResult):
-        self.filename = filename
-        self.subResult = subResult
-        self.expectResult = expectResult
-        args0 = (filename, subResult, expectResult)
-        assert subResult == expectResult , "Queryfile:%s ,result is %s != expect: %s" % args0    
-
-    def run(self):
-        buildPath = self.getBuildPath()
-        if (buildPath == ""):
-            tdLog.exit("taosd not found!")
-        else:
-            tdLog.info("taosd found in %s" % buildPath)
-        binPath = buildPath+ "/build/bin/"      
-
-        # clear env
-        os.system("ps -ef |grep 'taosdemoAllTest/subSync.json' |grep -v 'grep' |awk '{print $2}'|xargs kill -9")
-        os.system("ps -ef |grep 'taosdemoAllTest/subSyncKeepStart.json' |grep -v 'grep' |awk '{print $2}'|xargs kill -9")
-        sleep(1)
-        os.system("rm -rf ./subscribe_res*")  
-        os.system("rm -rf ./all_subscribe_res*") 
-        sleep(2)
-        # subscribe: sync 
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/subInsertdata.json" % binPath)
-        os.system("nohup %staosBenchmark -f tools/taosdemoAllTest/subSync.json &" % binPath)
-        query_pid = int(subprocess.getstatusoutput('ps aux|grep "taosdemoAllTest/subSync.json" |grep -v "grep"|awk \'{print $2}\'')[1])
-
-        # insert extral data     
-        tdSql.execute("use db")
-        tdSql.execute("insert into stb00_0 values(1614218412000,'R','bf3',8637,98.861045)")   
-        tdSql.execute("insert into stb00_1 values(1614218412000,'R','bf3',8637,78.861045)(1614218422000,'R','bf3',8637,98.861045)")   
-        sleep(5)
-
-        # merge result files
-        os.system("cat subscribe_res0.txt* > all_subscribe_res0.txt")
-        os.system("cat subscribe_res1.txt* > all_subscribe_res1.txt")
-        os.system("cat subscribe_res2.txt* > all_subscribe_res2.txt")
-        os.system("cat subscribe_res3.txt* > all_subscribe_res3.txt")
-
-        
-        # correct subscribeTimes testcase
-        subTimes0 = self.subTimes("all_subscribe_res0.txt")
-        self.assertCheck("all_subscribe_res0.txt",subTimes0 ,22)
-
-        subTimes1 = self.subTimes("all_subscribe_res1.txt")
-        self.assertCheck("all_subscribe_res1.txt",subTimes1 ,24)
-
-        subTimes2 = self.subTimes("all_subscribe_res2.txt")
-        self.assertCheck("all_subscribe_res2.txt",subTimes2 ,21)
-
-        subTimes3 = self.subTimes("all_subscribe_res3.txt")
-        self.assertCheck("all_subscribe_res3.txt",subTimes3 ,13)
-        
-
-        # correct data testcase
-        os.system("kill -9 %d" % query_pid)
-        sleep(3)
-        os.system("rm -rf ./subscribe_res*")   
-        os.system("rm -rf ./all_subscribe*")
-  
-        # # sql number lager  100
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/subInsertdataMaxsql100.json" % binPath)
-        assert os.system("%staosBenchmark -f tools/taosdemoAllTest/subSyncSpecMaxsql100.json" % binPath) != 0
-        assert os.system("%staosBenchmark -f tools/taosdemoAllTest/subSyncSuperMaxsql100.json" % binPath) != 0
-
-        # # result files is null
-        # os.system("%staosBenchmark -f tools/taosdemoAllTest/subInsertdataMaxsql100.json" % binPath)
-        # os.system("%staosBenchmark -f tools/taosdemoAllTest/subSyncResFileNull.json" % binPath)
-        # # assert os.system("%staosBenchmark -f tools/taosdemoAllTest/subSyncResFileNull.json" % binPath) != 0
-
-
-
-
-        # resubAfterConsume= -1 endAfter=-1 ;
-        os.system('kill -9 `ps aux|grep "subSyncResubACMinus1.json" |grep -v "grep"|awk \'{print $2}\'` ')
-        os.system("nohup %staosBenchmark -f tools/taosdemoAllTest/Resubjson/subSyncResubACMinus1.json & " % binPath)
-        sleep(2)
-        query_pid1 = int(subprocess.getstatusoutput('ps aux|grep "subSyncResubACMinus1.json" |grep -v "grep"|awk \'{print $2}\'')[1])
-        print("get sub1 process'pid")
-        subres0Number1 =int(subprocess.getstatusoutput('grep "1614218412000" subscribe_res0*  |wc -l' )[1])
-        subres2Number1 =int(subprocess.getstatusoutput('grep "1614218412000" subscribe_res2*  |wc -l' )[1])
-        assert 0==subres0Number1 , "subres0Number1 error"
-        assert 0==subres2Number1 , "subres2Number1 error"
-        tdSql.execute("insert into db.stb00_0 values(1614218412000,'R','bf3',8637,78.861045)(1614218413000,'R','bf3',8637,98.861045)") 
-        sleep(4)
-        subres2Number2 =int(subprocess.getstatusoutput('grep "1614218412000" subscribe_res0*  |wc -l' )[1])
-        subres0Number2 =int(subprocess.getstatusoutput('grep "1614218412000" subscribe_res0*  |wc -l' )[1])
-        assert 0!=subres2Number2 , "subres2Number2 error"
-        assert 0!=subres0Number2 , "subres0Number2 error"
-        os.system("kill -9 %d" % query_pid1)
-        os.system("rm -rf ./subscribe_res*")   
-
-        # # resubAfterConsume= -1 endAfter=0 ;
-        # os.system("%staosBenchmark -f tools/taosdemoAllTest/subInsertdataMaxsql100.json" % binPath)
-        # os.system('kill -9 `ps aux|grep "subSyncResubACMinus1endAfter0.json" |grep -v "grep"|awk \'{print $2}\'` ')
-        # os.system("nohup %staosBenchmark -f tools/taosdemoAllTest/Resubjson/subSyncResubACMinus1endAfter0.json & " % binPath)
-        # sleep(2)
-        # query_pid1 = int(subprocess.getstatusoutput('ps aux|grep "subSyncResubACMinus1endAfter0.json" |grep -v "grep"|awk \'{print $2}\'')[1])
-        # print("get sub2 process'pid")
-        # subres0Number1 =int(subprocess.getstatusoutput('grep "1614218412000" subscribe_res0*  |wc -l' )[1])
-        # subres2Number1 =int(subprocess.getstatusoutput('grep "1614218412000" subscribe_res2*  |wc -l' )[1])
-        # assert 0==subres0Number1 , "subres0Number1 error"
-        # assert 0==subres2Number1 , "subres2Number1 error"
-        # tdSql.execute("insert into db.stb00_0 values(1614218412000,'R','bf3',8637,78.861045)(1614218413000,'R','bf3',8637,98.861045)") 
-        # sleep(4)
-        # subres2Number2 =int(subprocess.getstatusoutput('grep "1614218412000" subscribe_res0*  |wc -l' )[1])
-        # subres0Number2 =int(subprocess.getstatusoutput('grep "1614218412000" subscribe_res0*  |wc -l' )[1])
-        # assert 0!=subres2Number2 , "subres2Number2 error"
-        # assert 0!=subres0Number2 , "subres0Number2 error"
-        # os.system("kill -9 %d" % query_pid1)
-        # os.system("rm -rf ./subscribe_res*")   
-        
-
-
-
-        # # # merge result files
-        # os.system("cat subscribe_res0.txt* > all_subscribe_res0.txt")
-        # os.system("cat subscribe_res1.txt* > all_subscribe_res1.txt")
-        # os.system("cat subscribe_res2.txt* > all_subscribe_res2.txt")
-        # # os.system("cat subscribe_res3.txt* > all_subscribe_res3.txt")
-
-        # sleep(3)
-
-        # # correct subscribeTimes testcase
-        # subTimes0 = self.subTimes("all_subscribe_res0.txt")
-        # self.assertCheck("all_subscribe_res0.txt",subTimes0 ,3960)
-
-        # subTimes1 = self.subTimes("all_subscribe_res1.txt")
-        # self.assertCheck("all_subscribe_res1.txt",subTimes1 ,40)
-
-        # subTimes2 = self.subTimes("all_subscribe_res2.txt")
-        # self.assertCheck("all_subscribe_res2.txt",subTimes2 ,1900)
-
-
-        # os.system("%staosBenchmark -f tools/taosdemoAllTest/subSupermaxsql100.json" % binPath)
-        # os.system("%staosBenchmark -f tools/taosdemoAllTest/subSupermaxsql100.json" % binPath)
-
-
-        
-        # delete useless files
-        os.system("rm -rf ./insert_res.txt")
-        os.system("rm -rf tools/taosdemoAllTest/*.py.sql")        
-        os.system("rm -rf ./subscribe_res*")   
-        os.system("rm -rf ./all_subscribe*")
-         
-    def stop(self):
-        tdSql.close()
-        tdLog.success("%s successfully executed" % __file__)
-
-tdCases.addWindows(__file__, TDTestCase())
-tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/system-test/5-taos-tools/taosbenchmark/taosdemoTestSubWithJsonAsync.py b/tests/system-test/5-taos-tools/taosbenchmark/taosdemoTestSubWithJsonAsync.py
deleted file mode 100644
index b236b2b48b93f210f0e73ebb5be240413f82d878..0000000000000000000000000000000000000000
--- a/tests/system-test/5-taos-tools/taosbenchmark/taosdemoTestSubWithJsonAsync.py
+++ /dev/null
@@ -1,124 +0,0 @@
-###################################################################
-#           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 os
-from util.log import *
-from util.cases import *
-from util.sql import *
-from util.dnodes import *
-import time
-from datetime import datetime
-import subprocess
-
-
-class TDTestCase:
-    def init(self, conn, logSql):
-        tdLog.debug("start to execute %s" % __file__)
-        tdSql.init(conn.cursor(), logSql)
-        
-    def getBuildPath(self):
-        selfPath = os.path.dirname(os.path.realpath(__file__))
-
-        if ("community" in selfPath):
-            projPath = selfPath[:selfPath.find("community")]
-        else:
-            projPath = selfPath[:selfPath.find("tests")]
-
-        for root, dirs, files in os.walk(projPath):
-            if ("taosd" in files):
-                rootRealPath = os.path.dirname(os.path.realpath(root))
-                if ("packaging" not in rootRealPath):
-                    buildPath = root[:len(root)-len("/build/bin")]
-                    break
-        return buildPath
-
-    # 获取订阅次数
-    def subTimes(self,filename):
-        self.filename = filename
-        command = 'cat %s |wc -l'% filename
-        times = int(subprocess.getstatusoutput(command)[1]) 
-        return times
-
-    def assertCheck(self,filename,queryResult,expectResult):
-        self.filename = filename
-        self.queryResult = queryResult
-        self.expectResult = expectResult
-        args0 = (filename, queryResult, expectResult)
-        assert queryResult == expectResult , "Queryfile:%s ,result is %s != expect: %s" % args0    
-
-    def run(self):
-        buildPath = self.getBuildPath()
-        if (buildPath == ""):
-            tdLog.exit("taosd not found!")
-        else:
-            tdLog.info("taosd found in %s" % buildPath)
-        binPath = buildPath+ "/build/bin/"      
-
-        # clear env
-        os.system("ps -ef |grep 'taosdemoAllTest/subAsync.json' |grep -v 'grep' |awk '{print $2}'|xargs kill -9")
-        sleep(1)
-        os.system("rm -rf ./subscribe_res*")  
-        os.system("rm -rf ./all_subscribe_res*") 
-
-        # subscribe: resultfile 
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/subInsertdata.json" % binPath)
-        os.system("nohup %staosBenchmark -f tools/taosdemoAllTest/subAsync.json &" % binPath)
-        query_pid = int(subprocess.getstatusoutput('ps aux|grep "taosdemoAllTest/subAsync.json" |grep -v "grep"|awk \'{print $2}\'')[1])
-
-        # insert extral data     
-        tdSql.execute("use db")
-        tdSql.execute("insert into stb00_0 values(1614218412000,'R','bf3',8637,98.861045)")   
-        tdSql.execute("insert into stb00_1 values(1614218412000,'R','bf3',8637,78.861045)(1614218422000,'R','bf3',8637,98.861045)")   
-        sleep(5)
-
-        # merge result files
-        os.system("cat subscribe_res0.txt* > all_subscribe_res0.txt")
-        os.system("cat subscribe_res1.txt* > all_subscribe_res1.txt")
-        os.system("cat subscribe_res2.txt* > all_subscribe_res2.txt")
-        os.system("cat subscribe_res3.txt* > all_subscribe_res3.txt")    
-
-        # correct subscribeTimes testcase
-        subTimes0 = self.subTimes("all_subscribe_res0.txt")
-        self.assertCheck("all_subscribe_res0.txt",subTimes0 ,22)
-
-        subTimes1 = self.subTimes("all_subscribe_res1.txt")
-        self.assertCheck("all_subscribe_res1.txt",subTimes1 ,24)
-
-        subTimes2 = self.subTimes("all_subscribe_res2.txt")
-        self.assertCheck("all_subscribe_res2.txt",subTimes2 ,21)
-
-        subTimes3 = self.subTimes("all_subscribe_res3.txt")
-        self.assertCheck("all_subscribe_res3.txt",subTimes3 ,13)
-
-        # correct data testcase
-  
-        os.system("kill -9 %d" % query_pid)
-  
-        # # query times less than or equal to 100
-        os.system("%staosBenchmark -f tools/taosdemoAllTest/subInsertdataMaxsql100.json" % binPath)
-        assert os.system("%staosBenchmark -f tools/taosdemoAllTest/subSyncSpecMaxsql100.json" % binPath) != 0
-        assert os.system("%staosBenchmark -f tools/taosdemoAllTest/subSyncSuperMaxsql100.json" % binPath) != 0
-        
-        # delete useless files
-        os.system("rm -rf ./insert_res.txt")
-        os.system("rm -rf tools/taosdemoAllTest/*.py.sql")        
-        os.system("rm -rf ./subscribe_res*")   
-        os.system("rm -rf ./all_subscribe*")
-         
-    def stop(self):
-        tdSql.close()
-        tdLog.success("%s successfully executed" % __file__)
-
-tdCases.addWindows(__file__, TDTestCase())
-tdCases.addLinux(__file__, TDTestCase())