Merge pull request #4029 from taosdata/wangyazhou/TD-1620

add testcase queryCountCSVData.py and add it to fulltest.sh

tests/pytest/fulltest.sh

@@ -151,6 +151,7 @@ python3 ./test.py -f query/select_last_crash.py
 python3 ./test.py -f query/queryNullValueTest.py
 python3 ./test.py -f query/queryInsertValue.py
 python3 ./test.py -f query/queryConnection.py
+python3 ./test.py -f query/queryCountCSVData.py
 python3 ./test.py -f query/natualInterval.py
 python3 ./test.py -f query/bug1471.py
 

tests/pytest/query/queryCountCSVData.py

+###################################################################
+#           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:
+    """
+    create table and insert data from disordered.csv which timestamp is disordered and
+    ordered.csv which timestamp is ordered.
+    then execute 'select count(*) from table xx;'
+    """
+
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        print("==============step1")
+        tdSql.execute("create database if not exists demo;");
+        tdSql.execute("use demo;")
+        tdSql.execute("CREATE TABLE IF NOT EXISTS test1 (ts TIMESTAMP, ValueID int, "
+                      "VariantValue float, Quality int, Flags int);")
+        tdSql.execute("CREATE TABLE IF NOT EXISTS test2 (ts TIMESTAMP, ValueID int, "
+                      "VariantValue float, Quality int, Flags int);")
+        ordered_csv = __file__.split('query')[0] + 'test_data/ordered.csv'
+        disordered_csv = __file__.split('query')[0] + 'test_data/disordered.csv'
+
+        tdSql.execute(" insert into test1 file '{file}';".format(file=ordered_csv))
+        tdSql.execute(" insert into test2 file '{file}';".format(file=disordered_csv))
+        print("==============insert into test1 and test2 form test file")
+
+
+        print("==============step2")
+        tdSql.query('select * from test1;')
+        with open(ordered_csv) as f1:
+            num1 = len(f1.readlines())
+        tdSql.checkRows(num1)
+
+
+        tdSql.query('select * from test2;')
+        with open(disordered_csv) as f2:
+            num2 = len(f2.readlines())
+        tdSql.checkRows(num2)
+        print("=============execute select count(*) from xxx")
+
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/pytest/test_data/__init__.py

+###################################################################
+#           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
+#
+###################################################################
+
+
+"""
+this directory contains test data files
+"""
\ No newline at end of file