From 28718b278f8b3724d0e0351a567bcd33274ad405 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Wed, 9 Mar 2022 13:57:11 +0800 Subject: [PATCH] Hotfix/sangshuduo/ts 1230 taosdump for2.4 (#10642) * remove -B from taosdump dump out * update taos-tools --- src/kit/taos-tools | 2 +- tests/pytest/tools/taosdumpTest2.py | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/kit/taos-tools b/src/kit/taos-tools index c7895975ca..e15409c518 160000 --- a/src/kit/taos-tools +++ b/src/kit/taos-tools @@ -1 +1 @@ -Subproject commit c7895975ca625b6380a48211c7b9102f967f6451 +Subproject commit e15409c5184167a96a9fe9ade026387073443d2f diff --git a/tests/pytest/tools/taosdumpTest2.py b/tests/pytest/tools/taosdumpTest2.py index 9f7076ff75..e2b62454e1 100644 --- a/tests/pytest/tools/taosdumpTest2.py +++ b/tests/pytest/tools/taosdumpTest2.py @@ -20,6 +20,7 @@ from util.dnodes import * import string import random + class TDTestCase: def init(self, conn, logSql): tdLog.debug("start to execute %s" % __file__) @@ -84,7 +85,7 @@ class TDTestCase: os.makedirs(self.tmpdir) os.system( - "%staosdump --databases db -o %s -B 16384 -y" % + "%staosdump --databases db -o %s -y" % (binPath, self.tmpdir)) tdSql.execute("drop database db") @@ -109,8 +110,13 @@ class TDTestCase: # test case for TS-1225 tdSql.execute("create database test") tdSql.execute("use test") - tdSql.execute("create table stb(ts timestamp, c1 binary(16374), c2 binary(16374), c3 binary(16374)) tags(t1 nchar(256))") - tdSql.execute("insert into t1 using stb tags('t1') values(now, '%s', '%s', '%s')" % (self.generateString(16374), self.generateString(16374), self.generateString(16374))) + tdSql.execute( + "create table stb(ts timestamp, c1 binary(16374), c2 binary(16374), c3 binary(16374)) tags(t1 nchar(256))") + tdSql.execute( + "insert into t1 using stb tags('t1') values(now, '%s', '%s', '%s')" % + (self.generateString(16374), + self.generateString(16374), + self.generateString(16374))) os.system("rm /tmp/*.sql") os.system("rm /tmp/*.avro*") -- GitLab