Commit Graph

8180 Commits

Author SHA1 Message Date
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
Haojun Liao 010c30afbf [td-1477] 2020-09-17 09:39:37 +08:00
Shengliang Guan 34c948aa9a Merge remote-tracking branch 'origin/develop' into hotfix/test 2020-09-17 09:34:27 +08:00
Bo Xiao 22000cf648
TDengine cluster document modification
Add DATA Node
Many minor modifications relate to firstEP and etc.
2020-09-16 19:24:20 +08:00
Shengliang Guan 1487bc5870
Merge pull request #3549 from taosdata/feature/query
[td-1478]
2020-09-16 19:08:42 +08:00
Ping Xiao 36fda719df [TD-1478]<test> add test case query groupby with interval 2020-09-16 18:51:24 +08:00
Haojun Liao 6ea7e4ee84 [td-1478] 2020-09-16 18:36:58 +08:00
Shengliang Guan e1b8d3910e
Merge pull request #3538 from taosdata/feature/query
Feature/query
2020-09-16 17:01:08 +08:00
Hui Li 9d0bb483f0 [TD-1472] 2020-09-16 16:08:31 +08:00
Xiaxin Li ee6bf34cd3
Merge pull request #3542 from taosdata/xiaoping/markdown_update
Update Taos error code
2020-09-16 15:40:16 +08:00
Ping Xiao b9db2aafb6 Update Taos error code 2020-09-16 15:35:38 +08:00
Haojun Liao d7f409fd9a [td-225] fix compiler error in win platform 2020-09-16 15:09:43 +08:00
Haojun Liao 848a37aafe [td-225] fix compiler error in win platform 2020-09-16 15:05:57 +08:00
Haojun Liao d545eb9bb4 [td-225] fix compiler error in win platform 2020-09-16 15:01:10 +08:00
Shengliang Guan 9f991f33df
Merge pull request #3537 from taosdata/zyyang-taosdata-patch-1
Update Connections with other Tools-ch.md
2020-09-16 13:11:43 +08:00
Shengliang Guan 06a22eefe7
Merge pull request #3539 from taosdata/hotfix/test
[TD-1468]
2020-09-16 13:11:26 +08:00
Shengliang Guan 71a467f838
Merge pull request #3536 from taosdata/feature/http
TD-1364
2020-09-16 13:10:36 +08:00
Haojun Liao b002f0be51 [td-225] 2020-09-16 12:54:00 +08:00
Haojun Liao 5e6006f533 [td-225] fix compiler errors. 2020-09-16 11:28:17 +08:00