diff --git a/tests/system-test/0-others/taosdShell.py b/tests/system-test/0-others/taosdShell.py index 868aa198f1eb991945c8a7fced1e21bd26446543..6d62420efec4bebd89e8656b2e966dac861318e3 100644 --- a/tests/system-test/0-others/taosdShell.py +++ b/tests/system-test/0-others/taosdShell.py @@ -176,290 +176,7 @@ class TDTestCase: startAction = " -k" tdLog.printNoPrefix("================================ parameter: %s"%startAction) self.taosdCommandExe(startAction,taosdCmdRun) - - # if retCode != "TAOS_OK": - # tdLog.exit("taos -h %s fail"%keyDict['h']) - # else: - # #dataDbName = ["information_schema", "performance_schema", "db", newDbName] - # tdSql.query("select * from information_schema.ins_databases") - # #tdSql.getResult("select * from information_schema.ins_databases") - # for i in range(tdSql.queryRows): - # if tdSql.getData(i, 0) == newDbName: - # break - # else: - # tdLog.exit("create db fail after taos -h %s fail"%keyDict['h']) - - # tdSql.query('drop database %s'%newDbName) - - # tdLog.printNoPrefix("================================ parameter: -P") - # #tdDnodes.stop(1) - # #sleep(3) - # #tdDnodes.start(1) - # #sleep(3) - # #keyDict['P'] = 6030 - # newDbName = "dbpp" - # sqlString = 'create database ' + newDbName + ';' - # retCode = taos_command(buildPath, "P", keyDict['P'], "taos>", keyDict['c'], sqlString) - # if retCode != "TAOS_OK": - # tdLog.exit("taos -P %s fail"%keyDict['P']) - # else: - # tdSql.query("select * from information_schema.ins_databases") - # for i in range(tdSql.queryRows): - # if tdSql.getData(i, 0) == newDbName: - # break - # else: - # tdLog.exit("create db fail after taos -P %s fail"%keyDict['P']) - - # tdSql.query('drop database %s'%newDbName) - - # tdLog.printNoPrefix("================================ parameter: -u") - # newDbName="dbu" - # sqlString = 'create database ' + newDbName + ';' - # retCode = taos_command(buildPath, "u", keyDict['u'], "taos>", keyDict['c'], sqlString, "p", keyDict['p']) - # if retCode != "TAOS_OK": - # tdLog.exit("taos -u %s -p%s fail"%(keyDict['u'], keyDict['p'])) - # else: - # tdSql.query("select * from information_schema.ins_databases") - # for i in range(tdSql.queryRows): - # if tdSql.getData(i, 0) == newDbName: - # break - # else: - # tdLog.exit("create db fail after taos -u %s -p%s fail"%(keyDict['u'], keyDict['p'])) - - # tdSql.query('drop database %s'%newDbName) - - # tdLog.printNoPrefix("================================ parameter: -A") - # newDbName="dbaa" - # retCode, retVal = taos_command(buildPath, "p", keyDict['p'], "taos>", keyDict['c'], '', "A", '') - # if retCode != "TAOS_OK": - # tdLog.exit("taos -A fail") - - # sqlString = 'create database ' + newDbName + ';' - # retCode = taos_command(buildPath, "u", keyDict['u'], "taos>", keyDict['c'], sqlString, 'a', retVal) - # if retCode != "TAOS_OK": - # tdLog.exit("taos -u %s -a %s"%(keyDict['u'], retVal)) - - # tdSql.query("select * from information_schema.ins_databases") - # for i in range(tdSql.queryRows): - # if tdSql.getData(i, 0) == newDbName: - # break - # else: - # tdLog.exit("create db fail after taos -u %s -a %s fail"%(keyDict['u'], retVal)) - - # tdSql.query('drop database %s'%newDbName) - - # tdLog.printNoPrefix("================================ parameter: -s") - # newDbName="dbss" - # keyDict['s'] = "\"create database " + newDbName + "\"" - # retCode = taos_command(buildPath, "s", keyDict['s'], "Query OK", keyDict['c'], '', '', '') - # if retCode != "TAOS_OK": - # tdLog.exit("taos -s fail") - - # print ("========== check new db ==========") - # tdSql.query("select * from information_schema.ins_databases") - # for i in range(tdSql.queryRows): - # if tdSql.getData(i, 0) == newDbName: - # break - # else: - # tdLog.exit("create db fail after taos -s %s fail"%(keyDict['s'])) - - # keyDict['s'] = "\"create table " + newDbName + ".stb (ts timestamp, c int) tags (t int)\"" - # retCode = taos_command(buildPath, "s", keyDict['s'], "Query OK", keyDict['c'], '', '', '') - # if retCode != "TAOS_OK": - # tdLog.exit("taos -s create table fail") - - # keyDict['s'] = "\"create table " + newDbName + ".ctb0 using " + newDbName + ".stb tags (0) " + newDbName + ".ctb1 using " + newDbName + ".stb tags (1)\"" - # retCode = taos_command(buildPath, "s", keyDict['s'], "Query OK", keyDict['c'], '', '', '') - # if retCode != "TAOS_OK": - # tdLog.exit("taos -s create table fail") - - # keyDict['s'] = "\"insert into " + newDbName + ".ctb0 values('2021-04-01 08:00:00.000', 10)('2021-04-01 08:00:01.000', 20) " + newDbName + ".ctb1 values('2021-04-01 08:00:00.000', 11)('2021-04-01 08:00:01.000', 21)\"" - # retCode = taos_command(buildPath, "s", keyDict['s'], "Query OK", keyDict['c'], '', '', '') - # if retCode != "TAOS_OK": - # tdLog.exit("taos -s insert data fail") - - # sqlString = "select * from " + newDbName + ".ctb0" - # tdSql.query(sqlString) - # tdSql.checkData(0, 0, '2021-04-01 08:00:00.000') - # tdSql.checkData(0, 1, 10) - # tdSql.checkData(1, 0, '2021-04-01 08:00:01.000') - # tdSql.checkData(1, 1, 20) - # sqlString = "select * from " + newDbName + ".ctb1" - # tdSql.query(sqlString) - # tdSql.checkData(0, 0, '2021-04-01 08:00:00.000') - # tdSql.checkData(0, 1, 11) - # tdSql.checkData(1, 0, '2021-04-01 08:00:01.000') - # tdSql.checkData(1, 1, 21) - - # keyDict['s'] = "\"select * from " + newDbName + ".ctb0\"" - # retCode = taos_command(buildPath, "s", keyDict['s'], "2021-04-01 08:00:01.000", keyDict['c'], '', '', '') - # if retCode != "TAOS_OK": - # tdLog.exit("taos -r show fail") - - # tdLog.printNoPrefix("================================ parameter: -r") - # keyDict['s'] = "\"select * from " + newDbName + ".ctb0\"" - # retCode = taos_command(buildPath, "s", keyDict['s'], "1617235200000", keyDict['c'], '', 'r', '') - # if retCode != "TAOS_OK": - # tdLog.exit("taos -r show fail") - - # keyDict['s'] = "\"select * from " + newDbName + ".ctb1\"" - # retCode = taos_command(buildPath, "s", keyDict['s'], "1617235201000", keyDict['c'], '', 'r', '') - # if retCode != "TAOS_OK": - # tdLog.exit("taos -r show fail") - - # tdSql.query('drop database %s'%newDbName) - - # tdLog.printNoPrefix("================================ parameter: -f") - # pwd=os.getcwd() - # newDbName="dbf" - # sqlFile = pwd + "/0-others/sql.txt" - # sql1 = "echo create database " + newDbName + " > " + sqlFile - # sql2 = "echo use " + newDbName + " >> " + sqlFile - # if platform.system().lower() == 'windows': - # sql3 = "echo create table ntbf (ts timestamp, c binary(40)) >> " + sqlFile - # sql4 = "echo insert into ntbf values (\"2021-04-01 08:00:00.000\", \"test taos -f1\")(\"2021-04-01 08:00:01.000\", \"test taos -f2\") >> " + sqlFile - # else: - # sql3 = "echo 'create table ntbf (ts timestamp, c binary(40))' >> " + sqlFile - # sql4 = "echo 'insert into ntbf values (\"2021-04-01 08:00:00.000\", \"test taos -f1\")(\"2021-04-01 08:00:01.000\", \"test taos -f2\")' >> " + sqlFile - # sql5 = "echo show databases >> " + sqlFile - # os.system(sql1) - # os.system(sql2) - # os.system(sql3) - # os.system(sql4) - # os.system(sql5) - - # keyDict['f'] = pwd + "/0-others/sql.txt" - # retCode = taos_command(buildPath, "f", keyDict['f'], 'performance_schema', keyDict['c'], '', '', '') - # print("============ ret code: ", retCode) - # if retCode != "TAOS_OK": - # tdLog.exit("taos -f fail") - - # print ("========== check new db ==========") - # tdSql.query("select * from information_schema.ins_databases") - # for i in range(tdSql.queryRows): - # #print ("dbseq: %d, dbname: %s"%(i, tdSql.getData(i, 0))) - # if tdSql.getData(i, 0) == newDbName: - # break - # else: - # tdLog.exit("create db fail after taos -f fail") - - # sqlString = "select * from " + newDbName + ".ntbf" - # tdSql.query(sqlString) - # tdSql.checkData(0, 0, '2021-04-01 08:00:00.000') - # tdSql.checkData(0, 1, 'test taos -f1') - # tdSql.checkData(1, 0, '2021-04-01 08:00:01.000') - # tdSql.checkData(1, 1, 'test taos -f2') - - # shellCmd = "rm -f " + sqlFile - # os.system(shellCmd) - # tdSql.query('drop database %s'%newDbName) - - # tdLog.printNoPrefix("================================ parameter: -C") - # #newDbName="dbcc" - # retCode, retVal = taos_command(buildPath, "C", keyDict['C'], "buildinfo", keyDict['c'], '', '', '') - # if retCode != "TAOS_OK": - # tdLog.exit("taos -C fail") - - - # #print ("-C return content:\n ", retVal) - # totalCfgItem = {"firstEp":['', '', ''], } - # for line in retVal.splitlines(): - # strList = line.split() - # if (len(strList) > 2): - # totalCfgItem[strList[1]] = strList - - # #print ("dict content:\n ", totalCfgItem) - # firstEp = keyDict["h"] + ':' + keyDict['P'] - # if (totalCfgItem["firstEp"][2] != firstEp) and (totalCfgItem["firstEp"][0] != 'cfg_file'): - # tdLog.exit("taos -C return firstEp error!") - - # if (totalCfgItem["rpcDebugFlag"][2] != self.rpcDebugFlagVal) and (totalCfgItem["rpcDebugFlag"][0] != 'cfg_file'): - # tdLog.exit("taos -C return rpcDebugFlag error!") - - # count = os.cpu_count() - # if (totalCfgItem["numOfCores"][2] != count) and (totalCfgItem["numOfCores"][0] != 'default'): - # tdLog.exit("taos -C return numOfCores error!") - - # version = totalCfgItem["version"][2] - - # tdLog.printNoPrefix("================================ parameter: -V") - # #newDbName="dbvv" - # retCode, retVal = taos_command(buildPath, "V", keyDict['V'], "", keyDict['c'], '', '', '') - # if retCode != "TAOS_OK": - # tdLog.exit("taos -V fail") - - # version = 'version: ' + version - # retVal = retVal.replace("\n", "") - # retVal = retVal.replace("\r", "") - # if retVal != version: - # print ("return version: [%s]"%retVal) - # print ("dict version: [%s]"%version) - # tdLog.exit("taos -V version not match") - - # tdLog.printNoPrefix("================================ parameter: -d") - # newDbName="dbd" - # sqlString = 'create database ' + newDbName + ';' - # retCode = taos_command(buildPath, "d", keyDict['d'], "taos>", keyDict['c'], sqlString, '', '') - # if retCode != "TAOS_OK": - # tdLog.exit("taos -d %s fail"%(keyDict['d'])) - # else: - # tdSql.query("select * from information_schema.ins_databases") - # for i in range(tdSql.queryRows): - # if tdSql.getData(i, 0) == newDbName: - # break - # else: - # tdLog.exit("create db fail after taos -d %s fail"%(keyDict['d'])) - - # tdSql.query('drop database %s'%newDbName) - - # retCode = taos_command(buildPath, "d", 'dbno', "taos>", keyDict['c'], sqlString, '', '') - # if retCode != "TAOS_FAIL": - # tdLog.exit("taos -d dbno fail") - - # tdLog.printNoPrefix("================================ parameter: -w") - # newDbName="dbw" - # keyDict['s'] = "\"create database " + newDbName + "\"" - # retCode = taos_command(buildPath, "s", keyDict['s'], "Query OK", keyDict['c'], '', '', '') - # if retCode != "TAOS_OK": - # tdLog.exit("taos -w fail") - - # keyDict['s'] = "\"create table " + newDbName + ".ntb (ts timestamp, c binary(128))\"" - # retCode = taos_command(buildPath, "s", keyDict['s'], "Query OK", keyDict['c'], '', '', '') - # if retCode != "TAOS_OK": - # tdLog.exit("taos -w create table fail") - - # keyDict['s'] = "\"insert into " + newDbName + ".ntb values('2021-04-01 08:00:00.001', 'abcd0123456789')('2021-04-01 08:00:00.002', 'abcd012345678901234567890123456789') \"" - # retCode = taos_command(buildPath, "s", keyDict['s'], "Query OK", keyDict['c'], '', '', '') - # if retCode != "TAOS_OK": - # tdLog.exit("taos -w insert data fail") - - # keyDict['s'] = "\"insert into " + newDbName + ".ntb values('2021-04-01 08:00:00.003', 'aaaaaaaaaaaaaaaaaaaa')('2021-04-01 08:00:01.004', 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb') \"" - # retCode = taos_command(buildPath, "s", keyDict['s'], "Query OK", keyDict['c'], '', '', '') - # if retCode != "TAOS_OK": - # tdLog.exit("taos -w insert data fail") - - # keyDict['s'] = "\"insert into " + newDbName + ".ntb values('2021-04-01 08:00:00.005', 'cccccccccccccccccccc')('2021-04-01 08:00:01.006', 'dddddddddddddddddddddddddddddddddddddddd') \"" - # retCode = taos_command(buildPath, "s", keyDict['s'], "Query OK", keyDict['c'], '', '', '') - # if retCode != "TAOS_OK": - # tdLog.exit("taos -w insert data fail") - - # keyDict['s'] = "\"select * from " + newDbName + ".ntb \"" - # retCode = taos_command(buildPath, "s", keyDict['s'], "aaaaaaaaaaaaaaaaaaaa", keyDict['c'], '', '', '') - # if retCode != "TAOS_OK": - # tdLog.exit("taos -w insert data fail") - - # keyDict['s'] = "\"select * from " + newDbName + ".ntb \"" - # retCode = taos_command(buildPath, "s", keyDict['s'], "dddddddddddddddddddddddddddddddddddddddd", keyDict['c'], '', '', '') - # if retCode != "TAOS_FAIL": - # tdLog.exit("taos -w insert data fail") - - # keyDict['s'] = "\"select * from " + newDbName + ".ntb \"" - # retCode = taos_command(buildPath, "s", keyDict['s'], "dddddddddddddddddddddddddddddddddddddddd", keyDict['c'], '', 'w', '60') - # if retCode != "TAOS_OK": - # tdLog.exit("taos -w insert data fail") - - # tdSql.query('drop database %s'%newDbName) - + def stop(self): tdSql.close() tdLog.success(f"{__file__} successfully executed")