Commit Graph

8148 Commits

Author SHA1 Message Date
Shengliang Guan 66894a8b05 Merge branch 'develop' of https://github.com/taosdata/TDengine into develop 2020-09-18 02:06:03 +00:00
Shengliang Guan 9f2f2ce665
Merge pull request #3572 from taosdata/xiaoping/add_test_case
[TD-804]<test> add test case for metadata update
2020-09-17 22:01:39 +08:00
Ping Xiao f63da34cc4 Merge branch 'develop' into xiaoping/add_test_case 2020-09-17 20:26:22 +08:00
Ping Xiao efcd12c8d2 [TD-804]<test> add test case for metadata update 2020-09-17 18:07:52 +08:00
Bomin Zhang 93af6ba530
Merge pull request #3570 from taosdata/feature/td-1245
td-1245: fix failed case 'lastrow.sim'
2020-09-17 17:41:50 +08:00
Bomin Zhang 28ac9104b0 td-1245: fix failed cast 'lastrow.sim' 2020-09-17 17:19:57 +08:00
Shengliang Guan 2f1264917b
Merge pull request #3556 from taosdata/feature/query
Feature/query
2020-09-17 17:10:03 +08:00
Shengliang Guan 1ddb252fc8 minor changes 2020-09-17 09:00:49 +00:00
Haojun Liao bd725f1b53 [td-225] fix compiler error on win 2020-09-17 16:48:06 +08:00
Haojun Liao 0655f427d3 [td-225] fix compiler error on win 2020-09-17 16:46:57 +08:00
Shengliang Guan 9976af09e3
Merge pull request #3568 from taosdata/feature/http
[TD-1450]<fix>: change maxSqlLength from 8M to 1M
2020-09-17 16:41:00 +08:00
Haojun Liao e7fa1ad0b3 [td-1478] 2020-09-17 16:34:43 +08:00
Haojun Liao 4f83e11354 [td-1483] 2020-09-17 16:33:40 +08:00
Shengliang Guan ce7a3623fb TD-1450 change maxSqlLength from 8M to 1M 2020-09-17 08:14:08 +00:00
Shengliang Guan 5c369d2c9f
Merge pull request #3565 from taosdata/feature/http
memory leak in restful while close context
2020-09-17 15:49:46 +08:00
Shengliang Guan a50a50c038
Merge pull request #3563 from taosdata/feature/TD-1313
Feature/td 1313
2020-09-17 15:08:50 +08:00
Shengliang Guan c9e1f79317 git commit -m 'memory leak in restful while close context' 2020-09-17 07:07:27 +00:00
zyyang 804045682c solve conflict 2020-09-17 14:06:39 +08:00
Haojun Liao 8e5a5d8ee1 Merge remote-tracking branch 'origin/feature/query' into feature/query 2020-09-17 13:56:30 +08:00
Haojun Liao 7ffdd6457b [td-1478] update sim script. 2020-09-17 13:55:37 +08:00
zyyang 21a03f05fc merge develop's code 2020-09-17 13:52:20 +08:00
zyyang e406aedbb4 clean unused codes 2020-09-17 13:32:12 +08:00
Shengliang Guan 1741508f4f Meger from develop into feature/query 2020-09-17 12:57:07 +08:00
Shengliang Guan d3d0f60ca6
Merge pull request #3560 from taosdata/feature/http
TD-1486
2020-09-17 12:50:58 +08:00
Shengliang Guan 1fdd0bfa2b
Merge pull request #3557 from taosdata/feature/td-1245
[TD-1245]<feature>: support interval offset in down sampling
2020-09-17 12:50:43 +08:00
Shengliang Guan 2d6f6afc17 compile in windows 2020-09-17 12:14:34 +08:00
Shengliang Guan 0eaffe9032 Merge remote-tracking branch 'origin/develop' into feature/td-1245 2020-09-17 12:11:07 +08:00
Shengliang Guan bf7abbab1c TD-1486 2020-09-17 04:06:56 +00:00
Shengliang Guan 60ef1c4c0e
Merge pull request #3550 from taosdata/xiaoping/add_test_case
[TD-1478]<test> add test case query groupby with interval
2020-09-17 12:06:50 +08:00
Shengliang Guan 7d7bed57c0
Merge pull request #3535 from taosdata/hotfix/sangshuduo/fix-compile-error-for-release
[TD-1459] <fix>: fix compile error for release build type.
2020-09-17 12:02:32 +08:00
Shengliang Guan 3d550c1a3c
Merge pull request #3559 from taosdata/develop
Merge from develop into feature/td-1245
2020-09-17 11:46:47 +08:00
Shengliang Guan f44eea86f7
Merge pull request #3558 from taosdata/develop
Merge from develop into feature/query
2020-09-17 11:44:48 +08:00
Shengliang Guan d951b7060c Merge remote-tracking branch 'origin/develop' into xiaoping/add_test_case 2020-09-17 03:42:39 +00:00
Shengliang Guan cff2e7c48b Merge remote-tracking branch 'origin/develop' into hotfix/sangshuduo/fix-compile-error-for-release 2020-09-17 03:42:15 +00:00
Shengliang Guan 455f9f870c
Merge pull request #3552 from boxiaobj/patch-4
TDengine cluster document modification
2020-09-17 11:41:01 +08:00
Shengliang Guan ea7239001f
Merge pull request #3545 from taosdata/hotfix/test
[TD-1472]
2020-09-17 11:37:21 +08:00
Shuduo Sang 1a7786f396 merged develop branch and fixed conflict. 2020-09-17 11:19:12 +08:00
Shengliang Guan 46516d98a3 compile in windows 2020-09-17 10:52:50 +08:00
Haojun Liao 9466a68ef5 [td-1478] 2020-09-17 10:10:13 +08:00
Haojun Liao c4d7810b76 [td-1478] 2020-09-17 10:07:32 +08:00
Haojun Liao a96f993692 [td-1442] 2020-09-17 10:06:12 +08:00
Bomin Zhang 1f63c23f2b td-1245: fix compile error 2020-09-17 09:46:48 +08:00
Bomin Zhang 702770e8a9 td-1245: fix failed test case 2020-09-17 09:44:02 +08:00
Bomin Zhang 01d62e6edc td-1245: update documentation for offset 2020-09-17 09:44:02 +08:00
Bomin Zhang 7cdb6c3f24 td-1245: disable natual duration in 'insert'&'where' 2020-09-17 09:44:02 +08:00
Bomin Zhang 9c219df206 td-1245: add test cases for interval offset 2020-09-17 09:44:02 +08:00
Bomin Zhang 6fa86bfb8f td-1245: fix crash and refactor 2020-09-17 09:44:02 +08:00
Bomin Zhang 85aca0c276 td-1245: replace taosAddNatualInterval with taosTimeAdd 2020-09-17 09:44:02 +08:00
Bomin Zhang 76d407395f td-1245: refactor interval/sliding/offset to one struct 2020-09-17 09:44:02 +08:00
Bomin Zhang 4456951e66 td-1245: update sql grammar to support offset 2020-09-17 09:43:26 +08:00