xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: replace tdSql.queryResult with res

This commit is contained in:
Alex Duan 2024-12-24 17:08:56 +08:00
parent f4e00a2483
commit ddee6b86bf
65 changed files with 95 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/army/tools/benchmark/basic/commandline-partial-col-numpy.py
View File

@ -34,7 +34,7 @@ class TDTestCase(TBase):
os.system("%s" % cmd)
tdSql.query("select * from test.meters")
dbresult = tdSql.queryResult
dbresult = tdSql.res
for i in range(len(dbresult[0])):
if i in (1, 2) and dbresult[0][i] is None:
tdLog.exit("result[0][%d] is NULL, which should not be" % i)

2
tests/army/tools/benchmark/basic/from-to.py
View File

@ -29,7 +29,7 @@ class TDTestCase(TBase):
def run(self):
tdSql.query("select client_version()")
client_ver = "".join(tdSql.queryResult[0])
client_ver = "".join(tdSql.res[0])
major_ver = client_ver.split(".")[0]
binPath = etool.benchMarkFile()

2
tests/army/tools/benchmark/basic/insert-json-csv.py
View File

@ -25,7 +25,7 @@ from frame import *
class TDTestCase(TBase):
def run(self):
tdSql.query("select client_version()")
client_ver = "".join(tdSql.queryResult[0])
client_ver = "".join(tdSql.res[0])
major_ver = client_ver.split(".")[0]
binPath = etool.benchMarkFile()

2
tests/army/tools/benchmark/basic/limit_offset_json.py
View File

@ -38,7 +38,7 @@ class TDTestCase(TBase):
tdSql.checkRows(8)
# tdSql.query("select * from db.stb")
# dbresult = tdSql.queryResult
# dbresult = tdSql.res
# print(dbresult)
# if dbresult != []:
# for i in range(len(dbresult[0])):

2
tests/army/tools/benchmark/basic/reuse-exist-stb.py
View File

@ -31,7 +31,7 @@ class TDTestCase(TBase):
def run(self):
tdSql.query("select client_version()")
client_ver = "".join(tdSql.queryResult[0])
client_ver = "".join(tdSql.res[0])
major_ver = client_ver.split(".")[0]
binPath = etool.benchMarkFile()

2
tests/army/tools/benchmark/basic/sml_interlace.py
View File

@ -28,7 +28,7 @@ class TDTestCase(TBase):
def run(self):
tdSql.query("select client_version()")
client_ver = "".join(tdSql.queryResult[0])
client_ver = "".join(tdSql.res[0])
major_ver = client_ver.split(".")[0]
binPath = etool.benchMarkFile()

2
tests/army/tools/benchmark/basic/sml_json_alltypes-interlace.py
View File

@ -28,7 +28,7 @@ class TDTestCase(TBase):
def run(self):
tdSql.query("select client_version()")
client_ver = "".join(tdSql.queryResult[0])
client_ver = "".join(tdSql.res[0])
major_ver = client_ver.split(".")[0]
binPath = etool.benchMarkFile()

2
tests/army/tools/benchmark/basic/sml_json_alltypes.py
View File

@ -31,7 +31,7 @@ class TDTestCase(TBase):
def run(self):
tdSql.query("select client_version()")
client_ver = "".join(tdSql.queryResult[0])
client_ver = "".join(tdSql.res[0])
major_ver = client_ver.split(".")[0]
binPath = etool.benchMarkFile()

4
tests/army/tools/benchmark/basic/sml_json_insert_alltypes-same-min-max.py
View File

@ -28,7 +28,7 @@ class TDTestCase(TBase):
def run(self):
tdSql.query("select client_version()")
client_ver = "".join(tdSql.queryResult[0])
client_ver = "".join(tdSql.res[0])
major_ver = client_ver.split(".")[0]
binPath = etool.benchMarkFile()
@ -40,7 +40,7 @@ class TDTestCase(TBase):
os.system("%s" % cmd)
tdSql.execute("reset query cache")
tdSql.query("select count(*) from db.stb")
rows = tdSql.queryResult[0]
rows = tdSql.res[0]
tdSql.query("select * from db.stb")
for row in range(rows[0]):
if major_ver == "3":

2
tests/army/tools/benchmark/basic/sml_taosjson_alltypes.py
View File

@ -28,7 +28,7 @@ class TDTestCase(TBase):
def run(self):
tdSql.query("select client_version()")
client_ver = "".join(tdSql.queryResult[0])
client_ver = "".join(tdSql.res[0])
major_ver = client_ver.split(".")[0]
binPath = etool.benchMarkFile()

2
tests/army/tools/benchmark/basic/sml_taosjson_insert_alltypes-same-min-max.py
View File

@ -36,7 +36,7 @@ class TDTestCase(TBase):
os.system("%s" % cmd)
tdSql.execute("reset query cache")
tdSql.query("select count(*) from db.stb")
rows = tdSql.queryResult[0]
rows = tdSql.res[0]
tdSql.query("select * from db.stb")
for row in range(rows[0]):
tdSql.checkData(row, 3, 1)

2
tests/army/tools/benchmark/basic/sml_telnet_alltypes.py
View File

@ -31,7 +31,7 @@ class TDTestCase(TBase):
def run(self):
tdSql.query("select client_version()")
client_ver = "".join(tdSql.queryResult[0])
client_ver = "".join(tdSql.res[0])
major_ver = client_ver.split(".")[0]
binPath = etool.benchMarkFile()

4
tests/army/tools/benchmark/basic/sml_telnet_insert_alltypes-same-min-max.py
View File

@ -28,7 +28,7 @@ class TDTestCase(TBase):
def run(self):
tdSql.query("select client_version()")
client_ver = "".join(tdSql.queryResult[0])
client_ver = "".join(tdSql.res[0])
major_ver = client_ver.split(".")[0]
binPath = etool.benchMarkFile()
@ -40,7 +40,7 @@ class TDTestCase(TBase):
os.system("%s" % cmd)
tdSql.execute("reset query cache")
tdSql.query("select count(*) from db.stb")
rows = tdSql.queryResult[0]
rows = tdSql.res[0]
tdSql.query("select * from db.stb")
for row in range(rows[0]):
if major_ver == "3":

2
tests/army/tools/benchmark/basic/stmt_insert_alltypes-same-min-max.py
View File

@ -36,7 +36,7 @@ class TDTestCase(TBase):
os.system("%s" % cmd)
tdSql.execute("reset query cache")
tdSql.query("select count(*) from db.t0")
rows = tdSql.queryResult[0]
rows = tdSql.res[0]
tdSql.query("select * from db.t0")
for row in range(rows[0]):
tdSql.checkData(row, 1, 1)

2
tests/army/tools/benchmark/basic/stmt_offset_json.py
View File

@ -38,7 +38,7 @@ class TDTestCase(TBase):
tdSql.checkRows(8)
# tdSql.query("select * from db.stb")
# dbresult = tdSql.queryResult
# dbresult = tdSql.res
# print(dbresult)
# if dbresult != []:
# for i in range(len(dbresult[0])):

2
tests/army/tools/benchmark/basic/stmt_sample_csv_json-subtable.py
View File

@ -62,7 +62,7 @@ class TDTestCase(TBase):
tdSql.query("select distinct(t0) from db.stb")
tdSql.checkRows(2)
dbresult = tdSql.queryResult
dbresult = tdSql.res
if dbresult[0][0] not in (17, None):
tdLog.exit("result[0][0]: {}".format(dbresult[0][0]))
else:

2
tests/army/tools/benchmark/basic/stmt_sample_csv_json.py
View File

@ -47,7 +47,7 @@ class TDTestCase(TBase):
tdSql.query("select distinct(t0) from db.stb")
tdSql.checkRows(2)
dbresult = tdSql.queryResult
dbresult = tdSql.res
if dbresult[0][0] not in (17, None):
tdLog.exit("result[0][0]: {}".format(dbresult[0][0]))
else:

5
tests/army/tools/benchmark/basic/stmt_sample_csv_json_doesnt_use_ts.py
View File

@ -26,8 +26,6 @@ class TDTestCase(TBase):
[TD-11510] taosBenchmark test cases
"""
def run(self):
binPath = etool.benchMarkFile()
cmd = "%s -f ./tools/benchmark/basic/json/stmt_sample_doesnt_use_ts.json" % binPath
@ -47,7 +45,8 @@ class TDTestCase(TBase):
tdSql.query("select distinct(t0) from db.stb")
tdSql.checkRows(2)
dbresult = tdSql.queryResult
dbresult = tdSql.res
if dbresult[0][0] not in (17, None):
tdLog.exit("result[0][0]: {}".format(dbresult[0][0]))
else:

2
tests/army/tools/benchmark/basic/stream_function_test.py
View File

@ -40,7 +40,7 @@ class TDTestCase(TBase):
tdSql.query("select count(*) from stream_test.stb")
tdSql.checkData(0, 0, 100000)
tdSql.query("select count(*) from stream_test.output_streamtb;")
tdSql.checkEqual(tdSql.queryResult[0][0] >= 0, True)
tdSql.checkEqual(tdSql.res[0][0] >= 0, True)
def stop(self):
tdSql.close()

2
tests/army/tools/benchmark/basic/taosc_auto_create_table_json.py
View File

@ -31,7 +31,7 @@ class TDTestCase(TBase):
def run(self):
tdSql.query("select client_version()")
client_ver = "".join(tdSql.queryResult[0])
client_ver = "".join(tdSql.res[0])
major_ver = client_ver.split(".")[0]
binPath = etool.benchMarkFile()

2
tests/army/tools/benchmark/basic/taosc_insert-table-creating-interval.py
View File

@ -32,7 +32,7 @@ class TDTestCase(TBase):
def run(self):
tdSql.query("select client_version()")
client_ver = "".join(tdSql.queryResult[0])
client_ver = "".join(tdSql.res[0])
major_ver = client_ver.split(".")[0]
binPath = etool.benchMarkFile()

2
tests/army/tools/benchmark/basic/taosc_insert_alltypes-same-min-max.py
View File

@ -36,7 +36,7 @@ class TDTestCase(TBase):
os.system("%s" % cmd)
tdSql.execute("reset query cache")
tdSql.query("select count(*) from db.t0")
rows = tdSql.queryResult[0]
rows = tdSql.res[0]
tdSql.query("select * from db.t0")
for row in range(rows[0]):
tdSql.checkData(row, 1, 1)

2
tests/army/tools/benchmark/basic/taosc_insert_alltypes_json-partial-col.py
View File

@ -77,7 +77,7 @@ class TDTestCase(TBase):
tdSql.query("select count(*) from db.stb where c1 >= 0 and c1 <= 10")
tdSql.checkData(0, 0, 160)
tdSql.query("select c0,c1,c2 from db.stb limit 1")
dbresult = tdSql.queryResult
dbresult = tdSql.res
for i in range(len(dbresult[0])):
if i in (0, 1) and dbresult[0][i] is None:
tdLog.exit("result[0][%d] is NULL, which should not be" % i)

2
tests/army/tools/benchmark/basic/taosc_insert_alltypes_json.py
View File

@ -28,7 +28,7 @@ class TDTestCase(TBase):
def run(self):
tdSql.query("select client_version()")
client_ver = "".join(tdSql.queryResult[0])
client_ver = "".join(tdSql.res[0])
major_ver = client_ver.split(".")[0]
binPath = etool.benchMarkFile()

2
tests/army/tools/benchmark/basic/taosc_sample_csv_json-subtable.py
View File

@ -62,7 +62,7 @@ class TDTestCase(TBase):
tdSql.query("select distinct(t0) from db.stb")
tdSql.checkRows(2)
dbresult = tdSql.queryResult
dbresult = tdSql.res
if dbresult[0][0] not in (17, None):
tdLog.exit("result[0][0]: {}".format(dbresult[0][0]))
else:

2
tests/army/tools/benchmark/basic/taosc_sample_csv_json.py
View File

@ -47,7 +47,7 @@ class TDTestCase(TBase):
tdSql.query("select distinct(t0) from db.stb")
tdSql.checkRows(2)
dbresult = tdSql.queryResult
dbresult = tdSql.res
if dbresult[0][0] not in (17, None):
tdLog.exit("result[0][0]: {}".format(dbresult[0][0]))
else:

2
tests/army/tools/benchmark/basic/taosdemoTestInsertWithJsonStmt-otherPara.py
View File

@ -27,7 +27,7 @@ class TDTestCase(TBase):
def run(self):
tdSql.query("select client_version()")
client_ver = "".join(tdSql.queryResult[0])
client_ver = "".join(tdSql.res[0])
major_ver = client_ver.split(".")[0]
binPath = etool.benchMarkFile()

2
tests/army/tools/benchmark/basic/telnet_tcp.py
View File

@ -32,7 +32,7 @@ class TDTestCase(TBase):
def run(self):
tdSql.query("select client_version()")
client_ver = "".join(tdSql.queryResult[0])
client_ver = "".join(tdSql.res[0])
major_ver = client_ver.split(".")[0]
binPath = etool.benchMarkFile()

9
tests/army/tools/runcase.sh Normal file
View File

@ -0,0 +1,9 @@
set -e
count=0
for i in `find tools/benchmark/basic/ -name "*.py"`
do printf "cnt=$count python3 test.py -f $i \n"
python3 test.py -f $i
((count=count+1))
done
echo "benchmark/basic count=$count \n"

2
tests/army/tools/taosdump/native/taosdumpDbNtb.py
View File

@ -84,7 +84,7 @@ class TDTestCase:
os.system("%s -i %s -T 1 -W db=newdb" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):

2
tests/army/tools/taosdump/native/taosdumpDbStb.py
View File

@ -85,7 +85,7 @@ class TDTestCase:
os.system("%s -i %s -T 1 -W db=newdb" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):

2
tests/army/tools/taosdump/native/taosdumpDbWithNonRoot.py
View File

@ -87,7 +87,7 @@ class TDTestCase:
os.system("%s -i %s -T 1 -W db=newdb" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):

2
tests/army/tools/taosdump/native/taosdumpEscapedDb.py
View File

@ -71,7 +71,7 @@ class TDTestCase:
os.system("%s -e -i %s -T 1 -W Db=NewDb" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):

4
tests/army/tools/taosdump/native/taosdumpInDiffType.py
View File

@ -69,7 +69,7 @@ class TDTestCase:
os.system("%s -i %s -T 1" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):
@ -83,7 +83,7 @@ class TDTestCase:
tdSql.execute("use db")
tdSql.query("SELECT * from tb")
for i in range(1, len(tdSql.queryResult[0])):
for i in range(1, len(tdSql.res[0])):
tdSql.checkData(0, i, None)
def stop(self):

2
tests/army/tools/taosdump/native/taosdumpManyCols.py
View File

@ -89,7 +89,7 @@ class TDTestCase:
os.system("%s -i %s -T 1" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):

4
tests/army/tools/taosdump/native/taosdumpTest.py
View File

@ -91,7 +91,7 @@ class TDTestCase:
tdSql.execute("use newdb")
tdSql.query("select * from information_schema.ins_databases")
tdSql.checkRows(4)
dbresult = tdSql.queryResult
dbresult = tdSql.res
# 6--duration,7--keep0,keep1,keep
isCommunity = self.checkCommunity()
@ -116,7 +116,7 @@ class TDTestCase:
tdSql.query("show tables")
tdSql.checkRows(2)
dbresult = tdSql.queryResult
dbresult = tdSql.res
print(dbresult)
for i in range(len(dbresult)):
assert (dbresult[i][0] == "t1") or (dbresult[i][0] == "t2")

2
tests/army/tools/taosdump/native/taosdumpTestBasic.py
View File

@ -85,7 +85,7 @@ class TDTestCase:
os.system("%s -i %s -T 1" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):

2
tests/army/tools/taosdump/native/taosdumpTestLooseMode.py
View File

@ -75,7 +75,7 @@ class TDTestCase:
os.system("%s -i %s -T 1" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):

2
tests/army/tools/taosdump/native/taosdumpTestTypeBigInt.py
View File

@ -73,7 +73,7 @@ class TDTestCase:
os.system("%s -i %s -T 1" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):

4
tests/army/tools/taosdump/native/taosdumpTestTypeBinary.py
View File

@ -67,7 +67,7 @@ class TDTestCase:
os.system("%s -i %s" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):
@ -85,7 +85,7 @@ class TDTestCase:
tdSql.query("show tables")
tdSql.checkRows(2)
dbresult = tdSql.queryResult
dbresult = tdSql.res
print(dbresult)
for i in range(len(dbresult)):
assert dbresult[i][0] in ("t1", "t2")

6
tests/army/tools/taosdump/native/taosdumpTestTypeBool.py
View File

@ -66,7 +66,7 @@ class TDTestCase:
os.system("%s -i %s" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):
@ -84,7 +84,7 @@ class TDTestCase:
tdSql.query("show tables")
tdSql.checkRows(3)
dbresult = tdSql.queryResult
dbresult = tdSql.res
print(dbresult)
for i in range(len(dbresult)):
assert (
@ -95,7 +95,7 @@ class TDTestCase:
tdSql.query("select btag from st")
tdSql.checkRows(3)
dbresult = tdSql.queryResult
dbresult = tdSql.res
print(dbresult)
tdSql.query("select * from st where btag = true")

2
tests/army/tools/taosdump/native/taosdumpTestTypeDouble.py
View File

@ -74,7 +74,7 @@ class TDTestCase:
os.system("%s -i %s -T 1" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):

2
tests/army/tools/taosdump/native/taosdumpTestTypeFloat.py
View File

@ -74,7 +74,7 @@ class TDTestCase:
os.system("%s -i %s -T 1" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):

2
tests/army/tools/taosdump/native/taosdumpTestTypeInt.py
View File

@ -70,7 +70,7 @@ class TDTestCase:
os.system("%s -i %s -T 1" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):

8
tests/army/tools/taosdump/native/taosdumpTestTypeJson.py
View File

@ -69,7 +69,7 @@ class TDTestCase:
os.system("%s -i %s -g" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):
@ -88,7 +88,7 @@ class TDTestCase:
tdSql.query("show tables")
tdSql.checkRows(3)
dbresult = tdSql.queryResult
dbresult = tdSql.res
print(dbresult)
for i in range(len(dbresult)):
assert (
@ -100,7 +100,7 @@ class TDTestCase:
tdSql.query("select jtag->'location' from st")
tdSql.checkRows(3)
dbresult = tdSql.queryResult
dbresult = tdSql.res
print(dbresult)
found = False
for i in range(len(dbresult)):
@ -118,7 +118,7 @@ class TDTestCase:
tdSql.query("select jtag from st")
tdSql.checkRows(3)
dbresult = tdSql.queryResult
dbresult = tdSql.res
print(dbresult)
found = False
for i in range(len(dbresult)):

2
tests/army/tools/taosdump/native/taosdumpTestTypeSmallInt.py
View File

@ -71,7 +71,7 @@ class TDTestCase:
os.system("%s -i %s -T 1" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):

2
tests/army/tools/taosdump/native/taosdumpTestTypeTinyInt.py
View File

@ -73,7 +73,7 @@ class TDTestCase:
os.system("%s -i %s -T 1" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):

2
tests/army/tools/taosdump/native/taosdumpTestTypeUnsignedBigInt.py
View File

@ -70,7 +70,7 @@ class TDTestCase:
os.system("%s -i %s -T 1 -g" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):

2
tests/army/tools/taosdump/native/taosdumpTestTypeUnsignedInt.py
View File

@ -70,7 +70,7 @@ class TDTestCase:
os.system("%s -i %s -T 1 -g" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):

2
tests/army/tools/taosdump/native/taosdumpTestTypeUnsignedSmallInt.py
View File

@ -70,7 +70,7 @@ class TDTestCase:
os.system("%s -i %s -T 1 -g" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):

2
tests/army/tools/taosdump/native/taosdumpTestTypeUnsignedTinyInt.py
View File

@ -70,7 +70,7 @@ class TDTestCase:
os.system("%s -i %s -T 1 -g" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):

2
tests/army/tools/taosdump/ws3/taosdumpEscapedDb.py
View File

@ -71,7 +71,7 @@ class TDTestCase:
os.system("%s -R -e -i %s -T 1" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):

2
tests/army/tools/taosdump/ws3/taosdumpTestTypeBigInt.py
View File

@ -74,7 +74,7 @@ class TDTestCase:
os.system("%s -R -i %s -T 1" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):

4
tests/army/tools/taosdump/ws3/taosdumpTestTypeBinary.py
View File

@ -68,7 +68,7 @@ class TDTestCase:
os.system("%s -R -i %s" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):
@ -86,7 +86,7 @@ class TDTestCase:
tdSql.query("show tables")
tdSql.checkRows(2)
dbresult = tdSql.queryResult
dbresult = tdSql.res
print(dbresult)
for i in range(len(dbresult)):
assert dbresult[i][0] in ("t1", "t2")

8
tests/army/tools/taosdump/ws3/taosdumpTestTypeBool.py
View File

@ -67,7 +67,7 @@ class TDTestCase:
os.system("%s -R -i %s" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):
@ -85,7 +85,7 @@ class TDTestCase:
tdSql.query("show tables")
tdSql.checkRows(3)
dbresult = tdSql.queryResult
dbresult = tdSql.res
print(dbresult)
for i in range(len(dbresult)):
assert (
@ -96,7 +96,7 @@ class TDTestCase:
tdSql.query("select btag from st")
tdSql.checkRows(3)
dbresult = tdSql.queryResult
dbresult = tdSql.res
print(dbresult)
tdSql.query("select * from st where btag = true")
@ -110,7 +110,7 @@ class TDTestCase:
tdSql.checkData(0, 2, "False")
tdSql.query("select * from st where btag is null")
dbresult = tdSql.queryResult
dbresult = tdSql.res
print(dbresult)
tdSql.checkRows(1)
tdSql.checkData(0, 1, None)

4
tests/army/tools/taosdump/ws3/taosdumpTestTypeDouble.py
View File

@ -75,7 +75,7 @@ class TDTestCase:
os.system("%s -R -i %s -T 1" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):
@ -133,7 +133,7 @@ class TDTestCase:
tdLog.exit("data is different")
tdSql.query("select * from st where dbtag is null")
dbresult = tdSql.queryResult
dbresult = tdSql.res
print(dbresult)
tdSql.checkRows(1)

2
tests/army/tools/taosdump/ws3/taosdumpTestTypeFloat.py
View File

@ -75,7 +75,7 @@ class TDTestCase:
os.system("%s -R -i %s -T 1" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):

4
tests/army/tools/taosdump/ws3/taosdumpTestTypeInt.py
View File

@ -71,7 +71,7 @@ class TDTestCase:
os.system("%s -R -i %s -T 1" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):
@ -109,7 +109,7 @@ class TDTestCase:
tdSql.checkData(0, 2, -2147483647)
tdSql.query("select * from st where ntag is null")
dbresult = tdSql.queryResult
dbresult = tdSql.res
print(dbresult)
tdSql.checkRows(1)
tdSql.checkData(0, 0, 0)

8
tests/army/tools/taosdump/ws3/taosdumpTestTypeJson.py
View File

@ -70,7 +70,7 @@ class TDTestCase:
os.system("%s -R -i %s" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):
@ -89,7 +89,7 @@ class TDTestCase:
tdSql.query("show tables")
tdSql.checkRows(3)
dbresult = tdSql.queryResult
dbresult = tdSql.res
print(dbresult)
for i in range(len(dbresult)):
assert (
@ -101,7 +101,7 @@ class TDTestCase:
tdSql.query("select jtag->'location' from st")
tdSql.checkRows(3)
dbresult = tdSql.queryResult
dbresult = tdSql.res
print(dbresult)
found = False
for i in range(len(dbresult)):
@ -119,7 +119,7 @@ class TDTestCase:
tdSql.query("select jtag from st")
tdSql.checkRows(3)
dbresult = tdSql.queryResult
dbresult = tdSql.res
print(dbresult)
found = False
for i in range(len(dbresult)):

2
tests/army/tools/taosdump/ws3/taosdumpTestTypeSmallInt.py
View File

@ -72,7 +72,7 @@ class TDTestCase:
os.system("%s -R -i %s -T 1" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):

4
tests/army/tools/taosdump/ws3/taosdumpTestTypeTinyInt.py
View File

@ -74,7 +74,7 @@ class TDTestCase:
os.system("%s -R -i %s -T 1" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):
@ -112,7 +112,7 @@ class TDTestCase:
tdSql.checkData(0, 2, -127)
tdSql.query("select * from st where tntag is null")
dbresult = tdSql.queryResult
dbresult = tdSql.res
print(dbresult)
tdSql.checkRows(1)

2
tests/army/tools/taosdump/ws3/taosdumpTestTypeUnsignedBigInt.py
View File

@ -72,7 +72,7 @@ class TDTestCase:
os.system("%s -R -i %s -T 1" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):

4
tests/army/tools/taosdump/ws3/taosdumpTestTypeUnsignedInt.py
View File

@ -71,7 +71,7 @@ class TDTestCase:
os.system("%s -R -i %s -T 1" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):
@ -103,7 +103,7 @@ class TDTestCase:
tdSql.checkData(0, 2, 4294967294)
tdSql.query("select * from st where untag is null")
dbresult = tdSql.queryResult
dbresult = tdSql.res
print(dbresult)
tdSql.checkRows(1)

2
tests/army/tools/taosdump/ws3/taosdumpTestTypeUnsignedSmallInt.py
View File

@ -72,7 +72,7 @@ class TDTestCase:
os.system("%s -R -i %s -T 1" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):

2
tests/army/tools/taosdump/ws3/taosdumpTestTypeUnsignedTinyInt.py
View File

@ -72,7 +72,7 @@ class TDTestCase:
os.system("%s -R -i %s -T 1" % (binPath, self.tmpdir))
tdSql.query("show databases")
dbresult = tdSql.queryResult
dbresult = tdSql.res
found = False
for i in range(len(dbresult)):