Merge remote-tracking branch 'origin/develop' into feature/linux
This commit is contained in:
Shengliang Guan
commit
871e24dc20
|
|
@ -31,6 +31,7 @@ def abort_previous(){
|
|||
if (buildNumber > 1) milestone(buildNumber - 1)
|
||||
milestone(buildNumber)
|
||||
}
|
||||
def kipstage=0
|
||||
def pre_test(){
|
||||
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
|
||||
sh '''
|
||||
|
|
@ -72,12 +73,29 @@ pipeline {
|
|||
}
|
||||
|
||||
stages {
|
||||
|
||||
stage('pre_build'){
|
||||
agent{label 'master'}
|
||||
steps {
|
||||
sh'''
|
||||
cd ${WORKSPACE}
|
||||
git checkout develop
|
||||
git pull
|
||||
git fetch origin +refs/pull/${CHANGE_ID}/merge
|
||||
git checkout -qf FETCH_HEAD
|
||||
'''
|
||||
script{
|
||||
skipstage=sh(script:"git --no-pager diff --name-only FETCH_HEAD develop|grep -v -E '.*md|//src//connector|Jenkinsfile|test-all.sh' || echo 1 ",returnStdout:true)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Parallel test stage') {
|
||||
//only build pr
|
||||
when {
|
||||
changeRequest()
|
||||
expression {
|
||||
skipstage == 0
|
||||
}
|
||||
}
|
||||
parallel {
|
||||
stage('python_1_s1') {
|
||||
|
|
@ -127,7 +145,7 @@ pipeline {
|
|||
stage('test_b1_s2') {
|
||||
agent{label 'b1'}
|
||||
steps {
|
||||
timeout(time: 90, unit: 'MINUTES'){
|
||||
timeout(time: 45, unit: 'MINUTES'){
|
||||
pre_test()
|
||||
sh '''
|
||||
cd ${WKC}/tests
|
||||
|
|
@ -244,8 +262,8 @@ pipeline {
|
|||
|
||||
success {
|
||||
emailext (
|
||||
subject: "PR-result: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'",
|
||||
body: '''<!DOCTYPE html>
|
||||
subject: "PR-result: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]' SUCCESS",
|
||||
body: """<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
|
|
@ -261,29 +279,29 @@ pipeline {
|
|||
<td>
|
||||
<ul>
|
||||
<div style="font-size:18px">
|
||||
<li>构建名称>>分支：${PROJECT_NAME}</li>
|
||||
<li>构建名称>>分支：${env.BRANCH_NAME}</li>
|
||||
<li>构建结果：<span style="color:green"> Successful </span></li>
|
||||
<li>构建编号：${BUILD_NUMBER}</li>
|
||||
<li>触发用户：${CAUSE}</li>
|
||||
<li>触发用户：${env.CHANGE_AUTHOR}</li>
|
||||
<li>提交信息：${CHANGE_TITLE}</li>
|
||||
<li>构建地址：<a href=${BUILD_URL}>${BUILD_URL}</a></li>
|
||||
<li>构建日志：<a href=${BUILD_URL}console>${BUILD_URL}console</a></li>
|
||||
<li>变更集：${JELLY_SCRIPT}</li>
|
||||
|
||||
</div>
|
||||
</ul>
|
||||
</td>
|
||||
</tr>
|
||||
</table></font>
|
||||
</body>
|
||||
</html>''',
|
||||
</html>""",
|
||||
to: "${env.CHANGE_AUTHOR_EMAIL}",
|
||||
from: "support@taosdata.com"
|
||||
)
|
||||
}
|
||||
failure {
|
||||
emailext (
|
||||
subject: "PR-result: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'",
|
||||
body: '''<!DOCTYPE html>
|
||||
subject: "PR-result: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]' FAIL",
|
||||
body: """<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
|
|
@ -299,21 +317,21 @@ pipeline {
|
|||
<td>
|
||||
<ul>
|
||||
<div style="font-size:18px">
|
||||
<li>构建名称>>分支：${PROJECT_NAME}</li>
|
||||
<li>构建名称>>分支：${env.BRANCH_NAME}</li>
|
||||
<li>构建结果：<span style="color:green"> Successful </span></li>
|
||||
<li>构建编号：${BUILD_NUMBER}</li>
|
||||
<li>触发用户：${CAUSE}</li>
|
||||
<li>触发用户：${env.CHANGE_AUTHOR}</li>
|
||||
<li>提交信息：${CHANGE_TITLE}</li>
|
||||
<li>构建地址：<a href=${BUILD_URL}>${BUILD_URL}</a></li>
|
||||
<li>构建日志：<a href=${BUILD_URL}console>${BUILD_URL}console</a></li>
|
||||
<li>变更集：${JELLY_SCRIPT}</li>
|
||||
|
||||
</div>
|
||||
</ul>
|
||||
</td>
|
||||
</tr>
|
||||
</table></font>
|
||||
</body>
|
||||
</html>''',
|
||||
</html>""",
|
||||
to: "${env.CHANGE_AUTHOR_EMAIL}",
|
||||
from: "support@taosdata.com"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -192,7 +192,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_MND_DB_IN_DROPPING, 0, 0x0386, "Database n
|
|||
TAOS_DEFINE_ERROR(TSDB_CODE_MND_VGROUP_NOT_READY, 0, 0x0387, "Database unsynced")
|
||||
|
||||
TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_DB_OPTION_DAYS, 0, 0x0390, "Invalid database option: days out of range")
|
||||
TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_DB_OPTION_KEEP, 0, 0x0391, "Invalid database option: keep >= keep2 >= keep1 >= days")
|
||||
TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_DB_OPTION_KEEP, 0, 0x0391, "Invalid database option: keep >= keep1 >= keep0 >= days")
|
||||
|
||||
// dnode
|
||||
TAOS_DEFINE_ERROR(TSDB_CODE_DND_MSG_NOT_PROCESSED, 0, 0x0400, "Message not processed")
|
||||
|
|
|
|||
|
|
@ -1380,7 +1380,7 @@ static void printfDbInfoForQueryToFile(char* filename, SDbInfo* dbInfos, int ind
|
|||
fprintf(fp, "replica: %d\n", dbInfos->replica);
|
||||
fprintf(fp, "quorum: %d\n", dbInfos->quorum);
|
||||
fprintf(fp, "days: %d\n", dbInfos->days);
|
||||
fprintf(fp, "keep1,keep2,keep(D): %s\n", dbInfos->keeplist);
|
||||
fprintf(fp, "keep0,keep1,keep(D): %s\n", dbInfos->keeplist);
|
||||
fprintf(fp, "cache(MB): %d\n", dbInfos->cache);
|
||||
fprintf(fp, "blocks: %d\n", dbInfos->blocks);
|
||||
fprintf(fp, "minrows: %d\n", dbInfos->minrows);
|
||||
|
|
|
|||
|
|
@ -568,7 +568,7 @@ static int32_t mnodeGetDbMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn
|
|||
|
||||
pShow->bytes[cols] = 24 + VARSTR_HEADER_SIZE;
|
||||
pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
|
||||
strcpy(pSchema[cols].name, "keep1,keep2,keep(D)");
|
||||
strcpy(pSchema[cols].name, "keep0,keep1,keep(D)");
|
||||
pSchema[cols].bytes = htons(pShow->bytes[cols]);
|
||||
cols++;
|
||||
|
||||
|
|
|
|||
|
|
@ -1180,9 +1180,12 @@ static void copyOneRowFromMem(STsdbQueryHandle* pQueryHandle, int32_t capacity,
|
|||
char* pData = NULL;
|
||||
|
||||
// the schema version info is embeded in SDataRow
|
||||
int32_t numOfRowCols = schemaNCols(pSchema);
|
||||
int32_t numOfRowCols = 0;
|
||||
if (pSchema == NULL) {
|
||||
pSchema = tsdbGetTableSchemaByVersion(pTable, dataRowVersion(row));
|
||||
numOfRowCols = schemaNCols(pSchema);
|
||||
} else {
|
||||
numOfRowCols = schemaNCols(pSchema);
|
||||
}
|
||||
|
||||
int32_t i = 0, j = 0;
|
||||
|
|
|
|||
|
|
@ -650,6 +650,7 @@ namespace TDengineDriver
|
|||
tester.CloseConnection();
|
||||
|
||||
Console.WriteLine("End.");
|
||||
CleanAndExitProgram(0);
|
||||
}
|
||||
|
||||
public class InsertDataThread
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ Welcome to the TDengine shell from Linux, Client Version:2.0.1.1
|
|||
Copyright (c) 2017 by TAOS Data, Inc. All rights reserved.
|
||||
|
||||
taos> show databases;
|
||||
name | created_time | ntables | vgroups | replica | quorum | days | keep1,keep2,keep(D) | cache(MB) | blocks | minrows | maxrows | wallevel | fsync | comp | precision | status |
|
||||
name | created_time | ntables | vgroups | replica | quorum | days | keep0,keep1,keep(D) | cache(MB) | blocks | minrows | maxrows | wallevel | fsync | comp | precision | status |
|
||||
===================================================================================================================================================================================================================================================================
|
||||
test | 2020-08-19 18:43:50.731 | 1 | 1 | 1 | 1 | 2 | 3650,3650,3650 | 16 | 6 | 100 | 4096 | 1 | 3000 | 2 | ms | ready |
|
||||
log | 2020-08-19 18:40:28.064 | 4 | 1 | 1 | 1 | 10 | 30,30,30 | 1 | 3 | 100 | 4096 | 1 | 3000 | 2 | us | ready |
|
||||
|
|
|
|||
|
|
@ -89,6 +89,7 @@ python3 ./test.py -f functions/function_sum.py -r 1
|
|||
python3 ./test.py -f functions/function_top.py -r 1
|
||||
python3 ./test.py -f functions/function_twa.py -r 1
|
||||
python3 ./test.py -f functions/function_twa_test2.py
|
||||
python3 ./test.py -f functions/function_stddev_td2555.py
|
||||
python3 queryCount.py
|
||||
python3 ./test.py -f query/queryGroupbyWithInterval.py
|
||||
python3 client/twoClients.py
|
||||
|
|
|
|||
|
|
@ -45,6 +45,10 @@ class TDTestCase:
|
|||
tdSql.checkData(0, 0, "2018-10-03 14:38:05")
|
||||
tdSql.checkData(1, 0, "2018-10-03 14:38:15")
|
||||
tdSql.checkData(2, 0, "2018-10-03 14:38:16")
|
||||
|
||||
tdSql.error("SELECT SUM(current) as s, AVG(voltage) FROM meters WHERE groupId > 1 INTERVAL(1s) GROUP BY location order by s ASC")
|
||||
|
||||
tdSql.error("SELECT SUM(current) as s, AVG(voltage) FROM meters WHERE groupId > 1 INTERVAL(1s) GROUP BY location order by s DESC")
|
||||
|
||||
def stop(self):
|
||||
tdSql.close()
|
||||
|
|
|
|||
|
|
@ -33,13 +33,23 @@ class TDTestCase:
|
|||
if(threadID == 0):
|
||||
os.system("yes | taosdemo -t %d -n %d -x" % (self.numberOfTables, self.numberOfRecords))
|
||||
if(threadID == 1):
|
||||
time.sleep(2)
|
||||
print("use test")
|
||||
tdSql.execute("use test")
|
||||
tdSql.execute("use test")
|
||||
# check if all the tables have heen created
|
||||
while True:
|
||||
tdSql.query("show tables")
|
||||
rows = tdSql.queryRows
|
||||
print("number of tables: %d" % rows)
|
||||
if(rows == self.numberOfTables):
|
||||
break
|
||||
time.sleep(1)
|
||||
# check if there are any records in the last created table
|
||||
while True:
|
||||
print("query started")
|
||||
tdSql.query("select * from test.t9")
|
||||
rows = tdSql.queryRows
|
||||
print("rows %d" % rows)
|
||||
print("number of records: %d" % rows)
|
||||
if(rows > 0):
|
||||
break
|
||||
time.sleep(1)
|
||||
|
|
@ -54,8 +64,7 @@ class TDTestCase:
|
|||
t1 = threading.Thread(target=self.insertDataAndAlterTable, args=(0, ))
|
||||
t2 = threading.Thread(target=self.insertDataAndAlterTable, args=(1, ))
|
||||
|
||||
t1.start()
|
||||
time.sleep(2)
|
||||
t1.start()
|
||||
t2.start()
|
||||
t1.join()
|
||||
t2.join()
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ print =============== step2 - no db
|
|||
#11
|
||||
system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'show databases' 127.0.0.1:7111/rest/sql
|
||||
print 11-> $system_content
|
||||
if $system_content != @{"status":"succ","head":["name","created_time","ntables","vgroups","replica","quorum","days","keep1,keep2,keep(D)","cache(MB)","blocks","minrows","maxrows","wallevel","fsync","comp","cachelast","precision","update","status"],"data":[],"rows":0}@ then
|
||||
if $system_content != @{"status":"succ","head":["name","created_time","ntables","vgroups","replica","quorum","days","keep0,keep1,keep(D)","cache(MB)","blocks","minrows","maxrows","wallevel","fsync","comp","cachelast","precision","update","status"],"data":[],"rows":0}@ then
|
||||
return -1
|
||||
endi
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue