diff --git a/src/util/src/ttokenizer.c b/src/util/src/ttokenizer.c index 8414b6292c43f674d62a61338ca271273922a209..0c7b65be80685e79312906010f476073f71b350f 100644 --- a/src/util/src/ttokenizer.c +++ b/src/util/src/ttokenizer.c @@ -592,7 +592,7 @@ SStrToken tscReplaceStrToken(char **str, SStrToken *token, const char* newToken) size_t nsize = strlen(newToken); int32_t size = (int32_t)strlen(*str) - token->n + (int32_t)nsize + 1; int32_t bsize = (int32_t)((uint64_t)token->z - (uint64_t)src); - SStrToken ntoken; + SStrToken ntoken = {0}; *str = calloc(1, size); diff --git a/tests/pytest/dbmgmt/nanoSecondCheck.py b/tests/pytest/dbmgmt/nanoSecondCheck.py index 40835639b2fb38ea9234b00da4f50de85cb7d243..15f22e3dbef937df9e2115510c938d077e97fbb3 100644 --- a/tests/pytest/dbmgmt/nanoSecondCheck.py +++ b/tests/pytest/dbmgmt/nanoSecondCheck.py @@ -31,23 +31,23 @@ class TDTestCase: tdSql.prepare() tdSql.execute('reset query cache') tdSql.execute('drop database if exists db') - tdSql.error('create database db keep 365000'); - tdSql.execute('create database db precision "ns";') - tdSql.query('show databases;') + tdSql.error('create database db keep 365000') + tdSql.execute('create database db precision "ns"') + tdSql.query('show databases') tdSql.checkData(0,16,'ns') tdSql.execute('use db') tdLog.debug('testing nanosecond support in 1st timestamp') tdSql.execute('create table tb (ts timestamp, speed int)') - tdSql.execute('insert into tb values(\'2021-06-10 0:00:00.100000001\', 1);') - tdSql.execute('insert into tb values(1623254400150000000, 2);') - tdSql.execute('import into tb values(1623254400300000000, 3);') - tdSql.execute('import into tb values(1623254400299999999, 4);') - tdSql.execute('insert into tb values(1623254400300000001, 5);') - tdSql.execute('insert into tb values(1623254400999999999, 7);') + tdSql.execute('insert into tb values(\'2021-06-10 0:00:00.100000001\', 1)') + tdSql.execute('insert into tb values(1623254400150000000, 2)') + tdSql.execute('import into tb values(1623254400300000000, 3)') + tdSql.execute('import into tb values(1623254400299999999, 4)') + tdSql.execute('insert into tb values(1623254400300000001, 5)') + tdSql.execute('insert into tb values(1623254400999999999, 7)') - tdSql.query('select * from tb;') + tdSql.query('select * from tb') tdSql.checkData(0,0,'2021-06-10 0:00:00.100000001') tdSql.checkData(1,0,'2021-06-10 0:00:00.150000000') tdSql.checkData(2,0,'2021-06-10 0:00:00.299999999') @@ -55,61 +55,61 @@ class TDTestCase: tdSql.checkData(4,1,5) tdSql.checkData(5,1,7) tdSql.checkRows(6) - tdSql.query('select count(*) from tb where ts > 1623254400100000000 and ts < 1623254400100000002;') + tdSql.query('select count(*) from tb where ts > 1623254400100000000 and ts < 1623254400100000002') tdSql.checkData(0,0,1) - tdSql.query('select count(*) from tb where ts > \'2021-06-10 0:00:00.100000001\' and ts < \'2021-06-10 0:00:00.160000000\';') + tdSql.query('select count(*) from tb where ts > \'2021-06-10 0:00:00.100000001\' and ts < \'2021-06-10 0:00:00.160000000\'') tdSql.checkData(0,0,1) - tdSql.query('select count(*) from tb where ts > 1623254400100000000 and ts < 1623254400150000000;') + tdSql.query('select count(*) from tb where ts > 1623254400100000000 and ts < 1623254400150000000') tdSql.checkData(0,0,1) - tdSql.query('select count(*) from tb where ts > \'2021-06-10 0:00:00.100000000\' and ts < \'2021-06-10 0:00:00.150000000\';') + tdSql.query('select count(*) from tb where ts > \'2021-06-10 0:00:00.100000000\' and ts < \'2021-06-10 0:00:00.150000000\'') tdSql.checkData(0,0,1) - tdSql.query('select count(*) from tb where ts > 1623254400400000000;') + tdSql.query('select count(*) from tb where ts > 1623254400400000000') tdSql.checkData(0,0,1) - tdSql.query('select count(*) from tb where ts < \'2021-06-10 00:00:00.400000000\';') + tdSql.query('select count(*) from tb where ts < \'2021-06-10 00:00:00.400000000\'') tdSql.checkData(0,0,5) - tdSql.query('select count(*) from tb where ts > now + 400000000b;') + tdSql.query('select count(*) from tb where ts > now + 400000000b') tdSql.checkRows(0) - tdSql.query('select count(*) from tb where ts >= \'2021-06-10 0:00:00.100000001\';') + tdSql.query('select count(*) from tb where ts >= \'2021-06-10 0:00:00.100000001\'') tdSql.checkData(0,0,6) - tdSql.query('select count(*) from tb where ts <= 1623254400300000000;') + tdSql.query('select count(*) from tb where ts <= 1623254400300000000') tdSql.checkData(0,0,4) - tdSql.query('select count(*) from tb where ts = \'2021-06-10 0:00:00.000000000\';') + tdSql.query('select count(*) from tb where ts = \'2021-06-10 0:00:00.000000000\'') tdSql.checkRows(0) - tdSql.query('select count(*) from tb where ts = 1623254400150000000;') + tdSql.query('select count(*) from tb where ts = 1623254400150000000') tdSql.checkData(0,0,1) - tdSql.query('select count(*) from tb where ts = \'2021-06-10 0:00:00.100000001\';') + tdSql.query('select count(*) from tb where ts = \'2021-06-10 0:00:00.100000001\'') tdSql.checkData(0,0,1) - tdSql.query('select count(*) from tb where ts between 1623254400000000000 and 1623254400400000000;') + tdSql.query('select count(*) from tb where ts between 1623254400000000000 and 1623254400400000000') tdSql.checkData(0,0,5) - tdSql.query('select count(*) from tb where ts between \'2021-06-10 0:00:00.299999999\' and \'2021-06-10 0:00:00.300000001\';') + tdSql.query('select count(*) from tb where ts between \'2021-06-10 0:00:00.299999999\' and \'2021-06-10 0:00:00.300000001\'') tdSql.checkData(0,0,3) - tdSql.query('select avg(speed) from tb interval(5000000000b);') + tdSql.query('select avg(speed) from tb interval(5000000000b)') tdSql.checkRows(1) tdSql.query('select avg(speed) from tb interval(100000000b)') tdSql.checkRows(4) - tdSql.error('select avg(speed) from tb interval(1b);') - tdSql.error('select avg(speed) from tb interval(999b);') + tdSql.error('select avg(speed) from tb interval(1b)') + tdSql.error('select avg(speed) from tb interval(999b)') - tdSql.query('select avg(speed) from tb interval(1000b);') + tdSql.query('select avg(speed) from tb interval(1000b)') tdSql.checkRows(5) - tdSql.query('select avg(speed) from tb interval(1u);') + tdSql.query('select avg(speed) from tb interval(1u)') tdSql.checkRows(5) - tdSql.query('select avg(speed) from tb interval(100000000b) sliding (100000000b);') + tdSql.query('select avg(speed) from tb interval(100000000b) sliding (100000000b)') tdSql.checkRows(4) tdSql.query('select last(*) from tb') @@ -120,20 +120,20 @@ class TDTestCase: tdSql.checkData(0,0, 1623254400100000001) tdSql.checkData(0,0, '2021-06-10 0:00:00.100000001') - tdSql.execute('insert into tb values(now + 500000000b, 6);') - tdSql.query('select * from tb;') + tdSql.execute('insert into tb values(now + 500000000b, 6)') + tdSql.query('select * from tb') tdSql.checkRows(7) tdLog.debug('testing nanosecond support in other timestamps') - tdSql.execute('create table tb2 (ts timestamp, speed int, ts2 timestamp);') - tdSql.execute('insert into tb2 values(\'2021-06-10 0:00:00.100000001\', 1, \'2021-06-11 0:00:00.100000001\');') - tdSql.execute('insert into tb2 values(1623254400150000000, 2, 1623340800150000000);') - tdSql.execute('import into tb2 values(1623254400300000000, 3, 1623340800300000000);') - tdSql.execute('import into tb2 values(1623254400299999999, 4, 1623340800299999999);') - tdSql.execute('insert into tb2 values(1623254400300000001, 5, 1623340800300000001);') - tdSql.execute('insert into tb2 values(1623254400999999999, 7, 1623513600999999999);') - - tdSql.query('select * from tb2;') + tdSql.execute('create table tb2 (ts timestamp, speed int, ts2 timestamp)') + tdSql.execute('insert into tb2 values(\'2021-06-10 0:00:00.100000001\', 1, \'2021-06-11 0:00:00.100000001\')') + tdSql.execute('insert into tb2 values(1623254400150000000, 2, 1623340800150000000)') + tdSql.execute('import into tb2 values(1623254400300000000, 3, 1623340800300000000)') + tdSql.execute('import into tb2 values(1623254400299999999, 4, 1623340800299999999)') + tdSql.execute('insert into tb2 values(1623254400300000001, 5, 1623340800300000001)') + tdSql.execute('insert into tb2 values(1623254400999999999, 7, 1623513600999999999)') + + tdSql.query('select * from tb2') tdSql.checkData(0,0,'2021-06-10 0:00:00.100000001') tdSql.checkData(1,0,'2021-06-10 0:00:00.150000000') tdSql.checkData(2,1,4) @@ -141,72 +141,72 @@ class TDTestCase: tdSql.checkData(4,2,'2021-06-11 00:00:00.300000001') tdSql.checkData(5,2,'2021-06-13 00:00:00.999999999') tdSql.checkRows(6) - tdSql.query('select count(*) from tb2 where ts2 > 1623340800000000000 and ts2 < 1623340800150000000;') + tdSql.query('select count(*) from tb2 where ts2 > 1623340800000000000 and ts2 < 1623340800150000000') tdSql.checkData(0,0,1) - tdSql.query('select count(*) from tb2 where ts2 > \'2021-06-11 0:00:00.100000000\' and ts2 < \'2021-06-11 0:00:00.100000002\';') + tdSql.query('select count(*) from tb2 where ts2 > \'2021-06-11 0:00:00.100000000\' and ts2 < \'2021-06-11 0:00:00.100000002\'') tdSql.checkData(0,0,1) - tdSql.query('select count(*) from tb2 where ts2 > 1623340800500000000;') + tdSql.query('select count(*) from tb2 where ts2 > 1623340800500000000') tdSql.checkData(0,0,1) - tdSql.query('select count(*) from tb2 where ts2 < \'2021-06-11 0:00:00.400000000\';') + tdSql.query('select count(*) from tb2 where ts2 < \'2021-06-11 0:00:00.400000000\'') tdSql.checkData(0,0,5) - tdSql.query('select count(*) from tb2 where ts2 > now + 400000000b;') + tdSql.query('select count(*) from tb2 where ts2 > now + 400000000b') tdSql.checkRows(0) - tdSql.query('select count(*) from tb2 where ts2 >= \'2021-06-11 0:00:00.100000001\';') + tdSql.query('select count(*) from tb2 where ts2 >= \'2021-06-11 0:00:00.100000001\'') tdSql.checkData(0,0,6) - tdSql.query('select count(*) from tb2 where ts2 <= 1623340800400000000;') + tdSql.query('select count(*) from tb2 where ts2 <= 1623340800400000000') tdSql.checkData(0,0,5) - tdSql.query('select count(*) from tb2 where ts2 = \'2021-06-11 0:00:00.000000000\';') + tdSql.query('select count(*) from tb2 where ts2 = \'2021-06-11 0:00:00.000000000\'') tdSql.checkRows(0) - tdSql.query('select count(*) from tb2 where ts2 = \'2021-06-11 0:00:00.300000001\';') + tdSql.query('select count(*) from tb2 where ts2 = \'2021-06-11 0:00:00.300000001\'') tdSql.checkData(0,0,1) - tdSql.query('select count(*) from tb2 where ts2 = 1623340800300000001;') + tdSql.query('select count(*) from tb2 where ts2 = 1623340800300000001') tdSql.checkData(0,0,1) - tdSql.query('select count(*) from tb2 where ts2 between 1623340800000000000 and 1623340800450000000;') + tdSql.query('select count(*) from tb2 where ts2 between 1623340800000000000 and 1623340800450000000') tdSql.checkData(0,0,5) - tdSql.query('select count(*) from tb2 where ts2 between \'2021-06-11 0:00:00.299999999\' and \'2021-06-11 0:00:00.300000001\';') + tdSql.query('select count(*) from tb2 where ts2 between \'2021-06-11 0:00:00.299999999\' and \'2021-06-11 0:00:00.300000001\'') tdSql.checkData(0,0,3) - tdSql.query('select count(*) from tb2 where ts2 <> 1623513600999999999;') + tdSql.query('select count(*) from tb2 where ts2 <> 1623513600999999999') tdSql.checkData(0,0,5) - tdSql.query('select count(*) from tb2 where ts2 <> \'2021-06-11 0:00:00.100000001\';') + tdSql.query('select count(*) from tb2 where ts2 <> \'2021-06-11 0:00:00.100000001\'') tdSql.checkData(0,0,5) - tdSql.query('select count(*) from tb2 where ts2 <> \'2021-06-11 0:00:00.100000000\';') + tdSql.query('select count(*) from tb2 where ts2 <> \'2021-06-11 0:00:00.100000000\'') tdSql.checkData(0,0,6) - tdSql.query('select count(*) from tb2 where ts2 != 1623513600999999999;') + tdSql.query('select count(*) from tb2 where ts2 != 1623513600999999999') tdSql.checkData(0,0,5) - tdSql.query('select count(*) from tb2 where ts2 != \'2021-06-11 0:00:00.100000001\';') + tdSql.query('select count(*) from tb2 where ts2 != \'2021-06-11 0:00:00.100000001\'') tdSql.checkData(0,0,5) - tdSql.query('select count(*) from tb2 where ts2 != \'2021-06-11 0:00:00.100000000\';') + tdSql.query('select count(*) from tb2 where ts2 != \'2021-06-11 0:00:00.100000000\'') tdSql.checkData(0,0,6) - tdSql.execute('insert into tb2 values(now + 500000000b, 6, now +2d);') - tdSql.query('select * from tb2;') + tdSql.execute('insert into tb2 values(now + 500000000b, 6, now +2d)') + tdSql.query('select * from tb2') tdSql.checkRows(7) tdLog.debug('testing ill nanosecond format handling') - tdSql.execute('create table tb3 (ts timestamp, speed int);') + tdSql.execute('create table tb3 (ts timestamp, speed int)') - tdSql.error('insert into tb3 values(16232544001500000, 2);') - tdSql.execute('insert into tb3 values(\'2021-06-10 0:00:00.123456\', 2);') - tdSql.query('select * from tb3 where ts = \'2021-06-10 0:00:00.123456000\';') + tdSql.error('insert into tb3 values(16232544001500000, 2)') + tdSql.execute('insert into tb3 values(\'2021-06-10 0:00:00.123456\', 2)') + tdSql.query('select * from tb3 where ts = \'2021-06-10 0:00:00.123456000\'') tdSql.checkRows(1) - tdSql.execute('insert into tb3 values(\'2021-06-10 0:00:00.123456789000\', 2);') - tdSql.query('select * from tb3 where ts = \'2021-06-10 0:00:00.123456789\';') + tdSql.execute('insert into tb3 values(\'2021-06-10 0:00:00.123456789000\', 2)') + tdSql.query('select * from tb3 where ts = \'2021-06-10 0:00:00.123456789\'') tdSql.checkRows(1) os.system('sudo timedatectl set-ntp on') diff --git a/tests/pytest/query/query.py b/tests/pytest/query/query.py index ed3740fcb52f8c885bd99d74053ba26a328968a9..1d9d6e5ea4d5c41c13222ceb4e23b165f0062837 100644 --- a/tests/pytest/query/query.py +++ b/tests/pytest/query/query.py @@ -74,7 +74,7 @@ class TDTestCase: tdSql.checkData(1, 1, 'dev_01') tdSql.checkData(1, 2, 1) - ## test case for https://jira.taosdata.com:18080/browse/TD-2488 + ## TD-2488 tdSql.execute("create table m1(ts timestamp, k int) tags(a int)") tdSql.execute("create table t1 using m1 tags(1)") tdSql.execute("create table t2 using m1 tags(2)") @@ -93,7 +93,7 @@ class TDTestCase: tdSql.checkRows(1) tdSql.checkData(0, 0, 1) - ## test case for https://jira.taosdata.com:18080/browse/TD-1930 + ## TD-1930 tdSql.execute("create table tb(ts timestamp, c1 int, c2 binary(10), c3 nchar(10), c4 float, c5 bool)") for i in range(10): tdSql.execute( @@ -126,7 +126,7 @@ class TDTestCase: tdSql.query("select * from tb where c5 = 'true' ") tdSql.checkRows(5) - # For jira: https://jira.taosdata.com:18080/browse/TD-2850 + # TD-2850 tdSql.execute("create database 'Test' ") tdSql.execute("use 'Test' ") tdSql.execute("create table 'TB'(ts timestamp, 'Col1' int) tags('Tag1' int)") @@ -136,7 +136,7 @@ class TDTestCase: tdSql.query("select * from tb0") tdSql.checkRows(1) - # For jira:https://jira.taosdata.com:18080/browse/TD-6314 + # TD-6314 tdSql.execute("use db") tdSql.execute("create stable stb_001(ts timestamp,v int) tags(c0 int)") tdSql.execute("insert into stb1 using stb_001 tags(1) values(now,1)") @@ -145,7 +145,7 @@ class TDTestCase: - #For jira: https://jira.taosdata.com:18080/browse/TD-6387 + #TD-6387 tdLog.info("case for bug_6387") self.bug_6387()