diff --git a/Jenkinsfile b/Jenkinsfile
index f2e3c1c4f6c3754f33f56575c4f6b89170e36948..35a2bf82606313fe015457cda3a6a57c23e2ef4d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,8 +4,10 @@ import jenkins.model.CauseOfInterruption
node {
}
-def skipbuild=0
-def win_stop=0
+def skipbuild = 0
+def win_stop = 0
+def scope = []
+def mod = [0,1,2,3,4]
def abortPreviousBuilds() {
def currentJobName = env.JOB_NAME
@@ -349,7 +351,7 @@ pipeline {
}
stages {
stage('pre_build'){
- agent{label 'master'}
+ agent{label 'catalina'}
options { skipDefaultCheckout() }
when {
changeRequest()
@@ -358,44 +360,32 @@ pipeline {
script{
abort_previous()
abortPreviousBuilds()
- }
- // sh'''
- // rm -rf ${WORKSPACE}.tes
- // cp -r ${WORKSPACE} ${WORKSPACE}.tes
- // cd ${WORKSPACE}.tes
- // git fetch
- // '''
- // script {
- // if (env.CHANGE_TARGET == 'master') {
- // sh '''
- // git checkout master
- // '''
- // }
- // else if(env.CHANGE_TARGET == '2.0'){
- // sh '''
- // git checkout 2.0
- // '''
- // }
- // else{
- // sh '''
- // git checkout develop
- // '''
- // }
- // }
- // sh'''
- // git fetch origin +refs/pull/${CHANGE_ID}/merge
- // git checkout -qf FETCH_HEAD
- // '''
+ println env.CHANGE_BRANCH
+ if(env.CHANGE_FORK){
+ scope = ['connector','query','insert','other','tools','taosAdapter']
+ }
+ else{
+ sh'''
+ cd ${WKC}
+ git fetch
+ git checkout ${CHANGE_BRANCH}
+ git pull
+ '''
+ dir('/var/lib/jenkins/workspace/TDinternal/community'){
+ gitlog = sh(script: "git log -1 --pretty=%B ", returnStdout:true)
+ println gitlog
+ if (!(gitlog =~ /\((.*?)\)/)){
+ autoCancelled = true
+ error('Aborting the build.')
+ }
+ temp = (gitlog =~ /\((.*?)\)/)
+ temp = temp[0].remove(1)
+ scope = temp.split(",")
+ Collections.shuffle mod
+ }
- // script{
- // skipbuild='2'
- // skipbuild=sh(script: "git log -2 --pretty=%B | fgrep -ie '[skip ci]' -e '[ci skip]' && echo 1 || echo 2", returnStdout:true)
- // println skipbuild
- // }
- // sh'''
- // rm -rf ${WORKSPACE}.tes
- // '''
- // }
+ }
+ }
}
}
stage('Parallel test stage') {
@@ -408,239 +398,90 @@ pipeline {
}
}
parallel {
- stage('python_1_s1') {
- agent{label " slave1 || slave11 "}
+ stage('python_1') {
+ agent{label " slave1 || slave6 || slave11 || slave16 "}
steps {
pre_test()
timeout(time: 55, unit: 'MINUTES'){
- sh '''
- date
- cd ${WKC}/tests
- ./test-all.sh p1
- date'''
- }
+ script{
+ scope.each {
+ sh """
+ date
+ cd ${WKC}/tests
+ ./test-CI.sh ${it} 5 ${mod[0]}
+ date"""
+ }
+ }
+ }
}
}
- stage('python_2_s5') {
- agent{label " slave5 || slave15 "}
+ stage('python_2') {
+ agent{label " slave2 || slave7 || slave12 || slave17 "}
steps {
pre_test()
timeout(time: 55, unit: 'MINUTES'){
- sh '''
- date
- cd ${WKC}/tests
- ./test-all.sh p2
- date'''
- }
- }
- }
- stage('python_3_s6') {
- agent{label " slave6 || slave16 "}
- steps {
- timeout(time: 55, unit: 'MINUTES'){
- pre_test()
- sh '''
- date
- cd ${WKC}/tests
- ./test-all.sh p3
- date'''
+ script{
+ scope.each {
+ sh """
+ date
+ cd ${WKC}/tests
+ ./test-CI.sh ${it} 5 ${mod[1]}
+ date"""
+ }
+ }
}
}
}
- stage('test_b1_s2') {
- agent{label " slave2 || slave12 "}
+ stage('python_3') {
+ agent{label " slave3 || slave8 || slave13 ||slave18 "}
steps {
timeout(time: 105, unit: 'MINUTES'){
pre_test()
- sh '''
- rm -rf /var/lib/taos/*
- rm -rf /var/log/taos/*
- nohup taosd >/dev/null &
- sleep 10
- '''
-
- sh '''
- cd ${WKC}/src/connector/python
- export PYTHONPATH=$PWD/
- export LD_LIBRARY_PATH=${WKC}/debug/build/lib
- pip3 install pytest
- pytest tests/
-
- python3 examples/bind-multi.py
- python3 examples/bind-row.py
- python3 examples/demo.py
- python3 examples/insert-lines.py
- python3 examples/pep-249.py
- python3 examples/query-async.py
- python3 examples/query-objectively.py
- python3 examples/subscribe-sync.py
- python3 examples/subscribe-async.py
- '''
-
- sh '''
- cd ${WKC}/src/connector/nodejs
- npm install
- npm run test
- cd ${WKC}/tests/examples/nodejs
- npm install td2.0-connector > /dev/null 2>&1
- node nodejsChecker.js host=localhost
- node test1970.js
- cd ${WKC}/tests/connectorTest/nodejsTest/nanosupport
- npm install td2.0-connector > /dev/null 2>&1
- node nanosecondTest.js
- '''
- catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
- sh '''
- cd ${WKC}/src/connector/C#
- dotnet test
- dotnet run --project src/test/Cases/Cases.csproj
-
- cd ${WKC}/tests/examples/C#
- dotnet run --project C#checker/C#checker.csproj
- dotnet run --project TDengineTest/TDengineTest.csproj
- dotnet run --project schemaless/schemaless.csproj
-
- cd ${WKC}/tests/examples/C#/taosdemo
- dotnet build -c Release
- tree | true
- ./bin/Release/net5.0/taosdemo -c /etc/taos -y
- '''
+ script{
+ scope.each {
+ sh """
+ date
+ cd ${WKC}/tests
+ ./test-CI.sh ${it} 5 ${mod[2]}
+ date"""
+ }
}
- sh '''
- cd ${WKC}/tests/gotest
- bash batchtest.sh
- '''
- sh '''
- cd ${WKC}/tests
- ./test-all.sh b1fq
- date'''
}
}
}
- stage('test_crash_gen_s3') {
- agent{label " slave3 || slave13 "}
-
+ stage('python_4') {
+ agent{label " slave4 || slave9 || slave14 || slave19 "}
steps {
- pre_test()
- timeout(time: 60, unit: 'MINUTES'){
- sh '''
- cd ${WKC}/tests/pytest
- ./crash_gen.sh -a -p -t 4 -s 2000
- '''
- }
- timeout(time: 60, unit: 'MINUTES'){
- sh '''
- cd ${WKC}/tests/pytest
- rm -rf /var/lib/taos/*
- rm -rf /var/log/taos/*
- ./handle_crash_gen_val_log.sh
- '''
- sh '''
- cd ${WKC}/tests/pytest
- rm -rf /var/lib/taos/*
- rm -rf /var/log/taos/*
- ./handle_taosd_val_log.sh
- '''
- }
timeout(time: 55, unit: 'MINUTES'){
- sh '''
- date
- cd ${WKC}/tests
- ./test-all.sh b2fq
- date
- '''
- }
- }
- }
- stage('test_valgrind_s4') {
- agent{label " slave4 || slave14 "}
-
- steps {
- pre_test()
- catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
- sh '''
- cd ${WKC}/tests/pytest
- ./valgrind-test.sh 2>&1 > mem-error-out.log
- ./handle_val_log.sh
- '''
- }
- timeout(time: 55, unit: 'MINUTES'){
- sh '''
- date
- cd ${WKC}/tests
- ./test-all.sh b3fq
- date'''
- sh '''
- date
- cd ${WKC}/tests
- ./test-all.sh full example
- date'''
- }
- }
- }
- stage('test_b4_s7') {
- agent{label " slave7 || slave17 "}
- steps {
- timeout(time: 105, unit: 'MINUTES'){
pre_test()
- sh '''
- date
- cd ${WKC}/tests
- ./test-all.sh b4fq
- cd ${WKC}/tests
- ./test-all.sh p4
- '''
- // cd ${WKC}/tests
- // ./test-all.sh full jdbc
- // cd ${WKC}/tests
- // ./test-all.sh full unit
- }
- }
- }
- stage('test_b5_s8') {
- agent{label " slave8 || slave18 "}
- steps {
- timeout(time: 55, unit: 'MINUTES'){
- pre_test()
- sh '''
- date
- cd ${WKC}/tests
- ./test-all.sh b5fq
- date'''
- }
- }
- }
- stage('test_b6_s9') {
- agent{label " slave9 || slave19 "}
- steps {
- timeout(time: 55, unit: 'MINUTES'){
- pre_test()
- sh '''
- cd ${WKC}/tests
- ./test-all.sh develop-test
- '''
- sh '''
- date
- cd ${WKC}/tests
- ./test-all.sh b6fq
- date'''
+ script{
+ scope.each {
+ sh """
+ date
+ cd ${WKC}/tests
+ ./test-CI.sh ${it} 5 ${mod[3]}
+ date"""
+ }
+ }
+
}
}
}
- stage('test_b7_s10') {
- agent{label " slave10 || slave20 "}
+ stage('python_5') {
+ agent{label " slave5 || slave10 || slave15 || slave20 "}
steps {
timeout(time: 55, unit: 'MINUTES'){
pre_test()
- sh '''
- cd ${WKC}/tests
- ./test-all.sh system-test
- '''
- sh '''
- date
- cd ${WKC}/tests
- ./test-all.sh b7fq
- date'''
+ script{
+ scope.each {
+ sh """
+ date
+ cd ${WKC}/tests
+ ./test-CI.sh ${it} 5 ${mod[4]}
+ date"""
+ }
+ }
+
}
}
}
@@ -813,3 +654,4 @@ pipeline {
}
}
}
+
diff --git a/packaging/tools/makeclient.sh b/packaging/tools/makeclient.sh
index 4c3278e41b0c51e86d84c3e200092b4554e6523c..92d3f8a89cf3d985ca9149fdb9d910949285d5d8 100755
--- a/packaging/tools/makeclient.sh
+++ b/packaging/tools/makeclient.sh
@@ -43,9 +43,11 @@ if [ "$osType" != "Darwin" ]; then
if [ "$pagMode" == "lite" ]; then
#strip ${build_dir}/bin/taosd
strip ${build_dir}/bin/taos
- bin_files="${build_dir}/bin/taos ${script_dir}/remove_client.sh"
+ bin_files="${build_dir}/bin/taos \
+ ${script_dir}/remove_client.sh"
else
- bin_files="${script_dir}/remove_client.sh \
+ bin_files="${build_dir}/bin/taos \
+ ${script_dir}/remove_client.sh \
${script_dir}/set_core.sh \
${script_dir}/get_client.sh"
#${script_dir}/get_client.sh ${script_dir}/taosd-dump-cfg.gdb"
diff --git a/src/client/src/tscLocal.c b/src/client/src/tscLocal.c
index 90379e6f7e5ccb5da12e6007ca0e94cfc859ee53..85c2215a2e71746889403e60ed09279e64574750 100644
--- a/src/client/src/tscLocal.c
+++ b/src/client/src/tscLocal.c
@@ -128,12 +128,13 @@ static int32_t tscSetValueToResObj(SSqlObj *pSql, int32_t rowLen) {
// type length
int32_t bytes = pSchema[i].bytes;
pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, 2);
- if (pSchema[i].type == TSDB_DATA_TYPE_BINARY || pSchema[i].type == TSDB_DATA_TYPE_NCHAR) {
+
+ if (pSchema[i].type == TSDB_DATA_TYPE_BINARY){
bytes -= VARSTR_HEADER_SIZE;
-
- if (pSchema[i].type == TSDB_DATA_TYPE_NCHAR) {
- bytes = bytes / TSDB_NCHAR_SIZE;
- }
+ }
+ else if(pSchema[i].type == TSDB_DATA_TYPE_NCHAR || pSchema[i].type == TSDB_DATA_TYPE_JSON) {
+ bytes -= VARSTR_HEADER_SIZE;
+ bytes = bytes / TSDB_NCHAR_SIZE;
}
*(int32_t *)(pRes->data + tscFieldInfoGetOffset(pQueryInfo, 2) * totalNumOfRows + pField->bytes * i) = bytes;
diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 063333d9cf72111826309939a818938b18879060..b045c566f1a72b8f0ca970d8e30d1b0e6486be68 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -4519,13 +4519,16 @@ static int32_t validateSQLExprItemSQLFunc(SSqlCmd* pCmd, tSqlExpr* pExpr,
if (TSDB_FUNC_IS_SCALAR(functionId)) {
code = validateSQLExprItem(pCmd, pParamElem->pNode, pQueryInfo, pList, childrenTypes + i, uid, childrenHeight+i);
if (code != TSDB_CODE_SUCCESS) {
- free(childrenTypes);
+ tfree(childrenTypes);
+ tfree(childrenHeight);
return code;
}
}
if (!TSDB_FUNC_IS_SCALAR(functionId) &&
(pParamElem->pNode->type == SQL_NODE_EXPR || pParamElem->pNode->type == SQL_NODE_SQLFUNCTION)) {
+ tfree(childrenTypes);
+ tfree(childrenHeight);
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg1);
}
@@ -4547,6 +4550,8 @@ static int32_t validateSQLExprItemSQLFunc(SSqlCmd* pCmd, tSqlExpr* pExpr,
*height = maxChildrenHeight + 1;
if (anyChildAgg && anyChildScalar) {
+ tfree(childrenTypes);
+ tfree(childrenHeight);
return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg1);
}
if (anyChildAgg) {
@@ -4558,7 +4563,8 @@ static int32_t validateSQLExprItemSQLFunc(SSqlCmd* pCmd, tSqlExpr* pExpr,
*type = SQLEXPR_TYPE_AGG;
}
}
- free(childrenTypes);
+ tfree(childrenTypes);
+ tfree(childrenHeight);
//end if param list is not null
} else {
if (TSDB_FUNC_IS_SCALAR(functionId)) {
@@ -6869,7 +6875,7 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
tscError("json type error, should be string");
return invalidOperationMsg(pMsg, msg25);
}
- if (pItem->pVar.nType > TSDB_MAX_JSON_TAGS_LEN / TSDB_NCHAR_SIZE) {
+ if (pItem->pVar.nLen > TSDB_MAX_JSON_TAGS_LEN / TSDB_NCHAR_SIZE) {
tscError("json tag too long");
return invalidOperationMsg(pMsg, msg14);
}
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 585865fb23adb9b5c8c6c7f5f1367a4532f12d41..e96e3c16da84b3ffc25b33e3864c4e38dcc3977f 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -774,11 +774,12 @@ static void setResRawPtrImpl(SSqlRes* pRes, SInternalField* pInfo, int32_t i, bo
memcpy(dst, p, varDataTLen(p));
} else if (varDataLen(p) > 0) {
int32_t length = taosUcs4ToMbs(varDataVal(p), varDataLen(p), varDataVal(dst));
- varDataSetLen(dst, length);
-
- if (length == 0) {
+ if (length <= 0) {
tscError("charset:%s to %s. val:%s convert failed.", DEFAULT_UNICODE_ENCODEC, tsCharset, (char*)p);
}
+ if (length >= 0){
+ varDataSetLen(dst, length);
+ }
} else {
varDataSetLen(dst, 0);
}
@@ -809,18 +810,23 @@ static void setResRawPtrImpl(SSqlRes* pRes, SInternalField* pInfo, int32_t i, bo
varDataSetLen(dst, strlen(varDataVal(dst)));
}else if (type == TSDB_DATA_TYPE_JSON) {
int32_t length = taosUcs4ToMbs(varDataVal(realData), varDataLen(realData), varDataVal(dst));
- varDataSetLen(dst, length);
- if (length == 0) {
+
+ if (length <= 0) {
tscError("charset:%s to %s. val:%s convert failed.", DEFAULT_UNICODE_ENCODEC, tsCharset, (char*)p);
}
+ if (length >= 0){
+ varDataSetLen(dst, length);
+ }
}else if (type == TSDB_DATA_TYPE_NCHAR) { // value -> "value"
*(char*)varDataVal(dst) = '\"';
int32_t length = taosUcs4ToMbs(varDataVal(realData), varDataLen(realData), POINTER_SHIFT(varDataVal(dst), CHAR_BYTES));
- *(char*)(POINTER_SHIFT(varDataVal(dst), length + CHAR_BYTES)) = '\"';
- varDataSetLen(dst, length + CHAR_BYTES*2);
- if (length == 0) {
+ if (length <= 0) {
tscError("charset:%s to %s. val:%s convert failed.", DEFAULT_UNICODE_ENCODEC, tsCharset, (char*)p);
}
+ if (length >= 0){
+ varDataSetLen(dst, length + CHAR_BYTES*2);
+ *(char*)(POINTER_SHIFT(varDataVal(dst), length + CHAR_BYTES)) = '\"';
+ }
}else if (type == TSDB_DATA_TYPE_DOUBLE) {
double jsonVd = *(double*)(realData);
sprintf(varDataVal(dst), "%.9lf", jsonVd);
@@ -5515,10 +5521,10 @@ int parseJsontoTagData(char* json, SKVRowBuilder* kvRowBuilder, char* errMsg, in
char *tagVal = calloc(strlen(jsonValue) * TSDB_NCHAR_SIZE + TSDB_NCHAR_SIZE, 1);
*tagVal = jsonType2DbType(0, item->type); // type
char* tagData = POINTER_SHIFT(tagVal,CHAR_BYTES);
- if (!taosMbsToUcs4(jsonValue, strlen(jsonValue), varDataVal(tagData),
+ if (strlen(jsonValue) > 0 && !taosMbsToUcs4(jsonValue, strlen(jsonValue), varDataVal(tagData),
(int32_t)(strlen(jsonValue) * TSDB_NCHAR_SIZE), &outLen)) {
- tscError("json string error:%s|%s", strerror(errno), jsonValue);
- retCode = tscSQLSyntaxErrMsg(errMsg, "serizelize json error", NULL);
+ tscError("charset:%s to %s. val:%s, errno:%s, convert failed.", DEFAULT_UNICODE_ENCODEC, tsCharset, jsonValue, strerror(errno));
+ retCode = tscSQLSyntaxErrMsg(errMsg, "charset convert json error", NULL);
free(tagVal);
goto end;
}
diff --git a/src/common/src/texpr.c b/src/common/src/texpr.c
index 63a19c5c1b74028b8536982b0b2445c06de121b4..db3bec2ddfeee60a90df33cae4c9770bfdb7c46f 100644
--- a/src/common/src/texpr.c
+++ b/src/common/src/texpr.c
@@ -27,6 +27,7 @@
#include "tskiplist.h"
#include "texpr.h"
#include "tarithoperator.h"
+#include "tulog.h"
static int32_t exprValidateMathNode(tExprNode *pExpr);
static int32_t exprValidateStringConcatNode(tExprNode *pExpr);
@@ -1274,6 +1275,11 @@ void castConvert(int16_t inputType, int16_t inputBytes, char *input, int16_t Out
} else if (inputType == TSDB_DATA_TYPE_NCHAR) {
char *newColData = calloc(1, outputBytes * TSDB_NCHAR_SIZE + 1);
int len = taosUcs4ToMbs(varDataVal(input), varDataLen(input), newColData);
+ if (len < 0){
+ uError("castConvert taosUcs4ToMbs error 1");
+ tfree(newColData);
+ return;
+ }
newColData[len] = 0;
*(int64_t *)output = strtoll(newColData, NULL, 10);
tfree(newColData);
@@ -1291,6 +1297,11 @@ void castConvert(int16_t inputType, int16_t inputBytes, char *input, int16_t Out
} else if (inputType == TSDB_DATA_TYPE_NCHAR) {
char *newColData = calloc(1, outputBytes * TSDB_NCHAR_SIZE + 1);
int len = taosUcs4ToMbs(varDataVal(input), varDataLen(input), newColData);
+ if (len < 0){
+ uError("castConvert taosUcs4ToMbs error 2");
+ tfree(newColData);
+ return;
+ }
newColData[len] = 0;
*(int64_t *)output = strtoull(newColData, NULL, 10);
tfree(newColData);
@@ -1332,11 +1343,19 @@ void castConvert(int16_t inputType, int16_t inputBytes, char *input, int16_t Out
if (inputType == TSDB_DATA_TYPE_BOOL) {
char tmp[8] = {0};
int32_t len = sprintf(tmp, "%.*s", ncharSize, *(int8_t*)input ? "true" : "false");
- taosMbsToUcs4(tmp, len, varDataVal(output), outputBytes - VARSTR_HEADER_SIZE, &len);
+ bool ret = taosMbsToUcs4(tmp, len, varDataVal(output), outputBytes - VARSTR_HEADER_SIZE, &len);
+ if(!ret) {
+ uError("castConvert1 taosMbsToUcs4 error");
+ return;
+ }
varDataSetLen(output, len);
} else if (inputType == TSDB_DATA_TYPE_BINARY) {
int32_t len = ncharSize > varDataLen(input) ? varDataLen(input) : ncharSize;
- taosMbsToUcs4(input + VARSTR_HEADER_SIZE, len, varDataVal(output), outputBytes - VARSTR_HEADER_SIZE, &len);
+ bool ret = taosMbsToUcs4(input + VARSTR_HEADER_SIZE, len, varDataVal(output), outputBytes - VARSTR_HEADER_SIZE, &len);
+ if(!ret) {
+ uError("castConvert2 taosMbsToUcs4 error");
+ return;
+ }
varDataSetLen(output, len);
} else if (inputType == TSDB_DATA_TYPE_TIMESTAMP) {
assert(0);
@@ -1348,7 +1367,11 @@ void castConvert(int16_t inputType, int16_t inputBytes, char *input, int16_t Out
char tmp[400] = {0};
NUM_TO_STRING(inputType, input, sizeof(tmp), tmp);
int32_t len = (int32_t)(ncharSize > strlen(tmp) ? strlen(tmp) : ncharSize);
- taosMbsToUcs4(tmp, len, varDataVal(output), outputBytes - VARSTR_HEADER_SIZE, &len);
+ bool ret = taosMbsToUcs4(tmp, len, varDataVal(output), outputBytes - VARSTR_HEADER_SIZE, &len);
+ if(!ret) {
+ uError("castConvert3 taosMbsToUcs4 error");
+ return;
+ }
varDataSetLen(output, len);
}
break;
diff --git a/src/common/src/tvariant.c b/src/common/src/tvariant.c
index ee85d2f0086bb2676cb8699ad6bc2acaa33c5fbb..0d00856f9be76ee917d12ff7435142d6d55ccecf 100644
--- a/src/common/src/tvariant.c
+++ b/src/common/src/tvariant.c
@@ -23,6 +23,7 @@
#include "ttype.h"
#include "tutil.h"
#include "tvariant.h"
+#include "tulog.h"
#define SET_EXT_INFO(converted, res, minv, maxv, exti) do { \
if (converted == NULL || exti == NULL || *converted == false) { break; } \
@@ -359,8 +360,12 @@ int32_t tVariantToString(tVariant *pVar, char *dst) {
case TSDB_DATA_TYPE_NCHAR: {
dst[0] = '\'';
- taosUcs4ToMbs(pVar->wpz, (twcslen(pVar->wpz) + 1) * TSDB_NCHAR_SIZE, dst + 1);
- int32_t len = (int32_t)strlen(dst);
+ int32_t len = taosUcs4ToMbs(pVar->wpz, (twcslen(pVar->wpz) + 1) * TSDB_NCHAR_SIZE, dst + 1);
+ if (len < 0){
+ uError("castConvert1 taosUcs4ToMbs error");
+ return 0 ;
+ }
+ len = (int32_t)strlen(dst);
dst[len] = '\'';
dst[len + 1] = 0;
return len + 1;
@@ -428,11 +433,17 @@ static int32_t toBinary(tVariant *pVariant, char **pDest, int32_t *pDestSize) {
pBuf = realloc(pBuf, newSize + 1);
}
- taosUcs4ToMbs(pVariant->wpz, (int32_t)newSize, pBuf);
+ int32_t len = taosUcs4ToMbs(pVariant->wpz, (int32_t)newSize, pBuf);
+ if (len < 0){
+ uError("castConvert1 taosUcs4ToMbs error");
+ }
free(pVariant->wpz);
pBuf[newSize] = 0;
} else {
- taosUcs4ToMbs(pVariant->wpz, (int32_t)newSize, *pDest);
+ int32_t len = taosUcs4ToMbs(pVariant->wpz, (int32_t)newSize, *pDest);
+ if (len < 0){
+ uError("castConvert1 taosUcs4ToMbs error");
+ }
}
} else {
diff --git a/src/connector/C#/src/TDengineDriver/TDengineDriver.cs b/src/connector/C#/src/TDengineDriver/TDengineDriver.cs
index 42bba438522db2a1c238609036e2b5be8b37929f..15e0ca0841c0022439c00fc1b7357b770ccb14f6 100644
--- a/src/connector/C#/src/TDengineDriver/TDengineDriver.cs
+++ b/src/connector/C#/src/TDengineDriver/TDengineDriver.cs
@@ -398,5 +398,8 @@ namespace TDengineDriver
IntPtr stmtErrPrt = StmtErrPtr(stmt);
return Marshal.PtrToStringAnsi(stmtErrPrt);
}
+
+ [DllImport("taos", EntryPoint = "taos_fetch_lengths", CallingConvention = CallingConvention.Cdecl)]
+ static extern public IntPtr FetchLengths(IntPtr taos);
}
}
diff --git a/src/connector/C#/src/test/Cases/Cases.csproj b/src/connector/C#/src/test/Cases/Cases.csproj
index f2ae6938fb4b8c58d9bb657e5fb504814068e92e..57c0dd8f7d363e9da4ae580751cacf706f714883 100644
--- a/src/connector/C#/src/test/Cases/Cases.csproj
+++ b/src/connector/C#/src/test/Cases/Cases.csproj
@@ -9,4 +9,8 @@
net5.0
+
+ true
+ ..\doc\FunctionTest.XML
+
diff --git a/src/connector/C#/src/test/Cases/FetchLength.cs b/src/connector/C#/src/test/Cases/FetchLength.cs
new file mode 100644
index 0000000000000000000000000000000000000000..b5c5c4ecadcd1ff67060a62ac6cfb460e65a530d
--- /dev/null
+++ b/src/connector/C#/src/test/Cases/FetchLength.cs
@@ -0,0 +1,44 @@
+using System;
+using Test.UtilsTools;
+using System.Collections.Generic;
+
+namespace Cases
+{
+
+ public class FetchLengthCase
+ {
+ /// xiaolei
+ /// TestRetrieveBinary
+ /// TD-12103 C# connector fetch_row with binary data retrieving error
+ /// FetchLength.cs
+ /// pass or failed
+ public void TestRetrieveBinary(IntPtr conn)
+ {
+ string sql1 = "create stable stb1 (ts timestamp, name binary(10)) tags(n int);";
+ string sql2 = "insert into tb1 using stb1 tags(1) values(now, 'log');";
+ string sql3 = "insert into tb2 using stb1 tags(2) values(now, 'test');";
+ string sql4 = "insert into tb3 using stb1 tags(3) values(now, 'db02');";
+ string sql5 = "insert into tb4 using stb1 tags(4) values(now, 'db3');";
+
+ string sql6 = "select distinct(name) from stb1;";//
+
+ UtilsTools.ExecuteQuery(conn, sql1);
+ UtilsTools.ExecuteQuery(conn, sql2);
+ UtilsTools.ExecuteQuery(conn, sql3);
+ UtilsTools.ExecuteQuery(conn, sql4);
+ UtilsTools.ExecuteQuery(conn, sql5);
+
+ IntPtr resPtr = IntPtr.Zero;
+ resPtr = UtilsTools.ExecuteQuery(conn, sql6);
+ List> result = UtilsTools.GetResultSet(resPtr);
+
+ List colname = result[0];
+ List data = result[1];
+ UtilsTools.AssertEqual("db3", data[0]);
+ UtilsTools.AssertEqual("log", data[1]);
+ UtilsTools.AssertEqual("db02", data[2]);
+ UtilsTools.AssertEqual("test", data[3]);
+
+ }
+ }
+}
diff --git a/src/connector/C#/src/test/Cases/Program.cs b/src/connector/C#/src/test/Cases/Program.cs
index a1b47f3890134040d3060fdb7b1e8d3beed4b7dd..89f878e994aa35977fc69c5576bca0ec21c41882 100644
--- a/src/connector/C#/src/test/Cases/Program.cs
+++ b/src/connector/C#/src/test/Cases/Program.cs
@@ -1,64 +1,67 @@
-using System;
-using Test.UtilsTools;
-using Cases;
-
-namespace Cases.EntryPoint
-{
- class Program
- {
-
- static void Main(string[] args)
- {
- IntPtr conn = IntPtr.Zero;
- IntPtr stmt = IntPtr.Zero;
- IntPtr res = IntPtr.Zero;
-
- conn = UtilsTools.TDConnection("127.0.0.1", "root", "taosdata", "", 0);
- UtilsTools.ExecuteQuery(conn, "drop database if exists csharp");
- UtilsTools.ExecuteQuery(conn, "create database if not exists csharp keep 3650");
- UtilsTools.ExecuteQuery(conn, "use csharp");
-
- Console.WriteLine("====================StableColumnByColumn===================");
- StableColumnByColumn columnByColumn = new StableColumnByColumn();
- columnByColumn.Test(conn, "stablecolumnbycolumn");
- Console.WriteLine("====================StmtStableQuery===================");
- StmtStableQuery stmtStableQuery = new StmtStableQuery();
- stmtStableQuery.Test(conn, "stablecolumnbycolumn");
-
- Console.WriteLine("====================StableMutipleLine===================");
- StableMutipleLine mutipleLine = new StableMutipleLine();
- mutipleLine.Test(conn, "stablemutipleline");
-
- //================================================================================
-
- Console.WriteLine("====================NtableSingleLine===================");
- NtableSingleLine ntableSingleLine = new NtableSingleLine();
- ntableSingleLine.Test(conn, "stablesingleline");
-
- Console.WriteLine("====================NtableMutipleLine===================");
- NtableMutipleLine ntableMutipleLine = new NtableMutipleLine();
- ntableMutipleLine.Test(conn, "ntablemutipleline");
- Console.WriteLine("====================StmtNtableQuery===================");
- StmtNtableQuery stmtNtableQuery = new StmtNtableQuery();
- stmtNtableQuery.Test(conn, "ntablemutipleline");
-
- Console.WriteLine("====================NtableColumnByColumn===================");
- NtableColumnByColumn ntableColumnByColumn = new NtableColumnByColumn();
- ntableColumnByColumn.Test(conn, "ntablecolumnbycolumn");
-
- Console.WriteLine("====================fetchfeilds===================");
- FetchFields fetchFields = new FetchFields();
- fetchFields.Test(conn,"fetchfeilds");
-
- Console.WriteLine("===================JsonTagTest====================");
- JsonTagTest jsonTagTest = new JsonTagTest();
- jsonTagTest.Test(conn);
-
- // UtilsTools.ExecuteQuery(conn, "drop database if exists csharp");
- UtilsTools.CloseConnection(conn);
- UtilsTools.ExitProgram();
-
-
- }
- }
-}
+using System;
+using Test.UtilsTools;
+using Cases;
+
+namespace Cases.EntryPoint
+{
+ class Program
+ {
+
+ static void Main(string[] args)
+ {
+ IntPtr conn = IntPtr.Zero;
+ IntPtr stmt = IntPtr.Zero;
+ IntPtr res = IntPtr.Zero;
+
+ conn = UtilsTools.TDConnection("127.0.0.1", "root", "taosdata", "", 0);
+ UtilsTools.ExecuteQuery(conn, "drop database if exists csharp");
+ UtilsTools.ExecuteQuery(conn, "create database if not exists csharp keep 3650");
+ UtilsTools.ExecuteQuery(conn, "use csharp");
+
+ Console.WriteLine("====================StableColumnByColumn===================");
+ StableColumnByColumn columnByColumn = new StableColumnByColumn();
+ columnByColumn.Test(conn, "stablecolumnbycolumn");
+ Console.WriteLine("====================StmtStableQuery===================");
+ StmtStableQuery stmtStableQuery = new StmtStableQuery();
+ stmtStableQuery.Test(conn, "stablecolumnbycolumn");
+
+ Console.WriteLine("====================StableMutipleLine===================");
+ StableMutipleLine mutipleLine = new StableMutipleLine();
+ mutipleLine.Test(conn, "stablemutipleline");
+
+ //================================================================================
+
+ Console.WriteLine("====================NtableSingleLine===================");
+ NtableSingleLine ntableSingleLine = new NtableSingleLine();
+ ntableSingleLine.Test(conn, "stablesingleline");
+
+ Console.WriteLine("====================NtableMutipleLine===================");
+ NtableMutipleLine ntableMutipleLine = new NtableMutipleLine();
+ ntableMutipleLine.Test(conn, "ntablemutipleline");
+ Console.WriteLine("====================StmtNtableQuery===================");
+ StmtNtableQuery stmtNtableQuery = new StmtNtableQuery();
+ stmtNtableQuery.Test(conn, "ntablemutipleline");
+
+ Console.WriteLine("====================NtableColumnByColumn===================");
+ NtableColumnByColumn ntableColumnByColumn = new NtableColumnByColumn();
+ ntableColumnByColumn.Test(conn, "ntablecolumnbycolumn");
+
+ Console.WriteLine("====================fetchfeilds===================");
+ FetchFields fetchFields = new FetchFields();
+ fetchFields.Test(conn, "fetchfeilds");
+
+ Console.WriteLine("===================JsonTagTest====================");
+ JsonTagTest jsonTagTest = new JsonTagTest();
+ jsonTagTest.Test(conn);
+
+ Console.WriteLine("====================fetchLengthCase===================");
+ FetchLengthCase fetchLengthCase = new FetchLengthCase();
+ fetchLengthCase.TestRetrieveBinary(conn);
+
+ UtilsTools.ExecuteQuery(conn, "drop database if exists csharp");
+ UtilsTools.CloseConnection(conn);
+ UtilsTools.ExitProgram();
+
+ }
+ }
+}
diff --git a/src/connector/C#/src/test/Cases/Utils.cs b/src/connector/C#/src/test/Cases/Utils.cs
index a549d75b16f76539b0f19d73eab576d0d9d582db..7877601e0adbc38c186bd44456ceb3005d806ff1 100644
--- a/src/connector/C#/src/test/Cases/Utils.cs
+++ b/src/connector/C#/src/test/Cases/Utils.cs
@@ -35,7 +35,6 @@ namespace Test.UtilsTools
else
{
Console.WriteLine(sql.ToString() + " success");
-
}
return res;
}
@@ -83,9 +82,13 @@ namespace Test.UtilsTools
IntPtr rowdata;
StringBuilder builder = new StringBuilder();
+
while ((rowdata = TDengine.FetchRows(res)) != IntPtr.Zero)
{
queryRows++;
+ IntPtr colLengthPtr = TDengine.FetchLengths(res);
+ int[] colLengthArr = new int[fieldCount];
+ Marshal.Copy(colLengthPtr, colLengthArr, 0, fieldCount);
for (int fields = 0; fields < fieldCount; ++fields)
{
TDengineMeta meta = metas[fields];
@@ -131,7 +134,7 @@ namespace Test.UtilsTools
builder.Append(v7);
break;
case TDengineDataType.TSDB_DATA_TYPE_BINARY:
- string v8 = Marshal.PtrToStringAnsi(data);
+ string v8 = Marshal.PtrToStringAnsi(data, colLengthArr[fields]);
builder.Append(v8);
break;
case TDengineDataType.TSDB_DATA_TYPE_TIMESTAMP:
@@ -139,7 +142,7 @@ namespace Test.UtilsTools
builder.Append(v9);
break;
case TDengineDataType.TSDB_DATA_TYPE_NCHAR:
- string v10 = Marshal.PtrToStringAnsi(data);
+ string v10 = Marshal.PtrToStringAnsi(data, colLengthArr[fields]);
builder.Append(v10);
break;
case TDengineDataType.TSDB_DATA_TYPE_JSONTAG:
@@ -164,6 +167,117 @@ namespace Test.UtilsTools
TDengine.FreeResult(res); Console.WriteLine("");
}
+ public static List> GetResultSet(IntPtr res)
+ {
+ List> result = new List>();
+ List colName = new List();
+ List dataRaw = new List();
+ long queryRows = 0;
+ if (!IsValidResult(res))
+ {
+ ExitProgram();
+ }
+
+ int fieldCount = TDengine.FieldCount(res);
+ List metas = TDengine.FetchFields(res);
+
+ for (int j = 0; j < metas.Count; j++)
+ {
+ TDengineMeta meta = (TDengineMeta)metas[j];
+ colName.Add(meta.name);
+ }
+ result.Add(colName);
+
+ IntPtr rowdata;
+ while ((rowdata = TDengine.FetchRows(res)) != IntPtr.Zero)
+ {
+ queryRows++;
+ IntPtr colLengthPtr = TDengine.FetchLengths(res);
+ int[] colLengthArr = new int[fieldCount];
+ Marshal.Copy(colLengthPtr, colLengthArr, 0, fieldCount);
+
+ for (int fields = 0; fields < fieldCount; ++fields)
+ {
+ TDengineMeta meta = metas[fields];
+ int offset = IntPtr.Size * fields;
+ IntPtr data = Marshal.ReadIntPtr(rowdata, offset);
+
+ if (data == IntPtr.Zero)
+ {
+ dataRaw.Add("NULL");
+ continue;
+ }
+
+ switch ((TDengineDataType)meta.type)
+ {
+ case TDengineDataType.TSDB_DATA_TYPE_BOOL:
+ bool v1 = Marshal.ReadByte(data) == 0 ? false : true;
+ dataRaw.Add(v1.ToString());
+ break;
+ case TDengineDataType.TSDB_DATA_TYPE_TINYINT:
+ byte v2 = Marshal.ReadByte(data);
+ dataRaw.Add(v2.ToString());
+ break;
+ case TDengineDataType.TSDB_DATA_TYPE_SMALLINT:
+ short v3 = Marshal.ReadInt16(data);
+ dataRaw.Add(v3.ToString());
+ break;
+ case TDengineDataType.TSDB_DATA_TYPE_INT:
+ int v4 = Marshal.ReadInt32(data);
+ dataRaw.Add(v4.ToString());
+ break;
+ case TDengineDataType.TSDB_DATA_TYPE_BIGINT:
+ long v5 = Marshal.ReadInt64(data);
+ dataRaw.Add(v5.ToString());
+ break;
+ case TDengineDataType.TSDB_DATA_TYPE_FLOAT:
+ float v6 = (float)Marshal.PtrToStructure(data, typeof(float));
+ dataRaw.Add(v6.ToString());
+ break;
+ case TDengineDataType.TSDB_DATA_TYPE_DOUBLE:
+ double v7 = (double)Marshal.PtrToStructure(data, typeof(double));
+ dataRaw.Add(v7.ToString());
+ break;
+ case TDengineDataType.TSDB_DATA_TYPE_BINARY:
+ string v8 = Marshal.PtrToStringAnsi(data, colLengthArr[fields]);
+ dataRaw.Add(v8);
+ break;
+ case TDengineDataType.TSDB_DATA_TYPE_TIMESTAMP:
+ long v9 = Marshal.ReadInt64(data);
+ dataRaw.Add(v9.ToString());
+ break;
+ case TDengineDataType.TSDB_DATA_TYPE_NCHAR:
+ string v10 = Marshal.PtrToStringAnsi(data, colLengthArr[fields]);
+ dataRaw.Add(v10);
+ break;
+ }
+ }
+
+ }
+ result.Add(dataRaw);
+
+ if (TDengine.ErrorNo(res) != 0)
+ {
+ Console.Write("Query is not complete, Error {0:G}", TDengine.ErrorNo(res), TDengine.Error(res));
+ }
+ TDengine.FreeResult(res); Console.WriteLine("");
+ return result;
+ }
+
+ public static bool IsValidResult(IntPtr res)
+ {
+ if ((res == IntPtr.Zero) || (TDengine.ErrorNo(res) != 0))
+ {
+ if (res != IntPtr.Zero)
+ {
+ Console.Write("reason: " + TDengine.Error(res));
+ return false;
+ }
+ Console.WriteLine("");
+ return false;
+ }
+ return true;
+ }
public static void CloseConnection(IntPtr conn)
{
if (conn != IntPtr.Zero)
@@ -183,6 +297,18 @@ namespace Test.UtilsTools
List metas = TDengine.FetchFields(res);
return metas;
}
+ public static void AssertEqual(string expectVal, string actualVal)
+ {
+ if (expectVal == actualVal)
+ {
+ Console.WriteLine("{0}=={1} pass", expectVal, actualVal);
+ }
+ else
+ {
+ Console.WriteLine("{0}=={1} failed", expectVal, actualVal);
+ ExitProgram();
+ }
+ }
public static void ExitProgram()
{
TDengine.Cleanup();
diff --git a/src/connector/C#/src/test/XUnitTest/XUnitTest.csproj b/src/connector/C#/src/test/XUnitTest/XUnitTest.csproj
index 97d13e5e9e74abada2efa27d64e57adbe5459023..997a9d6fe072c01ffeb45a32773f8c76a530825c 100644
--- a/src/connector/C#/src/test/XUnitTest/XUnitTest.csproj
+++ b/src/connector/C#/src/test/XUnitTest/XUnitTest.csproj
@@ -2,10 +2,14 @@
net5.0
-
false
+
+ true
+ ..\doc\UnitTest.XML
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetRowData.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetRowData.java
index d8ac10d839651bb476a8688f28917aa356b5b1fe..9f573452b1aacbaaf8593433a0b0c5986ad9d3aa 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetRowData.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetRowData.java
@@ -443,16 +443,29 @@ public class TSDBResultSetRowData {
case 0: {
milliseconds = ts;
fracNanoseconds = (int) (ts * 1_000_000 % 1_000_000_000);
+ fracNanoseconds = fracNanoseconds < 0 ? 1_000_000_000 + fracNanoseconds : fracNanoseconds;
break;
}
case 1: {
milliseconds = ts / 1_000;
fracNanoseconds = (int) (ts * 1_000 % 1_000_000_000);
+ if (fracNanoseconds < 0) {
+ if (milliseconds == 0 ){
+ milliseconds = -1;
+ }
+ fracNanoseconds += 1_000_000_000;
+ }
break;
}
case 2: {
milliseconds = ts / 1_000_000;
fracNanoseconds = (int) (ts % 1_000_000_000);
+ if (fracNanoseconds < 0) {
+ if (milliseconds == 0 ){
+ milliseconds = -1;
+ }
+ fracNanoseconds += 1_000_000_000;
+ }
break;
}
default: {
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/DatetimeBefore1970Test.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/DatetimeBefore1970Test.java
index bfffaa4a129dc7fe19a92c34abbcc886d5e4e22f..4f7f123f5c8b135e757919c8913f1f1bb032d98e 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/DatetimeBefore1970Test.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/DatetimeBefore1970Test.java
@@ -1,23 +1,36 @@
package com.taosdata.jdbc.cases;
+import com.taosdata.jdbc.annotation.CatalogRunner;
+import com.taosdata.jdbc.annotation.Description;
+import com.taosdata.jdbc.annotation.TestTarget;
import com.taosdata.jdbc.utils.TimestampUtil;
import org.junit.*;
+import org.junit.runner.RunWith;
import java.sql.*;
+@RunWith(CatalogRunner.class)
+@TestTarget(alias = "negative value convert to timestamp", author = "huolibo", version = "2.0.37")
public class DatetimeBefore1970Test {
private static final String host = "127.0.0.1";
private Connection conn;
@Test
- public void test() throws SQLException {
+ @Description("millisecond")
+ public void msTest() throws SQLException {
+ conn = createEnvironment("ms");
+ long now = System.currentTimeMillis();
try (Statement stmt = conn.createStatement()) {
// given
+ // before
+ stmt.executeUpdate("insert into weather(ts) values('1969-12-31 00:00:00.001')");
stmt.executeUpdate("insert into weather(ts) values('1969-12-31 23:59:59.999')");
+ // zero
stmt.executeUpdate("insert into weather(ts) values('1970-01-01 00:00:00.000')");
- stmt.executeUpdate("insert into weather(ts) values('1970-01-01 08:00:00.000')");
- stmt.executeUpdate("insert into weather(ts) values('1970-01-01 07:59:59.999')");
+ //after
+ stmt.executeUpdate("insert into weather(ts) values('1970-01-01 00:00:00.001')");
+ stmt.executeUpdate("insert into weather(ts) values(" + now + ")");
ResultSet rs = stmt.executeQuery("select * from weather order by ts asc");
ResultSetMetaData metaData = rs.getMetaData();
Assert.assertEquals(2, metaData.getColumnCount());
@@ -26,44 +39,221 @@ public class DatetimeBefore1970Test {
rs.next();
// then
Timestamp ts = rs.getTimestamp("ts");
- Assert.assertEquals("1969-12-31 23:59:59.999", TimestampUtil.longToDatetime(ts.getTime()));
+ Assert.assertEquals(-24 * 60 * 60 * 1000 + 1, ts.getTime());
// when
rs.next();
// then
ts = rs.getTimestamp("ts");
- Assert.assertEquals("1970-01-01 00:00:00.000", TimestampUtil.longToDatetime(ts.getTime()));
+ Assert.assertEquals(-1, ts.getTime());
// when
rs.next();
// then
ts = rs.getTimestamp("ts");
- Assert.assertEquals("1970-01-01 08:00:00.000", TimestampUtil.longToDatetime(ts.getTime()));
+ Assert.assertEquals(0, ts.getTime());
+
+ // when
+ rs.next();
+ // then
+ ts = rs.getTimestamp("ts");
+ Assert.assertEquals(1, ts.getTime());
+
+ // when
+ rs.next();
+ // then
+ ts = rs.getTimestamp("ts");
+ Assert.assertEquals(now, ts.getTime());
+ }
+ }
+
+ @Test
+ @Description("microsecond")
+ public void usTest() throws SQLException {
+ conn = createEnvironment("us");
+ long now = System.currentTimeMillis();
+ try (Statement stmt = conn.createStatement()) {
+ // given
+ stmt.executeUpdate("insert into weather(ts) values('1969-12-31 00:00:00.000001')");
+ stmt.executeUpdate("insert into weather(ts) values('1969-12-31 23:59:59.999999')");
+ stmt.executeUpdate("insert into weather(ts) values('1970-01-01 00:00:00.000000')");
+ stmt.executeUpdate("insert into weather(ts) values('1970-01-01 00:00:00.000001')");
+ stmt.executeUpdate("insert into weather(ts) values(" + now + ")");
+ ResultSet rs = stmt.executeQuery("select * from weather order by ts asc");
+ ResultSetMetaData metaData = rs.getMetaData();
+ Assert.assertEquals(2, metaData.getColumnCount());
+
+ // when
+ rs.next();
+ // then
+ Timestamp ts = rs.getTimestamp("ts");
+ Assert.assertEquals(-24 * 60 * 60 * 1000, ts.getTime());
+ Assert.assertEquals(1_000, ts.getNanos());
+
+ // when
+ rs.next();
+ // then
+ ts = rs.getTimestamp("ts");
+ Assert.assertEquals(-1, ts.getTime());
+ Assert.assertEquals(999_999_000, ts.getNanos());
+
+ // when
+ rs.next();
+ // then
+ ts = rs.getTimestamp("ts");
+ Assert.assertEquals(0, ts.getTime());
+
+ // when
+ rs.next();
+ // then
+ ts = rs.getTimestamp("ts");
+ Assert.assertEquals(0, ts.getTime());
+ Assert.assertEquals(1_000, ts.getNanos());
+
+ // when
+ rs.next();
+ // then
+ ts = rs.getTimestamp("ts");
+ String s = String.valueOf(now);
+ Assert.assertEquals(Long.parseLong(s.substring(0, s.length() - 3)), ts.getTime());
+ Assert.assertEquals(Long.parseLong(s.substring(s.length() - 6) + "000"), ts.getNanos());
+ }
+ }
+
+ @Test
+ @Description("nanosecond")
+ public void nanoTest() throws SQLException {
+ conn = createEnvironment("ns");
+ long now = System.currentTimeMillis() * 1000_000L + System.nanoTime() % 1000_000L;
+ try (Statement stmt = conn.createStatement()) {
+ // given
+ stmt.executeUpdate("insert into weather(ts) values('1969-12-31 00:00:00.000000123')");
+ stmt.executeUpdate("insert into weather(ts) values('1969-12-31 23:59:59.999999999')");
+ stmt.executeUpdate("insert into weather(ts) values('1970-01-01 00:00:00.000')");
+ stmt.executeUpdate("insert into weather(ts) values('1970-01-01 00:00:00.000000001')");
+ stmt.executeUpdate("insert into weather(ts) values(" + now + ")");
+ ResultSet rs = stmt.executeQuery("select * from weather order by ts asc");
+ ResultSetMetaData metaData = rs.getMetaData();
+ Assert.assertEquals(2, metaData.getColumnCount());
+
+ // when
+ rs.next();
+ // then
+ Timestamp ts = rs.getTimestamp("ts");
+ Assert.assertEquals(-24 * 60 * 60 * 1_000, ts.getTime());
+ Assert.assertEquals(123, ts.getNanos());
+
+ // when
+ rs.next();
+ // then
+ ts = rs.getTimestamp("ts");
+ Assert.assertEquals(-1, ts.getTime());
+ Assert.assertEquals(999999999, ts.getNanos());
+
+ // when
+ rs.next();
+ // then
+ ts = rs.getTimestamp("ts");
+ Assert.assertEquals(0, ts.getNanos());
+
+ // when
+ rs.next();
+ // then
+ ts = rs.getTimestamp("ts");
+ Assert.assertEquals(1, ts.getNanos());
+
+ // when
+ rs.next();
+ // then
+ ts = rs.getTimestamp("ts");
+ String s = String.valueOf(now);
+ Assert.assertEquals(Long.parseLong(s.substring(0, s.length() - 6)), ts.getTime());
+ Assert.assertEquals(Long.parseLong(s.substring(s.length() - 9)), ts.getNanos());
+ }
+ }
+
+ @Test
+ @Ignore
+ @Description("nanosecond convert timestamp when timezone is asia shanghai")
+ public void asiaShanghaiTest() throws SQLException {
+ conn = createEnvironment("ns");
+ long now = System.currentTimeMillis() * 1000_000L + System.nanoTime() % 1000_000L;
+ try (Statement stmt = conn.createStatement()) {
+ // given
+ stmt.executeUpdate("insert into weather(ts) values('1969-12-31 00:00:00.000000123')");
+ stmt.executeUpdate("insert into weather(ts) values('1969-12-31 23:59:59.999999999')");
+ stmt.executeUpdate("insert into weather(ts) values('1970-01-01 00:00:00.000')");
+ stmt.executeUpdate("insert into weather(ts) values('1970-01-01 00:00:00.000000001')");
+ stmt.executeUpdate("insert into weather(ts) values(" + now + ")");
+ ResultSet rs = stmt.executeQuery("select * from weather order by ts asc");
+ ResultSetMetaData metaData = rs.getMetaData();
+ Assert.assertEquals(2, metaData.getColumnCount());
+
+ // when
+ rs.next();
+ // then
+ Timestamp ts = rs.getTimestamp("ts");
+ Assert.assertEquals("1969-12-31 08:00:00.000", TimestampUtil.longToDatetime(ts.getTime()));
+ Assert.assertEquals(123, ts.getNanos());
// when
rs.next();
// then
ts = rs.getTimestamp("ts");
Assert.assertEquals("1970-01-01 07:59:59.999", TimestampUtil.longToDatetime(ts.getTime()));
+ Assert.assertEquals(999999999, ts.getNanos());
+
+ // when
+ rs.next();
+ // then
+ ts = rs.getTimestamp("ts");
+ Assert.assertEquals("1970-01-01 08:00:00.000", TimestampUtil.longToDatetime(ts.getTime()));
+ Assert.assertEquals(0, ts.getNanos());
+
+ // when
+ rs.next();
+ // then
+ ts = rs.getTimestamp("ts");
+ Assert.assertEquals("1970-01-01 08:00:00.000", TimestampUtil.longToDatetime(ts.getTime()));
+ Assert.assertEquals(1, ts.getNanos());
+
+ // when
+ rs.next();
+ // then
+ ts = rs.getTimestamp("ts");
+ String s = String.valueOf(now);
+ Assert.assertEquals(Long.parseLong(s.substring(0, s.length() - 6)), ts.getTime());
+ Assert.assertEquals(Long.parseLong(s.substring(s.length() - 9)), ts.getNanos());
}
}
- @Before
- public void before() throws SQLException {
- conn = DriverManager.getConnection("jdbc:TAOS://" + host + ":6030/?user=root&password=taosdata");
+ private Connection createEnvironment(String precision) throws SQLException {
+ String url = "jdbc:TAOS://" + host + ":6030/?user=root&password=taosdata&timezone=UTC";
+ String createSql = "create database if not exists test_timestamp keep 36500";
+ if (!isEmpty(precision)) {
+ createSql += " precision '" + precision + "'";
+ }
+ conn = DriverManager.getConnection(url);
Statement stmt = conn.createStatement();
stmt.execute("drop database if exists test_timestamp");
- stmt.execute("create database if not exists test_timestamp keep 36500");
+ stmt.execute(createSql);
stmt.execute("use test_timestamp");
stmt.execute("create table weather(ts timestamp,f1 float)");
stmt.close();
+ return conn;
+ }
+
+ private boolean isEmpty(String string) {
+ return null == string || string.trim().equals("");
}
@After
public void after() throws SQLException {
- Statement stmt = conn.createStatement();
- stmt.execute("drop database if exists test_timestamp");
- if (conn != null)
+ if (conn != null) {
+ Statement stmt = conn.createStatement();
+ stmt.execute("drop database if exists test_timestamp");
+ stmt.close();
conn.close();
+ }
}
}
diff --git a/src/connector/python/README.md b/src/connector/python/README.md
index 1bde964828f1c52bf65e62ef67f2fdb7fc90c355..e4fce45a59bea74ea64a5da082767579459d4196 100644
--- a/src/connector/python/README.md
+++ b/src/connector/python/README.md
@@ -41,6 +41,7 @@ cursor.execute("show databases")
results = cursor.fetchall()
for row in results:
print(row)
+
cursor.close()
conn.close()
```
@@ -57,8 +58,10 @@ result = conn.query("show databases")
num_of_fields = result.field_count
for field in result.fields:
print(field)
+
for row in result:
print(row)
+
result.close()
conn.execute("drop database pytest")
conn.close()
@@ -75,12 +78,13 @@ def fetch_callback(p_param, p_result, num_of_rows):
print("fetched ", num_of_rows, "rows")
p = cast(p_param, POINTER(Counter))
result = TaosResult(p_result)
-
+
if num_of_rows == 0:
print("fetching completed")
p.contents.done = True
result.close()
return
+
if num_of_rows < 0:
p.contents.done = True
result.check_error(num_of_rows)
@@ -90,6 +94,7 @@ def fetch_callback(p_param, p_result, num_of_rows):
for row in result.rows_iter(num_of_rows):
# print(row)
None
+
p.contents.count += result.row_count
result.fetch_rows_a(fetch_callback, p_param)
@@ -97,17 +102,19 @@ def fetch_callback(p_param, p_result, num_of_rows):
def query_callback(p_param, p_result, code):
# type: (c_void_p, c_void_p, c_int) -> None
- if p_result == None:
+ if p_result is None:
return
+
result = TaosResult(p_result)
if code == 0:
result.fetch_rows_a(fetch_callback, p_param)
+
result.check_error(code)
class Counter(Structure):
_fields_ = [("count", c_int), ("done", c_bool)]
-
+
def __str__(self):
return "{ count: %d, done: %s }" % (self.count, self.done)
@@ -116,10 +123,11 @@ def test_query(conn):
# type: (TaosConnection) -> None
counter = Counter(count=0)
conn.query_a("select * from log.log", query_callback, byref(counter))
-
+
while not counter.done:
print("wait query callback")
time.sleep(1)
+
print(counter)
conn.close()
@@ -182,6 +190,7 @@ result = conn.query("select * from log")
for row in result:
print(row)
+
result.close()
stmt.close()
conn.close()
@@ -237,18 +246,20 @@ result.close()
result = conn.query("select * from log")
for row in result:
print(row)
+
result.close()
stmt.close()
conn.close()
```
-### Statement API - Subscribe
+### Subscription
```python
import taos
+import random
conn = taos.connect()
-dbname = "pytest_taos_subscribe_callback"
+dbname = "pytest_taos_subscribe"
conn.execute("drop database if exists %s" % dbname)
conn.execute("create database if not exists %s" % dbname)
conn.select_db(dbname)
@@ -256,7 +267,7 @@ conn.execute("create table if not exists log(ts timestamp, n int)")
for i in range(10):
conn.execute("insert into log values(now, %d)" % i)
-sub = conn.subscribe(True, "test", "select * from log", 1000)
+sub = conn.subscribe(False, "test", "select * from log", 1000)
print("# consume from begin")
for ts, n in sub.consume():
print(ts, n)
@@ -268,9 +279,18 @@ for i in range(5):
for ts, n in result:
print(ts, n)
+sub.close(True)
+print("# keep progress consume")
+sub = conn.subscribe(False, "test", "select * from log", 1000)
+result = sub.consume()
+rows = result.fetch_all()
+# consume from latest subscription needs root privilege(for /var/lib/taos).
+assert result.row_count == 0
+print("## consumed ", len(rows), "rows")
+
print("# consume with a stop condition")
for i in range(10):
- conn.execute("insert into log values(now, %d)" % int(random() * 10))
+ conn.execute("insert into log values(now, %d)" % random.randint(0, 10))
result = sub.consume()
try:
ts, n = next(result)
@@ -283,12 +303,13 @@ for i in range(10):
continue
sub.close()
+# sub.close()
conn.execute("drop database if exists %s" % dbname)
-conn.close()
+# conn.close()
```
-### Statement API - Subscribe asynchronously with callback
+### Subscription asynchronously with callback
```python
from taos import *
@@ -300,7 +321,7 @@ import time
def subscribe_callback(p_sub, p_result, p_param, errno):
# type: (c_void_p, c_void_p, c_void_p, c_int) -> None
print("# fetch in callback")
- result = TaosResult(p_result)
+ result = TaosResult(c_void_p(p_result))
result.check_error(errno)
for row in result.rows_iter():
ts, n = row()
@@ -311,42 +332,45 @@ def test_subscribe_callback(conn):
# type: (TaosConnection) -> None
dbname = "pytest_taos_subscribe_callback"
try:
+ print("drop if exists")
conn.execute("drop database if exists %s" % dbname)
+ print("create database")
conn.execute("create database if not exists %s" % dbname)
- conn.select_db(dbname)
- conn.execute("create table if not exists log(ts timestamp, n int)")
-
+ print("create table")
+ # conn.execute("use %s" % dbname)
+ conn.execute("create table if not exists %s.log(ts timestamp, n int)" % dbname)
+
print("# subscribe with callback")
- sub = conn.subscribe(False, "test", "select * from log", 1000, subscribe_callback)
-
+ sub = conn.subscribe(False, "test", "select * from %s.log" % dbname, 1000, subscribe_callback)
+
for i in range(10):
- conn.execute("insert into log values(now, %d)" % i)
+ conn.execute("insert into %s.log values(now, %d)" % (dbname, i))
time.sleep(0.7)
+
sub.close()
-
+
conn.execute("drop database if exists %s" % dbname)
- conn.close()
+ # conn.close()
except Exception as err:
conn.execute("drop database if exists %s" % dbname)
- conn.close()
+ # conn.close()
raise err
if __name__ == "__main__":
test_subscribe_callback(connect())
-
```
-### Statement API - Stream
+### Stream
```python
from taos import *
from ctypes import *
+import time
def stream_callback(p_param, p_result, p_row):
# type: (c_void_p, c_void_p, c_void_p) -> None
-
- if p_result == None or p_row == None:
+ if p_result is None or p_row is None:
return
result = TaosResult(p_result)
row = TaosRow(result, p_row)
@@ -355,13 +379,12 @@ def stream_callback(p_param, p_result, p_row):
p = cast(p_param, POINTER(Counter))
p.contents.count += count
print("[%s] inserted %d in 5s, total count: %d" % (ts.strftime("%Y-%m-%d %H:%M:%S"), count, p.contents.count))
-
except Exception as err:
print(err)
raise err
-class Counter(ctypes.Structure):
+class Counter(Structure):
_fields_ = [
("count", c_int),
]
@@ -378,16 +401,17 @@ def test_stream(conn):
conn.execute("create database if not exists %s" % dbname)
conn.select_db(dbname)
conn.execute("create table if not exists log(ts timestamp, n int)")
-
+
result = conn.query("select count(*) from log interval(5s)")
assert result.field_count == 2
counter = Counter()
counter.count = 0
stream = conn.stream("select count(*) from log interval(5s)", stream_callback, param=byref(counter))
-
+
for _ in range(0, 20):
conn.execute("insert into log values(now,0)(now+1s, 1)(now + 2s, 2)")
time.sleep(2)
+
stream.close()
conn.execute("drop database if exists %s" % dbname)
conn.close()
@@ -399,12 +423,14 @@ def test_stream(conn):
if __name__ == "__main__":
test_stream(connect())
+
```
### Insert with line protocol
```python
import taos
+from taos import SmlProtocol, SmlPrecision
conn = taos.connect()
dbname = "pytest_line"
@@ -413,29 +439,22 @@ conn.execute("create database if not exists %s precision 'us'" % dbname)
conn.select_db(dbname)
lines = [
- 'st,t1=3i64,t2=4f64,t3="t3" c1=3i64,c3=L"pass",c2=false,c4=4f64 1626006833639000000ns',
- 'st,t1=4i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"pass it again",c2=true,c4=5f64,c5=5f64,c6=7u64 1626006933640000000',
- 'stf,t1=4i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"pass it again_stf",c2=false,c5=5f64,c6=7u64 1626006933641000000',
+ 'st,t1=3i64,t2=4f64,t3="t3" c1=3i64,c3=L"pass",c2=false,c4=4f64 1626006833639000000',
]
-conn.schemaless_insert(lines, 0, "ns")
+conn.schemaless_insert(lines, taos.SmlProtocol.LINE_PROTOCOL, taos.SmlPrecision.NOT_CONFIGURED)
print("inserted")
-lines = [
- 'stf,t1=5i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"pass it again_stf",c2=false,c5=5f64,c6=7u64 1626006933641000000',
-]
-conn.schemaless_insert(lines, 0, "ns")
+conn.schemaless_insert(lines, taos.SmlProtocol.LINE_PROTOCOL, taos.SmlPrecision.NOT_CONFIGURED)
result = conn.query("show tables")
for row in result:
print(row)
-result.close()
conn.execute("drop database if exists %s" % dbname)
-conn.close()
```
-## License - AGPL-3.0
+## License
-Keep same with [TDengine](https://github.com/taosdata/TDengine).
+We use MIT license for Python connector.
diff --git a/src/connector/python/examples/query-async.py b/src/connector/python/examples/query-async.py
index b600b796974e47d5e5fc7d88998e95ba46bb92cd..585db2344eda4c5d38c2868c35f4d91c50926880 100644
--- a/src/connector/python/examples/query-async.py
+++ b/src/connector/python/examples/query-async.py
@@ -29,7 +29,7 @@ def fetch_callback(p_param, p_result, num_of_rows):
def query_callback(p_param, p_result, code):
# type: (c_void_p, c_void_p, c_int) -> None
- if p_result == None:
+ if p_result is None:
return
result = TaosResult(p_result)
if code == 0:
diff --git a/src/connector/python/examples/stream.py b/src/connector/python/examples/stream.py
new file mode 100644
index 0000000000000000000000000000000000000000..73cbd03c493f4441d661f924bf648bc8992aeb0a
--- /dev/null
+++ b/src/connector/python/examples/stream.py
@@ -0,0 +1,59 @@
+from taos import *
+from ctypes import *
+import time
+
+def stream_callback(p_param, p_result, p_row):
+ # type: (c_void_p, c_void_p, c_void_p) -> None
+ if p_result is None or p_row is None:
+ return
+ result = TaosResult(p_result)
+ row = TaosRow(result, p_row)
+ try:
+ ts, count = row()
+ p = cast(p_param, POINTER(Counter))
+ p.contents.count += count
+ print("[%s] inserted %d in 5s, total count: %d" % (ts.strftime("%Y-%m-%d %H:%M:%S"), count, p.contents.count))
+ except Exception as err:
+ print(err)
+ raise err
+
+
+class Counter(Structure):
+ _fields_ = [
+ ("count", c_int),
+ ]
+
+ def __str__(self):
+ return "%d" % self.count
+
+
+def test_stream(conn):
+ # type: (TaosConnection) -> None
+ dbname = "pytest_taos_stream"
+ try:
+ conn.execute("drop database if exists %s" % dbname)
+ conn.execute("create database if not exists %s" % dbname)
+ conn.select_db(dbname)
+ conn.execute("create table if not exists log(ts timestamp, n int)")
+
+ result = conn.query("select count(*) from log interval(5s)")
+ assert result.field_count == 2
+ counter = Counter()
+ counter.count = 0
+ stream = conn.stream("select count(*) from log interval(5s)", stream_callback, param=byref(counter))
+
+ for _ in range(0, 20):
+ conn.execute("insert into log values(now,0)(now+1s, 1)(now + 2s, 2)")
+ time.sleep(2)
+
+ stream.close()
+ conn.execute("drop database if exists %s" % dbname)
+ conn.close()
+ except Exception as err:
+ conn.execute("drop database if exists %s" % dbname)
+ conn.close()
+ raise err
+
+
+if __name__ == "__main__":
+ test_stream(connect())
diff --git a/src/connector/python/taos/__init__.py b/src/connector/python/taos/__init__.py
index 7ebfa8adef6a82c979ad0544a3eb11ccd351b760..739265ef579b6a5127df8ee592b73293f113a2ef 100644
--- a/src/connector/python/taos/__init__.py
+++ b/src/connector/python/taos/__init__.py
@@ -86,7 +86,7 @@ def fetch_callback(p_param, p_result, num_of_rows):
def query_callback(p_param, p_result, code):
# type: (c_void_p, c_void_p, c_int) -> None
- if p_result == None:
+ if p_result is None:
return
result = TaosResult(p_result)
if code == 0:
@@ -335,7 +335,7 @@ from ctypes import *
def stream_callback(p_param, p_result, p_row):
# type: (c_void_p, c_void_p, c_void_p) -> None
- if p_result == None or p_row == None:
+ if p_result is None or p_row is None:
return
result = TaosResult(p_result)
row = TaosRow(result, p_row)
diff --git a/src/connector/python/taos/bind.py b/src/connector/python/taos/bind.py
index 05659714ef86da3bda383bfe7d7b25403848637f..8f39278c960c285f4a8c0bfc1d8b198bb4a56f4c 100644
--- a/src/connector/python/taos/bind.py
+++ b/src/connector/python/taos/bind.py
@@ -317,7 +317,7 @@ class TaosMultiBind(ctypes.Structure):
def _str_to_buffer(self, values):
self.num = len(values)
- is_null = [1 if v == None else 0 for v in values]
+ is_null = [1 if v is None else 0 for v in values]
self.is_null = cast((c_byte * self.num)(*is_null), c_char_p)
if sum(is_null) == self.num:
diff --git a/src/connector/python/taos/cinterface.py b/src/connector/python/taos/cinterface.py
index 740af5838235a6abc41ae27e7c6a462c30977616..be39d2291a908b9349599ba13e92a205696516c7 100644
--- a/src/connector/python/taos/cinterface.py
+++ b/src/connector/python/taos/cinterface.py
@@ -373,9 +373,9 @@ def taos_fetch_block(result, fields=None, field_count=None):
if num_of_rows == 0:
return None, 0
precision = taos_result_precision(result)
- if fields == None:
+ if fields is None:
fields = taos_fetch_fields(result)
- if field_count == None:
+ if field_count is None:
field_count = taos_field_count(result)
blocks = [None] * field_count
fieldLen = taos_fetch_lengths(result, field_count)
@@ -466,7 +466,7 @@ def taos_fetch_lengths(result, field_count=None):
# type: (c_void_p, int) -> Array[int]
"""Make sure to call taos_fetch_row or taos_fetch_block before fetch_lengths"""
lens = _libtaos.taos_fetch_lengths(result)
- if field_count == None:
+ if field_count is None:
field_count = taos_field_count(result)
if not lens:
raise OperationalError("field length empty, use taos_fetch_row/block before it")
@@ -823,7 +823,7 @@ def taos_stmt_use_result(stmt):
@stmt: TAOS_STMT*
"""
result = c_void_p(_libtaos.taos_stmt_use_result(stmt))
- if result == None:
+ if result is None:
raise StatementError(taos_stmt_errstr(stmt))
return result
diff --git a/src/connector/python/taos/result.py b/src/connector/python/taos/result.py
index 8b8a0cf108cf7c941d0a6476d8a9c1e2c5a41b84..05085a493eb8ffede536476f1ddf3bcb083d82f8 100644
--- a/src/connector/python/taos/result.py
+++ b/src/connector/python/taos/result.py
@@ -41,7 +41,7 @@ class TaosResult(object):
if self._result is None or self.fields is None:
raise OperationalError("Invalid use of fetch iterator")
- if self._block == None or self._block_iter >= self._block_length:
+ if self._block is None or self._block_iter >= self._block_length:
self._block, self._block_length = self.fetch_block()
self._block_iter = 0
# self._row_count += self._block_length
@@ -55,7 +55,7 @@ class TaosResult(object):
"""fields definitions of the current result"""
if self._result is None:
raise ResultError("no result object setted")
- if self._fields == None:
+ if self._fields is None:
self._fields = taos_fetch_fields(self._result)
return self._fields
@@ -72,7 +72,7 @@ class TaosResult(object):
@property
def precision(self):
- if self._precision == None:
+ if self._precision is None:
self._precision = taos_result_precision(self._result)
return self._precision
@@ -114,7 +114,7 @@ class TaosResult(object):
if self._result is None:
raise OperationalError("Invalid use of fetchall")
- if self._fields == None:
+ if self._fields is None:
self._fields = taos_fetch_fields(self._result)
buffer = [[] for i in range(len(self._fields))]
self._row_count = 0
@@ -150,7 +150,7 @@ class TaosResult(object):
return taos_errstr(self._result)
def check_error(self, errno=None, close=True):
- if errno == None:
+ if errno is None:
errno = self.errno()
if errno != 0:
msg = self.errstr()
diff --git a/src/inc/taoserror.h b/src/inc/taoserror.h
index 8700cf246a91655c307bbb4c3c2c111d3271fc67..fb70badb862943a0259b2dc94bf52b0a452bd714 100644
--- a/src/inc/taoserror.h
+++ b/src/inc/taoserror.h
@@ -274,7 +274,6 @@ int32_t* taosGetErrno();
#define TSDB_CODE_TDB_IVLD_TAG_VAL TAOS_DEF_ERROR_CODE(0, 0x0615) //"TSDB invalid tag value")
#define TSDB_CODE_TDB_NO_CACHE_LAST_ROW TAOS_DEF_ERROR_CODE(0, 0x0616) //"TSDB no cache last row data")
#define TSDB_CODE_TDB_INCOMPLETE_DFILESET TAOS_DEF_ERROR_CODE(0, 0x0617) //"TSDB incomplete DFileSet")
-#define TSDB_CODE_TDB_NO_JSON_TAG_KEY TAOS_DEF_ERROR_CODE(0, 0x0618) //"TSDB no tag json key")
// query
#define TSDB_CODE_QRY_INVALID_QHANDLE TAOS_DEF_ERROR_CODE(0, 0x0700) //"Invalid handle")
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 2ba143b147d5924eb07aeb9bb2fd321b5d519573..6346e743081a6594fcc9e8d8001ae18e3f90ac92 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -1942,7 +1942,7 @@ static SQLFunctionCtx* createSQLFunctionCtx(SQueryRuntimeEnv* pRuntimeEnv, SExpr
for (int32_t j = 0; j < pCtx->numOfParams; ++j) {
int16_t type = pSqlExpr->param[j].nType;
int16_t bytes = pSqlExpr->param[j].nLen;
- if (pSqlExpr->functionId == TSDB_FUNC_STDDEV_DST) {
+ if (pSqlExpr->functionId == TSDB_FUNC_STDDEV_DST || pSqlExpr->functionId == TSDB_FUNC_TS_COMP) {
continue;
}
diff --git a/src/query/src/qExtbuffer.c b/src/query/src/qExtbuffer.c
index cc214b953303e3b10b053bbe0c183eaee520e32a..9d174b0389d74073b5989af5a8fd7c26d5fd80dd 100644
--- a/src/query/src/qExtbuffer.c
+++ b/src/query/src/qExtbuffer.c
@@ -1040,7 +1040,10 @@ void tColModelDisplay(SColumnModel *pModel, void *pData, int32_t numOfRows, int3
break;
case TSDB_DATA_TYPE_NCHAR: {
char buf[4096] = {0};
- taosUcs4ToMbs(val, pModel->pFields[j].field.bytes, buf);
+ int32_t len = taosUcs4ToMbs(val, pModel->pFields[j].field.bytes, buf);
+ if (len < 0){
+ qError("castConvert1 taosUcs4ToMbs error");
+ }
printf("%s\t", buf);
break;
}
@@ -1092,7 +1095,10 @@ void tColModelDisplayEx(SColumnModel *pModel, void *pData, int32_t numOfRows, in
break;
case TSDB_DATA_TYPE_NCHAR: {
char buf[128] = {0};
- taosUcs4ToMbs(val, pModel->pFields[j].field.bytes, buf);
+ int32_t len = taosUcs4ToMbs(val, pModel->pFields[j].field.bytes, buf);
+ if (len < 0){
+ qError("castConvert1 taosUcs4ToMbs error");
+ }
printf("%s\t", buf);
break;
}
diff --git a/src/query/src/qFilter.c b/src/query/src/qFilter.c
index 05ecda2a51f33c00130bcad0c5aa7139e7429a48..6869017e116ab9fe9dce30fbb028242f0e990a4b 100644
--- a/src/query/src/qFilter.c
+++ b/src/query/src/qFilter.c
@@ -1899,12 +1899,20 @@ int32_t filterInitValFieldData(SFilterInfo *info) {
(unit->compare.optr == TSDB_RELATION_MATCH || unit->compare.optr == TSDB_RELATION_NMATCH)){
char newValData[TSDB_REGEX_STRING_DEFAULT_LEN * TSDB_NCHAR_SIZE + VARSTR_HEADER_SIZE] = {0};
int32_t len = taosUcs4ToMbs(varDataVal(fi->data), varDataLen(fi->data), varDataVal(newValData));
+ if (len < 0){
+ qError("filterInitValFieldData taosUcs4ToMbs error 1");
+ return TSDB_CODE_FAILED;
+ }
varDataSetLen(newValData, len);
varDataCopy(fi->data, newValData);
}else if(type == TSDB_DATA_TYPE_JSON &&
(unit->compare.optr == TSDB_RELATION_MATCH || unit->compare.optr == TSDB_RELATION_NMATCH)){
char newValData[TSDB_REGEX_STRING_DEFAULT_LEN * TSDB_NCHAR_SIZE + VARSTR_HEADER_SIZE] = {0};
int32_t len = taosUcs4ToMbs(((tVariant*)(fi->desc))->pz, ((tVariant*)(fi->desc))->nLen, newValData);
+ if (len < 0){
+ qError("filterInitValFieldData taosUcs4ToMbs error 2");
+ return TSDB_CODE_FAILED;
+ }
memcpy(((tVariant*)(fi->desc))->pz, newValData, len);
((tVariant*)(fi->desc))->nLen = len;
}
@@ -3025,6 +3033,11 @@ static void doJsonCompare(SFilterComUnit *cunit, int8_t *result, void* colData){
}else{
char *newColData = calloc(cunit->dataSize * TSDB_NCHAR_SIZE + VARSTR_HEADER_SIZE, 1);
int len = taosUcs4ToMbs(varDataVal(realData), varDataLen(realData), varDataVal(newColData));
+ if (len < 0){
+ qError("castConvert1 taosUcs4ToMbs error");
+ tfree(newColData);
+ return;
+ }
varDataSetLen(newColData, len);
tVariant* val = cunit->valData;
char newValData[TSDB_REGEX_STRING_DEFAULT_LEN * TSDB_NCHAR_SIZE + VARSTR_HEADER_SIZE] = {0};
@@ -3113,9 +3126,13 @@ bool filterExecuteImplMisc(void *pinfo, int32_t numOfRows, int8_t** p, SDataStat
if(info->cunits[uidx].dataType == TSDB_DATA_TYPE_NCHAR && (info->cunits[uidx].optr == TSDB_RELATION_MATCH || info->cunits[uidx].optr == TSDB_RELATION_NMATCH)){
char *newColData = calloc(info->cunits[uidx].dataSize * TSDB_NCHAR_SIZE + VARSTR_HEADER_SIZE, 1);
- int len = taosUcs4ToMbs(varDataVal(colData), varDataLen(colData), varDataVal(newColData));
- varDataSetLen(newColData, len);
- (*p)[i] = filterDoCompare(gDataCompare[info->cunits[uidx].func], info->cunits[uidx].optr, newColData, info->cunits[uidx].valData);
+ int32_t len = taosUcs4ToMbs(varDataVal(colData), varDataLen(colData), varDataVal(newColData));
+ if (len < 0){
+ qError("castConvert1 taosUcs4ToMbs error");
+ }else{
+ varDataSetLen(newColData, len);
+ (*p)[i] = filterDoCompare(gDataCompare[info->cunits[uidx].func], info->cunits[uidx].optr, newColData, info->cunits[uidx].valData);
+ }
tfree(newColData);
}else if(info->cunits[uidx].dataType == TSDB_DATA_TYPE_JSON){
doJsonCompare(&(info->cunits[uidx]), &(*p)[i], colData);
@@ -3170,9 +3187,13 @@ bool filterExecuteImpl(void *pinfo, int32_t numOfRows, int8_t** p, SDataStatis *
} else {
if(cunit->dataType == TSDB_DATA_TYPE_NCHAR && (cunit->optr == TSDB_RELATION_MATCH || cunit->optr == TSDB_RELATION_NMATCH)){
char *newColData = calloc(cunit->dataSize * TSDB_NCHAR_SIZE + VARSTR_HEADER_SIZE, 1);
- int len = taosUcs4ToMbs(varDataVal(colData), varDataLen(colData), varDataVal(newColData));
- varDataSetLen(newColData, len);
- (*p)[i] = filterDoCompare(gDataCompare[cunit->func], cunit->optr, newColData, cunit->valData);
+ int32_t len = taosUcs4ToMbs(varDataVal(colData), varDataLen(colData), varDataVal(newColData));
+ if (len < 0){
+ qError("castConvert1 taosUcs4ToMbs error");
+ }else{
+ varDataSetLen(newColData, len);
+ (*p)[i] = filterDoCompare(gDataCompare[cunit->func], cunit->optr, newColData, cunit->valData);
+ }
tfree(newColData);
}else if(cunit->dataType == TSDB_DATA_TYPE_JSON){
doJsonCompare(cunit, &(*p)[i], colData);
@@ -3577,7 +3598,11 @@ int32_t filterConverNcharColumns(SFilterInfo* info, int32_t rows, bool *gotNchar
char *src = FILTER_GET_COL_FIELD_DATA(fi, j);
char *dst = FILTER_GET_COL_FIELD_DATA(&nfi, j);
int32_t len = 0;
- taosMbsToUcs4(varDataVal(src), varDataLen(src), varDataVal(dst), bufSize, &len);
+ bool ret = taosMbsToUcs4(varDataVal(src), varDataLen(src), varDataVal(dst), bufSize, &len);
+ if(!ret) {
+ qError("filterConverNcharColumns taosMbsToUcs4 error");
+ return TSDB_CODE_FAILED;
+ }
varDataLen(dst) = len;
}
diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c
index 229d684e8364a4c1aabc5cf1825e45cc698a1de3..a095bff61e05822f6389a51671f98fc5a33e0bbe 100644
--- a/src/tsdb/src/tsdbMeta.c
+++ b/src/tsdb/src/tsdbMeta.c
@@ -1463,6 +1463,7 @@ static void *tsdbDecodeTable(void *buf, STable **pRTable) {
tsdbFreeTable(pTable);
return NULL;
}
+ taosHashSetFreeFp(pTable->jsonKeyMap, taosArrayDestroyForHash);
}else{
pTable->pIndex = tSkipListCreate(TSDB_SUPER_TABLE_SL_LEVEL, colType(pCol), (uint8_t)(colBytes(pCol)), NULL,
SL_ALLOW_DUP_KEY, getTagIndexKey);
diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c
index f3241cd0e0ea4c7929c6d0c82df339a513299c7d..be734ce0cccad6827cba4e2c27d0be478af92af3 100644
--- a/src/tsdb/src/tsdbRead.c
+++ b/src/tsdb/src/tsdbRead.c
@@ -4243,20 +4243,28 @@ char* parseTagDatatoJson(void *p){
}
cJSON_AddItemToObject(json, tagJsonKey, value);
}else if(type == TSDB_DATA_TYPE_NCHAR) {
- char *tagJsonValue = calloc(varDataLen(realData), 1);
- int32_t length = taosUcs4ToMbs(varDataVal(realData), varDataLen(realData), tagJsonValue);
- if (length < 0) {
- tsdbError("charset:%s to %s. val:%s convert json value failed.", DEFAULT_UNICODE_ENCODEC, tsCharset,
- (char*)val);
+ cJSON* value = NULL;
+ if (varDataLen(realData) > 0){
+ char *tagJsonValue = calloc(varDataLen(realData), 1);
+ int32_t length = taosUcs4ToMbs(varDataVal(realData), varDataLen(realData), tagJsonValue);
+ if (length < 0) {
+ tsdbError("charset:%s to %s. val:%s convert json value failed.", DEFAULT_UNICODE_ENCODEC, tsCharset,
+ (char*)val);
+ free(tagJsonValue);
+ goto end;
+ }
+ value = cJSON_CreateString(tagJsonValue);
free(tagJsonValue);
- goto end;
- }
- cJSON* value = cJSON_CreateString(tagJsonValue);
- free(tagJsonValue);
- if (value == NULL)
- {
- goto end;
+ if (value == NULL)
+ {
+ goto end;
+ }
+ }else if(varDataLen(realData) == 0){
+ value = cJSON_CreateString("");
+ }else{
+ assert(0);
}
+
cJSON_AddItemToObject(json, tagJsonKey, value);
}else if(type == TSDB_DATA_TYPE_DOUBLE){
double jsonVd = *(double*)(realData);
diff --git a/src/util/src/terror.c b/src/util/src/terror.c
index 3853d2e9c7491db68abf4ca9f7d42edd62da5729..acbee18ec21b02761295de90ef9ff535a97739d1 100644
--- a/src/util/src/terror.c
+++ b/src/util/src/terror.c
@@ -282,7 +282,6 @@ TAOS_DEFINE_ERROR(TSDB_CODE_TDB_MESSED_MSG, "TSDB messed message")
TAOS_DEFINE_ERROR(TSDB_CODE_TDB_IVLD_TAG_VAL, "TSDB invalid tag value")
TAOS_DEFINE_ERROR(TSDB_CODE_TDB_NO_CACHE_LAST_ROW, "TSDB no cache last row data")
TAOS_DEFINE_ERROR(TSDB_CODE_TDB_INCOMPLETE_DFILESET, "Incomplete DFileSet")
-TAOS_DEFINE_ERROR(TSDB_CODE_TDB_NO_JSON_TAG_KEY, "TSDB no tag json key")
// query
TAOS_DEFINE_ERROR(TSDB_CODE_QRY_INVALID_QHANDLE, "Invalid handle")
diff --git a/tests/develop-test/3-connectors/c#/test.sh b/tests/develop-test/3-connectors/c#/test.sh
new file mode 100755
index 0000000000000000000000000000000000000000..2d4f18b668263d40bb18ef46f34b7299b3f7cdd3
--- /dev/null
+++ b/tests/develop-test/3-connectors/c#/test.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+function stopTaosd {
+ echo "Stop taosd"
+ sudo systemctl stop taosd || echo 'no sudo or systemctl or stop fail'
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ while [ -n "$PID" ]
+ do
+ pkill -TERM -x taosd
+ sleep 1
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ done
+}
+stopTaosd
+rm -rf /var/lib/taos/*
+rm -rf /var/log/taos/*
+nohup taosd -c /etc/taos/ > /dev/null 2>&1 &
+sleep 10
+cd ../../
+WKC=`pwd`
+cd ${WKC}/src/connector/C#
+dotnet test
+dotnet run --project src/test/Cases/Cases.csproj
+
+cd ${WKC}/tests/examples/C#
+dotnet run --project C#checker/C#checker.csproj
+dotnet run --project TDengineTest/TDengineTest.csproj
+dotnet run --project schemaless/schemaless.csproj
+
+cd ${WKC}/tests/examples/C#/taosdemo
+dotnet build -c Release
+tree | true
+./bin/Release/net5.0/taosdemo -c /etc/taos -y
diff --git a/tests/develop-test/3-connectors/go/test.sh b/tests/develop-test/3-connectors/go/test.sh
new file mode 100755
index 0000000000000000000000000000000000000000..097723ad461b69c75e18bc8018c025f0e9f7a3e3
--- /dev/null
+++ b/tests/develop-test/3-connectors/go/test.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+function stopTaosd {
+ echo "Stop taosd"
+ sudo systemctl stop taosd || echo 'no sudo or systemctl or stop fail'
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ while [ -n "$PID" ]
+ do
+ pkill -TERM -x taosd
+ sleep 1
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ done
+}
+stopTaosd
+rm -rf /var/lib/taos/*
+rm -rf /var/log/taos/*
+nohup taosd -c /etc/taos/ > /dev/null 2>&1 &
+sleep 10
+cd ../../
+WKC=`pwd`
+
diff --git a/tests/develop-test/3-connectors/java/test.sh b/tests/develop-test/3-connectors/java/test.sh
new file mode 100755
index 0000000000000000000000000000000000000000..15f7b84955b793e0fb6acaa434fba83c6ff0c710
--- /dev/null
+++ b/tests/develop-test/3-connectors/java/test.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+function stopTaosd {
+ echo "Stop taosd"
+ sudo systemctl stop taosd || echo 'no sudo or systemctl or stop fail'
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ while [ -n "$PID" ]
+ do
+ pkill -TERM -x taosd
+ sleep 1
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ done
+}
+stopTaosd
+rm -rf /var/lib/taos/*
+rm -rf /var/log/taos/*
+nohup taosd -c /etc/taos/ > /dev/null 2>&1 &
+sleep 10
diff --git a/tests/develop-test/3-connectors/nodejs/test.sh b/tests/develop-test/3-connectors/nodejs/test.sh
new file mode 100755
index 0000000000000000000000000000000000000000..3b1d8bb4790d6273e32a42ce50979e98e1ce5a92
--- /dev/null
+++ b/tests/develop-test/3-connectors/nodejs/test.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+function stopTaosd {
+ echo "Stop taosd"
+ sudo systemctl stop taosd || echo 'no sudo or systemctl or stop fail'
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ while [ -n "$PID" ]
+ do
+ pkill -TERM -x taosd
+ sleep 1
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ done
+}
+stopTaosd
+rm -rf /var/lib/taos/*
+rm -rf /var/log/taos/*
+nohup taosd -c /etc/taos/ > /dev/null 2>&1 &
+sleep 10
+cd ../../
+WKC=`pwd`
+cd ${WKC}/src/connector/nodejs
+npm install
+npm run test
+cd ${WKC}/tests/examples/nodejs
+npm install td2.0-connector > /dev/null 2>&1
+node nodejsChecker.js host=localhost
+node test1970.js
+cd ${WKC}/tests/connectorTest/nodejsTest/nanosupport
+npm install td2.0-connector > /dev/null 2>&1
+node nanosecondTest.js
diff --git a/tests/develop-test/3-connectors/python/test.sh b/tests/develop-test/3-connectors/python/test.sh
new file mode 100755
index 0000000000000000000000000000000000000000..fe0dfbdac99f6938c8a57d13666f609c2c7c5d33
--- /dev/null
+++ b/tests/develop-test/3-connectors/python/test.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+function stopTaosd {
+ echo "Stop taosd"
+ sudo systemctl stop taosd || echo 'no sudo or systemctl or stop fail'
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ while [ -n "$PID" ]
+ do
+ pkill -TERM -x taosd
+ sleep 1
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ done
+}
+stopTaosd
+rm -rf /var/lib/taos/*
+rm -rf /var/log/taos/*
+nohup taosd -c /etc/taos/ > /dev/null 2>&1 &
+sleep 10
+cd ../../src/connector/python
+pip3 install pytest
+pytest tests/
+
+python3 examples/bind-multi.py
+python3 examples/bind-row.py
+python3 examples/demo.py
+python3 examples/insert-lines.py
+python3 examples/pep-249.py
+python3 examples/query-async.py
+python3 examples/query-objectively.py
+python3 examples/subscribe-sync.py
+python3 examples/subscribe-async.py
diff --git a/tests/develop-test/3-connectors/restful/test.sh b/tests/develop-test/3-connectors/restful/test.sh
new file mode 100755
index 0000000000000000000000000000000000000000..1c6d8fbc2c5da6633d749054a19a5bde7772faf7
--- /dev/null
+++ b/tests/develop-test/3-connectors/restful/test.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+function stopTaosd {
+ echo "Stop taosd"
+ sudo systemctl stop taosd || echo 'no sudo or systemctl or stop fail'
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ while [ -n "$PID" ]
+ do
+ pkill -TERM -x taosd
+ sleep 1
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ done
+}
+stopTaosd
+rm -rf /var/lib/taos/*
+rm -rf /var/log/taos/*
+nohup taosd -c /etc/taos/ > /dev/null 2>&1 &
+sleep 10
+cd ../../
+WKC=`pwd`
diff --git a/tests/develop-test/3-connectors/rust/test.sh b/tests/develop-test/3-connectors/rust/test.sh
new file mode 100755
index 0000000000000000000000000000000000000000..4bf6394b27cf43674ed38a1e4de46342ee3b1ae4
--- /dev/null
+++ b/tests/develop-test/3-connectors/rust/test.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+function stopTaosd {
+ echo "Stop taosd"
+ sudo systemctl stop taosd || echo 'no sudo or systemctl or stop fail'
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ while [ -n "$PID" ]
+ do
+ pkill -TERM -x taosd
+ sleep 1
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ done
+}
+stopTaosd
+rm -rf /var/lib/taos/*
+rm -rf /var/log/taos/*
+nohup taosd -c /etc/taos/ > /dev/null 2>&1 &
+sleep 10
+cd ../../
+WKC=`pwd`
\ No newline at end of file
diff --git a/tests/develop-test/fulltest-connector.sh b/tests/develop-test/fulltest-connector.sh
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..81999dc2cf8d8945487387463c86f18106a97641 100755
--- a/tests/develop-test/fulltest-connector.sh
+++ b/tests/develop-test/fulltest-connector.sh
@@ -0,0 +1,7 @@
+bash 3-connectors/c#/test.sh
+bash 3-connectors/go/test.sh
+bash 3-connectors/java/test.sh
+bash 3-connectors/nodejs/test.sh
+bash 3-connectors/python/test.sh
+bash 3-connectors/restful/test.sh
+bash 3-connectors/rust/test.sh
diff --git a/tests/develop-test/fulltest-insert.sh b/tests/develop-test/fulltest-insert.sh
index 8269dbb5bc0fce1dbc67a36e09edc21ac1ee5f26..532f7e6fc0446f6a68ca0a5e80be070684a71c23 100755
--- a/tests/develop-test/fulltest-insert.sh
+++ b/tests/develop-test/fulltest-insert.sh
@@ -1 +1 @@
-python3 ./test.py -f 1-insert/batchInsert.py
+python3 ./test.py -f 1-insert/batchInsert.py
\ No newline at end of file
diff --git a/tests/develop-test/fulltest-others.sh b/tests/develop-test/fulltest-others.sh
index eea6e856ba170ebfcf64df8e63dbe91abbaf2c38..bb0bb585b5323b45d43b01404093b97babca3ab7 100755
--- a/tests/develop-test/fulltest-others.sh
+++ b/tests/develop-test/fulltest-others.sh
@@ -1 +1 @@
-python3 ./test.py -f 0-others/json_tag.py
+python3 ./test.py -f 0-others/json_tag.py
\ No newline at end of file
diff --git a/tests/develop-test/fulltest-query.sh b/tests/develop-test/fulltest-query.sh
index ed8a4fcd9d92ca631395a233c07095eb983df5fe..b5147d20a399e6e19bcb7d84985a83a187429780 100755
--- a/tests/develop-test/fulltest-query.sh
+++ b/tests/develop-test/fulltest-query.sh
@@ -1,3 +1,3 @@
-python3 ./test.py -f 2-query/ts_hidden_column.py
-python3 ./test.py -f 2-query/union-order.py
-python3 ./test.py -f 2-query/session_two_stage.py
+python3 ./test.py -f 2-query/ts_hidden_column.py
+python3 ./test.py -f 2-query/union-order.py
+python3 ./test.py -f 2-query/session_two_stage.py
diff --git a/tests/develop-test/fulltest-tools.sh b/tests/develop-test/fulltest-tools.sh
index 52e6ac28bfc62be3106150c05f95e249a4c62b54..df6e1718ccf31dfc1a2e5b652a0e38acedb8fe69 100755
--- a/tests/develop-test/fulltest-tools.sh
+++ b/tests/develop-test/fulltest-tools.sh
@@ -1 +1 @@
-python3 ./test.py -f 5-taos-tools/taosdump/taosdumpTestTypeJson.py
+python3 ./test.py -f 5-taos-tools/taosdump/taosdumpTestTypeJson.py
\ No newline at end of file
diff --git a/tests/pytest/fulltest-connector.sh b/tests/pytest/fulltest-connector.sh
index 701c316040970b9077e6c730c1346dcf8759f673..1e456503989f47a20a4595c86a1df0b4c3a32946 100755
--- a/tests/pytest/fulltest-connector.sh
+++ b/tests/pytest/fulltest-connector.sh
@@ -1,13 +1,2 @@
#!/bin/bash
-ulimit -c unlimited
-#======================p1-start===============
-
-# restful test for python
-# python3 test.py -f restful/restful_bind_db1.py
-# python3 test.py -f restful/restful_bind_db2.py
-python3 ./test.py -f client/nettest.py
-
-python3 ./test.py -f ../system-test/4-taosAdapter/taosAdapter_query.py
-python3 ./test.py -f ../system-test/4-taosAdapter/taosAdapter_insert.py
-
-#======================p1-end===============
+ulimit -c unlimited
\ No newline at end of file
diff --git a/tests/pytest/fulltest-insert.sh b/tests/pytest/fulltest-insert.sh
index 85b36bda29a047c788eb00b991bb890a2c270bac..153bc072dba128fa8f5635e26aba0d30066b9c9a 100755
--- a/tests/pytest/fulltest-insert.sh
+++ b/tests/pytest/fulltest-insert.sh
@@ -4,7 +4,6 @@ ulimit -c unlimited
python3 testCompress.py
python3 testNoCompress.py
-
python3 ./test.py -f import_merge/importBlock1HO.py
python3 ./test.py -f import_merge/importBlock1HPO.py
python3 ./test.py -f import_merge/importBlock1H.py
@@ -23,10 +22,6 @@ python3 ./test.py -f import_merge/importBlock2TPO.py
python3 ./test.py -f import_merge/importBlock2T.py
python3 ./test.py -f import_merge/importBlockbetween.py
python3 ./test.py -f import_merge/importCacheFileHO.py
-
-#======================p1-end===============
-#======================p2-start===============
-
python3 ./test.py -f import_merge/importCacheFileHPO.py
python3 ./test.py -f import_merge/importCacheFileH.py
python3 ./test.py -f import_merge/importCacheFileS.py
@@ -48,10 +43,6 @@ python3 ./test.py -f import_merge/importDataLastTPO.py
python3 ./test.py -f import_merge/importDataLastT.py
python3 ./test.py -f import_merge/importDataS.py
python3 ./test.py -f import_merge/importDataSub.py
-
-#======================p2-end===============
-#======================p3-start===============
-
python3 ./test.py -f import_merge/importDataTO.py
python3 ./test.py -f import_merge/importDataTPO.py
python3 ./test.py -f import_merge/importDataT.py
@@ -73,10 +64,6 @@ python3 ./test.py -f import_merge/importSpan.py
python3 ./test.py -f import_merge/importSRestart.py
python3 ./test.py -f import_merge/importSubRestart.py
python3 ./test.py -f import_merge/importTailOverlap.py
-
-#======================p3-end===============
-#======================p4-start===============
-
python3 ./test.py -f import_merge/importTailPartOverlap.py
python3 ./test.py -f import_merge/importTail.py
python3 ./test.py -f import_merge/importToCommit.py
@@ -88,7 +75,6 @@ python3 ./test.py -f import_merge/importCSV.py
python3 ./test.py -f import_merge/import_update_0.py
python3 ./test.py -f import_merge/import_update_1.py
python3 ./test.py -f import_merge/import_update_2.py
-
python3 ./test.py -f insert/basic.py
python3 ./test.py -f insert/int.py
python3 ./test.py -f insert/float.py
@@ -98,8 +84,6 @@ python3 ./test.py -f insert/double.py
python3 ./test.py -f insert/smallint.py
python3 ./test.py -f insert/tinyint.py
python3 ./test.py -f insert/date.py
-
-
python3 ./test.py -f insert/binary.py
python3 ./test.py -f insert/nchar.py
#python3 ./test.py -f insert/nchar-boundary.py
@@ -133,41 +117,21 @@ python3 ./test.py -f insert/verifyMemToDiskCrash.py
#python3 ./test.py -f insert/schemalessInsert.py
#python3 ./test.py -f insert/openTsdbJsonInsert.py
python3 ./test.py -f insert/openTsdbTelnetLinesInsert.py
-
-
-# update
python3 ./test.py -f update/merge_commit_data.py
python3 ./test.py -f update/allow_update.py
python3 ./test.py -f update/allow_update-0.py
python3 ./test.py -f update/append_commit_data.py
python3 ./test.py -f update/append_commit_last-0.py
python3 ./test.py -f update/append_commit_last.py
-
-
python3 ./test.py -f update/merge_commit_data2.py
python3 ./test.py -f update/merge_commit_data2_update0.py
python3 ./test.py -f update/merge_commit_last-0.py
python3 ./test.py -f update/merge_commit_last.py
python3 ./test.py -f update/update_options.py
python3 ./test.py -f update/merge_commit_data-0.py
-
-# wal
python3 ./test.py -f wal/addOldWalTest.py
python3 ./test.py -f wal/sdbComp.py
-#======================p4-end===============
-#======================p5-start===============
-python3 ./test.py -f ../system-test/1-insert/0-sql/basic.py
-python3 ./test.py -f ../develop-test/1-insert/0-sql/basic.py
-python3 ./test.py -f ../develop-test/1-insert/0-sql/batchInsert.py
-
-#======================p5-end===============
-
-
-
-
-
-
diff --git a/tests/pytest/stable/json_tagBenchmark.py b/tests/pytest/stable/json_tagBenchmark.py
new file mode 100644
index 0000000000000000000000000000000000000000..b32259531d2b4fa438b9a5c07438523a2c757343
--- /dev/null
+++ b/tests/pytest/stable/json_tagBenchmark.py
@@ -0,0 +1,91 @@
+###################################################################
+# 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, db_test.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 os
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+import time
+import random
+import datetime
+class TDTestCase:
+
+ def init(self, conn, logSql):
+ tdLog.debug("start to execute %s" % __file__)
+ tdSql.init(conn.cursor(), logSql)
+
+ # def assertCheck(self, filename, queryResult, expectResult):
+ # self.filename = filename
+ # self.queryResult = queryResult
+ # self.expectResult = expectResult
+ # args0 = (filename, queryResult, expectResult)
+ # assert queryResult == expectResult, "Queryfile:%s ,result is %s != expect: %s" % args0
+
+ def assertfileDataExport(self, filename, expectResult):
+ self.filename = filename
+ self.expectResult = expectResult
+ with open("%s" % filename, 'r+') as f1:
+ for line in f1.readlines():
+ queryResultTaosc = line.strip().split(',')[0]
+ # self.assertCheck(filename, queryResultTaosc, expectResult)
+
+ def run(self):
+ starttime = 1537146000000
+ tdSql.prepare()
+ tdSql.execute("drop database if exists db_json;")
+ print("==============step1 tag format =======")
+ tdLog.info("create database db_jsonB ")
+ tdSql.execute("create database db_jsonB")
+ tdSql.execute("use db_jsonB")
+ # test Benchmark
+ tdSql.execute("create table if not exists jsons1(ts timestamp,dataFloat float) tags(jtag json)")
+ for numTables in range(500):
+ json = "{\"loc1%d\":\"beijingandshanghaiandchangzhouandshijiazhuanganda%d\",\"loc2%d\":\"beijingandshanghaiandchangzhouandshijiazhuangandb%d\" ,\"loc3%d\":\"beijingandshanghaiandchangzhouandshijiazhuangandc%d\",\
+ \"loc4%d\":\"beijingandshanghaiandchangzhouandshijiazhuangandd%d\",\"loc5%d\":\"beijingandshanghaiandchangzhouandshijiazhuangande%d\",\"loc6%d\":\"beijingandshanghaiandchangzhouandshijiazhuangandf%d\",\
+ \"loc7%d\":\"beijingandshanghaiandchangzhouandshijiazhuangandg%d\"}"% (numTables,numTables,numTables,numTables,numTables,numTables,numTables,numTables,numTables,numTables,numTables,numTables,numTables,numTables)
+ print(json)
+ createTableSqls = "create table if not exists jsons1_%d using jsons1 tags('%s')" %(numTables,json)
+ print(createTableSqls)
+ tdLog.info(createTableSqls)
+ tdSql.execute(createTableSqls)
+ for numRecords in range(1,101):
+ dataFloatSql=numRecords*10+numRecords*0.01
+ insertDataSqls = "insert into jsons1_%d values(%d+%ds, %d) " %(numTables,starttime,numRecords,dataFloatSql)
+ tdLog.info(insertDataSqls)
+ tdSql.execute(insertDataSqls)
+ tdSql.execute("use db_jsonB")
+ now_time1 = datetime.datetime.now()
+ tdSql.query("select * from jsons1 where ts>1537145900000 and ts<1537156000000;")
+ spendTimes1 = datetime.datetime.now() - now_time1
+ print(spendTimes1)
+ now_time2 = datetime.datetime.now()
+ tdSql.query("select * from jsons1 where ts>1537156000000;")
+ spendTimes2 = datetime.datetime.now() - now_time2
+ print(spendTimes2)
+
+ tdSql.execute("drop database db_jsonB")
+
+ testcaseFilename = os.path.split(__file__)[-1]
+ os.system("rm -rf ./insert_res.txt")
+ os.system("rm -rf tools/taosdemoAllTest/%s.sql" % testcaseFilename )
+
+
+ def stop(self):
+ tdSql.close()
+ tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/json_tag_extra.py b/tests/pytest/tag_lite/json_tag_extra.py
index 094359d05141d02e181bd2ed92beffbfd612f507..1f2f6b0426df7f1a7a0d75d817bf2b181595971b 100644
--- a/tests/pytest/tag_lite/json_tag_extra.py
+++ b/tests/pytest/tag_lite/json_tag_extra.py
@@ -12,6 +12,7 @@
# -*- coding: utf-8 -*-
import sys
+import os
import taos
from util.log import tdLog
from util.cases import tdCases
@@ -25,6 +26,21 @@ class TDTestCase:
tdLog.debug("start to execute %s" % __file__)
tdSql.init(conn.cursor(), logSql)
+ # def assertCheck(self, filename, queryResult, expectResult):
+ # self.filename = filename
+ # self.queryResult = queryResult
+ # self.expectResult = expectResult
+ # args0 = (filename, queryResult, expectResult)
+ # assert queryResult == expectResult, "Queryfile:%s ,result is %s != expect: %s" % args0
+
+ def assertfileDataExport(self, filename, expectResult):
+ self.filename = filename
+ self.expectResult = expectResult
+ with open("%s" % filename, 'r+') as f1:
+ for line in f1.readlines():
+ queryResultTaosc = line.strip().split(',')[0]
+ # self.assertCheck(filename, queryResultTaosc, expectResult)
+
def run(self):
tdSql.prepare()
tdSql.execute("drop database if exists db_json;")
@@ -62,8 +78,18 @@ class TDTestCase:
tdSql.error("CREATE TABLE if not exists jsons4_1 using jsons4 tags('{\"%s1\":5}')" % char2) # len(key)=257
tdSql.execute("CREATE TABLE if not exists jsons4_2 using jsons4 tags('{\"T\":\"%s\"}')" % char3) # len(object)=4096
tdSql.error("CREATE TABLE if not exists jsons4_2 using jsons4 tags('{\"TS\":\"%s\"}')" % char3) # len(object)=4097
+
+ # test the min/max length of double type , and int64 is not required
+ tdSql.error("CREATE TABLE if not exists jsons4_3 using jsons4 tags('{\"doublength\":-1.8e308}')")
+ tdSql.error("CREATE TABLE if not exists jsons4_3 using jsons4 tags('{\"doublength\":1.8e308}')")
+ tdSql.execute("CREATE TABLE if not exists jsons4_4 using jsons4 tags('{\"doublength\":-1.7e308}')")
+ tdSql.execute("CREATE TABLE if not exists jsons4_5 using jsons4 tags('{\"doublength\":1.71e308}')")
+ tdSql.query("select jtag from jsons4 where jtag->'doublength'<-1.69e+308;")
+ tdSql.checkRows(1)
+ tdSql.query("select jtag from jsons4 where jtag->'doublength'>1.7e+308;")
+ tdSql.checkRows(1)
- tdSql.execute("insert into jsons1_1 values(now, 1, 'json1')")
+ tdSql.execute("insert into jsons1_1 values(now+2s, 1, 'json1')")
tdSql.execute("insert into jsons1_1 values(now+1s, 1, 'json1')")
tdSql.execute("insert into jsons1_2 using jsons1 tags('{\"num\":5,\"location\":\"beijing\"}') values (now, 1, 'json2')")
tdSql.execute("insert into jsons1_3 using jsons1 tags('{\"num\":34,\"location\":\"beijing\",\"level\":\"l1\"}') values (now, 1, 'json3')")
@@ -194,15 +220,12 @@ class TDTestCase:
tdSql.checkRows(0)
# # test where condition in
- # tdSql.query("select * from jsons1 where jtag->'location' in ('beijing')")
+ tdSql.error("select * from jsons1 where jtag->'location' in ('beijing')")
# tdSql.checkRows(3)
-
- # tdSql.query("select * from jsons1 where jtag->'num' in (5,34)")
+ tdSql.error("select * from jsons1 where jtag->'num' in (5,34)")
# tdSql.checkRows(2)
-
- # tdSql.error("select * from jsons1 where jtag->'num' in ('5',34)")
-
- # tdSql.query("select * from jsons1 where jtag->'location' in ('beijing') and jtag->'class'=55")
+ tdSql.error("select * from jsons1 where jtag->'num' in ('5',34)")
+ tdSql.error("select * from jsons1 where jtag->'location' in ('beijing') and jtag->'class'=55")
# tdSql.checkRows(1)
# test where condition match
@@ -412,8 +435,25 @@ class TDTestCase:
tdSql.query(" select stddev(dataint) from jsons1 where jtag->'location'='beijing';")
tdSql.checkRows(1)
tdSql.error(" select LEASTSQUARES(dataint,1,2) from jsons1_1 where jtag->'location' ='beijing' ;")
+
+ tdSql.query("select count(jtag) from jsons1 ;")
+ tdSql.checkData(0, 0, 15)
+ tdSql.error("select count( jtag->'location'='beijing') from jsons1 ;")
+ tdSql.error("select count( jtag contains 'age') from jsons1 ;")
+ functionName = ['avg','twa','irate','stddev', 'stddev', 'leastsquares']
+ print(functionName)
+ for fn in functionName:
+ tdSql.error("select %s( jtag) from jsons1 ;"%fn)
+ tdSql.error("select %s( jtag->'location'='beijing') from jsons1 ;"%fn)
+ tdSql.error("select %s( jtag contains 'age') from jsons1 ;"%fn)
+ # tdSql.error("select avg( jtag) from jsons1 ;")
+ # tdSql.error("select avg( jtag->'location'='beijing') from jsons1 ;")
+ # tdSql.error("select avg( jtag contains 'age') from jsons1 ;")
+
+
+
# Select_exprs is SQL function -Selection function
@@ -467,6 +507,13 @@ class TDTestCase:
tdSql.checkRows(4)
tdSql.checkData(0,1,2)
tdSql.checkData(2,1,4)
+ #error
+ functionName = ['min','max','last','TOP','last_row','bottom','apercentile','interp']
+ print(functionName)
+ for fn in functionName:
+ tdSql.error("select %s( jtag) from jsons1 ;"%fn)
+ tdSql.error("select %s( jtag->'location'='beijing') from jsons1 ;"%fn)
+ tdSql.error("select %s( jtag contains 'age') from jsons1 ;"%fn)
# Select_exprs is SQL function -Calculation function
tdSql.error(" select diff(dataint) from jsons1 where jtag->'location'= 'beijing' or jtag->'location'= 'tianjing'or jtag contains 'num' or jtag->'age'=35 ;")
@@ -500,13 +547,21 @@ class TDTestCase:
tdSql.query("select ts,round(dataint),round(datafloat),round(datadouble) from jsons7 where jtag contains 'tea';")
tdSql.query("select round(dataint),round(datafloat),round(datadouble) from jsons7 where jtag contains 'tea';")
+ functionName = ['diff','Derivative','SPREAD','ceil','round','floor']
+ print(functionName)
+ for fn in functionName:
+ tdSql.error("select %s( jtag) from jsons1 ;"%fn)
+ tdSql.error("select %s( jtag->'location'='beijing') from jsons1 ;"%fn)
+ tdSql.error("select %s( jtag contains 'age') from jsons1 ;"%fn)
+
+
#modify one same key and diffirent data type,include negative number of double
tdSql.execute("insert into jsons7_4 using jsons7 tags('{\"nv\":null,\"tea\":123,\"tag\":123,\"tea\":false}') values (now+1s,5,'true',4.01,2.2,'abc'); ")
tdSql.execute("insert into jsons7_5 using jsons7 tags('{\"nv\":null,\"tea\":\"app\",\"tag\":123,\"tea\":false}') values (now+2s,5,'true',4.01,2.2,'abc'); ")
tdSql.error("insert into jsons7_6 using jsons7 tags('{\"nv\":null,\"tea\":-1.111111111111111111111111111111111111111111111111111111111111111111111,\"tag\":123,\"tea\":false}') values (now+3s,5,'true',4.01,2.2,'123'); ")
tdSql.execute("insert into jsons7_6 using jsons7 tags('{\"nv\":null,\"tea\":-1.111111111,\"tag\":123,\"tea\":false}') values (now,5,'false',4.01,2.2,'t123'); ")
- tdSql.query("select jtag from jsons7 where jtag->'tea'>-1.01;")
- # tdSql.checkRows(2)
+ tdSql.query("select jtag from jsons7 where jtag->'tea'<-1.01;")
+ tdSql.checkRows(1)
# test join
tdSql.execute("create table if not exists jsons6(ts timestamp, dataInt int, dataBool bool, dataStr nchar(50)) tags(jtag json)")
@@ -572,6 +627,36 @@ class TDTestCase:
tdSql.query(" select stddev(dataint) from jsons8 group by datatime;")
tdSql.error(" select stddev(datatime) from jsons8 group by datadouble;")
+ # # verify the tag length of the super table and the child table
+ # TD-12389
+ # tdSql.query("describe jsons1;")
+ # jtagLengthSup=tdSql.queryResult[3][2]
+ # tdSql.query("describe jsons1_1;")
+ # tdSql.checkData(3, 2, jtagLengthSup)
+
+
+ # #test import and export
+ # tdSql.execute("select * from jsons1 >> jsons1_data.csv;")
+ # tdSql.query("select * from jsons1 ")
+ # with open("./jsons1_data.csv", 'r+') as f1:
+ # # count=len(open("./jsons1_data.csv",'rU').readlines())
+ # # print(count)
+ # rows=0
+ # for line in f1.readlines():
+ # # for columns in range(4): # it will be replaced with column length later,but now it is setted to a fixed value first
+ # queryResultInt = line.strip().split(',')[1]
+ # # queryResultTag = line.strip().split(',')[3]
+ # # for rows in range(9):
+ # # print(rows,1,queryResultInt,queryResultTag)
+ # tdSql.checkData(rows, 1, "%s" %queryResultInt)
+ # # tdSql.checkData(rows, 3, "%s" %queryResultTag)
+ # rows +=1
+
+ # # test taos -f
+ # os.system("taos -f stable/json_tag_extra.py.sql ")
+ # tdSql.execute("use db_json")
+ # tdSql.query("select * from jsons1")
+ # tdSql.checkRows(9)
# # test drop tables and databases
# tdSql.execute("drop table jsons1_1")
@@ -579,7 +664,10 @@ class TDTestCase:
# tdSql.execute("drop stable jsons3")
# tdSql.execute("drop stable jsons2")
# tdSql.execute("drop database db_json")
-
+
+ testcaseFilename = os.path.split(__file__)[-1]
+ os.system("rm -rf ./insert_res.txt")
+ os.system("rm -rf tools/taosdemoAllTest/%s.sql" % testcaseFilename )
def stop(self):
diff --git a/tests/pytest/tools/taosdemoAllTest/insert-chinese.json b/tests/pytest/tools/taosdemoAllTest/insert-chinese.json
index b7f3be9546c61fe895979cdc13e39eea5a322400..14a56826744f52a01f55b85f6d84744f6b458b70 100644
--- a/tests/pytest/tools/taosdemoAllTest/insert-chinese.json
+++ b/tests/pytest/tools/taosdemoAllTest/insert-chinese.json
@@ -42,7 +42,7 @@
"batch_create_tbl_num": 20,
"data_source": "rand",
"insert_mode": "taosc",
- "insert_rows": 150,
+ "insert_rows": 100,
"childtable_limit": -1,
"childtable_offset":0,
"multi_thread_write_one_tbl": "no",
@@ -58,6 +58,138 @@
"tags_file": "",
"columns": [{"type": "INT"}, {"type": "DOUBLE", "count":1}, {"type": "BINARY", "len": 16, "count":2}, {"type": "nchar", "len": 32, "count":2}],
"tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY","count":1}, {"type": "nchar", "count":2}]
+ },
+ {
+ "name": "stb1",
+ "child_table_exists":"no",
+ "childtable_count": 20,
+ "childtable_prefix": "stb00_",
+ "auto_create_table": "no",
+ "batch_create_tbl_num": 20,
+ "data_source": "rand",
+ "insert_mode": "rest",
+ "insert_rows": 100,
+ "childtable_limit": -1,
+ "childtable_offset":0,
+ "multi_thread_write_one_tbl": "no",
+ "interlace_rows": 0,
+ "insert_interval":0,
+ "max_sql_len": 1024000,
+ "disorder_ratio": 0,
+ "disorder_range": 1000,
+ "timestamp_step": 1,
+ "start_timestamp": "2020-10-01 00:00:00.000",
+ "sample_format": "csv",
+ "sample_file": "./sample.csv",
+ "tags_file": "",
+ "columns": [{"type": "INT"}, {"type": "DOUBLE", "count":1}, {"type": "BINARY", "len": 16, "count":2}, {"type": "nchar", "len": 32, "count":2}],
+ "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY","count":1}, {"type": "nchar", "count":2}]
+ },
+ {
+ "name": "stb2",
+ "child_table_exists":"no",
+ "childtable_count": 30,
+ "childtable_prefix": "stb00_",
+ "auto_create_table": "no",
+ "batch_create_tbl_num": 20,
+ "data_source": "rand",
+ "insert_mode": "stmt",
+ "insert_rows": 100,
+ "childtable_limit": -1,
+ "childtable_offset":0,
+ "multi_thread_write_one_tbl": "no",
+ "interlace_rows": 0,
+ "insert_interval":0,
+ "max_sql_len": 1024000,
+ "disorder_ratio": 0,
+ "disorder_range": 1000,
+ "timestamp_step": 1,
+ "start_timestamp": "2020-10-01 00:00:00.000",
+ "sample_format": "csv",
+ "sample_file": "./sample.csv",
+ "tags_file": "",
+ "columns": [{"type": "INT"}, {"type": "DOUBLE", "count":1}, {"type": "BINARY", "len": 16, "count":2}, {"type": "nchar", "len": 32, "count":2}],
+ "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY","count":1}, {"type": "nchar", "count":2}]
+ },
+ {
+ "name": "stb3",
+ "child_table_exists":"no",
+ "childtable_count": 40,
+ "childtable_prefix": "stb00_",
+ "auto_create_table": "no",
+ "batch_create_tbl_num": 20,
+ "data_source": "rand",
+ "insert_mode": "sml",
+ "insert_rows": 100,
+ "childtable_limit": -1,
+ "childtable_offset":0,
+ "multi_thread_write_one_tbl": "no",
+ "interlace_rows": 0,
+ "insert_interval":0,
+ "max_sql_len": 1024000,
+ "disorder_ratio": 0,
+ "disorder_range": 1000,
+ "timestamp_step": 1,
+ "start_timestamp": "2020-10-01 00:00:00.000",
+ "sample_format": "csv",
+ "sample_file": "./sample.csv",
+ "tags_file": "",
+ "columns": [{"type": "INT"}, {"type": "DOUBLE", "count":1}, {"type": "BINARY", "len": 16, "count":2}, {"type": "nchar", "len": 32, "count":2}],
+ "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY","count":1}, {"type": "nchar", "count":2}]
+ },
+ {
+ "name": "stb4",
+ "child_table_exists":"no",
+ "childtable_count": 50,
+ "childtable_prefix": "stb00_",
+ "auto_create_table": "no",
+ "batch_create_tbl_num": 20,
+ "data_source": "rand",
+ "insert_mode": "sml",
+ "line_protocol": "telnet",
+ "insert_rows": 100,
+ "childtable_limit": -1,
+ "childtable_offset":0,
+ "multi_thread_write_one_tbl": "no",
+ "interlace_rows": 0,
+ "insert_interval":0,
+ "max_sql_len": 1024000,
+ "disorder_ratio": 0,
+ "disorder_range": 1000,
+ "timestamp_step": 1,
+ "start_timestamp": "2020-10-01 00:00:00.000",
+ "sample_format": "csv",
+ "sample_file": "./sample.csv",
+ "tags_file": "",
+ "columns": [{"type": "INT"}],
+ "tags": [{"type": "TINYINT", "count":2}]
+ },
+ {
+ "name": "stb5",
+ "child_table_exists":"no",
+ "childtable_count": 60,
+ "childtable_prefix": "stb00_",
+ "auto_create_table": "no",
+ "batch_create_tbl_num": 20,
+ "data_source": "rand",
+ "insert_mode": "sml",
+ "line_protocol": "json",
+ "insert_rows": 100,
+ "childtable_limit": -1,
+ "childtable_offset":0,
+ "multi_thread_write_one_tbl": "no",
+ "interlace_rows": 0,
+ "insert_interval":0,
+ "max_sql_len": 1024000,
+ "disorder_ratio": 0,
+ "disorder_range": 1000,
+ "timestamp_step": 1,
+ "start_timestamp": "2020-10-01 00:00:00.000",
+ "sample_format": "csv",
+ "sample_file": "./sample.csv",
+ "tags_file": "",
+ "columns": [{"type": "INT"}],
+ "tags": [{"type": "TINYINT"}]
}]
}]
}
diff --git a/tests/pytest/tools/taosdemoAllTest/sml/insert-sml-json-alltype.json b/tests/pytest/tools/taosdemoAllTest/sml/insert-sml-json-alltype.json
index f21cd6297c5a6277c4d9dfb5ec6eda1d9220de97..1b255a37f19b584211430b2f13e8754faedd5577 100644
--- a/tests/pytest/tools/taosdemoAllTest/sml/insert-sml-json-alltype.json
+++ b/tests/pytest/tools/taosdemoAllTest/sml/insert-sml-json-alltype.json
@@ -85,16 +85,16 @@
"tags": [{"type": "TINYINT", "count":1}]
},
{
- "name": "stb3",
+ "name": "stb2",
"child_table_exists":"no",
- "childtable_count": 5,
+ "childtable_count": 3,
"childtable_prefix": "stb03_",
"auto_create_table": "no",
"batch_create_tbl_num": 100,
"data_source": "rand",
"insert_mode": "sml",
"line_protocol": "json" ,
- "insert_rows":50,
+ "insert_rows":10,
"childtable_limit": -1,
"childtable_offset":0,
"interlace_rows": 32767,
@@ -111,16 +111,16 @@
"tags": [{"type": "BIGINT", "count":1}]
},
{
- "name": "stb4",
+ "name": "stb3",
"child_table_exists":"no",
- "childtable_count": 20,
+ "childtable_count": 4,
"childtable_prefix": "stb04_",
"auto_create_table": "no",
"batch_create_tbl_num": 100,
"data_source": "rand",
"insert_mode": "sml",
"line_protocol": "json" ,
- "insert_rows":50,
+ "insert_rows":10,
"childtable_limit": -1,
"childtable_offset":0,
"interlace_rows": 32767,
@@ -137,16 +137,16 @@
"tags": [{"type": "SMALLINT", "count":1}]
},
{
- "name": "stb5",
+ "name": "stb4",
"child_table_exists":"no",
- "childtable_count": 40,
+ "childtable_count": 5,
"childtable_prefix": "stb05_",
"auto_create_table": "no",
"batch_create_tbl_num": 100,
"data_source": "rand",
"insert_mode": "sml",
"line_protocol": "json" ,
- "insert_rows":50,
+ "insert_rows":10,
"childtable_limit": -1,
"childtable_offset":0,
"interlace_rows": 32767,
@@ -163,16 +163,16 @@
"tags": [{"type": "FLOAT", "count":1}]
},
{
- "name": "stb6",
+ "name": "stb5",
"child_table_exists":"no",
- "childtable_count": 15,
+ "childtable_count": 6,
"childtable_prefix": "stb06_",
"auto_create_table": "no",
"batch_create_tbl_num": 100,
"data_source": "rand",
"insert_mode": "sml",
"line_protocol": "json" ,
- "insert_rows":50,
+ "insert_rows":10,
"childtable_limit": -1,
"childtable_offset":0,
"interlace_rows": 32767,
@@ -188,17 +188,43 @@
"columns": [{"type": "DOUBLE"}],
"tags": [{"type": "DOUBLE", "count":1}]
},
+ {
+ "name": "stb6",
+ "child_table_exists":"no",
+ "childtable_count": 7,
+ "childtable_prefix": "stb01_",
+ "auto_create_table": "no",
+ "batch_create_tbl_num": 100,
+ "data_source": "rand",
+ "insert_mode": "sml",
+ "line_protocol": "telnet" ,
+ "insert_rows":10,
+ "childtable_limit": -1,
+ "childtable_offset":0,
+ "interlace_rows": 32767,
+ "insert_interval":0,
+ "max_sql_len": 1025000,
+ "disorder_ratio": 0,
+ "disorder_range": 1000,
+ "timestamp_step": 1,
+ "start_timestamp": "2012-10-01 00:00:00.000",
+ "sample_format": "csv",
+ "sample_file": "./sample.csv",
+ "tags_file": "",
+ "columns": [{"type": "UINT"}],
+ "tags": [{"type": "UINT", "count":1}]
+ },
{
"name": "stb7",
"child_table_exists":"no",
- "childtable_count": 10,
+ "childtable_count": 8,
"childtable_prefix": "stb07_",
"auto_create_table": "no",
"batch_create_tbl_num": 100,
"data_source": "rand",
"insert_mode": "sml",
"line_protocol": "json" ,
- "insert_rows":50,
+ "insert_rows":10,
"childtable_limit": -1,
"childtable_offset":0,
"interlace_rows": 32767,
@@ -217,14 +243,14 @@
{
"name": "stb8",
"child_table_exists":"no",
- "childtable_count": 20,
+ "childtable_count": 9,
"childtable_prefix": "stb08_",
"auto_create_table": "no",
"batch_create_tbl_num": 100,
"data_source": "rand",
"insert_mode": "sml",
"line_protocol": "json" ,
- "insert_rows":50,
+ "insert_rows":10,
"childtable_limit": -1,
"childtable_offset":0,
"interlace_rows": 32767,
@@ -243,14 +269,14 @@
{
"name": "stb9",
"child_table_exists":"no",
- "childtable_count": 3,
+ "childtable_count": 10,
"childtable_prefix": "stb09_",
"auto_create_table": "no",
"batch_create_tbl_num": 100,
"data_source": "rand",
"insert_mode": "sml",
"line_protocol": "json" ,
- "insert_rows":50,
+ "insert_rows":10,
"childtable_limit": -1,
"childtable_offset":0,
"interlace_rows": 32767,
@@ -269,14 +295,14 @@
{
"name": "stb10",
"child_table_exists":"no",
- "childtable_count": 3,
+ "childtable_count": 11,
"childtable_prefix": "stb10_",
"auto_create_table": "no",
"batch_create_tbl_num": 100,
"data_source": "rand",
"insert_mode": "sml",
"line_protocol": "telnet" ,
- "insert_rows":50,
+ "insert_rows":10,
"childtable_limit": -1,
"childtable_offset":0,
"interlace_rows": 32767,
@@ -295,14 +321,14 @@
{
"name": "stb11",
"child_table_exists":"no",
- "childtable_count": 3,
+ "childtable_count": 12,
"childtable_prefix": "stb11_",
"auto_create_table": "no",
"batch_create_tbl_num": 100,
"data_source": "rand",
"insert_mode": "sml",
"line_protocol": "telnet" ,
- "insert_rows":50,
+ "insert_rows":10,
"childtable_limit": -1,
"childtable_offset":0,
"interlace_rows": 32767,
@@ -321,14 +347,14 @@
{
"name": "stb12",
"child_table_exists":"no",
- "childtable_count": 3,
+ "childtable_count": 13,
"childtable_prefix": "stb12_",
"auto_create_table": "no",
"batch_create_tbl_num": 100,
"data_source": "rand",
"insert_mode": "sml",
"line_protocol": "telnet" ,
- "insert_rows":50,
+ "insert_rows":10,
"childtable_limit": -1,
"childtable_offset":0,
"interlace_rows": 32767,
diff --git a/tests/pytest/tools/taosdemoAllTest/taosdemoTestInsertAllType.py b/tests/pytest/tools/taosdemoAllTest/taosdemoTestInsertAllType.py
index 4fdaab25fe182141bebbc06a30fa257481360be3..3bc2495f626e28017d55fc6d01f487ef239cd8b5 100644
--- a/tests/pytest/tools/taosdemoAllTest/taosdemoTestInsertAllType.py
+++ b/tests/pytest/tools/taosdemoAllTest/taosdemoTestInsertAllType.py
@@ -97,15 +97,15 @@ class TDTestCase:
tdSql.checkData(0, 0, 4000)
- # # insert-interface: sml-json
- # os.system("%staosBenchmark -f tools/taosdemoAllTest/sml/insert-sml-json-alltype.json -y " % binPath)
- # tdSql.execute("use db")
- # tdSql.query("show stables")
- # for i in range(13):
- # for j in range(13):
- # if tdSql.queryResult[i][0] == 'stb%d'%j:
- # # print(i,"stb%d"%j)
- # tdSql.checkData(i, 4, j+1)
+ # insert-interface: sml-json
+ os.system("%staosBenchmark -f tools/taosdemoAllTest/sml/insert-sml-json-alltype.json -y " % binPath)
+ tdSql.execute("use db")
+ tdSql.query("show stables")
+ for i in range(13):
+ for j in range(13):
+ if tdSql.queryResult[i][0] == 'stb%d'%j:
+ # print(i,"stb%d"%j)
+ tdSql.checkData(i, 4, j+1)
# insert-interface: sml-telnet
diff --git a/tests/pytest/tools/taosdemoAllTest/taosdemoTestInsertShell.py b/tests/pytest/tools/taosdemoAllTest/taosdemoTestInsertShell.py
index 7f3106e0fa52b8622fe91546e13e4df69defed73..a872d8566fa83a95c1c47519fd391a69c34b78d5 100644
--- a/tests/pytest/tools/taosdemoAllTest/taosdemoTestInsertShell.py
+++ b/tests/pytest/tools/taosdemoAllTest/taosdemoTestInsertShell.py
@@ -95,18 +95,18 @@ class TDTestCase:
tdSql.query("select count(*) from `test.0`")
tdSql.checkData(0, 0, 100)
- # tdLog.info("use diffrent interface rest")
- # tdSql.execute("drop database db1;")
- # # use diffrent interface -rest
- # os.system("%staosBenchmark -u root -c %s -h localhost -P 6030 -d db1 -a 1 -l 10 -b float,int,NCHAR\(15\) -w 4097 \
- # -T 8 -i 10 -S 1000 -r 1000000 -t 10 -n 100 -M -x -y -O 10 -R 100 -E -m test. -I rest " % (binPath,cfgPath))
- # tdSql.execute("use db1")
- # tdSql.query("select count(*) from meters")
- # tdSql.checkData(0, 0, 1000)
- # tdSql.query("select count(tbname) from meters")
- # tdSql.checkData(0, 0, 10)
- # tdSql.query("select count(*) from `test.0`")
- # tdSql.checkData(0, 0, 100)
+ tdLog.info("use diffrent interface rest")
+ tdSql.execute("drop database db1;")
+ # use diffrent interface -rest
+ os.system("%staosBenchmark -u root -c %s -h localhost -P 6030 -d db1 -a 1 -l 10 -b float,int,NCHAR\(15\) -w 4097 \
+ -T 8 -i 10 -S 1000 -r 1000000 -t 10 -n 100 -M -x -y -O 10 -R 100 -E -m test. -I rest " % (binPath,cfgPath))
+ tdSql.execute("use db1")
+ tdSql.query("select count(*) from meters")
+ tdSql.checkData(0, 0, 1000)
+ tdSql.query("select count(tbname) from meters")
+ tdSql.checkData(0, 0, 10)
+ tdSql.query("select count(*) from `test.0`")
+ tdSql.checkData(0, 0, 100)
tdLog.info("use diffrent interface sml")
tdSql.execute("drop database db1;")
@@ -121,7 +121,7 @@ class TDTestCase:
tdLog.info("all data type")
tdSql.execute("drop database db1;")
- # all data type
+ # all data type-taosc
os.system("%staosBenchmark -u root -c %s -h localhost -P 6030 -d db1 -a 1 -l 10 \
-b INT,TIMESTAMP,BIGINT,FLOAT,DOUBLE,SMALLINT,TINYINT,BOOL,UINT,UBIGINT,UTINYINT,USMALLINT,BINARY\(15\),NCHAR\(15\) -w 4096 \
-T 8 -i 10 -S 1000 -r 1000000 -t 10 -n 100 -M -x -y -O 10 -R 100 -E -m test. " % (binPath,cfgPath))
@@ -132,6 +132,43 @@ class TDTestCase:
tdSql.checkData(0, 0, 10)
tdSql.query("select count(*) from `test.0`")
tdSql.checkData(0, 0, 100)
+ tdLog.info("all data type")
+ tdSql.execute("drop database db1;")
+ # all data type-stmt
+ os.system("%staosBenchmark -u root -c %s -h localhost -P 6030 -d db1 -a 1 -l 10 \
+ -b INT,TIMESTAMP,BIGINT,FLOAT,DOUBLE,SMALLINT,TINYINT,BOOL,UINT,UBIGINT,UTINYINT,USMALLINT,BINARY\(15\),NCHAR\(15\) -w 4096 \
+ -T 8 -i 10 -S 1000 -r 1000000 -t 10 -n 100 -M -x -y -O 10 -R 100 -E -m test. -I stmt " % (binPath,cfgPath))
+ tdSql.execute("use db1")
+ tdSql.query("select count(*) from meters")
+ tdSql.checkData(0, 0, 1000)
+ tdSql.query("select count(tbname) from meters")
+ tdSql.checkData(0, 0, 10)
+ tdSql.query("select count(*) from `test.0`")
+ tdSql.checkData(0, 0, 100)
+
+ # all data type-rest
+ os.system("%staosBenchmark -u root -c %s -h localhost -P 6030 -d db1 -a 1 -l 10 \
+ -b INT,TIMESTAMP,BIGINT,FLOAT,DOUBLE,SMALLINT,TINYINT,BOOL,UINT,UBIGINT,UTINYINT,USMALLINT,BINARY\(15\),NCHAR\(15\) -w 4096 \
+ -T 8 -i 10 -S 1000 -r 1000000 -t 10 -n 100 -M -x -y -O 10 -R 100 -E -m test. -I rest " % (binPath,cfgPath))
+ tdSql.execute("use db1")
+ tdSql.query("select count(*) from meters")
+ tdSql.checkData(0, 0, 1000)
+ tdSql.query("select count(tbname) from meters")
+ tdSql.checkData(0, 0, 10)
+ tdSql.query("select count(*) from `test.0`")
+ tdSql.checkData(0, 0, 100)
+
+ # # all data type-rest
+ # os.system("%staosBenchmark -u root -c %s -h localhost -P 6030 -d db1 -a 1 -l 10 \
+ # -b INT,BIGINT,FLOAT,DOUBLE,SMALLINT,TINYINT,BOOL,UINT,UBIGINT,UTINYINT,USMALLINT,BINARY\(15\),NCHAR\(15\) -w 4096 \
+ # -T 8 -i 10 -S 1000 -r 1000000 -t 10 -n 100 -M -x -y -O 10 -R 100 -E -m test. -I sml " % (binPath,cfgPath))
+ # tdSql.execute("use db1")
+ # tdSql.query("select count(*) from meters")
+ # tdSql.checkData(0, 0, 1000)
+ # tdSql.query("select count(tbname) from meters")
+ # tdSql.checkData(0, 0, 10)
+ # # tdSql.query("select count(*) from `test.0`")
+ # # tdSql.checkData(0, 0, 100)
tdLog.info("all data type and interlace rows")
tdSql.execute("drop database db1;")
@@ -164,11 +201,18 @@ class TDTestCase:
tdSql.query("select count(*) from `test.0`")
tdSql.checkData(0, 0, 100)
- # tdLog.info("%staosBenchmark -u root -c %s -h localhost -P 6030 -d db1 -a 1 -l 10 -b float,int,NCHAR\(4096\) \
- # -w 40 -T 8 -i 10 -S 1000 -r 1000000 -t 10 -n 100 -M -x -y -O 10 -R 100 -E -m test. -I stmt" % (binPath,cfgPath))
- # # taosdemo error-exceeds max length
- # assert os.system("%staosBenchmark -u root -c %s -h localhost -P 6030 -d db1 -a 1 -l 10 -b float,int,NCHAR\(4096\) \
- # -w 40 -T 8 -i 10 -S 1000 -r 1000000 -t 10 -n 100 -M -x -y -O 10 -R 100 -E -m test. -I taosc" % (binPath,cfgPath)) != 0
+ # taosdemo error
+ # too max length
+ sql = "%staosBenchmark -u root -c %s -h localhost -P 6030 -d db1 -a 1 -l 10 -b float,int,NCHAR\(4096\) \
+ -w 40 -T 8 -i 10 -S 1000 -r 1000000 -t 10 -n 100 -M -x -y -O 10 -R 100 -E -m test. -I taosc" % (binPath,cfgPath)
+ tdLog.info("%s" % sql )
+ assert os.system("%s" % sql ) != 0
+
+ # error password
+ sql = "%staosBenchmark -u root -c %s -h localhost -P 6030 -p123 -d db1 -a 1 -l 10 -b float,int,NCHAR\(40\) \
+ -w 40 -T 8 -i 10 -S 1000 -r 1000000 -t 10 -n 100 -M -x -y -O 10 -R 100 -E -m test. -I stmt" % (binPath,cfgPath)
+ tdLog.info("%s" % sql )
+ assert os.system("%s" % sql ) != 0
testcaseFilename = os.path.split(__file__)[-1]
os.system("rm -rf ./insert_res*.txt*")
diff --git a/tests/pytest/tools/taosdemoAllTest/taosdemoTestInsertWithJson.py b/tests/pytest/tools/taosdemoAllTest/taosdemoTestInsertWithJson.py
index 06236a1d0175e4f685b29584cc0456e621fb754b..1154beda7846065001093898d617c0292fc8da05 100644
--- a/tests/pytest/tools/taosdemoAllTest/taosdemoTestInsertWithJson.py
+++ b/tests/pytest/tools/taosdemoAllTest/taosdemoTestInsertWithJson.py
@@ -52,319 +52,324 @@ class TDTestCase:
os.system("rm -rf ./insert*_res.txt*")
os.system("rm -rf tools/taosdemoAllTest/%s.sql" % testcaseFilename )
- # insert: create one or mutiple tables per sql and insert multiple rows per sql
- os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-1s1tnt1r.json -y " % binPath)
- tdSql.execute("use db")
- tdSql.query("select count (tbname) from stb0")
- tdSql.checkData(0, 0, 11)
- tdSql.query("select count (tbname) from stb1")
- tdSql.checkData(0, 0, 10)
- tdSql.query("select count(*) from stb00_0")
- tdSql.checkData(0, 0, 100)
- tdSql.query("select count(*) from stb0")
- tdSql.checkData(0, 0, 1100)
- tdSql.query("select count(*) from stb01_1")
- tdSql.checkData(0, 0, 200)
- tdSql.query("select count(*) from stb1")
- tdSql.checkData(0, 0, 2000)
-
- # # restful connector insert data
- # os.system("%staosBenchmark -f tools/taosdemoAllTest/insertRestful.json -y " % binPath)
+ # # insert: create one or mutiple tables per sql and insert multiple rows per sql
+ # os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-1s1tnt1r.json -y " % binPath)
# tdSql.execute("use db")
# tdSql.query("select count (tbname) from stb0")
- # tdSql.checkData(0, 0, 10)
+ # tdSql.checkData(0, 0, 11)
# tdSql.query("select count (tbname) from stb1")
# tdSql.checkData(0, 0, 10)
# tdSql.query("select count(*) from stb00_0")
- # tdSql.checkData(0, 0, 10)
- # tdSql.query("select count(*) from stb0")
# tdSql.checkData(0, 0, 100)
+ # tdSql.query("select count(*) from stb0")
+ # tdSql.checkData(0, 0, 1100)
# tdSql.query("select count(*) from stb01_1")
+ # tdSql.checkData(0, 0, 200)
+ # tdSql.query("select count(*) from stb1")
+ # tdSql.checkData(0, 0, 2000)
+
+ # # # restful connector insert data
+ # # os.system("%staosBenchmark -f tools/taosdemoAllTest/insertRestful.json -y " % binPath)
+ # # tdSql.execute("use db")
+ # # tdSql.query("select count (tbname) from stb0")
+ # # tdSql.checkData(0, 0, 10)
+ # # tdSql.query("select count (tbname) from stb1")
+ # # tdSql.checkData(0, 0, 10)
+ # # tdSql.query("select count(*) from stb00_0")
+ # # tdSql.checkData(0, 0, 10)
+ # # tdSql.query("select count(*) from stb0")
+ # # tdSql.checkData(0, 0, 100)
+ # # tdSql.query("select count(*) from stb01_1")
+ # # tdSql.checkData(0, 0, 20)
+ # # tdSql.query("select count(*) from stb1")
+ # # tdSql.checkData(0, 0, 200)
+
+ # # default values json files
+ # tdSql.execute("drop database if exists db")
+ # os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-default.json -y " % binPath)
+ # tdSql.query("show databases;")
+ # for i in range(tdSql.queryRows):
+ # if tdSql.queryResult[i][0] == 'db':
+ # tdSql.checkData(i, 2, 100)
+ # tdSql.checkData(i, 4, 1)
+ # tdSql.checkData(i, 6, 10)
+ # tdSql.checkData(i, 16, 'ms')
+
+ # # insert: create mutiple tables per sql and insert one rows per sql .
+ # os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-1s1tntmr.json -y " % binPath)
+ # tdSql.execute("use db")
+ # tdSql.query("select count (tbname) from stb0")
+ # tdSql.checkData(0, 0, 10)
+ # tdSql.query("select count (tbname) from stb1")
# tdSql.checkData(0, 0, 20)
+ # tdSql.query("select count(*) from stb00_0")
+ # tdSql.checkData(0, 0, 100)
+ # tdSql.query("select count(*) from stb0")
+ # tdSql.checkData(0, 0, 1000)
+ # tdSql.query("select count(*) from stb01_0")
+ # tdSql.checkData(0, 0, 200)
+ # tdSql.query("select count(*) from stb1")
+ # tdSql.checkData(0, 0, 4000)
+
+ # # insert: using parament "insert_interval to controls spped of insert.
+ # # but We need to have accurate methods to control the speed, such as getting the speed value, checking the count and so on。
+ # os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-interval-speed.json -y" % binPath)
+ # tdSql.execute("use db")
+ # tdSql.query("show stables")
+ # tdSql.checkData(0, 4, 10)
+ # tdSql.query("select count(*) from stb00_0")
+ # tdSql.checkData(0, 0, 200)
+ # tdSql.query("select count(*) from stb0")
+ # tdSql.checkData(0, 0, 2000)
+ # tdSql.query("show stables")
+ # tdSql.checkData(1, 4, 20)
+ # tdSql.query("select count(*) from stb01_0")
+ # tdSql.checkData(0, 0, 200)
+ # tdSql.query("select count(*) from stb1")
+ # tdSql.checkData(0, 0, 4000)
+
+ # # spend 2min30s for 3 testcases.
+ # # insert: drop and child_table_exists combination test
+ # # insert: using parament "childtable_offset and childtable_limit" to control table'offset point and offset
+ # os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-nodbnodrop.json -y" % binPath)
+ # tdSql.error("show dbno.stables")
+ # os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-newdb.json -y" % binPath)
+ # tdSql.execute("use db")
+ # tdSql.query("select count (tbname) from stb0")
+ # tdSql.checkData(0, 0, 5)
+ # tdSql.query("select count (tbname) from stb1")
+ # tdSql.checkData(0, 0, 6)
+ # tdSql.query("select count (tbname) from stb2")
+ # tdSql.checkData(0, 0, 7)
+ # tdSql.query("select count (tbname) from stb3")
+ # tdSql.checkData(0, 0, 8)
+ # tdSql.query("select count (tbname) from stb4")
+ # tdSql.checkData(0, 0, 8)
+ # os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-offset.json -y" % binPath)
+ # tdSql.execute("use db")
+ # tdSql.query("select count(*) from stb0")
+ # tdSql.checkData(0, 0, 50)
+ # tdSql.query("select count(*) from stb1")
+ # tdSql.checkData(0, 0, 240)
+ # tdSql.query("select count(*) from stb2")
+ # tdSql.checkData(0, 0, 220)
+ # tdSql.query("select count(*) from stb3")
+ # tdSql.checkData(0, 0, 180)
+ # tdSql.query("select count(*) from stb4")
+ # tdSql.checkData(0, 0, 160)
+ # os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-newtable.json -y" % binPath)
+ # tdSql.execute("use db")
+ # tdSql.query("select count(*) from stb0")
+ # tdSql.checkData(0, 0, 150)
+ # tdSql.query("select count(*) from stb1")
+ # tdSql.checkData(0, 0, 360)
+ # tdSql.query("select count(*) from stb2")
+ # tdSql.checkData(0, 0, 360)
+ # tdSql.query("select count(*) from stb3")
+ # tdSql.checkData(0, 0, 340)
+ # tdSql.query("select count(*) from stb4")
+ # tdSql.checkData(0, 0, 400)
+ # os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-renewdb.json -y" % binPath)
+ # tdSql.execute("use db")
+ # tdSql.query("select count(*) from stb0")
+ # tdSql.checkData(0, 0, 50)
+ # tdSql.query("select count(*) from stb1")
+ # tdSql.checkData(0, 0, 120)
+ # tdSql.query("select count(*) from stb2")
+ # tdSql.checkData(0, 0, 140)
+ # tdSql.query("select count(*) from stb3")
+ # tdSql.checkData(0, 0, 160)
+ # tdSql.query("select count(*) from stb4")
+ # tdSql.checkData(0, 0, 160)
+
+
+ # # insert: let parament in json file is illegal, it'll expect error.
+ # tdSql.execute("drop database if exists db")
+ # os.system("%staosBenchmark -f tools/taosdemoAllTest/insertColumnsAndTagNumLarge4096.json -y " % binPath)
+ # tdSql.error("use db")
+ # tdSql.execute("drop database if exists db")
+ # os.system("%staosBenchmark -f tools/taosdemoAllTest/insertSigcolumnsNum4096.json -y " % binPath)
+ # tdSql.error("select * from db.stb0")
+ # tdSql.execute("drop database if exists db")
+ # os.system("%staosBenchmark -f tools/taosdemoAllTest/insertColumnsAndTagNum4096.json -y " % binPath)
+ # tdSql.query("select count(*) from db.stb0")
+ # tdSql.checkData(0, 0, 10000)
+
+ # tdSql.execute("drop database if exists db")
+ # os.system("%staosBenchmark -f tools/taosdemoAllTest/insertInterlaceRowsLarge1M.json -y " % binPath)
+ # tdSql.query("select count(*) from db.stb0")
+ # tdSql.checkRows(0)
+ # tdSql.execute("drop database if exists db")
+ # os.system("%staosBenchmark -f tools/taosdemoAllTest/insertColumnsNum0.json -y " % binPath)
+ # tdSql.execute("use db")
+ # tdSql.query("show stables like 'stb0%' ")
+ # tdSql.checkData(0, 2, 11)
+ # tdSql.execute("drop database if exists db")
+ # os.system("%staosBenchmark -f tools/taosdemoAllTest/insertTagsNumLarge128.json -y " % binPath)
+ # tdSql.error("use db1")
+ # tdSql.execute("drop database if exists db")
+ # os.system("%staosBenchmark -f tools/taosdemoAllTest/insertBinaryLenLarge16374AllcolLar49151.json -y " % binPath)
+ # tdSql.query("select count(*) from db.stb0")
+ # tdSql.checkRows(1)
+ # tdSql.query("select count(*) from db.stb1")
+ # tdSql.checkRows(1)
+ # tdSql.error("select * from db.stb4")
+ # tdSql.error("select * from db.stb2")
+ # tdSql.query("select count(*) from db.stb3")
+ # tdSql.checkRows(1)
+ # tdSql.execute("drop database if exists db")
+ # os.system("%staosBenchmark -f tools/taosdemoAllTest/insertBinaryLenLarge16374AllcolLar49151-error.json -y " % binPath)
+ # tdSql.error("select * from db.stb4")
+ # tdSql.error("select * from db.stb2")
+ # tdSql.execute("drop database if exists db")
+ # os.system("%staosBenchmark -f tools/taosdemoAllTest/insertNumOfrecordPerReq0.json -y " % binPath)
+ # tdSql.error("select count(*) from db.stb0")
+ # tdSql.execute("drop database if exists db")
+ # os.system("%staosBenchmark -f tools/taosdemoAllTest/insertNumOfrecordPerReqless0.json -y " % binPath)
+ # tdSql.error("use db")
+ # tdSql.execute("drop database if exists db")
+ # os.system("%staosBenchmark -f tools/taosdemoAllTest/insertChildTab0.json -y " % binPath)
+ # tdSql.error("use db")
+ # tdSql.execute("drop database if exists db")
+ # os.system("%staosBenchmark -f tools/taosdemoAllTest/insertChildTabLess0.json -y " % binPath)
+ # tdSql.error("use db")
+ # tdSql.execute("drop database if exists blf")
+ # os.system("%staosBenchmark -f tools/taosdemoAllTest/insertTimestepMulRowsLargeint16.json -y " % binPath)
+ # tdSql.execute("use blf")
+ # tdSql.query("select ts from blf.p_0_topics_7 limit 262800,1")
+ # tdSql.checkData(0, 0, "2020-03-31 12:00:00.000")
+ # tdSql.query("select first(ts) from blf.p_0_topics_2")
+ # tdSql.checkData(0, 0, "2019-10-01 00:00:00")
+ # tdSql.query("select last(ts) from blf.p_0_topics_6 ")
+ # tdSql.checkData(0, 0, "2020-09-29 23:59:00")
+ # os.system("%staosBenchmark -f tools/taosdemoAllTest/insertMaxNumPerReq.json -y " % binPath)
+ # tdSql.execute("use db")
+ # tdSql.query("select count(*) from stb0")
+ # tdSql.checkData(0, 0, 5000000)
# tdSql.query("select count(*) from stb1")
+ # tdSql.checkData(0, 0, 5000000)
+
+
+
+ # # insert: timestamp and step
+ # os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-timestep.json -y " % binPath)
+ # tdSql.execute("use db")
+ # tdSql.query("show stables")
+ # tdSql.query("select count (tbname) from stb0")
+ # tdSql.checkData(0, 0, 10)
+ # tdSql.query("select count (tbname) from stb1")
+ # tdSql.checkData(0, 0, 20)
+ # tdSql.query("select last(ts) from db.stb00_0")
+ # tdSql.checkData(0, 0, "2020-10-01 00:00:00.019000")
+ # tdSql.query("select count(*) from stb0")
# tdSql.checkData(0, 0, 200)
+ # tdSql.query("select last(ts) from db.stb01_0")
+ # tdSql.checkData(0, 0, "2020-11-01 00:00:00.190000")
+ # tdSql.query("select count(*) from stb1")
+ # tdSql.checkData(0, 0, 400)
- # default values json files
- tdSql.execute("drop database if exists db")
- os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-default.json -y " % binPath)
- tdSql.query("show databases;")
- for i in range(tdSql.queryRows):
- if tdSql.queryResult[i][0] == 'db':
- tdSql.checkData(i, 2, 100)
- tdSql.checkData(i, 4, 1)
- tdSql.checkData(i, 6, 10)
- tdSql.checkData(i, 16, 'ms')
-
- # insert: create mutiple tables per sql and insert one rows per sql .
- os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-1s1tntmr.json -y " % binPath)
- tdSql.execute("use db")
- tdSql.query("select count (tbname) from stb0")
- tdSql.checkData(0, 0, 10)
- tdSql.query("select count (tbname) from stb1")
- tdSql.checkData(0, 0, 20)
- tdSql.query("select count(*) from stb00_0")
- tdSql.checkData(0, 0, 100)
- tdSql.query("select count(*) from stb0")
- tdSql.checkData(0, 0, 1000)
- tdSql.query("select count(*) from stb01_0")
- tdSql.checkData(0, 0, 200)
- tdSql.query("select count(*) from stb1")
- tdSql.checkData(0, 0, 4000)
-
- # insert: using parament "insert_interval to controls spped of insert.
- # but We need to have accurate methods to control the speed, such as getting the speed value, checking the count and so on。
- os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-interval-speed.json -y" % binPath)
- tdSql.execute("use db")
- tdSql.query("show stables")
- tdSql.checkData(0, 4, 10)
- tdSql.query("select count(*) from stb00_0")
- tdSql.checkData(0, 0, 200)
- tdSql.query("select count(*) from stb0")
- tdSql.checkData(0, 0, 2000)
- tdSql.query("show stables")
- tdSql.checkData(1, 4, 20)
- tdSql.query("select count(*) from stb01_0")
- tdSql.checkData(0, 0, 200)
- tdSql.query("select count(*) from stb1")
- tdSql.checkData(0, 0, 4000)
-
- # spend 2min30s for 3 testcases.
- # insert: drop and child_table_exists combination test
- # insert: using parament "childtable_offset and childtable_limit" to control table'offset point and offset
- os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-nodbnodrop.json -y" % binPath)
- tdSql.error("show dbno.stables")
- os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-newdb.json -y" % binPath)
- tdSql.execute("use db")
- tdSql.query("select count (tbname) from stb0")
- tdSql.checkData(0, 0, 5)
- tdSql.query("select count (tbname) from stb1")
- tdSql.checkData(0, 0, 6)
- tdSql.query("select count (tbname) from stb2")
- tdSql.checkData(0, 0, 7)
- tdSql.query("select count (tbname) from stb3")
- tdSql.checkData(0, 0, 8)
- tdSql.query("select count (tbname) from stb4")
- tdSql.checkData(0, 0, 8)
- os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-offset.json -y" % binPath)
- tdSql.execute("use db")
- tdSql.query("select count(*) from stb0")
- tdSql.checkData(0, 0, 50)
- tdSql.query("select count(*) from stb1")
- tdSql.checkData(0, 0, 240)
- tdSql.query("select count(*) from stb2")
- tdSql.checkData(0, 0, 220)
- tdSql.query("select count(*) from stb3")
- tdSql.checkData(0, 0, 180)
- tdSql.query("select count(*) from stb4")
- tdSql.checkData(0, 0, 160)
- os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-newtable.json -y" % binPath)
- tdSql.execute("use db")
- tdSql.query("select count(*) from stb0")
- tdSql.checkData(0, 0, 150)
- tdSql.query("select count(*) from stb1")
- tdSql.checkData(0, 0, 360)
- tdSql.query("select count(*) from stb2")
- tdSql.checkData(0, 0, 360)
- tdSql.query("select count(*) from stb3")
- tdSql.checkData(0, 0, 340)
- tdSql.query("select count(*) from stb4")
- tdSql.checkData(0, 0, 400)
- os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-renewdb.json -y" % binPath)
- tdSql.execute("use db")
- tdSql.query("select count(*) from stb0")
- tdSql.checkData(0, 0, 50)
- tdSql.query("select count(*) from stb1")
- tdSql.checkData(0, 0, 120)
- tdSql.query("select count(*) from stb2")
- tdSql.checkData(0, 0, 140)
- tdSql.query("select count(*) from stb3")
- tdSql.checkData(0, 0, 160)
- tdSql.query("select count(*) from stb4")
- tdSql.checkData(0, 0, 160)
-
-
- # insert: let parament in json file is illegal, it'll expect error.
- tdSql.execute("drop database if exists db")
- os.system("%staosBenchmark -f tools/taosdemoAllTest/insertColumnsAndTagNumLarge4096.json -y " % binPath)
- tdSql.error("use db")
- tdSql.execute("drop database if exists db")
- os.system("%staosBenchmark -f tools/taosdemoAllTest/insertSigcolumnsNum4096.json -y " % binPath)
- tdSql.error("select * from db.stb0")
- tdSql.execute("drop database if exists db")
- os.system("%staosBenchmark -f tools/taosdemoAllTest/insertColumnsAndTagNum4096.json -y " % binPath)
- tdSql.query("select count(*) from db.stb0")
- tdSql.checkData(0, 0, 10000)
-
- tdSql.execute("drop database if exists db")
- os.system("%staosBenchmark -f tools/taosdemoAllTest/insertInterlaceRowsLarge1M.json -y " % binPath)
- tdSql.query("select count(*) from db.stb0")
- tdSql.checkRows(0)
- tdSql.execute("drop database if exists db")
- os.system("%staosBenchmark -f tools/taosdemoAllTest/insertColumnsNum0.json -y " % binPath)
- tdSql.execute("use db")
- tdSql.query("show stables like 'stb0%' ")
- tdSql.checkData(0, 2, 11)
- tdSql.execute("drop database if exists db")
- os.system("%staosBenchmark -f tools/taosdemoAllTest/insertTagsNumLarge128.json -y " % binPath)
- tdSql.error("use db1")
- tdSql.execute("drop database if exists db")
- os.system("%staosBenchmark -f tools/taosdemoAllTest/insertBinaryLenLarge16374AllcolLar49151.json -y " % binPath)
- tdSql.query("select count(*) from db.stb0")
- tdSql.checkRows(1)
- tdSql.query("select count(*) from db.stb1")
- tdSql.checkRows(1)
- tdSql.error("select * from db.stb4")
- tdSql.error("select * from db.stb2")
- tdSql.query("select count(*) from db.stb3")
- tdSql.checkRows(1)
- tdSql.execute("drop database if exists db")
- os.system("%staosBenchmark -f tools/taosdemoAllTest/insertBinaryLenLarge16374AllcolLar49151-error.json -y " % binPath)
- tdSql.error("select * from db.stb4")
- tdSql.error("select * from db.stb2")
- tdSql.execute("drop database if exists db")
- os.system("%staosBenchmark -f tools/taosdemoAllTest/insertNumOfrecordPerReq0.json -y " % binPath)
- tdSql.error("select count(*) from db.stb0")
- tdSql.execute("drop database if exists db")
- os.system("%staosBenchmark -f tools/taosdemoAllTest/insertNumOfrecordPerReqless0.json -y " % binPath)
- tdSql.error("use db")
- tdSql.execute("drop database if exists db")
- os.system("%staosBenchmark -f tools/taosdemoAllTest/insertChildTab0.json -y " % binPath)
- tdSql.error("use db")
- tdSql.execute("drop database if exists db")
- os.system("%staosBenchmark -f tools/taosdemoAllTest/insertChildTabLess0.json -y " % binPath)
- tdSql.error("use db")
- tdSql.execute("drop database if exists blf")
- os.system("%staosBenchmark -f tools/taosdemoAllTest/insertTimestepMulRowsLargeint16.json -y " % binPath)
- tdSql.execute("use blf")
- tdSql.query("select ts from blf.p_0_topics_7 limit 262800,1")
- tdSql.checkData(0, 0, "2020-03-31 12:00:00.000")
- tdSql.query("select first(ts) from blf.p_0_topics_2")
- tdSql.checkData(0, 0, "2019-10-01 00:00:00")
- tdSql.query("select last(ts) from blf.p_0_topics_6 ")
- tdSql.checkData(0, 0, "2020-09-29 23:59:00")
- os.system("%staosBenchmark -f tools/taosdemoAllTest/insertMaxNumPerReq.json -y " % binPath)
- tdSql.execute("use db")
- tdSql.query("select count(*) from stb0")
- tdSql.checkData(0, 0, 5000000)
- tdSql.query("select count(*) from stb1")
- tdSql.checkData(0, 0, 5000000)
-
-
-
- # insert: timestamp and step
- os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-timestep.json -y " % binPath)
- tdSql.execute("use db")
- tdSql.query("show stables")
- tdSql.query("select count (tbname) from stb0")
- tdSql.checkData(0, 0, 10)
- tdSql.query("select count (tbname) from stb1")
- tdSql.checkData(0, 0, 20)
- tdSql.query("select last(ts) from db.stb00_0")
- tdSql.checkData(0, 0, "2020-10-01 00:00:00.019000")
- tdSql.query("select count(*) from stb0")
- tdSql.checkData(0, 0, 200)
- tdSql.query("select last(ts) from db.stb01_0")
- tdSql.checkData(0, 0, "2020-11-01 00:00:00.190000")
- tdSql.query("select count(*) from stb1")
- tdSql.checkData(0, 0, 400)
-
- # # insert: disorder_ratio
- os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-disorder.json -g 2>&1 -y " % binPath)
- tdSql.execute("use db")
- tdSql.query("select count (tbname) from stb0")
- tdSql.checkData(0, 0, 1)
- tdSql.query("select count (tbname) from stb1")
- tdSql.checkData(0, 0, 1)
- tdSql.query("select count(*) from stb0")
- tdSql.checkData(0, 0, 10)
- tdSql.query("select count(*) from stb1")
- tdSql.checkData(0, 0, 10)
-
- # insert: sample json
- os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-sample-ts.json -y " % binPath)
- tdSql.execute("use dbtest123")
- tdSql.query("select c2 from stb0")
- tdSql.checkData(0, 0, 2147483647)
- tdSql.query("select c0 from stb0_0 order by ts")
- tdSql.checkData(3, 0, 4)
- tdSql.query("select count(*) from stb0 order by ts")
- tdSql.checkData(0, 0, 40)
- tdSql.query("select * from stb0_1 order by ts")
- tdSql.checkData(0, 0, '2021-10-28 15:34:44.735')
- tdSql.checkData(3, 0, '2021-10-31 15:34:44.735')
- tdSql.query("select * from stb1 where t1=-127")
- tdSql.checkRows(20)
- tdSql.query("select * from stb1 where t2=127")
- tdSql.checkRows(10)
- tdSql.query("select * from stb1 where t2=126")
- tdSql.checkRows(10)
-
- # insert: sample json
- os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-sample.json -y " % binPath)
- tdSql.execute("use dbtest123")
- tdSql.query("select c2 from stb0")
- tdSql.checkData(0, 0, 2147483647)
- tdSql.query("select * from stb1 where t1=-127")
- tdSql.checkRows(20)
- tdSql.query("select * from stb1 where t2=127")
- tdSql.checkRows(10)
- tdSql.query("select * from stb1 where t2=126")
- tdSql.checkRows(10)
-
-
- # insert: test interlace parament
- os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-interlace-row.json -y " % binPath)
- tdSql.execute("use db")
- tdSql.query("select count (tbname) from stb0")
- tdSql.checkData(0, 0, 100)
- tdSql.query("select count (*) from stb0")
- tdSql.checkData(0, 0, 15000)
-
-
- # # insert: auto_create
-
- tdSql.execute('drop database if exists db')
- tdSql.execute('create database db')
- tdSql.execute('use db')
- os.system("%staosBenchmark -y -f tools/taosdemoAllTest/insert-drop-exist-auto-N00.json " % binPath) # drop = no, child_table_exists, auto_create_table varies
- tdSql.execute('use db')
- tdSql.query('show tables like \'NN123%\'') #child_table_exists = no, auto_create_table varies = 123
- tdSql.checkRows(20)
- tdSql.query('show tables like \'NNN%\'') #child_table_exists = no, auto_create_table varies = no
- tdSql.checkRows(20)
- tdSql.query('show tables like \'NNY%\'') #child_table_exists = no, auto_create_table varies = yes
- tdSql.checkRows(20)
- tdSql.query('show tables like \'NYN%\'') #child_table_exists = yes, auto_create_table varies = no
- tdSql.checkRows(0)
- tdSql.query('show tables like \'NY123%\'') #child_table_exists = yes, auto_create_table varies = 123
- tdSql.checkRows(0)
- tdSql.query('show tables like \'NYY%\'') #child_table_exists = yes, auto_create_table varies = yes
- tdSql.checkRows(0)
-
- tdSql.execute('drop database if exists db')
- os.system("%staosBenchmark -y -f tools/taosdemoAllTest/insert-drop-exist-auto-Y00.json " % binPath) # drop = yes, child_table_exists, auto_create_table varies
- tdSql.execute('use db')
- tdSql.query('show tables like \'YN123%\'') #child_table_exists = no, auto_create_table varies = 123
- tdSql.checkRows(20)
- tdSql.query('show tables like \'YNN%\'') #child_table_exists = no, auto_create_table varies = no
- tdSql.checkRows(20)
- tdSql.query('show tables like \'YNY%\'') #child_table_exists = no, auto_create_table varies = yes
- tdSql.checkRows(20)
- tdSql.query('show tables like \'YYN%\'') #child_table_exists = yes, auto_create_table varies = no
- tdSql.checkRows(20)
- tdSql.query('show tables like \'YY123%\'') #child_table_exists = yes, auto_create_table varies = 123
- tdSql.checkRows(20)
- tdSql.query('show tables like \'YYY%\'') #child_table_exists = yes, auto_create_table varies = yes
- tdSql.checkRows(20)
-
- # insert: test chinese encoding
- os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-chinese.json -y " % binPath)
- tdSql.execute("use db")
- tdSql.query("select count (tbname) from stb0")
- tdSql.checkData(0, 0, 10)
- tdSql.query("select count (*) from stb0")
- tdSql.checkData(0, 0, 1500)
+ # # # insert: disorder_ratio
+ # os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-disorder.json -g 2>&1 -y " % binPath)
+ # tdSql.execute("use db")
+ # tdSql.query("select count (tbname) from stb0")
+ # tdSql.checkData(0, 0, 1)
+ # tdSql.query("select count (tbname) from stb1")
+ # tdSql.checkData(0, 0, 1)
+ # tdSql.query("select count(*) from stb0")
+ # tdSql.checkData(0, 0, 10)
+ # tdSql.query("select count(*) from stb1")
+ # tdSql.checkData(0, 0, 10)
+ # # insert: sample json
+ # os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-sample-ts.json -y " % binPath)
+ # tdSql.execute("use dbtest123")
+ # tdSql.query("select c2 from stb0")
+ # tdSql.checkData(0, 0, 2147483647)
+ # tdSql.query("select c0 from stb0_0 order by ts")
+ # tdSql.checkData(3, 0, 4)
+ # tdSql.query("select count(*) from stb0 order by ts")
+ # tdSql.checkData(0, 0, 40)
+ # tdSql.query("select * from stb0_1 order by ts")
+ # tdSql.checkData(0, 0, '2021-10-28 15:34:44.735')
+ # tdSql.checkData(3, 0, '2021-10-31 15:34:44.735')
+ # tdSql.query("select * from stb1 where t1=-127")
+ # tdSql.checkRows(20)
+ # tdSql.query("select * from stb1 where t2=127")
+ # tdSql.checkRows(10)
+ # tdSql.query("select * from stb1 where t2=126")
+ # tdSql.checkRows(10)
+
+ # # insert: sample json
+ # os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-sample.json -y " % binPath)
+ # tdSql.execute("use dbtest123")
+ # tdSql.query("select c2 from stb0")
+ # tdSql.checkData(0, 0, 2147483647)
+ # tdSql.query("select * from stb1 where t1=-127")
+ # tdSql.checkRows(20)
+ # tdSql.query("select * from stb1 where t2=127")
+ # tdSql.checkRows(10)
+ # tdSql.query("select * from stb1 where t2=126")
+ # tdSql.checkRows(10)
+
+
+ # # insert: test interlace parament
+ # os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-interlace-row.json -y " % binPath)
+ # tdSql.execute("use db")
+ # tdSql.query("select count (tbname) from stb0")
+ # tdSql.checkData(0, 0, 100)
+ # tdSql.query("select count (*) from stb0")
+ # tdSql.checkData(0, 0, 15000)
+
+
+ # # # insert: auto_create
+
+ # tdSql.execute('drop database if exists db')
+ # tdSql.execute('create database db')
+ # tdSql.execute('use db')
+ # os.system("%staosBenchmark -y -f tools/taosdemoAllTest/insert-drop-exist-auto-N00.json " % binPath) # drop = no, child_table_exists, auto_create_table varies
+ # tdSql.execute('use db')
+ # tdSql.query('show tables like \'NN123%\'') #child_table_exists = no, auto_create_table varies = 123
+ # tdSql.checkRows(20)
+ # tdSql.query('show tables like \'NNN%\'') #child_table_exists = no, auto_create_table varies = no
+ # tdSql.checkRows(20)
+ # tdSql.query('show tables like \'NNY%\'') #child_table_exists = no, auto_create_table varies = yes
+ # tdSql.checkRows(20)
+ # tdSql.query('show tables like \'NYN%\'') #child_table_exists = yes, auto_create_table varies = no
+ # tdSql.checkRows(0)
+ # tdSql.query('show tables like \'NY123%\'') #child_table_exists = yes, auto_create_table varies = 123
+ # tdSql.checkRows(0)
+ # tdSql.query('show tables like \'NYY%\'') #child_table_exists = yes, auto_create_table varies = yes
+ # tdSql.checkRows(0)
+
+ # tdSql.execute('drop database if exists db')
+ # os.system("%staosBenchmark -y -f tools/taosdemoAllTest/insert-drop-exist-auto-Y00.json " % binPath) # drop = yes, child_table_exists, auto_create_table varies
+ # tdSql.execute('use db')
+ # tdSql.query('show tables like \'YN123%\'') #child_table_exists = no, auto_create_table varies = 123
+ # tdSql.checkRows(20)
+ # tdSql.query('show tables like \'YNN%\'') #child_table_exists = no, auto_create_table varies = no
+ # tdSql.checkRows(20)
+ # tdSql.query('show tables like \'YNY%\'') #child_table_exists = no, auto_create_table varies = yes
+ # tdSql.checkRows(20)
+ # tdSql.query('show tables like \'YYN%\'') #child_table_exists = yes, auto_create_table varies = no
+ # tdSql.checkRows(20)
+ # tdSql.query('show tables like \'YY123%\'') #child_table_exists = yes, auto_create_table varies = 123
+ # tdSql.checkRows(20)
+ # tdSql.query('show tables like \'YYY%\'') #child_table_exists = yes, auto_create_table varies = yes
+ # tdSql.checkRows(20)
+
+ # # insert: test chinese encoding
+ # # TD-11399、TD-10819
+ # os.system("%staosBenchmark -f tools/taosdemoAllTest/insert-chinese.json -y " % binPath)
+ # tdSql.execute("use db")
+ # tdSql.query("show stables")
+ # for i in range(6):
+ # for j in range(6):
+ # if tdSql.queryResult[i][0] == 'stb%d'%j:
+ # # print(i,"stb%d"%j)
+ # tdSql.checkData(i, 4, (j+1)*10)
+ # for i in range(13):
+ # tdSql.query("select count(*) from stb%d"%i)
+ # tdSql.checkData(0, 0, (i+1)*100)
# rm useless files
os.system("rm -rf ./insert*_res.txt*")
diff --git a/tests/pytest/tools/taosdemoAllTest/taosdemoTestInsertWithJsonSml.py b/tests/pytest/tools/taosdemoAllTest/taosdemoTestInsertWithJsonSml.py
index f1eee8d0cff9f3ca22e70c683343f57ec7baca2b..1a11d5c60cf8bbf97f4dd66a11e7fa85ba04a98c 100644
--- a/tests/pytest/tools/taosdemoAllTest/taosdemoTestInsertWithJsonSml.py
+++ b/tests/pytest/tools/taosdemoAllTest/taosdemoTestInsertWithJsonSml.py
@@ -74,22 +74,23 @@ class TDTestCase:
tdSql.query("select count(*) from stb1")
tdSql.checkData(0, 0, 3000)
- # # insert: using parament "insert_interval to controls spped of insert.
- # # but We need to have accurate methods to control the speed, such as getting the speed value, checking the count and so on。
- # os.system("%staosBenchmark -f tools/taosdemoAllTest/sml/insert-interval-speed-sml.json -y" % binPath)
- # tdSql.execute("use db")
- # tdSql.query("select tbname from db.stb0")
- # tdSql.checkRows(100 )
- # # tdSql.query("select count(*) from stb00_0")
- # # tdSql.checkData(0, 0, 20)
- # tdSql.query("select count(*) from stb0")
- # tdSql.checkData(0, 0, 2000)
- # tdSql.query("show stables")
- # tdSql.checkData(1, 4, 20)
- # # tdSql.query("select count(*) from stb01_0")
- # # tdSql.checkData(0, 0, 35)
- # tdSql.query("select count(*) from stb1")
- # tdSql.checkData(0, 0, 700)
+ # insert: using parament "insert_interval to controls spped of insert.
+ # but We need to have accurate methods to control the speed, such as getting the speed value, checking the count and so on。
+ os.system("%staosBenchmark -f tools/taosdemoAllTest/sml/insert-interval-speed-sml.json -y" % binPath)
+ tdSql.execute("use db")
+ # tdSql.query("select count (tbname) from stb0")
+ tdSql.query("select tbname from db.stb0")
+ tdSql.checkRows(100 )
+ # tdSql.query("select count(*) from stb00_0")
+ # tdSql.checkData(0, 0, 20)
+ tdSql.query("select count(*) from stb0")
+ tdSql.checkData(0, 0, 2000)
+ tdSql.query("show stables")
+ tdSql.checkData(1, 4, 20)
+ # tdSql.query("select count(*) from stb01_0")
+ # tdSql.checkData(0, 0, 35)
+ tdSql.query("select count(*) from stb1")
+ tdSql.checkData(0, 0, 700)
# spend 2min30s for 3 testcases.
# insert: drop and child_table_exists combination test
@@ -134,10 +135,13 @@ class TDTestCase:
# os.system("%staosBenchmark -f tools/taosdemoAllTest/sml/insertColumnsAndTagNum4096-sml.json -y " % binPath)
# tdSql.query("select count(*) from db.stb0")
# tdSql.checkData(0, 0, 10000)
+
+ # there is no limit of 4096 columns,so cancels this case
# tdSql.execute("drop database if exists db")
# os.system("%staosBenchmark -f tools/taosdemoAllTest/sml/insertInterlaceRowsLarge1M-sml.json -y " % binPath)
# tdSql.query("select count(*) from db.stb0")
# tdSql.checkRows(0)
+
tdSql.execute("drop database if exists db")
os.system("%staosBenchmark -f tools/taosdemoAllTest/sml/insertColumnsNum0-sml.json -y " % binPath)
tdSql.execute("use db")
diff --git a/tests/system-test/1-insert/TD-11970.py b/tests/system-test/1-insert/TD-11970.py
new file mode 100644
index 0000000000000000000000000000000000000000..ec80434b377158a4b9f5202aeda8c7fee600e867
--- /dev/null
+++ b/tests/system-test/1-insert/TD-11970.py
@@ -0,0 +1,84 @@
+###################################################################
+# Copyright (c) 2020 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 taos
+import time
+
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+ def __init__(self):
+ self.err_case = 0
+ self.curret_case = 0
+
+ def caseDescription(self):
+
+ '''
+ case1 : [TD-11970] : there is no err return when create table using now+Ntimes.
+ '''
+ return
+
+ def init(self, conn, logSql):
+ tdLog.debug("start to execute %s" % __file__)
+ tdSql.init(conn.cursor(), logSql)
+
+ def check_td11970(self):
+ # this case expect all create table sql with now+Ntime is success.
+ tdSql.prepare()
+ tdSql.execute(f"create stable stb1(ts timestamp, c1 int) tags (tag1 int, tag2 timestamp)")
+
+ try:
+ tdSql.execute(f"create table t1 using stb1 tags(1, now-100b)")
+ tdSql.execute(f"create table t2 using stb1 tags(2, now-100u)")
+ tdSql.execute(f"create table t3 using stb1 tags(3, now-100a)")
+ tdSql.execute(f"create table t4 using stb1 tags(4, now-100s)")
+ tdSql.execute(f"create table t5 using stb1 tags(5, now-100m)")
+ tdSql.execute(f"create table t6 using stb1 tags(6, now-100h)")
+ tdSql.execute(f"create table t7 using stb1 tags(7, now-100d)")
+ tdSql.execute(f"create table t8 using stb1 tags(8, now-100w)")
+
+ tdSql.execute(f"create table t9 using stb1 tags(9, now+10b)")
+ tdSql.execute(f"create table t10 using stb1 tags(10, now+10u)")
+ tdSql.execute(f"create table t11 using stb1 tags(11, now+10a)")
+ tdSql.execute(f"create table t12 using stb1 tags(12, now+10s)")
+ tdSql.execute(f"create table t13 using stb1 tags(13, now+10m)")
+ tdSql.execute(f"create table t14 using stb1 tags(14, now+10h)")
+ tdSql.execute(f"create table t15 using stb1 tags(15, now+10d)")
+ tdSql.execute(f"create table t16 using stb1 tags(16, now+10w)")
+ self.curret_case += 1
+ tdLog.printNoPrefix("the case for td-11970 run passed")
+ except:
+ self.err_case += 1
+ tdLog.printNoPrefix("the case for td-11970 run failed")
+
+ pass
+
+ def run(self):
+ self.check_td11970()
+
+ if self.err_case > 0:
+ tdLog.exit(f"{self.err_case} case run failed")
+ else:
+ tdLog.success("all case run passed")
+
+ def stop(self):
+ tdSql.close()
+ tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/system-test/2-query/TD-11256.py b/tests/system-test/2-query/TD-11256.py
new file mode 100644
index 0000000000000000000000000000000000000000..f101ad211377310d01ad44504e2e1c60a405e826
--- /dev/null
+++ b/tests/system-test/2-query/TD-11256.py
@@ -0,0 +1,78 @@
+###################################################################
+# Copyright (c) 2020 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 taos
+import time
+
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+ def __init__(self):
+ self.err_case = 0
+ self.curret_case = 0
+
+ def caseDescription(self):
+
+ '''
+ case1 : [TD-11256] query the super table in a mixed way of expression + tbanme and using group by tbname
+ '''
+ return
+
+ def init(self, conn, logSql):
+ tdLog.debug("start to execute %s" % __file__)
+ tdSql.init(conn.cursor(), logSql)
+
+ def create_stb(self):
+ basetime = int(round(time.time() * 1000))
+ tdSql.prepare()
+ tdSql.execute(f"create stable stb1(ts timestamp, c1 int) tags (tag1 int)")
+ for i in range(10):
+ tdSql.execute(f"create table t{i} using stb1 tags({i})")
+ tdSql.execute(f"insert into t{i} values ({basetime}, {i})")
+
+ pass
+
+ def check_td11256(self):
+ # this case expect connect is current after run group by sql
+ tdSql.query("select count(*) from stb1 group by ts")
+ try:
+ tdSql.error("select c1/2, tbname from stb1 group by tbname")
+ tdSql.query("show databases")
+ self.curret_case += 1
+ tdLog.printNoPrefix("the case1: td-11256 run passed")
+ except:
+ self.err_case += 1
+ tdLog.printNoPrefix("the case1: td-11256 run failed")
+ pass
+
+ def run(self):
+ self.create_stb()
+
+ self.check_td11256()
+
+ if self.err_case > 0:
+ tdLog.exit(f"{self.err_case} case for TD-11256 run failed")
+ else:
+ tdLog.success("case for TD-11256 run passed")
+
+ def stop(self):
+ tdSql.close()
+ tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
\ No newline at end of file
diff --git a/tests/system-test/2-query/TD-12344.py b/tests/system-test/2-query/TD-12344.py
index 4588893e157af3a0e2a2906a35228e9034502252..871356d49bc738fc6290e79b13d4ea41013282ef 100644
--- a/tests/system-test/2-query/TD-12344.py
+++ b/tests/system-test/2-query/TD-12344.py
@@ -19,6 +19,7 @@ from util.log import *
from util.cases import *
from util.sql import *
from util.dnodes import *
+import subprocess
class TDTestCase:
def init(self, conn, logSql):
@@ -48,10 +49,9 @@ class TDTestCase:
def caseDescription(self):
'''
- case1 : [TD-11389] :
- this test case is an test case for cache error , it will let the cached data obtained by the client that has connected to taosd incorrect，
- root cause : table schema is changed, tag hostname size is increased through schema-less insertion. The schema cache of client taos is not refreshed.
-
+ case1 : [TD-12344] :
+ this test case is an test case for unexpectd crash for session function , it will coredump taoshell ;
+
'''
return
@@ -81,9 +81,6 @@ class TDTestCase:
cfgPath = projPath + "/sim/dnode1/cfg "
return cfgPath
-
-
-
def run(self):
tdSql.prepare()
@@ -91,17 +88,17 @@ class TDTestCase:
tdSql.execute("use testdb;")
tdSql.execute("create stable st (ts timestamp , id int , value double) tags(hostname binary(10) ,ind int);")
for i in range(self.num):
+ tdSql.execute("insert into sub_%s using st tags('host_%s' , %d) values (%d , %d , %f );"%(str(i),str(i),i*10,self.ts+100*i,i*2,i+10.00))
+ tdSql.execute("insert into sub_%s using st tags('host_%s' , %d) values (%d , %d , %f );"%(str(i),str(i),i*10,self.ts+200*i,i*2,i+10.00))
+ tdSql.execute("insert into sub_%s using st tags('host_%s' , %d) values (%d , %d , %f );"%(str(i),str(i),i*10,self.ts+300*i,i*2,i+10.00))
tdSql.execute("insert into sub_%s using st tags('host_%s' , %d) values (%d , %d , %f );"%(str(i),str(i),i*10,self.ts+10000*i,i*2,i+10.00))
- tdSql.query('select elapsed(ts,10s) from sub_1 where ts>="2015-01-01 00:00:00.000" and ts < "2015-01-01 00:10:00.000" session(ts,1d) ;')
-
cfg_path = self.getcfgPath()
print(cfg_path)
- # tdSql.execute('select elapsed(ts,10s) from st where ts>="2015-01-01 00:00:00.000" and ts < "2015-01-01 00:10:00.000" session(ts,1d) group by tbname;') # session not support super table
- os.system("taos -c %s -s 'select elapsed(ts,10s) from testdb.st where ts>=\"2015-01-01 00:00:00.000\" and ts < \"2015-01-01 00:10:00.000\" session(ts,1d) group by tbname;' " % (cfg_path))
-
-
-
+ tdSql.execute('select elapsed(ts,10s) from testdb.st where ts>=\"2015-01-01 00:00:00.000\" and ts < \"2015-01-01 00:10:00.000\" session(ts,1d) group by tbname;') # session not support super table
+ taos_cmd1= "taos -c %s -s 'select elapsed(ts,10s) from testdb.st where ts>=\"2015-01-01 00:00:00.000\" and ts < \"2015-01-01 00:10:00.000\" session(ts,1d) group by tbname;' " % (cfg_path)
+ _ = subprocess.check_output(taos_cmd1, shell=True).decode("utf-8")
+
def stop(self):
tdSql.close()
diff --git a/tests/system-test/3-connectors/c#/test.sh b/tests/system-test/3-connectors/c#/test.sh
new file mode 100755
index 0000000000000000000000000000000000000000..2d4f18b668263d40bb18ef46f34b7299b3f7cdd3
--- /dev/null
+++ b/tests/system-test/3-connectors/c#/test.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+function stopTaosd {
+ echo "Stop taosd"
+ sudo systemctl stop taosd || echo 'no sudo or systemctl or stop fail'
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ while [ -n "$PID" ]
+ do
+ pkill -TERM -x taosd
+ sleep 1
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ done
+}
+stopTaosd
+rm -rf /var/lib/taos/*
+rm -rf /var/log/taos/*
+nohup taosd -c /etc/taos/ > /dev/null 2>&1 &
+sleep 10
+cd ../../
+WKC=`pwd`
+cd ${WKC}/src/connector/C#
+dotnet test
+dotnet run --project src/test/Cases/Cases.csproj
+
+cd ${WKC}/tests/examples/C#
+dotnet run --project C#checker/C#checker.csproj
+dotnet run --project TDengineTest/TDengineTest.csproj
+dotnet run --project schemaless/schemaless.csproj
+
+cd ${WKC}/tests/examples/C#/taosdemo
+dotnet build -c Release
+tree | true
+./bin/Release/net5.0/taosdemo -c /etc/taos -y
diff --git a/tests/system-test/3-connectors/go/test.sh b/tests/system-test/3-connectors/go/test.sh
new file mode 100755
index 0000000000000000000000000000000000000000..097723ad461b69c75e18bc8018c025f0e9f7a3e3
--- /dev/null
+++ b/tests/system-test/3-connectors/go/test.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+function stopTaosd {
+ echo "Stop taosd"
+ sudo systemctl stop taosd || echo 'no sudo or systemctl or stop fail'
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ while [ -n "$PID" ]
+ do
+ pkill -TERM -x taosd
+ sleep 1
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ done
+}
+stopTaosd
+rm -rf /var/lib/taos/*
+rm -rf /var/log/taos/*
+nohup taosd -c /etc/taos/ > /dev/null 2>&1 &
+sleep 10
+cd ../../
+WKC=`pwd`
+
diff --git a/tests/system-test/3-connectors/java/test.sh b/tests/system-test/3-connectors/java/test.sh
new file mode 100755
index 0000000000000000000000000000000000000000..15f7b84955b793e0fb6acaa434fba83c6ff0c710
--- /dev/null
+++ b/tests/system-test/3-connectors/java/test.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+function stopTaosd {
+ echo "Stop taosd"
+ sudo systemctl stop taosd || echo 'no sudo or systemctl or stop fail'
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ while [ -n "$PID" ]
+ do
+ pkill -TERM -x taosd
+ sleep 1
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ done
+}
+stopTaosd
+rm -rf /var/lib/taos/*
+rm -rf /var/log/taos/*
+nohup taosd -c /etc/taos/ > /dev/null 2>&1 &
+sleep 10
diff --git a/tests/system-test/3-connectors/nodejs/test.sh b/tests/system-test/3-connectors/nodejs/test.sh
new file mode 100755
index 0000000000000000000000000000000000000000..3b1d8bb4790d6273e32a42ce50979e98e1ce5a92
--- /dev/null
+++ b/tests/system-test/3-connectors/nodejs/test.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+function stopTaosd {
+ echo "Stop taosd"
+ sudo systemctl stop taosd || echo 'no sudo or systemctl or stop fail'
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ while [ -n "$PID" ]
+ do
+ pkill -TERM -x taosd
+ sleep 1
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ done
+}
+stopTaosd
+rm -rf /var/lib/taos/*
+rm -rf /var/log/taos/*
+nohup taosd -c /etc/taos/ > /dev/null 2>&1 &
+sleep 10
+cd ../../
+WKC=`pwd`
+cd ${WKC}/src/connector/nodejs
+npm install
+npm run test
+cd ${WKC}/tests/examples/nodejs
+npm install td2.0-connector > /dev/null 2>&1
+node nodejsChecker.js host=localhost
+node test1970.js
+cd ${WKC}/tests/connectorTest/nodejsTest/nanosupport
+npm install td2.0-connector > /dev/null 2>&1
+node nanosecondTest.js
diff --git a/tests/system-test/3-connectors/python/test.sh b/tests/system-test/3-connectors/python/test.sh
new file mode 100755
index 0000000000000000000000000000000000000000..fe0dfbdac99f6938c8a57d13666f609c2c7c5d33
--- /dev/null
+++ b/tests/system-test/3-connectors/python/test.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+function stopTaosd {
+ echo "Stop taosd"
+ sudo systemctl stop taosd || echo 'no sudo or systemctl or stop fail'
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ while [ -n "$PID" ]
+ do
+ pkill -TERM -x taosd
+ sleep 1
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ done
+}
+stopTaosd
+rm -rf /var/lib/taos/*
+rm -rf /var/log/taos/*
+nohup taosd -c /etc/taos/ > /dev/null 2>&1 &
+sleep 10
+cd ../../src/connector/python
+pip3 install pytest
+pytest tests/
+
+python3 examples/bind-multi.py
+python3 examples/bind-row.py
+python3 examples/demo.py
+python3 examples/insert-lines.py
+python3 examples/pep-249.py
+python3 examples/query-async.py
+python3 examples/query-objectively.py
+python3 examples/subscribe-sync.py
+python3 examples/subscribe-async.py
diff --git a/tests/system-test/3-connectors/restful/test.sh b/tests/system-test/3-connectors/restful/test.sh
new file mode 100755
index 0000000000000000000000000000000000000000..1c6d8fbc2c5da6633d749054a19a5bde7772faf7
--- /dev/null
+++ b/tests/system-test/3-connectors/restful/test.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+function stopTaosd {
+ echo "Stop taosd"
+ sudo systemctl stop taosd || echo 'no sudo or systemctl or stop fail'
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ while [ -n "$PID" ]
+ do
+ pkill -TERM -x taosd
+ sleep 1
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ done
+}
+stopTaosd
+rm -rf /var/lib/taos/*
+rm -rf /var/log/taos/*
+nohup taosd -c /etc/taos/ > /dev/null 2>&1 &
+sleep 10
+cd ../../
+WKC=`pwd`
diff --git a/tests/system-test/3-connectors/rust/test.sh b/tests/system-test/3-connectors/rust/test.sh
new file mode 100755
index 0000000000000000000000000000000000000000..4bf6394b27cf43674ed38a1e4de46342ee3b1ae4
--- /dev/null
+++ b/tests/system-test/3-connectors/rust/test.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+function stopTaosd {
+ echo "Stop taosd"
+ sudo systemctl stop taosd || echo 'no sudo or systemctl or stop fail'
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ while [ -n "$PID" ]
+ do
+ pkill -TERM -x taosd
+ sleep 1
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ done
+}
+stopTaosd
+rm -rf /var/lib/taos/*
+rm -rf /var/log/taos/*
+nohup taosd -c /etc/taos/ > /dev/null 2>&1 &
+sleep 10
+cd ../../
+WKC=`pwd`
\ No newline at end of file
diff --git a/tests/system-test/4-taosAdapter/TD-12163.py b/tests/system-test/4-taosAdapter/TD-12163.py
new file mode 100644
index 0000000000000000000000000000000000000000..aafc218611c1c51e3d6f82d802c95fd8e2c16cf5
--- /dev/null
+++ b/tests/system-test/4-taosAdapter/TD-12163.py
@@ -0,0 +1,118 @@
+###################################################################
+# Copyright (c) 2020 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 taosdata
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import taos
+import time
+import requests
+
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+ def __init__(self):
+ self.err_case = 0
+ self.curret_case = 0
+ self.url = "http://127.0.0.1:6041/rest/sql"
+ self.header = {'Authorization': 'Basic cm9vdDp0YW9zZGF0YQ=='}
+
+ def caseDescription(self):
+
+ '''
+ case1 : [TD-12163] alter table-schema using restful interface
+ '''
+ return
+
+ def init(self, conn, logSql):
+ tdLog.debug("start to execute %s" % __file__)
+ tdSql.init(conn.cursor(), logSql)
+
+ def check_td12163(self):
+ # basetime = int(round(time.time() * 1000))
+ tdSql.prepare()
+ tdSql.execute(f"create stable stb1(ts timestamp, c1 int) tags (tag1 int)")
+ tdSql.execute(f"create table nt1 (nts timestamp, nc1 int)")
+
+ add_column_stb = "alter table db.stb1 add column c2 float"
+ drop_column_stb = "alter table db.stb1 drop column c2 "
+ add_column_ntb = "alter table db.nt1 add column nc2 float"
+ drop_column_ntb = "alter table db.nt1 drop column nc2 "
+
+ conn_add_stb = requests.post(url=self.url, headers=self.header, data=add_column_stb)
+ resp_code_stb_add = conn_add_stb.status_code
+ resp_add_stb = conn_add_stb.json()
+ try:
+ assert resp_code_stb_add//200 == 1
+ assert resp_add_stb["status"] == "succ"
+ self.curret_case += 1
+ tdLog.printNoPrefix("the case add column to stable successful")
+ except:
+ self.err_case += 1
+ tdLog.printNoPrefix("the case add column to stable failed")
+
+
+ conn_add_ntb = requests.post(url=self.url, headers=self.header, data=add_column_ntb)
+ resp_code_ntb_add = conn_add_ntb.status_code
+ resp_add_ntb = conn_add_ntb.json()
+ try:
+ assert resp_code_ntb_add//200 == 1
+ assert resp_add_ntb["status"] == "succ"
+ self.curret_case += 1
+ tdLog.printNoPrefix("the case add column to normal table successful")
+ except:
+ self.err_case += 1
+ tdLog.printNoPrefix("the case add column to normal table failed")
+
+ conn_drop_stb = requests.post(url=self.url, headers=self.header, data=drop_column_stb)
+ resp_code_stb_drop = conn_drop_stb.status_code
+ resp_drop_stb = conn_drop_stb.json()
+ try:
+ assert resp_code_stb_drop // 200 == 1
+ assert resp_drop_stb["status"] == "succ"
+ self.curret_case += 1
+ tdLog.printNoPrefix("the case drop column to stable successful")
+ except:
+ self.err_case += 1
+ tdLog.printNoPrefix("the case add column to stable failed")
+
+ conn_drop_ntb = requests.post(url=self.url, headers=self.header, data=drop_column_ntb)
+ resp_code_ntb_drop = conn_drop_ntb.status_code
+ resp_drop_ntb = conn_drop_ntb.json()
+ try:
+ assert resp_code_ntb_drop // 200 == 1
+ assert resp_drop_ntb["status"] == "succ"
+ self.curret_case += 1
+ tdLog.printNoPrefix("the case drop column to stable successful")
+ except:
+ self.err_case += 1
+ tdLog.printNoPrefix("the case add column to stable failed")
+
+ pass
+
+ def run(self):
+ self.check_td12163()
+
+ if self.err_case > 0:
+ tdLog.exit(f"{self.err_case} case for TD-12163 run failed")
+ else:
+ tdLog.success("case for TD-12163 run passed")
+
+ def stop(self):
+ tdSql.close()
+ tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
\ No newline at end of file
diff --git a/tests/system-test/fulltest-connector.sh b/tests/system-test/fulltest-connector.sh
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..dbb77b2ce07d8c34c549a22a3218ebcb6894d2a3 100755
--- a/tests/system-test/fulltest-connector.sh
+++ b/tests/system-test/fulltest-connector.sh
@@ -0,0 +1,7 @@
+bash 3-connectors/c#/test.sh
+bash 3-connectors/go/test.sh
+bash 3-connectors/java/test.sh
+bash 3-connectors/nodejs/test.sh
+bash 3-connectors/python/test.sh
+bash 3-connectors/restful/test.sh
+bash 3-connectors/rust/test.sh
diff --git a/tests/system-test/fulltest-insert.sh b/tests/system-test/fulltest-insert.sh
index 383342fdb873d37a1389260fb579ff7de3b7d259..709fab8791b37169a236887d57109a93cb38b585 100755
--- a/tests/system-test/fulltest-insert.sh
+++ b/tests/system-test/fulltest-insert.sh
@@ -1 +1,5 @@
-#python3 ./test.py -f 1-insert/batchInsert.py
+
+python3 ./test.py -f 1-insert/batchInsert.py
+python3 test.py -f 1-insert/TD-11970.py
+
+
diff --git a/tests/system-test/fulltest-others.sh b/tests/system-test/fulltest-others.sh
index e098631f97ee913ad22ed5f30abbc8212798a53d..26e6aee2b90a619329e23bb8418b95cc0466a78f 100755
--- a/tests/system-test/fulltest-others.sh
+++ b/tests/system-test/fulltest-others.sh
@@ -1 +1 @@
-python3 ./test.py -f 0-others/create_col_tag.py
+python3 ./test.py -f 0-others/create_col_tag.py
\ No newline at end of file
diff --git a/tests/system-test/fulltest-query.sh b/tests/system-test/fulltest-query.sh
index f7eafab13c33f911103cfd8e0a3b43313493f974..c6a2da21fe3ff832ade57b408cb2db8a7e8e690b 100755
--- a/tests/system-test/fulltest-query.sh
+++ b/tests/system-test/fulltest-query.sh
@@ -1,5 +1,11 @@
+
+python3 ./test.py -f 2-query/ts_hidden_column.py
+python3 ./test.py -f 2-query/union-order.py
+python3 test.py -f 2-query/TD-11256.py
+
python3 ./test.py -f 2-query/TD-11389.py
python3 ./test.py -f 2-query/TD-11945_crash.py
python3 ./test.py -f 2-query/TD-12340-12342.py
python3 ./test.py -f 2-query/TD-12344.py
python3 ./test.py -f 2-query/TD-11561.py
+
diff --git a/tests/system-test/fulltest-taosAdapter.sh b/tests/system-test/fulltest-taosAdapter.sh
index 181a29d458b5095dd3af48a073d725ba7b1453b1..f7ca439fd4407438d3ffaf11a6dcd2c839508404 100755
--- a/tests/system-test/fulltest-taosAdapter.sh
+++ b/tests/system-test/fulltest-taosAdapter.sh
@@ -1,2 +1,3 @@
+python3 test.py -f 4-taosAdapter/TD-12163.py
python3 ./test.py -f 4-taosAdapter/taosAdapter_insert.py
-python3 ./test.py -f 4-taosAdapter/taosAdapter_query.py
+python3 ./test.py -f 4-taosAdapter/taosAdapter_query.py
\ No newline at end of file
diff --git a/tests/test-CI.sh b/tests/test-CI.sh
new file mode 100755
index 0000000000000000000000000000000000000000..f08479bc806a5a8b0f8918f292769924b9134502
--- /dev/null
+++ b/tests/test-CI.sh
@@ -0,0 +1,222 @@
+#!/bin/bash
+
+# Color setting
+RED='\033[0;31m'
+GREEN='\033[1;32m'
+GREEN_DARK='\033[0;32m'
+GREEN_UNDERLINE='\033[4;32m'
+NC='\033[0m'
+
+tests_dir=`pwd`
+IN_TDINTERNAL="community"
+
+function stopTaosd {
+ echo "Stop taosd"
+ sudo systemctl stop taosd || echo 'no sudo or systemctl or stop fail'
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ while [ -n "$PID" ]
+ do
+ pkill -TERM -x taosd
+ sleep 1
+ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+ done
+}
+
+function dohavecore(){
+ corefile=`find $corepath -mmin 1`
+ if [ -n "$corefile" ];then
+ core_file=`echo $corefile|cut -d " " -f2`
+ proc=`file $core_file|awk -F "execfn:" '/execfn:/{print $2}'|tr -d \' |awk '{print $1}'|tr -d \,`
+ echo 'taosd or taos has generated core'
+ rm case.log
+ if [[ "$tests_dir" == *"$IN_TDINTERNAL"* ]] && [[ $1 == 1 ]]; then
+ cd ../../../
+ tar -zcPf $corepath'taos_'`date "+%Y_%m_%d_%H_%M_%S"`.tar.gz debug/build/bin/taosd debug/build/bin/tsim debug/build/lib/libtaos*so*
+ if [[ $2 == 1 ]];then
+ cp -r sim ~/sim_`date "+%Y_%m_%d_%H:%M:%S"`
+ else
+ cd community
+ cp -r sim ~/sim_`date "+%Y_%m_%d_%H:%M:%S" `
+ fi
+ else
+ cd ../../
+ if [[ $1 == 1 ]];then
+ tar -zcPf $corepath'taos_'`date "+%Y_%m_%d_%H_%M_%S"`.tar.gz debug/build/bin/taosd debug/build/bin/tsim debug/build/lib/libtaos*so*
+ cp -r sim ~/sim_`date "+%Y_%m_%d_%H:%M:%S" `
+ fi
+ fi
+ if [[ $1 == 1 ]];then
+ echo '\n'|gdb $proc $core_file -ex "bt 10" -ex quit
+ exit 8
+ fi
+ fi
+}
+
+
+function runPyCaseOneByOne {
+ while read -r line; do
+ if [[ $line =~ ^python.* ]]; then
+ if [[ $line != *sleep* ]]; then
+
+ if [[ $line =~ '-r' ]];then
+ case=`echo $line|awk '{print $4}'`
+ else
+ case=`echo $line|awk '{print $NF}'`
+ fi
+ start_time=`date +%s`
+ date +%F\ %T | tee -a pytest-out.log
+ echo -n $case
+ $line > /dev/null 2>&1 && \
+ echo -e "${GREEN} success${NC}" | tee -a pytest-out.log || \
+ echo -e "${RED} failed${NC}" | tee -a pytest-out.log
+ end_time=`date +%s`
+ out_log=`tail -1 pytest-out.log `
+ # if [[ $out_log =~ 'failed' ]];then
+ # exit 8
+ # fi
+ echo execution time of $case was `expr $end_time - $start_time`s. | tee -a pytest-out.log
+ else
+ $line > /dev/null 2>&1
+ fi
+ fi
+ done < $1
+}
+
+function runPyCaseOneByOnefq() {
+ end=`sed -n '$=' $1`
+ for ((i=1;i<=$end;i++)) ; do
+ if [[ $(($i%$2)) -eq $4 ]];then
+ line=`sed -n "$i"p $1`
+ if [[ $line =~ ^python.* ]]; then
+ if [[ $line != *sleep* ]]; then
+
+ if [[ $line =~ '-r' ]];then
+ case=`echo $line|awk '{print $4}'`
+ else
+ case=`echo $line|awk '{print $NF}'`
+ fi
+ start_time=`date +%s`
+ date +%F\ %T | tee -a pytest-out.log
+ echo -n $case
+ if [[ $1 =~ full ]] ; then
+ line=$line" -s"
+ fi
+ $line > case.log 2>&1 && \
+ echo -e "${GREEN} success${NC}" | tee -a pytest-out.log || \
+ echo -e "${RED} failed${NC}" | tee -a pytest-out.log
+ end_time=`date +%s`
+ out_log=`tail -1 pytest-out.log `
+ if [[ $out_log =~ 'failed' ]];then
+ cp -r ../../sim ~/sim_`date "+%Y_%m_%d_%H:%M:%S" `
+ echo '=====================log===================== '
+ cat case.log
+ rm -rf case.log
+ dohavecore $3 2
+ if [[ $3 == 1 ]];then
+ exit 8
+ fi
+ fi
+ echo execution time of $case was `expr $end_time - $start_time`s. | tee -a pytest-out.log
+ else
+ $line > /dev/null 2>&1
+ fi
+ dohavecore $3 2
+ else
+ echo $line
+ if [[ $line =~ ^bash.* ]]; then
+ # $line > case.log 2>&1 || cat case.log && exit 8
+ # cat case.log
+ $line > case.log 2>&1
+ if [ $? -ne 0 ];then
+ cat case.log
+ exit 8
+ fi
+ fi
+ fi
+ fi
+ done
+ rm -rf ../../sim/case.log
+}
+
+######################
+# main entry
+######################
+
+unameOut="$(uname -s)"
+case "${unameOut}" in
+ Linux*) OS=Linux;;
+ Darwin*) OS=Darwin;;
+ CYGWIN*) OS=Windows;;
+ *) OS=Unknown;;
+esac
+
+case "${OS}" in
+ Linux*) TAOSLIB=libtaos.so;;
+ Darwin*) TAOSLIB=libtaos.dylib;;
+ Windows*) TAOSLIB=taos.dll;;
+ Unknown) TAOSLIB="UNKNOWN:${unameOut}";;
+esac
+
+echo TAOSLIB is ${TAOSLIB}
+
+totalFailed=0
+totalPyFailed=0
+totalJDBCFailed=0
+totalUnitFailed=0
+totalExampleFailed=0
+totalApiFailed=0
+
+if [ "${OS}" == "Linux" ]; then
+ corepath=`grep -oP '.*(?=core_)' /proc/sys/kernel/core_pattern||grep -oP '.*(?=core-)' /proc/sys/kernel/core_pattern`
+ if [ -z "$corepath" ];then
+ echo "/coredump/core_%e_%p_%t" > /proc/sys/kernel/core_pattern || echo "Permission denied"
+ corepath="/coredump/"
+ fi
+fi
+
+
+echo "### run Python test case ###"
+
+cd $tests_dir
+
+if [[ "$tests_dir" == *"$IN_TDINTERNAL"* ]]; then
+ cd ../..
+else
+ cd ../
+fi
+
+TOP_DIR=`pwd`
+TAOSLIB_DIR=`find . -name "${TAOSLIB}"|grep -w lib|head -n1`
+if [[ "$TAOSLIB_DIR" == *"$IN_TDINTERNAL"* ]]; then
+ LIB_DIR=`find . -name "${TAOSLIB}"|grep -w lib|head -n1|cut -d '/' -f 2,3,4,5`
+else
+ LIB_DIR=`find . -name "${TAOSLIB}"|grep -w lib|head -n1|cut -d '/' -f 2,3,4`
+fi
+
+export LD_LIBRARY_PATH=$TOP_DIR/$LIB_DIR:$LD_LIBRARY_PATH
+
+cd $tests_dir/pytest
+
+[ -f pytest-out.log ] && rm -f pytest-out.log
+
+if [ "$1" == "full" ]; then
+ echo "### run Python full test ###"
+ runPyCaseOneByOne fulltest-tools.sh
+ runPyCaseOneByOne fulltest-query.sh
+ runPyCaseOneByOne fulltest-other.sh
+ runPyCaseOneByOne fulltest-insert.sh
+ runPyCaseOneByOne fulltest-connector.sh
+else
+ echo "### run $1 $2 test ###"
+ if [ "$1" != "query" ] && [ "$1" != "other" ] && [ "$1" != "tools" ] && [ "$1" != "insert" ] && [ "$1" != "connector" ] ;then
+ echo " wrong option:$1 must one of [query,other,tools,insert,connector]"
+ exit 8
+ fi
+ cd $tests_dir/pytest
+ runPyCaseOneByOnefq fulltest-$1.sh $2 1 $3
+ cd $tests_dir/develop-test
+ runPyCaseOneByOnefq fulltest-$1.sh $2 1 $3
+ cd $tests_dir/system-test
+ runPyCaseOneByOnefq fulltest-$1.sh $2 1 $3
+fi
+