update
This commit is contained in:
parent
9f5a406441
commit
0e6481a4a0
|
@ -1978,15 +1978,8 @@ class TdSuperTable:
|
||||||
def drop(self, dbc, skipCheck = False):
|
def drop(self, dbc, skipCheck = False):
|
||||||
dbName = self._dbName
|
dbName = self._dbName
|
||||||
if self.exists(dbc) : # if myself exists
|
if self.exists(dbc) : # if myself exists
|
||||||
fullTableName = dbName + '.' + self._stName
|
fullTableName = dbName + '.' + self._stName
|
||||||
|
dbc.execute("DROP TABLE {}".format(fullTableName))
|
||||||
try:
|
|
||||||
dbc.execute("DROP TABLE {}".format(fullTableName))
|
|
||||||
except taos.error.ProgrammingError as err:
|
|
||||||
errno = Helper.convertErrno(err.errno)
|
|
||||||
if errno in [1011,0x3F3,0x03f3,0x2662]: # table doesn't exist # Stream must be dropped first, SQL: DROP TABLE db_0.fs_table
|
|
||||||
pass
|
|
||||||
|
|
||||||
else:
|
else:
|
||||||
if not skipCheck:
|
if not skipCheck:
|
||||||
raise CrashGenError("Cannot drop non-existant super table: {}".format(self._stName))
|
raise CrashGenError("Cannot drop non-existant super table: {}".format(self._stName))
|
||||||
|
@ -2004,16 +1997,9 @@ class TdSuperTable:
|
||||||
fullTableName = dbName + '.' + self._stName
|
fullTableName = dbName + '.' + self._stName
|
||||||
|
|
||||||
if dbc.existsSuperTable(self._stName):
|
if dbc.existsSuperTable(self._stName):
|
||||||
if dropIfExists:
|
if dropIfExists:
|
||||||
try:
|
dbc.execute("DROP TABLE {}".format(fullTableName))
|
||||||
dbc.execute("DROP TABLE {}".format(fullTableName))
|
|
||||||
except taos.error.ProgrammingError as err:
|
|
||||||
errno = Helper.convertErrno(err.errno)
|
|
||||||
if errno in [1011,0x3F3,0x03f3,0x2662]: # table doesn't exist # Stream must be dropped first, SQL: DROP TABLE db_0.fs_table
|
|
||||||
pass
|
|
||||||
|
|
||||||
pass
|
|
||||||
# dbc.execute("DROP TABLE {}".format(fullTableName))
|
|
||||||
else: # error
|
else: # error
|
||||||
raise CrashGenError("Cannot create super table, already exists: {}".format(self._stName))
|
raise CrashGenError("Cannot create super table, already exists: {}".format(self._stName))
|
||||||
|
|
||||||
|
@ -2434,11 +2420,15 @@ class TaskDropSuperTable(StateTransitionTask):
|
||||||
for i in tblSeq:
|
for i in tblSeq:
|
||||||
regTableName = self.getRegTableName(i) # "db.reg_table_{}".format(i)
|
regTableName = self.getRegTableName(i) # "db.reg_table_{}".format(i)
|
||||||
try:
|
try:
|
||||||
|
|
||||||
self.execWtSql(wt, "drop table {}.{}".
|
self.execWtSql(wt, "drop table {}.{}".
|
||||||
format(self._db.getName(), regTableName)) # nRows always 0, like MySQL
|
format(self._db.getName(), regTableName)) # nRows always 0, like MySQL
|
||||||
except taos.error.ProgrammingError as err:
|
except taos.error.ProgrammingError as err:
|
||||||
pass
|
# correcting for strange error number scheme
|
||||||
|
errno2 = Helper.convertErrno(err.errno)
|
||||||
|
if (errno2 in [0x362]): # mnode invalid table name
|
||||||
|
isSuccess = False
|
||||||
|
Logging.debug("[DB] Acceptable error when dropping a table")
|
||||||
|
continue # try to delete next regular table
|
||||||
|
|
||||||
|
|
||||||
if (not tickOutput):
|
if (not tickOutput):
|
||||||
|
@ -2956,6 +2946,8 @@ class ThreadStacks: # stack info for all threads
|
||||||
print(" {}".format(frame.line))
|
print(" {}".format(frame.line))
|
||||||
stackFrame += 1
|
stackFrame += 1
|
||||||
print("-----> End of Thread Info ----->\n")
|
print("-----> End of Thread Info ----->\n")
|
||||||
|
if self.current_time-last_sql_commit_time >100: # dead lock occured
|
||||||
|
print("maybe dead locked of thread {} ".format(shortTid))
|
||||||
|
|
||||||
class ClientManager:
|
class ClientManager:
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
|
|
Loading…
Reference in New Issue