From 1f46b47ff497c339d9fdb96ce2dcca1d91581706 Mon Sep 17 00:00:00 2001 From: bryanchang0603 Date: Thu, 10 Jun 2021 17:03:20 +0800 Subject: [PATCH 1/9] [TD-4652] update initial test --- src/connector/python/taos/cinterface.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/connector/python/taos/cinterface.py b/src/connector/python/taos/cinterface.py index 0f690aeb27..ff922c1155 100644 --- a/src/connector/python/taos/cinterface.py +++ b/src/connector/python/taos/cinterface.py @@ -10,11 +10,11 @@ def _convert_millisecond_to_datetime(milli): return datetime.datetime.fromtimestamp(milli / 1000.0) -def _convert_microsecond_to_datetime(micro): +def _convert_microsecond_to_datetime(micro): #checkpoint return datetime.datetime.fromtimestamp(micro / 1000000.0) -def _crow_timestamp_to_python(data, num_of_rows, nbytes=None, micro=False): +def _crow_timestamp_to_python(data, num_of_rows, nbytes=None, micro=False):#checkpoint """Function to convert C bool row to python row """ _timestamp_converter = _convert_millisecond_to_datetime From cd3fb30a6c101255a842886453f0f22dc4bb8fd4 Mon Sep 17 00:00:00 2001 From: bryanchang0603 Date: Fri, 11 Jun 2021 14:07:41 +0800 Subject: [PATCH 2/9] [TD-4652] adding test case --- tests/pytest/dbmgmt/nanoSecondCheck.py | 93 ++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 tests/pytest/dbmgmt/nanoSecondCheck.py diff --git a/tests/pytest/dbmgmt/nanoSecondCheck.py b/tests/pytest/dbmgmt/nanoSecondCheck.py new file mode 100644 index 0000000000..3cd8168b35 --- /dev/null +++ b/tests/pytest/dbmgmt/nanoSecondCheck.py @@ -0,0 +1,93 @@ +################################################################### +# 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 -*- + +#TODO: after TD-4518 and TD-4510 is resolved, add the exception test case for these situations + +import sys +from util.log import * +from util.cases import * +from util.sql import * +import time +from datetime import datetime +import os + + +class TDTestCase: + def init(self, conn, logSql): + tdLog.debug("start to execute %s" % __file__) + tdSql.init(conn.cursor(), logSql) + + def run(self): + tdSql.prepare() + + tdSql.execute('reset query cache') + tdSql.execute('drop database if exists db') + tdSql.execute('create database db precision "ns"') + tdSql.query('show databases') + tdSql.checkData(0,16,'ns') + tdSql.execute('use db') + 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(1623254400223456789, 1)') + os.system('sudo timedatectl set-ntp off') + os.system('sudo timedatectl set-time 2021-06-10') + tdSql.execute('insert into tb values(now + 500000000b, 1)') + + ##TODO: after the connector is updated, run the following commented code + # tdSql.query('select count(*) from tb where ts > 1623254400000000000 and ts < 1623254400150000000') + # tdSql.checkData(0,0,1) + # tdSql.query('select count(*) from tb where ts > \'2021-06-10 0:00:00.000000000\' and ts < \'2021-06-10 0:00:00.150000000\'') + # tdSql.checkData(0,0,1) + + # tdSql.query('select count(*) from tb where ts > 1623254400223456788 and ts < 1623254400223456790') + # tdSql.checkData(0,0,1) + # tdSql.query('select count(*) from tb where ts > \'2021-06-10 00:00:00.223456788\' and ts < \'2021-06-10 00:00:00.223456790\'') + # tdSql.checkData(0,0,1) + + # 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.checkData(0,0,1) + + # os.system('sudo timedatectl set-ntp off') + # os.system('sudo timedatectl set-time 2021-06-10') + # tdSql.query('select count(*) from tb where ts > now') + # tdSql.checkData(0,0,3) + # os.system('sudo timedatectl set-ntp off') + # os.system('sudo timedatectl set-time 2021-06-10') + # tdSql.query('select count(*) from tb where ts > now + 300000000b') + # tdSql.checkData(0,0,1) + + # tdSql.query('select count(*) from tb where ts >= \'2021-06-10 0:00:00.100000001\'') + # tdSql.checkData(0,0,3) + + # tdSql.query('select count(*) from tb where ts <= \'2021-06-10 0:00:00.223456789\'') + # tdSql.checkData(0,0,2) + + # tdSql.query('select count(*) from tb where ts = \'2021-06-10 0:00:00.000000000\'') + # tdSql.checkData(0,0,0) + + # tdSql.query('select count(*) from tb where ts <> \'2021-06-10 0:00:00.223456789\'') + # tdSql.checkData(0,0,2) + + # tdSql.query('select count(*) from tb where ts between 1623254400000000000 and 1623254400950000000') + # tdSql.checkData(0,0,2) + + + 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 From 308d87c84a13e97946271e5b356f18c60d2263e7 Mon Sep 17 00:00:00 2001 From: bryanchang0603 Date: Fri, 11 Jun 2021 15:52:07 +0800 Subject: [PATCH 3/9] [TD-4652] add test case --- tests/pytest/dbmgmt/nanoSecondCheck.py | 117 ++++++++++++++++++++----- 1 file changed, 96 insertions(+), 21 deletions(-) diff --git a/tests/pytest/dbmgmt/nanoSecondCheck.py b/tests/pytest/dbmgmt/nanoSecondCheck.py index 3cd8168b35..3e42d6a178 100644 --- a/tests/pytest/dbmgmt/nanoSecondCheck.py +++ b/tests/pytest/dbmgmt/nanoSecondCheck.py @@ -38,51 +38,126 @@ class TDTestCase: tdSql.execute('use db') 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(1623254400223456789, 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)') os.system('sudo timedatectl set-ntp off') os.system('sudo timedatectl set-time 2021-06-10') - tdSql.execute('insert into tb values(now + 500000000b, 1)') + tdSql.execute('insert into tb values(now + 500000000b, 6)') + tdSql.execute('insert into tb values(1623254400999999999, 7)') + ##TODO: after the connector is updated, run the following commented code - # tdSql.query('select count(*) from tb where ts > 1623254400000000000 and ts < 1623254400150000000') + ##TODO: due to the precision limit of double, spread currently cannot be tested since ns timestampe cannot be accurately represented + + # tdSql.query('select count(*) from tb where ts > 1623254400000000000 and ts < 1623254400110000000') # tdSql.checkData(0,0,1) - # tdSql.query('select count(*) from tb where ts > \'2021-06-10 0:00:00.000000000\' and ts < \'2021-06-10 0:00:00.150000000\'') + # tdSql.query('select count(*) from tb where ts > \'2021-06-10 0:00:00.000000000\' and ts < \'2021-06-10 0:00:00.110000000\'') # tdSql.checkData(0,0,1) - # tdSql.query('select count(*) from tb where ts > 1623254400223456788 and ts < 1623254400223456790') + # 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 00:00:00.223456788\' and ts < \'2021-06-10 00:00:00.223456790\'') + # 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.checkData(0,0,1) - # tdSql.query('select count(*) from tb where ts > \'2021-06-10 00:00:00.400000000\'') - # tdSql.checkData(0,0,1) + # tdSql.checkData(0,0,2) + # tdSql.query('select count(*) from tb where ts < \'2021-06-10 00:00:00.400000000\'') + # tdSql.checkData(0,0,5) # os.system('sudo timedatectl set-ntp off') # os.system('sudo timedatectl set-time 2021-06-10') - # tdSql.query('select count(*) from tb where ts > now') - # tdSql.checkData(0,0,3) - # os.system('sudo timedatectl set-ntp off') - # os.system('sudo timedatectl set-time 2021-06-10') - # tdSql.query('select count(*) from tb where ts > now + 300000000b') - # tdSql.checkData(0,0,1) + # tdSql.query('select count(*) from tb where ts > now + 400000000b') + # tdSql.checkData(0,0,2) # tdSql.query('select count(*) from tb where ts >= \'2021-06-10 0:00:00.100000001\'') - # tdSql.checkData(0,0,3) + # tdSql.checkData(0,0,7) - # tdSql.query('select count(*) from tb where ts <= \'2021-06-10 0:00:00.223456789\'') - # tdSql.checkData(0,0,2) + # 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.checkData(0,0,0) - # tdSql.query('select count(*) from tb where ts <> \'2021-06-10 0:00:00.223456789\'') + # 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.checkData(0,0,3) + + #tdSql.query('select avg(speed) from tb interval(5000000000b)') + # tdSql.checkRows(1) + + #tdSql.query('select avg(speed) from tb interval(100000000b)') + #tdSql.checkRows(5) + + #tdSql.query('select avg(speed) from tb interval(100000000b) sliding (100000000b)') + #tdSql.checkRows(5) + + #tdSql.query('select last(*) from tb') + #tdSql.checkData(0,0, '2021-06-10 0:00:00.999999999') + #tdSql.checkData(0,0, 1623254400999999999) + + #tdSql.query('select first(*) from tb') + #tdSql.checkData(0,0, 1623254400100000001) + #tdSql.checkData(0,0, 2021-06-10 0:00:00.100000001) + + 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)') + os.system('sudo timedatectl set-ntp off') + os.system('sudo timedatectl set-time 2021-06-10') + tdSql.execute('insert into tb2 values(now + 500000000b, 6, now +2d)') + tdSql.execute('insert into tb2 values(1623254400999999999, 7, 1623513600999999999)') + + # 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.checkData(0,0,1) + + # tdSql.query('select count(*) from tb2 where ts2 > 1623340800500000000') + # tdSql.checkData(0,0,2) + # tdSql.query('select count(*) from tb2 where ts2 < \'2021-06-11 0:00:00.400000000\'') + # tdSql.checkData(0,0,5) + + # os.system('sudo timedatectl set-ntp off') + # os.system('sudo timedatectl set-time 2021-06-11') + # tdSql.query('select count(*) from tb2 where ts2 > now + 400000000b') # tdSql.checkData(0,0,2) - # tdSql.query('select count(*) from tb where ts between 1623254400000000000 and 1623254400950000000') - # tdSql.checkData(0,0,2) + # tdSql.query('select count(*) from tb2 where ts2 >= \'2021-06-11 0:00:00.100000001\'') + # tdSql.checkData(0,0,7) + + # 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.checkData(0,0,0) + + # 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.checkData(0,0,3) + + # tdSql.query('select count(*) from tb2 where ts2 <> 1623513600999999999') + # tdSql.checkData(0,0,6) + + # 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 != 1623513600999999999') + # tdSql.checkData(0,0,6) + + # tdSql.query('select count(*) from tb2 where ts2 != \'2021-06-11 0:00:00.100000001\'') + # tdSql.checkData(0,0,6) + + os.system('sudo timedatectl set-ntp on') def stop(self): tdSql.close() From a7762c65a90b67751c03894a03c3faab3a25c5c7 Mon Sep 17 00:00:00 2001 From: bryanchang0603 Date: Fri, 11 Jun 2021 16:13:29 +0800 Subject: [PATCH 4/9] [TD-4652] adding exception tests --- tests/pytest/dbmgmt/nanoSecondCheck.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/pytest/dbmgmt/nanoSecondCheck.py b/tests/pytest/dbmgmt/nanoSecondCheck.py index 3e42d6a178..0bf461e820 100644 --- a/tests/pytest/dbmgmt/nanoSecondCheck.py +++ b/tests/pytest/dbmgmt/nanoSecondCheck.py @@ -157,6 +157,17 @@ class TDTestCase: # tdSql.query('select count(*) from tb2 where ts2 != \'2021-06-11 0:00:00.100000001\'') # tdSql.checkData(0,0,6) + 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.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.checkRows(1) + os.system('sudo timedatectl set-ntp on') def stop(self): From 04b3a7d4829c7d681a68b7f43908bc0964997134 Mon Sep 17 00:00:00 2001 From: bryanchang0603 Date: Tue, 15 Jun 2021 19:49:40 +0800 Subject: [PATCH 5/9] [TD-4652] update test case --- tests/pytest/dbmgmt/nanoSecondCheck.py | 184 ++++++++++++++----------- 1 file changed, 103 insertions(+), 81 deletions(-) diff --git a/tests/pytest/dbmgmt/nanoSecondCheck.py b/tests/pytest/dbmgmt/nanoSecondCheck.py index 0bf461e820..a55823e639 100644 --- a/tests/pytest/dbmgmt/nanoSecondCheck.py +++ b/tests/pytest/dbmgmt/nanoSecondCheck.py @@ -32,68 +32,74 @@ class TDTestCase: tdSql.execute('reset query cache') tdSql.execute('drop database if exists db') - tdSql.execute('create database db precision "ns"') - tdSql.query('show databases') + tdSql.execute('create database db precision "ns";') + tdSql.query('show databases;') tdSql.checkData(0,16,'ns') tdSql.execute('use db') 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)') - os.system('sudo timedatectl set-ntp off') - os.system('sudo timedatectl set-time 2021-06-10') - tdSql.execute('insert into tb values(now + 500000000b, 6)') - 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);') + # # os.system('sudo timedatectl set-ntp off') + # # os.system('sudo timedatectl set-time 2021-06-10') + tdSql.execute('insert into tb values(1623254400999999999, 7);') ##TODO: after the connector is updated, run the following commented code ##TODO: due to the precision limit of double, spread currently cannot be tested since ns timestampe cannot be accurately represented - - # tdSql.query('select count(*) from tb where ts > 1623254400000000000 and ts < 1623254400110000000') + # tdSql.query('select * from tb;') + # tdSql.checkRows(6) + # 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.000000000\' and ts < \'2021-06-10 0:00:00.110000000\'') + # 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.checkData(0,0,2) - # tdSql.query('select count(*) from tb where ts < \'2021-06-10 00:00:00.400000000\'') + # 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.checkData(0,0,5) - # os.system('sudo timedatectl set-ntp off') - # os.system('sudo timedatectl set-time 2021-06-10') - # tdSql.query('select count(*) from tb where ts > now + 400000000b') - # tdSql.checkData(0,0,2) - - # tdSql.query('select count(*) from tb where ts >= \'2021-06-10 0:00:00.100000001\'') - # tdSql.checkData(0,0,7) - - # 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\'') + # # os.system('sudo timedatectl set-ntp off') + # # os.system('sudo timedatectl set-time 2021-06-10') + # tdSql.query('select count(*) from tb where ts > now + 400000000b;') # tdSql.checkData(0,0,0) - # tdSql.query('select count(*) from tb where ts between 1623254400000000000 and 1623254400400000000') + # 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.checkData(0,0,4) + + # tdSql.query('select count(*) from tb where ts = \'2021-06-10 0:00:00.000000000\';') + # tdSql.checkData(0,0,0) + + # 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.checkData(0,0,1) + + # 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(5) + #tdSql.checkRows(4) - #tdSql.query('select avg(speed) from tb interval(100000000b) sliding (100000000b)') - #tdSql.checkRows(5) + #tdSql.query('select avg(speed) from tb interval(100000000b) sliding (100000000b);') + #tdSql.checkRows(4) #tdSql.query('select last(*) from tb') #tdSql.checkData(0,0, '2021-06-10 0:00:00.999999999') @@ -103,69 +109,85 @@ class TDTestCase: #tdSql.checkData(0,0, 1623254400100000001) #tdSql.checkData(0,0, 2021-06-10 0:00:00.100000001) - 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)') - os.system('sudo timedatectl set-ntp off') - os.system('sudo timedatectl set-time 2021-06-10') - tdSql.execute('insert into tb2 values(now + 500000000b, 6, now +2d)') - tdSql.execute('insert into tb2 values(1623254400999999999, 7, 1623513600999999999)') + #tdSql.execute('insert into tb values(now + 500000000b, 6);') + # tdSql.query('select * from tb;') + # tdSql.checkRows(7) - # tdSql.query('select count(*) from tb2 where ts2 > 1623340800000000000 and ts2 < 1623340800150000000') + 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);') + # # os.system('sudo timedatectl set-ntp off') + # # os.system('sudo timedatectl set-time 2021-06-10') + #tdSql.execute('insert into tb2 values(now + 500000000b, 6, now +2d)') + tdSql.execute('insert into tb2 values(1623254400999999999, 7, 1623513600999999999);') + + # tdSql.query('select * from tb2;') + # tdSql.checkRows(6) + # 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.checkData(0,0,2) - # tdSql.query('select count(*) from tb2 where ts2 < \'2021-06-11 0:00:00.400000000\'') + # 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.checkData(0,0,5) - # os.system('sudo timedatectl set-ntp off') - # os.system('sudo timedatectl set-time 2021-06-11') - # tdSql.query('select count(*) from tb2 where ts2 > now + 400000000b') - # tdSql.checkData(0,0,2) - - - # tdSql.query('select count(*) from tb2 where ts2 >= \'2021-06-11 0:00:00.100000001\'') - # tdSql.checkData(0,0,7) - - # 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\'') + # # os.system('sudo timedatectl set-ntp off') + # # os.system('sudo timedatectl set-time 2021-06-11') + # tdSql.query('select count(*) from tb2 where ts2 > now + 400000000b;') # tdSql.checkData(0,0,0) - # tdSql.query('select count(*) from tb2 where ts2 between 1623340800000000000 and 1623340800450000000') + + # 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.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 = \'2021-06-11 0:00:00.000000000\';') + # tdSql.checkData(0,0,0) + + # 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.checkData(0,0,0) + + # 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.checkData(0,0,3) - # tdSql.query('select count(*) from tb2 where ts2 <> 1623513600999999999') - # tdSql.checkData(0,0,6) + # 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.checkData(0,0,6) + # 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 != 1623513600999999999') - # tdSql.checkData(0,0,6) + # 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.checkData(0,0,6) + # tdSql.query('select count(*) from tb2 where ts2 != \'2021-06-11 0:00:00.100000001\';') + # tdSql.checkData(0,0,5) - tdSql.execute('create table tb3 (ts timestamp, speed int)') + # tdSql.execute('insert into tb2 values(now + 500000000b, 6, now +2d);') + # tdSql.query('select * from tb2;') + # tdSql.checkRows(7) - 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.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.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') From ee74391f9961746f5f9ac361295461a470e4f9ba Mon Sep 17 00:00:00 2001 From: bryanchang0603 Date: Thu, 17 Jun 2021 14:24:21 +0800 Subject: [PATCH 6/9] modify the file, waiting for connector --- tests/pytest/dbmgmt/nanoSecondCheck.py | 69 +++++++++++++++----------- 1 file changed, 40 insertions(+), 29 deletions(-) diff --git a/tests/pytest/dbmgmt/nanoSecondCheck.py b/tests/pytest/dbmgmt/nanoSecondCheck.py index a55823e639..b88936a3c6 100644 --- a/tests/pytest/dbmgmt/nanoSecondCheck.py +++ b/tests/pytest/dbmgmt/nanoSecondCheck.py @@ -1,17 +1,17 @@ -################################################################### +# ################################################################# # 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 -*- -#TODO: after TD-4518 and TD-4510 is resolved, add the exception test case for these situations +# TODO: after TD-4518 and TD-4510 is resolved, add the exception test case for these situations import sys from util.log import * @@ -42,14 +42,20 @@ class TDTestCase: tdSql.execute('import into tb values(1623254400300000000, 3);') tdSql.execute('import into tb values(1623254400299999999, 4);') tdSql.execute('insert into tb values(1623254400300000001, 5);') - # # os.system('sudo timedatectl set-ntp off') - # # os.system('sudo timedatectl set-time 2021-06-10') + # os.system('sudo timedatectl set-ntp off') + # os.system('sudo timedatectl set-time 2021-06-10') tdSql.execute('insert into tb values(1623254400999999999, 7);') - ##TODO: after the connector is updated, run the following commented code - ##TODO: due to the precision limit of double, spread currently cannot be tested since ns timestampe cannot be accurately represented + #TODO: after the connector is updated, run the following commented code + #TODO: due to the precision limit of double, spread currently cannot be tested since ns timestampe cannot be accurately represented # 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') + # tdSql.checkData(3,1,3) + # 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.checkData(0,0,1) @@ -92,24 +98,24 @@ class TDTestCase: # 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.query('select avg(speed) from tb interval(100000000b)') + # tdSql.checkRows(4) - #tdSql.query('select avg(speed) from tb interval(100000000b) sliding (100000000b);') - #tdSql.checkRows(4) + # tdSql.query('select avg(speed) from tb interval(100000000b) sliding (100000000b);') + # tdSql.checkRows(4) - #tdSql.query('select last(*) from tb') - #tdSql.checkData(0,0, '2021-06-10 0:00:00.999999999') - #tdSql.checkData(0,0, 1623254400999999999) + # tdSql.query('select last(*) from tb') + # tdSql.checkData(0,0, '2021-06-10 0:00:00.999999999') + # tdSql.checkData(0,0, 1623254400999999999) - #tdSql.query('select first(*) from tb') - #tdSql.checkData(0,0, 1623254400100000001) - #tdSql.checkData(0,0, 2021-06-10 0:00:00.100000001) + # tdSql.query('select first(*) from tb') + # 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.execute('insert into tb values(now + 500000000b, 6);') # tdSql.query('select * from tb;') # tdSql.checkRows(7) @@ -119,12 +125,17 @@ class TDTestCase: 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);') - # # os.system('sudo timedatectl set-ntp off') - # # os.system('sudo timedatectl set-time 2021-06-10') - #tdSql.execute('insert into tb2 values(now + 500000000b, 6, now +2d)') + # os.system('sudo timedatectl set-ntp off') + # os.system('sudo timedatectl set-time 2021-06-10') 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) + # tdSql.checkData(3,1,3) + # 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.checkData(0,0,1) @@ -155,7 +166,7 @@ class TDTestCase: # tdSql.checkData(0,0,1) # tdSql.query('select count(*) from tb2 where ts2 = 1623340800300000001;') - # tdSql.checkData(0,0,0) + # tdSql.checkData(0,0,1) # tdSql.query('select count(*) from tb2 where ts2 between 1623340800000000000 and 1623340800450000000;') # tdSql.checkData(0,0,5) @@ -179,14 +190,14 @@ class TDTestCase: # tdSql.query('select * from tb2;') # tdSql.checkRows(7) - 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.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.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) From 23117de9a059caeb017463e8f37be3e089457158 Mon Sep 17 00:00:00 2001 From: bryanchang0603 Date: Fri, 18 Jun 2021 09:59:29 +0800 Subject: [PATCH 7/9] [TD-4652] update nanoSecondCheck.py --- tests/pytest/dbmgmt/nanoSecondCheck.py | 216 ++++++++++++------------- 1 file changed, 108 insertions(+), 108 deletions(-) diff --git a/tests/pytest/dbmgmt/nanoSecondCheck.py b/tests/pytest/dbmgmt/nanoSecondCheck.py index b88936a3c6..54769563c7 100644 --- a/tests/pytest/dbmgmt/nanoSecondCheck.py +++ b/tests/pytest/dbmgmt/nanoSecondCheck.py @@ -49,75 +49,75 @@ class TDTestCase: #TODO: after the connector is updated, run the following commented code #TODO: due to the precision limit of double, spread currently cannot be tested since ns timestampe cannot be accurately represented - # 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') - # tdSql.checkData(3,1,3) - # 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.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.checkData(0,0,1) + 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') + tdSql.checkData(3,1,3) + 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.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.checkData(0,0,1) - # 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.checkData(0,0,1) + 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.checkData(0,0,1) - # 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.checkData(0,0,5) + 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.checkData(0,0,5) - # # os.system('sudo timedatectl set-ntp off') - # # os.system('sudo timedatectl set-time 2021-06-10') - # tdSql.query('select count(*) from tb where ts > now + 400000000b;') - # tdSql.checkData(0,0,0) + # os.system('sudo timedatectl set-ntp off') + # os.system('sudo timedatectl set-time 2021-06-10') + tdSql.query('select count(*) from tb where ts > now + 400000000b;') + tdSql.checkData(0,0,0) - # 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 >= \'2021-06-10 0:00:00.100000001\';') + tdSql.checkData(0,0,6) - # tdSql.query('select count(*) from tb where ts <= 1623254400300000000;') - # tdSql.checkData(0,0,4) + 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.checkData(0,0,0) + tdSql.query('select count(*) from tb where ts = \'2021-06-10 0:00:00.000000000\';') + tdSql.checkData(0,0,0) - # tdSql.query('select count(*) from tb where ts = 1623254400150000000;') - # tdSql.checkData(0,0,1) + 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.checkData(0,0,1) + 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.checkData(0,0,5) + 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.checkData(0,0,3) + 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.checkRows(1) + 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.query('select avg(speed) from tb interval(100000000b)') + tdSql.checkRows(4) - # tdSql.query('select avg(speed) from tb interval(100000000b) sliding (100000000b);') - # tdSql.checkRows(4) + tdSql.query('select avg(speed) from tb interval(100000000b) sliding (100000000b);') + tdSql.checkRows(4) - # tdSql.query('select last(*) from tb') - # tdSql.checkData(0,0, '2021-06-10 0:00:00.999999999') - # tdSql.checkData(0,0, 1623254400999999999) + tdSql.query('select last(*) from tb') + tdSql.checkData(0,0, '2021-06-10 0:00:00.999999999') + tdSql.checkData(0,0, 1623254400999999999) - # tdSql.query('select first(*) from tb') - # tdSql.checkData(0,0, 1623254400100000001) - # tdSql.checkData(0,0, '2021-06-10 0:00:00.100000001') + tdSql.query('select first(*) from tb') + 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.checkRows(7) + tdSql.execute('insert into tb values(now + 500000000b, 6);') + tdSql.query('select * from tb;') + tdSql.checkRows(7) 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\');') @@ -125,81 +125,81 @@ class TDTestCase: 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);') - # os.system('sudo timedatectl set-ntp off') - # os.system('sudo timedatectl set-time 2021-06-10') + # # os.system('sudo timedatectl set-ntp off') + # # os.system('sudo timedatectl set-time 2021-06-10') 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) - # tdSql.checkData(3,1,3) - # 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.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.checkData(0,0,1) + 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) + tdSql.checkData(3,1,3) + 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.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.checkData(0,0,1) - # 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.checkData(0,0,5) + 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.checkData(0,0,5) - # # os.system('sudo timedatectl set-ntp off') - # # os.system('sudo timedatectl set-time 2021-06-11') - # tdSql.query('select count(*) from tb2 where ts2 > now + 400000000b;') - # tdSql.checkData(0,0,0) + # os.system('sudo timedatectl set-ntp off') + # os.system('sudo timedatectl set-time 2021-06-11') + tdSql.query('select count(*) from tb2 where ts2 > now + 400000000b;') + tdSql.checkData(0,0,0) - # 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 >= \'2021-06-11 0:00:00.100000001\';') + tdSql.checkData(0,0,6) - # tdSql.query('select count(*) from tb2 where ts2 <= 1623340800400000000;') - # tdSql.checkData(0,0,5) + 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.checkData(0,0,0) + tdSql.query('select count(*) from tb2 where ts2 = \'2021-06-11 0:00:00.000000000\';') + tdSql.checkData(0,0,0) - # 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 = \'2021-06-11 0:00:00.300000001\';') + tdSql.checkData(0,0,1) - # tdSql.query('select count(*) from tb2 where ts2 = 1623340800300000001;') - # tdSql.checkData(0,0,1) + 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.checkData(0,0,5) + 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.checkData(0,0,3) + 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.checkData(0,0,5) + 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.checkData(0,0,5) + 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 != 1623513600999999999;') - # tdSql.checkData(0,0,5) + 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.checkData(0,0,5) + tdSql.query('select count(*) from tb2 where ts2 != \'2021-06-11 0:00:00.100000001\';') + tdSql.checkData(0,0,5) - # tdSql.execute('insert into tb2 values(now + 500000000b, 6, now +2d);') - # tdSql.query('select * from tb2;') - # tdSql.checkRows(7) + tdSql.execute('insert into tb2 values(now + 500000000b, 6, now +2d);') + tdSql.query('select * from tb2;') + tdSql.checkRows(7) - # 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.checkRows(1) + 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.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.checkRows(1) os.system('sudo timedatectl set-ntp on') From a1d95323c040f67ea30a1edb2618aba5bcfcdf67 Mon Sep 17 00:00:00 2001 From: bryanchang0603 Date: Sat, 19 Jun 2021 13:28:41 +0800 Subject: [PATCH 8/9] [TD-4751] minor modification --- tests/pytest/dbmgmt/nanoSecondCheck.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/tests/pytest/dbmgmt/nanoSecondCheck.py b/tests/pytest/dbmgmt/nanoSecondCheck.py index 47592bdb8c..27050a2213 100644 --- a/tests/pytest/dbmgmt/nanoSecondCheck.py +++ b/tests/pytest/dbmgmt/nanoSecondCheck.py @@ -43,8 +43,6 @@ class TDTestCase: tdSql.execute('import into tb values(1623254400300000000, 3);') tdSql.execute('import into tb values(1623254400299999999, 4);') tdSql.execute('insert into tb values(1623254400300000001, 5);') - # os.system('sudo timedatectl set-ntp off') - # os.system('sudo timedatectl set-time 2021-06-10') tdSql.execute('insert into tb values(1623254400999999999, 7);') @@ -71,8 +69,6 @@ class TDTestCase: tdSql.query('select count(*) from tb where ts < \'2021-06-10 00:00:00.400000000\';') tdSql.checkData(0,0,5) - # os.system('sudo timedatectl set-ntp off') - # os.system('sudo timedatectl set-time 2021-06-10') tdSql.query('select count(*) from tb where ts > now + 400000000b;') tdSql.checkRows(0) @@ -125,8 +121,6 @@ class TDTestCase: 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);') - # # os.system('sudo timedatectl set-ntp off') - # # os.system('sudo timedatectl set-time 2021-06-10') tdSql.execute('insert into tb2 values(1623254400999999999, 7, 1623513600999999999);') tdSql.query('select * from tb2;') @@ -147,12 +141,9 @@ class TDTestCase: tdSql.query('select count(*) from tb2 where ts2 < \'2021-06-11 0:00:00.400000000\';') tdSql.checkData(0,0,5) - # os.system('sudo timedatectl set-ntp off') - # os.system('sudo timedatectl set-time 2021-06-11') 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.checkData(0,0,6) @@ -180,12 +171,18 @@ class TDTestCase: 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.checkData(0,0,6) + 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.checkData(0,0,5) + 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.checkRows(7) From 1226669352934093e421d5d85784ac55513d01e3 Mon Sep 17 00:00:00 2001 From: bryanchang0603 Date: Sat, 19 Jun 2021 13:31:07 +0800 Subject: [PATCH 9/9] [TD-4751] removing comment for understanding the files --- src/connector/python/taos/cinterface.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/connector/python/taos/cinterface.py b/src/connector/python/taos/cinterface.py index e69d980a95..cc7c279458 100644 --- a/src/connector/python/taos/cinterface.py +++ b/src/connector/python/taos/cinterface.py @@ -10,7 +10,7 @@ def _convert_millisecond_to_datetime(milli): return datetime.datetime.fromtimestamp(milli / 1000.0) -def _convert_microsecond_to_datetime(micro): #checkpoint +def _convert_microsecond_to_datetime(micro): return datetime.datetime.fromtimestamp(micro / 1000000.0)