Merge remote-tracking branch 'origin/develop' into feature/crash_gen

This commit is contained in:
Steven Li 2020-10-22 09:32:56 +00:00
commit b74add25e2
4 changed files with 7 additions and 7 deletions

4
Jenkinsfile vendored
View File

@ -9,7 +9,7 @@ pipeline {
stage('Parallel test stage') { stage('Parallel test stage') {
parallel { parallel {
stage('pytest') { stage('pytest') {
agent{label 'master'} agent{label '184'}
steps { steps {
sh ''' sh '''
date date
@ -34,7 +34,7 @@ pipeline {
} }
} }
stage('test_b1') { stage('test_b1') {
agent{label '184'} agent{label 'master'}
steps { steps {
sh ''' sh '''
cd ${WKC} cd ${WKC}

View File

@ -39,7 +39,7 @@ class TDTestCase:
tdSql.query("select * from t0") tdSql.query("select * from t0")
tdSql.checkRows(1) tdSql.checkRows(1)
tdSql.checkData(0, 0, 1) tdSql.checkData(0, 1, 1)
tdSql.query("select * from t1") tdSql.query("select * from t1")
tdSql.checkRows(5) tdSql.checkRows(5)

View File

@ -103,7 +103,7 @@ class TDTestCase:
tdSql.execute('alter table stb add tag tnc nchar(10)') tdSql.execute('alter table stb add tag tnc nchar(10)')
for tid in range(1, self.ntables + 1): for tid in range(1, self.ntables + 1):
tdSql.execute('alter table tb%d set tag tnc=\"%s\"' % tdSql.execute('alter table tb%d set tag tnc=\"%s\"' %
(tid, str(tid * 1.2))) (tid, str(tid + 1000000000)))
tdLog.info("insert %d data in to each %d tables" % (2, self.ntables)) tdLog.info("insert %d data in to each %d tables" % (2, self.ntables))
for rid in range(self.rowsPerTable + 1, self.rowsPerTable + 3): for rid in range(self.rowsPerTable + 1, self.rowsPerTable + 3):
sqlcmd = ['insert into'] sqlcmd = ['insert into']

View File

@ -52,10 +52,10 @@ sleep 1000
sql use $db sql use $db
sql drop table tb5 sql drop table tb5
$i = 0
while $i < 4 while $i < 4
$tbId = $i + $halfNum
$tb = $tbPrefix . $i $tb = tb . $i
$x = 0 $x = 0
while $x < $rowNum while $x < $rowNum
$xs = $x * $delta $xs = $x * $delta