From cc7ed630fdc562220f395bb0afa57e55a4ac9f2d Mon Sep 17 00:00:00 2001 From: Ping Xiao Date: Wed, 19 Aug 2020 17:25:19 +0800 Subject: [PATCH] Fix version.py and queries-ch.md --- .../webdocs/markdowndocs/Queries-ch.md | 2 +- tests/pytest/client/version.py | 22 ++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/documentation20/webdocs/markdowndocs/Queries-ch.md b/documentation20/webdocs/markdowndocs/Queries-ch.md index b424baef86..ed8342c88d 100644 --- a/documentation20/webdocs/markdowndocs/Queries-ch.md +++ b/documentation20/webdocs/markdowndocs/Queries-ch.md @@ -12,7 +12,7 @@ TDengine 采用 SQL 作为查询语言。应用程序可以通过 C/C++, Java, G - 标签和数值的多种过滤条件：\>, \<, =, \<>, like 等 - 聚合结果的分组（Group by）、排序（Order by）、约束输出（Limit/Offset） - 数值列及聚合结果的四则运算 -- 时间戳对齐的连接查询（Join Query）操作 +- 时间戳对齐的连接查询（Join Query: 隐式连接）操作 - 多种聚合/计算函数: count, max, min, avg, sum, twa, stddev, leastsquares, top, bottom, first, last, percentile, apercentile, last_row, spread, diff等 例如：在TAOS Shell中，从表d1001中查询出vlotage > 215的记录，按时间降序排列，仅仅输出2条。 diff --git a/tests/pytest/client/version.py b/tests/pytest/client/version.py index bc2e58f106..93b302f619 100644 --- a/tests/pytest/client/version.py +++ b/tests/pytest/client/version.py @@ -25,11 +25,23 @@ class TDTestCase: def run(self): tdSql.prepare() - ret = tdSql.query('select server_version()') - tdSql.checkData(0, 0, "2.0.0.6") - - ret = tdSql.query('select client_version()') - tdSql.checkData(0, 0, "2.0.0.6") + sql = "select server_version()" + ret = tdSql.query(sql) + version = tdSql.getData(0, 0)[0:3] + expectedVersion = "2.0" + if(version == expectedVersion): + tdLog.info("sql:%s, row:%d col:%d data:%s == expect:%s" % (sql, 0, 0, version, expectedVersion)) + else: + tdLog.exit("sql:%s, row:%d col:%d data:%s != expect:%s" % (sql, 0, 0, version, expectedVersion)) + + sql = "select client_version()" + ret = tdSql.query(sql) + version = tdSql.getData(0, 0)[0:3] + expectedVersion = "2.0" + if(version == expectedVersion): + tdLog.info("sql:%s, row:%d col:%d data:%s == expect:%s" % (sql, 0, 0, version, expectedVersion)) + else: + tdLog.exit("sql:%s, row:%d col:%d data:%s != expect:%s" % (sql, 0, 0, version, expectedVersion)) def stop(self): -- GitLab