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

[TD-14540]<impr>: taosdump code cleanup for2.4 (#11299)

* [TD-14540]<impr>: taosdump code cleanup

for 2.4

* update taos-tools

for 2.4

* refine 5-taos-tools/taosdump/taosdumpTestInspect.py
上级 7f347fcf
Subproject commit da06f99e10224d39079232e9605e92cbcd1cecb3 Subproject commit 3a1a45a2b17be3305d1561d8f79e7a9fb42be8f4
...@@ -59,15 +59,15 @@ class TDTestCase: ...@@ -59,15 +59,15 @@ class TDTestCase:
tdSql.execute("use db") tdSql.execute("use db")
tdSql.execute( tdSql.execute(
"create table st(ts timestamp, c1 INT) tags(ntag INT)") "create table st(ts timestamp, c1 INT, c2 BOOL, c3 TINYINT, c4 SMALLINT, c5 BIGINT, c6 FLOAT, c7 DOUBLE, c8 TIMESTAMP, c9 BINARY(10), c10 NCHAR(10), c11 TINYINT UNSIGNED, c12 SMALLINT UNSIGNED, c13 INT UNSIGNED, c14 BIGINT UNSIGNED) tags(n1 INT, w2 BOOL, t3 TINYINT, t4 SMALLINT, t5 BIGINT, t6 FLOAT, t7 DOUBLE, t8 TIMESTAMP, t9 BINARY(10), t10 NCHAR(10), t11 TINYINT UNSIGNED, t12 SMALLINT UNSIGNED, t13 INT UNSIGNED, t14 BIGINT UNSIGNED)")
tdSql.execute("create table t1 using st tags(1)") tdSql.execute(
tdSql.execute("insert into t1 values(1640000000000, 1)") "create table t1 using st tags(1, true, 1, 1, 1, 1.0, 1.0, 1, '1', '一', 1, 1, 1, 1)")
tdSql.execute("create table t2 using st tags(2147483647)") tdSql.execute(
tdSql.execute("insert into t2 values(1640000000000, 2147483647)") "insert into t1 values(1640000000000, 1, true, 1, 1, 1, 1.0, 1.0, 1, '1', '一', 1, 1, 1, 1)")
tdSql.execute("create table t3 using st tags(-2147483647)") tdSql.execute(
tdSql.execute("insert into t3 values(1640000000000, -2147483647)") "create table t2 using st tags(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL)")
tdSql.execute("create table t4 using st tags(NULL)") tdSql.execute(
tdSql.execute("insert into t4 values(1640000000000, NULL)") "insert into t2 values(1640000000000, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL)")
# sys.exit(1) # sys.exit(1)
...@@ -96,10 +96,10 @@ class TDTestCase: ...@@ -96,10 +96,10 @@ class TDTestCase:
taosdumpInspectCmd, shell=True).decode("utf-8") taosdumpInspectCmd, shell=True).decode("utf-8")
print("schema found times: %d" % int(schemaTimes)) print("schema found times: %d" % int(schemaTimes))
if (int(schemaTimes) != 5): if (int(schemaTimes) != 3):
caller = inspect.getframeinfo(inspect.stack()[0][0]) caller = inspect.getframeinfo(inspect.stack()[0][0])
tdLog.exit( tdLog.exit(
"%s(%d) failed: expected schema found times 5, actual %d" % "%s(%d) failed: expected schema found times 3, actual %d" %
(caller.filename, caller.lineno, int(schemaTimes))) (caller.filename, caller.lineno, int(schemaTimes)))
taosdumpInspectCmd = "%s -I %s/*.avro* | grep '=== Records:'|wc -l" % ( taosdumpInspectCmd = "%s -I %s/*.avro* | grep '=== Records:'|wc -l" % (
...@@ -108,10 +108,10 @@ class TDTestCase: ...@@ -108,10 +108,10 @@ class TDTestCase:
taosdumpInspectCmd, shell=True).decode("utf-8") taosdumpInspectCmd, shell=True).decode("utf-8")
print("records found times: %d" % int(recordsTimes)) print("records found times: %d" % int(recordsTimes))
if (int(recordsTimes) != 5): if (int(recordsTimes) != 3):
caller = inspect.getframeinfo(inspect.stack()[0][0]) caller = inspect.getframeinfo(inspect.stack()[0][0])
tdLog.exit( tdLog.exit(
"%s(%d) failed: expected records found times 5, actual %d" % "%s(%d) failed: expected records found times 3, actual %d" %
(caller.filename, caller.lineno, int(recordsTimes))) (caller.filename, caller.lineno, int(recordsTimes)))
def stop(self): def stop(self):
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册