Commit Graph

8214 Commits

Author SHA1 Message Date
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
Shuduo Sang e7099d5518 add void cast to solve unused variables. 2020-09-16 11:02:36 +08:00
Hui Li ce458cf037 [TD-1468] 2020-09-16 11:00:48 +08:00
Shuduo Sang af08259379 Merge branch 'develop' into hotfix/sangshuduo/fix-compile-error-for-release 2020-09-16 11:00:22 +08:00
Shuduo Sang ab198e6fd7 disable warning for self assign. 2020-09-16 10:47:47 +08:00
Haojun Liao 805ee80611 [td-225] merge develop 2020-09-16 09:36:41 +08:00
Haojun Liao 1446d990d4 [td-1456] 2020-09-16 09:31:50 +08:00
zyyang 02427c1ef3
Update Connections with other Tools-ch.md
grafanapulgin dir is changed
2020-09-16 09:07:35 +08:00
Shengliang Guan 8381148d80 TD-1364 2020-09-16 00:55:38 +00:00
Shengliang Guan cdd653dbe0 Merge branch 'feature/http' of https://github.com/taosdata/TDengine into feature/http 2020-09-15 16:16:57 +00:00
Shengliang Guan 5b208fd479 TD-1291 2020-09-15 16:16:02 +00:00
Haojun Liao 5c055cbfcb [td-1456] update test 2020-09-16 00:04:38 +08:00
Haojun Liao 4454b077ff [td-1456] 2020-09-15 23:49:17 +08:00
Shengliang Guan c1cebd8715 Merge remote-tracking branch 'origin/develop' into feature/http 2020-09-15 23:47:54 +08:00
Shengliang Guan 61d082dc79
Merge pull request #3534 from taosdata/hotfix/test
[TD-1427]
2020-09-15 23:44:42 +08:00
Shengliang Guan 0015100d2b TD-1364 2020-09-15 15:40:10 +00:00
Shuduo Sang e544363106 [TD-1459] <fix>: fix compile error for release build type. 2020-09-15 18:56:32 +08:00