diff --git a/tests/pytest/fulltest.sh b/tests/pytest/fulltest.sh index a93a98a145fb8984903001ef0569cf35ac3f3a99..e9dc3762fe9aed0eac8e7e7d70356ba3baa5a450 100755 --- a/tests/pytest/fulltest.sh +++ b/tests/pytest/fulltest.sh @@ -317,7 +317,6 @@ python3 ./test.py -f query/last_row_cache.py python3 ./test.py -f account/account_create.py python3 ./test.py -f alter/alter_table.py python3 ./test.py -f query/queryGroupbySort.py -python3 ./test.py -f functions/function_session.py python3 ./test.py -f functions/function_stateWindow.py python3 ./test.py -f insert/unsignedInt.py @@ -344,4 +343,5 @@ python3 test.py -f insert/insert_before_use_db.py python3 test.py -f alter/alter_keep.py python3 test.py -f alter/alter_cacheLastRow.py python3 test.py -f alter/alter_keep_exception.py +python3 ./test.py -f query/querySession.py #======================p4-end=============== diff --git a/tests/pytest/functions/function_session.py b/tests/pytest/functions/function_session.py deleted file mode 100644 index 21b6d088ffd45c3a0e1b867335b8a36d834b93cc..0000000000000000000000000000000000000000 --- a/tests/pytest/functions/function_session.py +++ /dev/null @@ -1,86 +0,0 @@ -################################################################### -# 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 * -from util.cases import * -from util.sql import * -#import numpy as np - - -class TDTestCase: - def init(self, conn, logSql): - tdLog.debug("start to execute %s" % __file__) - tdSql.init(conn.cursor()) - - self.rowNum = 10 - self.ts = 1537146000000 - - def run(self): - tdSql.prepare() - - tdSql.execute('''create table test(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double, - col7 bool, col8 binary(20), col9 nchar(20), col11 tinyint unsigned, col12 smallint unsigned, col13 int unsigned, col14 bigint unsigned) tags(loc nchar(20))''') - tdSql.execute("create table test1 using test tags('beijing')") - for i in range(self.rowNum): - tdSql.execute("insert into test1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d', %d, %d, %d, %d)" - % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1)) - - # operation not allowed on super table - tdSql.error("select count(*) from test session(ts, 1s)") - # operation not allowde on col pro - tdSql.error("select * from test1 session(ts, 1s)") - # operation not allowed on col except primary ts - tdSql.error("select * from test1 session(col1, 1s)") - - tdSql.query("select count(*) from test1 session(ts, 1s)") - - tdSql.checkRows(1) - tdSql.checkData(0, 1, 10) - # append more data - - for i in range(self.rowNum): - tdSql.execute("insert into test1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d', %d, %d, %d, %d)" - % (self.ts + 2000, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1)) - - tdSql.query("select count(*) from test1 session(ts, 1s)") - tdSql.checkRows(2) - tdSql.checkData(0, 1, 10) - tdSql.checkData(1, 1, 1) - - tdSql.query("select count(*) from test1 session(ts, 1m)") - tdSql.checkRows(1) - tdSql.checkData(0, 1, 11) - - tdSql.query("select first(col1) from test1 session(ts, 1s)") - tdSql.checkRows(2) - tdSql.checkData(0, 1, 1) - tdSql.checkData(1, 1, 1) - - - tdSql.query("select first(col1), last(col2) from test1 session(ts, 1s)") - tdSql.checkRows(2) - tdSql.checkData(0, 1, 1) - tdSql.checkData(0, 2, 10) - tdSql.checkData(1, 1, 1) - tdSql.checkData(1, 1, 1) - - # add more function - - def stop(self): - tdSql.close() - tdLog.success("%s successfully executed" % __file__) - -tdCases.addWindows(__file__, TDTestCase()) -tdCases.addLinux(__file__, TDTestCase()) diff --git a/tests/pytest/query/querySession.py b/tests/pytest/query/querySession.py index 9c8fc747dfbdbb07561a13a27257cc3bab1a2df3..53d53e2b02efbcc1212f8ef64f3b89a9cce03e13 100644 --- a/tests/pytest/query/querySession.py +++ b/tests/pytest/query/querySession.py @@ -82,7 +82,7 @@ class TDTestCase: tdSql.checkData(0, 1, 15) # session with where - tdSql.query("select count(*),first(tagtype),last(tagtype),avg(tagtype),sum(tagtype),min(tagtype),max(tagtype),leastsquares(tagtype, 1, 1),spread(tagtype) from dev_001 where ts <'2020-05-20 0:0:0' session(ts,1d)") + tdSql.query("select count(*),first(tagtype),last(tagtype),avg(tagtype),sum(tagtype),min(tagtype),max(tagtype),leastsquares(tagtype, 1, 1),spread(tagtype),stddev(tagtype),percentile(tagtype,0) from dev_001 where ts <'2020-05-20 0:0:0' session(ts,1d)") tdSql.checkRows(2) tdSql.checkData(0, 1, 13) tdSql.checkData(0, 2, 1) @@ -93,6 +93,9 @@ class TDTestCase: tdSql.checkData(0, 7, 13) tdSql.checkData(0, 8, '{slop:1.000000, intercept:0.000000}') tdSql.checkData(0, 9, 12) + tdSql.checkData(0, 10, 3.741657387) + tdSql.checkData(0, 11, 1) + tdSql.checkData(1, 11, 14) # tdsql err tdSql.error("select * from dev_001 session(ts,1w)")