Merge remote-tracking branch 'origin/develop' into feature/win

documentation20/webdocs/markdowndocs/Getting Started-ch.md

@@ -179,7 +179,7 @@ taos> select avg(f1), max(f2), min(f3) from test.t10 interval(10s);
 
   
 
-## **支持平台列表**
+## 支持平台列表
 
 ### TDengine服务器支持的平台列表
 

tests/pytest/query/queryFillTest.py

@@ -47,11 +47,38 @@ class TDTestCase:
 
         tdSql.query("select first(col1) - avg(col1) from stb where ts > '2018-09-17 08:00:00.000' and ts < '2018-09-23 04:36:40.000' interval(1h)")
         tdSql.checkRows(139)        
+        tdSql.checkData(0, 1, -1.5)
+        tdSql.checkData(138, 1, -1.0)
+
+        tdSql.query("select first(col1) - avg(col1) from stb where ts > '2018-09-17 08:00:00.000' and ts < '2018-09-23 04:36:40.000' interval(1h) fill(none)")
+        tdSql.checkRows(139)
+        tdSql.checkData(0, 1, -1.5)
+        tdSql.checkData(138, 1, -1.0)
+
+        tdSql.query("select first(col1) - avg(col1) from stb where ts > '2018-09-17 08:00:00.000' and ts < '2018-09-23 04:36:40.000' interval(1h) fill(value, 2.0)")
+        tdSql.checkRows(141)
+        tdSql.checkData(0, 1, 2.0)
+        tdSql.checkData(140, 1, 2.0)
+
+        tdSql.query("select first(col1) - avg(col1) from stb where ts > '2018-09-17 08:00:00.000' and ts < '2018-09-23 04:36:40.000' interval(1h) fill(prev)")
+        tdSql.checkRows(141)
+        tdSql.checkData(0, 1, None)
+        tdSql.checkData(140, 1, -1.0)  
 
         tdSql.query("select first(col1) - avg(col1) from stb where ts > '2018-09-17 08:00:00.000' and ts < '2018-09-23 04:36:40.000' interval(1h) fill(null)")
         tdSql.checkRows(141)
         tdSql.checkData(0, 1, None)
-        tdSql.checkData(140, 1, None)       
+        tdSql.checkData(140, 1, None)        
+
+        tdSql.query("select first(col1) - avg(col1) from stb where ts > '2018-09-17 08:00:00.000' and ts < '2018-09-23 04:36:40.000' interval(1h) fill(linear)")        
+        tdSql.checkRows(141)
+        tdSql.checkData(0, 1, None)
+        tdSql.checkData(140, 1, None) 
+
+        tdSql.query("select first(col1) - avg(col1) from stb where ts > '2018-09-17 08:00:00.000' and ts < '2018-09-23 04:36:40.000' interval(1h) fill(next)")
+        tdSql.checkRows(141)
+        tdSql.checkData(0, 1, -1.5)
+        tdSql.checkData(140, 1, None)
 
         tdSql.query("select max(col1) - min(col1) from stb where ts > '2018-09-17 08:00:00.000' and ts < '2018-09-23 04:36:40.000' and id = 1 group by loc, id")
         rows = tdSql.queryRows

tests/pytest/query/sliding.py

@@ -52,7 +52,15 @@ class TDTestCase:
         tdSql.query("select count(*) from meters group by loc")
         tdSql.checkRows(2)
 
-        tdSql.error("select * from meters group by loc sliding(5s)")    
+        tdSql.error("select * from meters group by loc sliding(5s)")   
+
+        # Fix defect: https://jira.taosdata.com:18080/browse/TD-2700
+        tdSql.execute("create database test")
+        tdSql.execute("use test")
+        tdSql.execute("create table t1(ts timestamp, k int)")
+        tdSql.execute("insert into t1 values(1500000001000, 0)")
+        tdSql.query("select sum(k) from t1 interval(1d) sliding(1h)")
+        tdSql.checkRows(24)
 
     def stop(self):
         tdSql.close()