Commit Graph

10207 Commits

Author SHA1 Message Date
Hongze Cheng bcbb45067b fix compile error 2020-12-01 18:42:07 +08:00
Hongze Cheng b7112fc74b refact 2020-12-01 17:10:30 +08:00
Hongze Cheng 9e14eb778b refact 2020-12-01 16:19:07 +08:00
Hongze Cheng acda511468 refact 2020-12-01 14:43:37 +08:00
Hongze Cheng 4a78a061d4 Merge branch 'develop' into feature/TD-1413 2020-12-01 03:27:48 +00:00
Shengliang Guan 71afc90b36
Merge pull request #4393 from taosdata/revert-4377-patch/td-2268
Revert "[TD-2268]: cancel all related timers in taosTmrCleanUp"
2020-12-01 11:24:47 +08:00
Bomin Zhang 892e2599ec
Revert "[TD-2268]: cancel all related timers in taosTmrCleanUp" 2020-12-01 11:20:14 +08:00
huili 9e79aef978
Merge pull request #4386 from taosdata/test/testcase
Test/testcase
2020-12-01 11:06:00 +08:00
Shengliang Guan 5a0ee04b25
Merge pull request #4385 from taosdata/bugfix/TD-2265
fix TSDB_MAX_ALLOWED_SQL_LEN from 8MB to 1MB
2020-12-01 09:12:06 +08:00
Hongze Cheng c8abec2736 Merge branch 'feature/TD-1413' of https://github.com/taosdata/TDengine into feature/TD-1413 2020-11-30 10:38:29 +00:00
Hongze Cheng 53ea89b076 Merge branch 'develop' into feature/TD-1413 2020-11-30 10:38:07 +00:00
Shengliang Guan 71bed5816a
Merge pull request #4390 from taosdata/feature/wal
TD-2283
2020-11-30 18:37:00 +08:00
Shengliang Guan 2e69b78fcd TD-2283 2020-11-30 10:32:12 +00:00
haojun Liao 21a0c74106
Merge pull request #4384 from taosdata/bugfix/td-2140
Bugfix/td 2140
2020-11-30 17:08:21 +08:00
Hongze Cheng e0b1585eeb Merge branch 'develop' into feature/TD-1413 2020-11-30 16:52:11 +08:00
huili 9fca318eb3
Merge pull request #4388 from taosdata/hotfix/TD-2279
fix TD-2279
2020-11-30 16:47:44 +08:00
Bomin Zhang 2b11f6ab4e [TD-2140]: fix invalid write 2020-11-30 08:42:42 +00:00
Hongze Cheng eebed5c210 fix TD-2279 2020-11-30 08:16:58 +00:00
stephenkgu a432168ae5 [TD-2265]<fix>: fix TSDB_MAX_ALLOWED_SQL_LEN from 8MB to 1MB 2020-11-30 14:39:37 +08:00
liuyq-617 ab6d41f706 <test> fix test case error 2020-11-30 14:34:36 +08:00
liuyq-617 57bbd174a9 <test>fix test case error 2020-11-30 14:31:47 +08:00
liuyq-617 679d309371 <test> fix test case error 2020-11-30 14:30:29 +08:00
Bomin Zhang 4c234c707b Merge branch 'develop' into bugfix/td-2140 2020-11-30 05:33:28 +00:00
Shengliang Guan 1f8c70d405
Merge pull request #4383 from taosdata/feature/wal
TD-2276
2020-11-30 13:30:54 +08:00
haojun Liao 055888b76b
Merge pull request #4377 from taosdata/patch/td-2268
[TD-2268]: cancel all related timers in taosTmrCleanUp
2020-11-30 13:21:43 +08:00
haojun Liao c9a725dff4
Merge pull request #4370 from taosdata/bugfix/td-2198
[TD-2198]<fix>: cq can be created more than once
2020-11-30 13:21:01 +08:00
Shengliang Guan dede7188b9 TD-2276 2020-11-30 05:10:22 +00:00
Hongze Cheng f429ad5875 Merge branch 'develop' into feature/TD-1413 2020-11-30 03:38:22 +00:00
huili 1ccb87854d
Merge pull request #4382 from taosdata/hotfix/test
Hotfix/test
2020-11-30 10:30:06 +08:00
Hui Li d50b8e88e9 [TD-2260]<fix> set default value for some terminal 2020-11-30 10:08:50 +08:00
Hui Li 0b869643f2 [TD-2260]<fix> set default value for some terminal 2020-11-30 09:58:35 +08:00
Hongze Cheng 480a71bed6 Merge branch 'develop' into feature/TD-1413 2020-11-30 09:49:22 +08:00
Hui Li 88c11ce773 Merge branch 'develop' into hotfix/test 2020-11-30 09:40:21 +08:00
huili 4037f2febe
Merge pull request #4378 from taosdata/hotfix/test
[TD-2269]<fix> install taosdump to /usr/bin
2020-11-30 09:39:43 +08:00
huili d782a83b9d
Merge pull request #4379 from taosdata/xiaoping/add_test_case2
[TD-2109] <test> add test case
2020-11-30 09:38:58 +08:00
Shengliang Guan 98a86b3cb9
Merge pull request #4376 from taosdata/feature/wal
TD-2266
2020-11-29 11:23:08 +08:00
Shengliang Guan b897d803de TD-2264 2020-11-28 22:08:00 +08:00
Ping Xiao cb899a2c80 Add a insert demo 2020-11-28 18:37:38 +08:00
Hui Li 59cbb734c9 [TD-2269]<fix> install taosdump to /usr/bin 2020-11-28 18:26:36 +08:00
Ping Xiao 00ce6543a3 Merge branch 'develop' into xiaoping/add_test_case2 2020-11-28 18:23:19 +08:00
Ping Xiao 213cba6e81 [TD-2109] <test> add test case 2020-11-28 18:18:14 +08:00
Bomin Zhang 1eba3f965e [TD-2268]: cancel all related timers in taosTmrCleanUp 2020-11-28 09:58:11 +00:00
Shengliang Guan 521ae131a3 TD-2266 2020-11-28 15:27:57 +08:00
haojun Liao a9f53e2f95
Merge pull request #4374 from taosdata/feature/query
Feature/query
2020-11-28 12:33:19 +08:00
Haojun Liao ab1a8746e1 [TD-225]fix compiler error. 2020-11-28 11:28:23 +08:00
Haojun Liao 3a02c6b3ad [TD-225]fix compiler error. 2020-11-28 11:23:08 +08:00
Hongze Cheng 91bc2e9c9d Merge branch 'develop' into feature/TD-1413 2020-11-28 03:20:36 +00:00
Haojun Liao 0c426a2cc6 Merge branch 'develop' into feature/query 2020-11-28 11:20:20 +08:00
Haojun Liao 27a3cff1c5 [TD-2129] 2020-11-28 11:17:22 +08:00
Haojun Liao c23e4c44ad [TD-225]update test sim. 2020-11-28 11:16:07 +08:00