support log Sql command to file.

[TD-383]
This commit is contained in:
Shuduo Sang 2020-05-21 16:12:15 +08:00
parent 0d8027a0c3
commit cf4c4e98fd
135 changed files with 405 additions and 337 deletions

View File

@ -36,6 +36,7 @@ class TDengineCursor(object):
self._block_rows = -1 self._block_rows = -1
self._block_iter = 0 self._block_iter = 0
self._affected_rows = 0 self._affected_rows = 0
self._logfile = ""
if connection is not None: if connection is not None:
self._connection = connection self._connection = connection
@ -85,6 +86,9 @@ class TDengineCursor(object):
""" """
pass pass
def log(self, logfile):
self._logfile = logfile
def close(self): def close(self):
"""Close the cursor. """Close the cursor.
""" """
@ -121,6 +125,10 @@ class TDengineCursor(object):
res = CTaosInterface.query(self._connection._conn, stmt) res = CTaosInterface.query(self._connection._conn, stmt)
# print(" << Query ({}) Exec Done".format(localSeqNum)) # print(" << Query ({}) Exec Done".format(localSeqNum))
if (self._logfile):
with open(self._logfile, "a") as logfile:
logfile.write("%s;\n" % operation)
if res == 0: if res == 0:
if CTaosInterface.fieldsCount(self._connection._conn) == 0: if CTaosInterface.fieldsCount(self._connection._conn) == 0:
self._affected_rows += CTaosInterface.affectedRows( self._affected_rows += CTaosInterface.affectedRows(

View File

@ -19,9 +19,9 @@ from util.sql import tdSql
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
try: try:

View File

@ -19,9 +19,9 @@ from util.sql import tdSql
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
print("==========step1") print("==========step1")

View File

@ -9,9 +9,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
self.types = [ self.types = [
"int", "int",
"bigint", "bigint",

View File

@ -9,9 +9,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
self.types = [ self.types = [
"int", "int",
"bigint", "bigint",

View File

@ -19,9 +19,9 @@ from util.sql import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
tdSql.prepare() tdSql.prepare()

View File

@ -23,9 +23,9 @@ from util.sql import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):

View File

@ -19,9 +19,9 @@ from util.sql import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
tdSql.prepare() tdSql.prepare()

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -20,9 +20,9 @@ from util.dnodes import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
self.ntables = 1 self.ntables = 1

View File

@ -18,9 +18,9 @@ from util.sql import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
tdSql.prepare() tdSql.prepare()

View File

@ -7,9 +7,9 @@ from util.sql import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
tdSql.prepare() tdSql.prepare()

View File

@ -7,9 +7,9 @@ from util.sql import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
tdSql.prepare() tdSql.prepare()

View File

@ -7,9 +7,9 @@ from util.sql import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
tdSql.prepare() tdSql.prepare()

View File

@ -7,9 +7,9 @@ from util.sql import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
tdSql.prepare() tdSql.prepare()

View File

@ -7,9 +7,9 @@ from util.sql import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
tdSql.prepare() tdSql.prepare()

View File

@ -7,9 +7,9 @@ from util.sql import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
tdSql.prepare() tdSql.prepare()

View File

@ -19,9 +19,9 @@ from util.sql import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
tdSql.prepare() tdSql.prepare()

View File

@ -20,9 +20,9 @@ from util.sql import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
tdSql.prepare() tdSql.prepare()

View File

@ -20,9 +20,9 @@ from util.sql import tdSql
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
tdSql.prepare() tdSql.prepare()

View File

@ -18,9 +18,9 @@ from util.sql import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
tdSql.prepare() tdSql.prepare()

View File

@ -18,9 +18,9 @@ from util.sql import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
tdSql.prepare() tdSql.prepare()

View File

@ -18,9 +18,9 @@ from util.sql import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
tdSql.prepare() tdSql.prepare()

View File

@ -7,9 +7,9 @@ from util.sql import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
tdSql.prepare() tdSql.prepare()

View File

@ -7,9 +7,9 @@ from util.sql import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
tdSql.prepare() tdSql.prepare()

View File

@ -19,9 +19,9 @@ from util.sql import tdSql
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
tdSql.prepare() tdSql.prepare()

View File

@ -19,9 +19,9 @@ from util.sql import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
tdSql.prepare() tdSql.prepare()

View File

@ -110,9 +110,9 @@ class Test:
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
tdSql.prepare() tdSql.prepare()

View File

@ -19,9 +19,9 @@ from util.sql import tdSql
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
tdSql.prepare() tdSql.prepare()

View File

@ -20,9 +20,9 @@ from util.sql import tdSql
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
tdSql.prepare() tdSql.prepare()

View File

@ -12,14 +12,12 @@ from util.sql import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def getLimitFromSourceCode(self, name): def getLimitFromSourceCode(self, name):
cmd = "grep -w '#define %s' ../../src/inc/taosdef.h|awk '{print $3}'" % name cmd = "grep -w '#define %s' ../../src/inc/taosdef.h|awk '{print $3}'" % name
return int(subprocess.check_output(cmd, shell=True)) return int(subprocess.check_output(cmd, shell=True))
def generateString(self, length): def generateString(self, length):
chars = string.ascii_uppercase + string.ascii_lowercase chars = string.ascii_uppercase + string.ascii_lowercase
v = "" v = ""
@ -27,7 +25,6 @@ class TDTestCase:
v += random.choice(chars) v += random.choice(chars)
return v return v
def checkTagBoundaries(self): def checkTagBoundaries(self):
tdLog.debug("checking tag boundaries") tdLog.debug("checking tag boundaries")
tdSql.prepare() tdSql.prepare()
@ -68,7 +65,6 @@ class TDTestCase:
tdSql.query('select * from cars;') tdSql.query('select * from cars;')
tdSql.checkRows(10) tdSql.checkRows(10)
def checkColumnBoundaries(self): def checkColumnBoundaries(self):
tdLog.debug("checking column boundaries") tdLog.debug("checking column boundaries")
tdSql.prepare() tdSql.prepare()
@ -92,7 +88,6 @@ class TDTestCase:
tdSql.query('select * from cars') tdSql.query('select * from cars')
tdSql.checkRows(1) tdSql.checkRows(1)
def checkTableNameBoundaries(self): def checkTableNameBoundaries(self):
tdLog.debug("checking table name boundaries") tdLog.debug("checking table name boundaries")
tdSql.prepare() tdSql.prepare()
@ -112,7 +107,6 @@ class TDTestCase:
tdSql.query('select * from %s' % name) tdSql.query('select * from %s' % name)
tdSql.checkRows(1) tdSql.checkRows(1)
def checkRowBoundaries(self): def checkRowBoundaries(self):
tdLog.debug("checking row boundaries") tdLog.debug("checking row boundaries")
tdSql.prepare() tdSql.prepare()
@ -139,19 +133,17 @@ class TDTestCase:
for i in range(1, maxCols): for i in range(1, maxCols):
sql += ", '%s'" % col sql += ", '%s'" % col
sql += ");" sql += ");"
tdLog.info( sql ); tdLog.info(sql)
tdSql.execute(sql) tdSql.execute(sql)
tdSql.query("select * from cars") tdSql.query("select * from cars")
tdSql.checkRows(1) tdSql.checkRows(1)
def run(self): def run(self):
self.checkTagBoundaries() self.checkTagBoundaries()
self.checkColumnBoundaries() self.checkColumnBoundaries()
self.checkTableNameBoundaries() self.checkTableNameBoundaries()
self.checkRowBoundaries() self.checkRowBoundaries()
def stop(self): def stop(self):
tdSql.close() tdSql.close()
tdLog.success("%s successfully executed" % __file__) tdLog.success("%s successfully executed" % __file__)

View File

@ -10,9 +10,9 @@ from util.sql import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
tdSql.prepare() tdSql.prepare()

View File

@ -8,9 +8,9 @@ from util.sql import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
tdSql.prepare() tdSql.prepare()

View File

@ -0,0 +1,45 @@
###################################################################
# Copyright (c) 2016 by TAOS Technologies, Inc.
# All rights reserved.
#
# This file is proprietary and confidential to TAOS Technologies.
# No part of this file may be reproduced, stored, transmitted,
# disclosed or used in any form or by any means other than as
# expressly provided by the written permission from Jianhui Tao
#
###################################################################
# -*- coding: utf-8 -*-
import sys
import taos
from util.log import tdLog
from util.cases import tdCases
from util.sql import tdSql
class TDTestCase:
def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor(), logSql)
def run(self):
tdSql.prepare()
print("==============step1")
print("prepare data")
for x in range(0, 1000000):
tb_name = "tb%d" % x
tdLog.info("create table %s (ts timestamp, i int)" % tb_name)
tdSql.execute("create table %s (ts timestamp, i int)" % tb_name)
tdLog.info("insert into %s values(now, 1)" % tb_name)
tdSql.execute("insert into %s values(now, 1)" % tb_name)
def stop(self):
tdSql.close()
tdLog.success("%s successfully executed" % __file__)
tdCases.addWindows(__file__, TDTestCase())
tdCases.addLinux(__file__, TDTestCase())

View File

@ -19,9 +19,9 @@ from util.sql import tdSql
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
tdSql.prepare() tdSql.prepare()

View File

@ -7,9 +7,9 @@ from util.sql import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor()) tdSql.init(conn.cursor(), logSql)
def run(self): def run(self):
tdSql.prepare() tdSql.prepare()

Some files were not shown because too many files have changed in this diff Show More