diff --git a/tests/examples/c/makefile b/tests/examples/c/makefile index eee4e5d9b50d734232ffd4fc56a84451b59e504d..73f4ff43c175bf61ea19a8eacc6d70a06b302cb7 100644 --- a/tests/examples/c/makefile +++ b/tests/examples/c/makefile @@ -7,8 +7,7 @@ LFLAGS = '-Wl,-rpath,/usr/local/taos/driver/' -ltaos -lpthread -lm -lrt CFLAGS = -O3 -g -Wall -Wno-deprecated -fPIC -Wno-unused-result -Wconversion \ -Wno-char-subscripts -D_REENTRANT -Wno-format -D_REENTRANT -DLINUX \ -Wno-unused-function -D_M_X64 -I/usr/local/taos/include -std=gnu99 \ - -I../../../src/os/inc -I../../../src/inc \ - -I../../../src/util/inc -I../../../src/common/inc + -I../../../deps/cJson/inc all: $(TARGET) exe: @@ -18,12 +17,6 @@ exe: gcc $(CFLAGS) ./stream.c -o $(ROOT)stream $(LFLAGS) gcc $(CFLAGS) ./subscribe.c -o $(ROOT)subscribe $(LFLAGS) gcc $(CFLAGS) ./apitest.c -o $(ROOT)apitest $(LFLAGS) - gcc $(CFLAGS) ./clientcfgtest.c -o $(ROOT)clientcfgtest $(LFLAGS) - gcc $(CFLAGS) ./clientcfgtest-wrongtype.c -o $(ROOT)clientcfgtest-wrongtype $(LFLAGS) - gcc $(CFLAGS) ./clientcfgtest-wrongjson.c -o $(ROOT)clientcfgtest-wrongjson $(LFLAGS) - gcc $(CFLAGS) ./clientcfgtest-wrongvalue.c -o $(ROOT)clientcfgtest-wrongvalue $(LFLAGS) - gcc $(CFLAGS) ./clientcfgtest-taosd.c -o $(ROOT)clientcfgtest-taosd $(LFLAGS) - clean: rm $(ROOT)asyncdemo @@ -33,9 +26,7 @@ clean: rm $(ROOT)stream rm $(ROOT)subscribe rm $(ROOT)apitest - rm $(ROOT)clientcfgtest - rm $(ROOT)clientcfgtest-wrongtype - rm $(ROOT)clientcfgtest-wrongjson - rm $(ROOT)clientcfgtest-wrongvalue - rm $(ROOT)clientcfgtest-taosd + + + diff --git a/tests/pytest/fulltest.sh b/tests/pytest/fulltest.sh index b8bb94b26d5117cb9e99468dfa94155ca70c4193..a7c375489aec74517f9bb92938b4179b6f9e5dc0 100755 --- a/tests/pytest/fulltest.sh +++ b/tests/pytest/fulltest.sh @@ -398,6 +398,7 @@ python3 ./test.py -f query/queryWildcardLength.py python3 ./test.py -f query/queryTbnameUpperLower.py python3 ./test.py -f query/query.py python3 ./test.py -f query/queryDiffColsOr.py +python3 ./test.py -f query/queryRegex.py #======================p4-end=============== diff --git a/tests/pytest/query/queryGroupbyWithInterval.py b/tests/pytest/query/queryGroupbyWithInterval.py index 14f6999021f23764bef95afdaa33cbcb695f2f55..d5474d069ab1af7a496515e23a46713d45f6262f 100644 --- a/tests/pytest/query/queryGroupbyWithInterval.py +++ b/tests/pytest/query/queryGroupbyWithInterval.py @@ -41,6 +41,14 @@ class TDTestCase: tdSql.execute( "insert into test22 using stest tags('test21','ccc') values ('2020-09-04 16:54:54.003',210,3)") + #2021-09-17 For jira: https://jira.taosdata.com:18080/browse/TD-6085 + tdSql.query("select last(size),appname from stest where tbname in ('test1','test2','test11')") + tdSql.checkRows(1) + + #2021-09-17 For jira: https://jira.taosdata.com:18080/browse/TD-6314 + tdSql.query("select _block_dist() from stest") + tdSql.checkRows(1) + tdSql.query("select sum(size) from stest interval(1d) group by appname") tdSql.checkRows(3) diff --git a/tests/pytest/query/queryRegex.py b/tests/pytest/query/queryRegex.py new file mode 100644 index 0000000000000000000000000000000000000000..25afa6395f62faeeac51bab73ed742626e4fba90 --- /dev/null +++ b/tests/pytest/query/queryRegex.py @@ -0,0 +1,74 @@ +################################################################### +# Copyright (c) 2016 by TAOS Technologies, Inc. +# All rights reserved. +# +# This file is proprietary and confidential to TAOS Technologies. +# No part of this file may be reproduced, stored, transmitted, +# disclosed or used in any form or by any means other than as +# expressly provided by the written permission from Jianhui Tao +# +################################################################### + +# -*- coding: utf-8 -*- + +import sys +import taos +from util.log import tdLog +from util.cases import tdCases +from util.sql import tdSql +from util.dnodes import tdDnodes + + +class TDTestCase: + def init(self, conn, logSql): + tdLog.debug("start to execute %s" % __file__) + tdSql.init(conn.cursor(), logSql) + + def run(self): + tdSql.prepare() + print("==============step1") + ##2021-09-17 For jira: https://jira.taosdata.com:18080/browse/TD-6585 + tdSql.execute( + "create stable if not exists stb_test(ts timestamp,c0 binary(32)) tags(t0 binary(32))" + ) + tdSql.execute( + 'create table if not exists stb_1 using stb_test tags("abcdefgasdfg12346")' + ) + tdLog.info('insert into stb_1 values("2021-09-13 10:00:00.001","abcefdasdqwerxasdazx12345"') + tdSql.execute('insert into stb_1 values("2021-09-13 10:00:00.001","abcefdasdqwerxasdazx12345")') + + + tdSql.query('select * from stb_test where tbname match "asd"') + tdSql.checkRows(0) + + tdSql.query('select * from stb_test where tbname nmatch "asd"') + tdSql.checkRows(1) + + tdSql.query('select * from stb_test where c0 match "abc"') + tdSql.checkRows(1) + tdSql.checkData(0,1,"abcefdasdqwerxasdazx12345") + + tdSql.query('select * from stb_test where c0 nmatch "abc"') + tdSql.checkRows(0) + + tdSql.error('select * from stb_test where c0 match abc') + + tdSql.error('select * from stb_test where c0 nmatch abc') + + + tdSql.execute('insert into stb_1 values("2020-10-13 10:00:00.001","abcd\\\efgh")') + tdSql.query("select * from stb_1 where c0 match '\\\\'") + tdSql.checkRows(1) + + + + + + + def stop(self): + tdSql.close() + tdLog.success("%s successfully executed" % __file__) + + +tdCases.addWindows(__file__, TDTestCase()) +tdCases.addLinux(__file__, TDTestCase()) diff --git a/tests/script/api/clientcfgtest.c b/tests/script/api/clientcfgtest.c new file mode 100644 index 0000000000000000000000000000000000000000..bfed93498ef51700cee3f56ca035868dcaaf90f2 --- /dev/null +++ b/tests/script/api/clientcfgtest.c @@ -0,0 +1,62 @@ +// The test case to verfy TS-293 +#include +#include +#include +#include +#include +#include "os.h" +#include "taosdef.h" +#include "taoserror.h" +#include "tconfig.h" +#include "tglobal.h" +#include "tulog.h" +#include "tsocket.h" +#include "tutil.h" +extern SGlobalCfg *taosGetConfigOption(const char *option) ; +int main( int argc, char *argv[]){ + + printf("start to test\n"); + + //case1: + //Test config firstEp success + const char config1[128] = "{\"firstEp\":\"BCC-2:6030\",\"debugFlag\":\"135\"}";//input the parameter which want to be configured + taos_set_config(config1); //configure the parameter + + SGlobalCfg *cfg ; + + cfg = taosGetConfigOption("firstEp");//check the option result + if(cfg->cfgStatus != 3){ //If cfgStatus is 3,it means configure is success + printf("config firstEp 'BCC-2:6030'failures!\n"); + exit(1); + } + + + cfg = taosGetConfigOption("debugFlag");//check the option result + if(cfg->cfgStatus != 3){ + printf("config debugFlag '135' failures!\n"); + exit(1); + } + + //case2: + //Test config only useful at the first time + //The result is failure + const char config2[128] = "{\"fqdn\":\"BCC-3\"}"; + taos_set_config(config2); //configure the parameter + + + cfg = taosGetConfigOption("fqdn");//check the option result + if(cfg->cfgStatus == 3){ + printf("config firstEp to 'BCC-3' failures!\n"); + exit(1); + } + else{ + printf("test case success!\n"); + exit(0); + } + + + return 0 ; + + + +} diff --git a/tests/script/api/makefile b/tests/script/api/makefile index 43613f6fe9327a2324f4b4a6b8c720c4b44d7139..2e599947f70787189f1bfee587b8d9171b8d6f2b 100644 --- a/tests/script/api/makefile +++ b/tests/script/api/makefile @@ -7,7 +7,10 @@ LFLAGS = '-Wl,-rpath,/usr/local/taos/driver/' -ltaos -lpthread -lm -lrt CFLAGS = -O0 -g -Wall -Wno-deprecated -fPIC -Wno-unused-result -Wconversion \ -Wno-char-subscripts -D_REENTRANT -Wno-format -D_REENTRANT -DLINUX \ -Wno-unused-function -D_M_X64 -I/usr/local/taos/include -std=gnu99 \ - -fsanitize=address -I../../../deps/cJson/inc + -I../../../deps/cJson/inc\ + -I../../../src/os/inc/ -I../../../src/inc -I../../../src/util/inc \ + -I../../../src/common/inc -I../../../deps/cJson/inc + all: $(TARGET) @@ -16,11 +19,19 @@ exe: gcc $(CFLAGS) ./stmtBatchTest.c -o $(ROOT)stmtBatchTest $(LFLAGS) gcc $(CFLAGS) ./stmtTest.c -o $(ROOT)stmtTest $(LFLAGS) gcc $(CFLAGS) ./stmt_function.c -o $(ROOT)stmt_function $(LFLAGS) + + gcc $(CFLAGS) ./clientcfgtest.c -o $(ROOT)clientcfgtest $(LFLAGS) + gcc $(CFLAGS) ./openTSDBTest.c -o $(ROOT)openTSDBTest $(LFLAGS) + clean: rm $(ROOT)batchprepare rm $(ROOT)stmtBatchTest rm $(ROOT)stmtTest rm $(ROOT)stmt_function + + rm $(ROOT)clientcfgtest + rm $(ROOT)openTSDBTest + diff --git a/tests/test-all.sh b/tests/test-all.sh index dfd7f49178ac3d9b4fc5437181a10e9f846aabcf..5eab3a9ed7469603a79c0df8bacaeec624c38a83 100755 --- a/tests/test-all.sh +++ b/tests/test-all.sh @@ -233,6 +233,7 @@ 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` @@ -532,7 +533,28 @@ if [ "$2" != "sim" ] && [ "$2" != "python" ] && [ "$2" != "jdbc" ] && [ "$2" != echo "demo pass" totalExamplePass=`expr $totalExamplePass + 1` fi + echo "### run setconfig tests ###" + + stopTaosd + + cd $tests_dir + echo "current dir: " + pwd + + cd script/api + echo "building setcfgtest" + make > /dev/null + ./clientcfgtest + if [ $? != "0" ]; then + echo "clientcfgtest failed" + totalExampleFailed=`expr $totalExampleFailed + 1` + else + echo "clientcfgtest pass" + totalExamplePass=`expr $totalExamplePass + 1` + fi + + if [ "$totalExamplePass" -gt "0" ]; then echo -e "\n${GREEN} ### Total $totalExamplePass examples succeed! ### ${NC}" fi @@ -544,7 +566,13 @@ if [ "$2" != "sim" ] && [ "$2" != "python" ] && [ "$2" != "jdbc" ] && [ "$2" != if [ "${OS}" == "Linux" ]; then dohavecore 1 fi + + + + + fi + exit $(($totalFailed + $totalPyFailed + $totalJDBCFailed + $totalUnitFailed + $totalExampleFailed))