未验证 提交 7917e3ad 编写于 作者: sangshuduo's avatar sangshuduo 提交者: GitHub

fix: taosbenchmark multithreads with limit for 2.6 (#20746)

* fix: taosbenchmark multithreads with limit for 2.6

* fix: update taos-tools

* fix: 5-taos-tools/taosbenchmark/taosdemoTestInsertWithJsonSml.py
上级 9ec695ad
Subproject commit d194dc93eefb80b8aa3e03d645197ef35fee92b7
Subproject commit 273a3fed3e3c5569933eb9122befd26c991ecfe4
......@@ -27,30 +27,33 @@ class TDTestCase:
def getBuildPath(self):
selfPath = os.path.dirname(os.path.realpath(__file__))
if ("community" in selfPath):
projPath = selfPath[:selfPath.find("community")]
if "community" in selfPath:
projPath = selfPath[: selfPath.find("community")]
else:
projPath = selfPath[:selfPath.find("tests")]
projPath = selfPath[: selfPath.find("tests")]
for root, dirs, files in os.walk(projPath):
if ("taosd" in files):
if "taosd" in files:
rootRealPath = os.path.dirname(os.path.realpath(root))
if ("packaging" not in rootRealPath):
buildPath = root[:len(root)-len("/build/bin")]
if "packaging" not in rootRealPath:
buildPath = root[: len(root) - len("/build/bin")]
break
return buildPath
def run(self):
buildPath = self.getBuildPath()
if (buildPath == ""):
if buildPath == "":
tdLog.exit("taosd not found!")
else:
tdLog.info("taosd found in %s" % buildPath)
binPath = buildPath+ "/build/bin/"
binPath = buildPath + "/build/bin/"
# insert: create one or mutiple tables per sql and insert multiple rows per sql
# line_protocol——telnet and json
os.system("%staosBenchmark -f 5-taos-tools/taosbenchmark/sml/insert-1s1tnt1r-sml.json -y " % binPath)
os.system(
"%staosBenchmark -f 5-taos-tools/taosbenchmark/sml/insert-1s1tnt1r-sml.json -y "
% binPath
)
tdSql.execute("use db")
tdSql.query("select count (tbname) from stb0")
tdSql.checkData(0, 0, 10)
......@@ -61,9 +64,11 @@ class TDTestCase:
tdSql.query("select count(*) from stb1")
tdSql.checkData(0, 0, 4000)
# insert: create mutiple tables per sql and insert one rows per sql .
os.system("%staosBenchmark -f 5-taos-tools/taosbenchmark/sml/insert-1s1tntmr-sml.json -y " % binPath)
os.system(
"%staosBenchmark -f 5-taos-tools/taosbenchmark/sml/insert-1s1tntmr-sml.json -y "
% binPath
)
tdSql.execute("use db")
tdSql.query("select count (tbname) from stb0")
tdSql.checkData(0, 0, 10)
......@@ -76,11 +81,14 @@ class TDTestCase:
# insert: using parament "insert_interval to controls spped of insert.
# but We need to have accurate methods to control the speed, such as getting the speed value, checking the count and so on。
os.system("%staosBenchmark -f 5-taos-tools/taosbenchmark/sml/insert-interval-speed-sml.json -y" % binPath)
os.system(
"%staosBenchmark -f 5-taos-tools/taosbenchmark/sml/insert-interval-speed-sml.json -y"
% binPath
)
tdSql.execute("use db")
# tdSql.query("select count (tbname) from stb0")
tdSql.query("select tbname from db.stb0")
tdSql.checkRows(100 )
tdSql.checkRows(100)
# tdSql.query("select count(*) from stb00_0")
# tdSql.checkData(0, 0, 20)
tdSql.query("select count(*) from stb0")
......@@ -98,36 +106,38 @@ class TDTestCase:
# os.system("%staosBenchmark -f 5-taos-tools/taosbenchmark/sml/insert-nodbnodrop-sml.json -y" % binPath)
# tdSql.error("show dbno.stables")
os.system("%staosBenchmark -f 5-taos-tools/taosbenchmark/sml/insert-newdb-sml.json -y" % binPath)
os.system(
"%staosBenchmark -f 5-taos-tools/taosbenchmark/sml/insert-newdb-sml.json -y"
% binPath
)
tdSql.execute("use db")
tdSql.query("select count (tbname) from stb0")
tdSql.checkData(0, 0, 5)
tdSql.query("select count (tbname) from stb1")
tdSql.checkData(0, 0, 6)
tdSql.query("select count (tbname) from stb2")
tdSql.checkData(0, 0, 7)
tdSql.checkData(0, 0, 4)
tdSql.query("select count (tbname) from stb3")
tdSql.checkData(0, 0, 8)
tdSql.query("select count (tbname) from stb4")
tdSql.checkData(0, 0, 8)
os.system("%staosBenchmark -f 5-taos-tools/taosbenchmark/sml/insert-renewdb-sml.json -y" % binPath)
tdSql.checkData(0, 0, 2)
os.system(
"%staosBenchmark -f 5-taos-tools/taosbenchmark/sml/insert-renewdb-sml.json -y"
% binPath
)
tdSql.execute("use db")
tdSql.query("select count(*) from stb0")
tdSql.checkData(0, 0, 50)
tdSql.query("select count(*) from stb1")
tdSql.checkData(0, 0, 120)
tdSql.query("select count(*) from stb2")
tdSql.checkData(0, 0, 140)
tdSql.checkData(0, 0, 80)
tdSql.query("select count(*) from stb3")
tdSql.checkData(0, 0, 160)
tdSql.checkData(0, 0, 40)
tdSql.query("select count(*) from stb4")
tdSql.checkData(0, 0, 160)
testcaseFilename = os.path.split(__file__)[-1]
os.system("rm -rf ./insert_res.txt")
os.system("rm -rf 5-taos-tools/taosbenchmark/%s.sql" % testcaseFilename )
os.system("rm -rf 5-taos-tools/taosbenchmark/%s.sql" % testcaseFilename)
def stop(self):
tdSql.close()
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册