Commit Graph

1333 Commits

Author SHA1 Message Date
Haojun Liao 90b41841f6 [TD-2482]<fix>: fix bug in the skiplist iteration during query processing. 2020-12-19 14:25:02 +08:00
Haojun Liao abb4a9a1d8 [TD-2471]<fix>: fix the bug during the removal of elements in trashcan. 2020-12-19 10:37:12 +08:00
Minglei Jin c2801a46c8 [TD-2484]<fix>: use IPv4's AI_INET instead of AI_UNSPEC 2020-12-18 15:05:13 +08:00
Haojun Liao cabc32e74d [TD-225]fix clang-tidy warning. 2020-12-16 13:21:20 +08:00
Haojun Liao 59acafab7c Merge remote-tracking branch 'origin/feature/query' into feature/query 2020-12-15 18:18:08 +08:00
Haojun Liao 40b3b5a457 [TD-2425]<feature>: multi-table creation in one request. 2020-12-15 18:17:38 +08:00
Shengliang Guan a8efcbd70d TD-1843 2020-12-14 18:45:45 +08:00
haojun Liao 0a779c7467
Merge pull request #4478 from taosdata/bugfix/td-2373
[TD-2373]<fix>: data race in removeFromWheel
2020-12-11 18:39:09 +08:00
Shengliang Guan 6248b98621
Merge pull request #4514 from taosdata/feature/TD-2405
[TD-2405]<feature>: new option -C (--dump-config) for taos and -C for taosd to dump configuration
2020-12-10 23:52:39 +08:00
stephenkgu 31a43dc988 tconfig: new api taosDumpGlobalCfg 2020-12-10 14:57:38 +08:00
haojun Liao b4c618ea8a
Merge pull request #4491 from taosdata/feature/query
Feature/query
2020-12-10 11:07:56 +08:00
Haojun Liao 434aefb880 [TD-225] fix compiler error. 2020-12-10 10:44:04 +08:00
Haojun Liao 7e84d868d9 [TD-225] fix compiler error. 2020-12-09 23:10:02 +08:00
Shengliang Guan 937a2164b9 TD-2381 2020-12-09 19:17:16 +08:00
Shengliang Guan d9da9fc912 TD-2393 2020-12-09 14:12:50 +08:00
Shengliang Guan 9598664f41 Merge from develop 2020-12-09 10:50:18 +08:00
Shengliang Guan 1c1dac72c1 TD-2371 2020-12-08 22:17:02 +08:00
Shengliang Guan 6691dccb8f minor changes 2020-12-08 20:28:46 +08:00
Shengliang Guan 8383217187 Merge branch 'feature/wal' of https://github.com/taosdata/TDengine into feature/wal 2020-12-08 20:20:25 +08:00
Shengliang Guan 77e853e4c3 minor changes 2020-12-08 20:14:55 +08:00
Shengliang Guan 553e66bd36 compile error 2020-12-08 19:32:22 +08:00
Shengliang Guan a7d9dae774 Merge branch 'feature/wal' of https://github.com/taosdata/TDengine into feature/wal 2020-12-08 19:29:38 +08:00
Shengliang Guan 51aaef5430 nettest role 2020-12-08 19:27:06 +08:00
Shengliang Guan be5940fe7e TD-2367 2020-12-08 13:06:22 +08:00
Shengliang Guan b21f78d320 TD-2371 2020-12-08 11:10:04 +08:00
Shengliang Guan c3a7a9576d TD-2371 2020-12-08 10:56:50 +08:00
Bomin Zhang c90ea80143 [TD-2373]<fix>: data race in removeFromWheel 2020-12-08 02:55:20 +00:00
Shengliang Guan aa3df5f7fa TD-2371 2020-12-08 10:28:13 +08:00
Shengliang Guan aa1a5700fb TD-2371 2020-12-07 23:52:07 +08:00
Shengliang Guan 1fc3380019 TD-2370 2020-12-07 17:54:13 +08:00
Shengliang Guan 5aef8c57ac Re implement the TD-1925 code because it cannot merge 2020-12-07 12:57:35 +08:00
Shengliang Guan c17139097a Merge from develop 2020-12-06 11:57:05 +00:00
Shengliang Guan 8fb299ce4d TD-2324 2020-12-05 14:46:58 +08:00
haojun Liao 8fc2bb8dd5
Merge pull request #4428 from taosdata/feature/query
Feature/query
2020-12-04 11:01:52 +08:00
yihaoDeng 1be5c3f88e TD-2257 2020-12-03 21:17:50 +00:00
Haojun Liao 0fe731af0f [TD-2325]<feature>: enable configure if 50% cpu will be used in query processing. 2020-12-03 22:01:55 +08:00
Haojun Liao ea1ee014db Merge branch 'develop' into feature/query 2020-12-03 16:36:22 +08:00
Shengliang Guan 4cc2e9038d TD-1843 2020-12-02 18:26:09 +08:00
Shengliang Guan 8b4e85dd09 TD-1843 2020-12-02 17:50:44 +08:00
Haojun Liao b55548782b [TD-2293]<enhance>: improve projection query performance for super table. 2020-12-02 15:23:34 +08:00
Shengliang Guan d3c1202782 TD-1843 2020-12-02 10:10:40 +08:00
Shengliang Guan 2761853843 Merge branch 'feature/TD-1925' of https://github.com/taosdata/TDengine into feature/TD-1925 2020-12-01 19:16:39 +08:00
Hongze Cheng bcbb45067b fix compile error 2020-12-01 18:42:07 +08:00
Shengliang Guan 7ad83106e9 TD-2289 2020-12-01 17:25:16 +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 4a78a061d4 Merge branch 'develop' into feature/TD-1413 2020-12-01 03:27:48 +00:00
Bomin Zhang 892e2599ec
Revert "[TD-2268]: cancel all related timers in taosTmrCleanUp" 2020-12-01 11:20:14 +08:00
Hongze Cheng 53ea89b076 Merge branch 'develop' into feature/TD-1413 2020-11-30 10:38:07 +00:00
Shengliang Guan 1f8c70d405
Merge pull request #4383 from taosdata/feature/wal
TD-2276
2020-11-30 13:30:54 +08:00
Shengliang Guan dede7188b9 TD-2276 2020-11-30 05:10:22 +00:00
Hongze Cheng 480a71bed6 Merge branch 'develop' into feature/TD-1413 2020-11-30 09:49:22 +08:00
Bomin Zhang 1eba3f965e [TD-2268]: cancel all related timers in taosTmrCleanUp 2020-11-28 09:58:11 +00:00
Hongze Cheng 91bc2e9c9d Merge branch 'develop' into feature/TD-1413 2020-11-28 03:20:36 +00:00
Shengliang Guan a2331e5df6 compile in win64 2020-11-28 09:47:07 +08:00
Shengliang Guan 754ad5ff5b compile error in windows 2020-11-27 23:38:07 +08:00
Shengliang Guan dbe3b6f8f6 TD-1895 2020-11-27 23:27:13 +08:00
Shengliang Guan de7bbc0d96
Merge pull request #4368 from taosdata/patch/TD-1983
Patch/td 1983
2020-11-27 16:16:04 +08:00
Jeff Tao 15691bfb08 data type compatible with windows 2020-11-27 07:41:35 +00:00
Jeff Tao 4b09f05290 add a removed flag in pNode 2020-11-27 07:23:16 +00:00
haojun Liao f3aa7cff18
Merge pull request #4359 from taosdata/bugfix/td-2182
[TD-2182]<fix>: coverity issues
2020-11-27 11:47:46 +08:00
Shengliang Guan c7abe34dc4 Merge remote-tracking branch 'origin/develop' into patch/TD-1983 2020-11-27 11:31:03 +08:00
Hongze Cheng 19eccc86ad fix TD-2184 2020-11-26 08:44:20 +00:00
Bomin Zhang 55ce69e2f0 [TD-2182]<fix>: coverity issues 2020-11-26 08:00:58 +00:00
Hongze Cheng dae3e2ec19 refactor 2020-11-26 11:55:05 +08:00
Hongze Cheng f68b434356 Merge branch 'develop' into feature/TD-1413 2020-11-24 05:07:34 +00:00
Shengliang Guan 0a90950bdf TD-2157 2020-11-23 10:08:15 +00:00
Jeff Tao a8b87ce0cd change applications 2020-11-20 01:07:33 +00:00
Hongze Cheng de1a75f64d Merge branch 'develop' into feature/TD-1413 2020-11-18 10:17:18 +08:00
Shengliang Guan 04832fde1a
Merge pull request #4260 from taosdata/feature/wal
[TD-2051]<fix>: taosd will crash if there a hostame not exist  #4249
2020-11-17 14:17:34 +08:00
Hongze Cheng a0b44608a9 fix skiplist put batch bug 2020-11-17 05:47:38 +00:00
Shengliang Guan 33012d3d20 TD-2051 2020-11-17 03:36:52 +00:00
Hongze Cheng a803f24045 [TD-2066]<feature>: pass error code when commit failed 2020-11-16 16:00:57 +08:00
Hongze Cheng fb7fd4b822 Merge branch 'develop' into feature/TD-2088 2020-11-16 14:15:02 +08:00
Hongze Cheng ec149ac4d0 Merge branch 'develop' into feature/TD-2088 2020-11-16 09:57:15 +08:00
zjd1988 d06dc6ff6d current codes not work as expedted 2020-11-16 09:13:10 +08:00
Shengliang Guan d9963d3eaa
Merge pull request #4228 from taosdata/feature/wal
Feature/wal
2020-11-15 20:30:23 +08:00
Shengliang Guan 79cf4d6027 TD-1924 2020-11-15 11:37:17 +08:00
Hongze Cheng dfb0921c1f fix coredump 2020-11-14 21:40:55 +08:00
Shengliang Guan f94431100d log 2020-11-14 09:07:54 +00:00
Hongze Cheng 9e87f232d8 Merge branch 'develop' into feature/TD-2088 2020-11-14 08:52:35 +00:00
Hongze Cheng a3580fd06f implement TD-2088 2020-11-14 08:51:21 +00:00
Haojun Liao 922711df1f Merge branch 'develop' into feature/query 2020-11-14 10:58:37 +08:00
Jeff Tao 98e3431eaf taosAcquireRef return a pointer, not an integer 2020-11-13 14:07:59 +00:00
Haojun Liao b3d582bb45 [TD-225] 2020-11-13 15:04:16 +08:00
Haojun Liao e59ee37c85 [TD-1955]<fix>: fix bugs in refresh threads 2020-11-13 13:36:42 +08:00
Haojun Liao 067ee44bdb [TD-225] 2020-11-13 11:48:53 +08:00
Haojun Liao bf3ff27d5f [TD-225] merge develop 2020-11-13 11:23:19 +08:00
Shengliang Guan ab6387cae2 log error while client version not matched with server version 2020-11-11 23:34:21 +08:00
Haojun Liao cb5bc95969 [TD-225] 2020-11-11 19:02:23 +08:00
Hongze Cheng c7285a96f0 implement TD-2061 2020-11-11 06:29:33 +00:00
Jeff Tao cc74b689fc add some notes on tqueue.c 2020-11-10 13:00:31 +00:00
Shengliang Guan 95d3e55042 TD-1848 2020-11-10 06:44:12 +00:00
Haojun Liao 909ca7edeb [TD-225] 2020-11-09 20:00:28 +08:00
Haojun Liao 9487c1b9c6 [TD-1978] 2020-11-09 16:24:25 +08:00
Haojun Liao 7314a0dd08 [TD-1978] 2020-11-08 23:17:01 +08:00
Shengliang Guan 4735b224ef change read/write to taosRead/Write 2020-11-06 06:25:06 +00:00
Shengliang Guan 9d95c7f6e6 Merge remote-tracking branch 'origin/develop' into feature/file 2020-11-06 06:09:51 +00:00
Jeff Tao a191917452 change head file 2020-11-06 03:59:43 +00:00
Hongze Cheng d5db0347cf Merge branch 'develop' into feature/update 2020-11-06 09:48:54 +08:00
Jeff Tao 1e34d8ca9a minor changes, dont set terrno 2020-11-06 01:37:59 +00:00
Jeff Tao ecdd067900 size_t type conversion 2020-11-06 01:20:53 +00:00
Jeff Tao 5ffa312614 return -1 if error happens 2020-11-06 01:10:08 +00:00
Jeff Tao 54a50d66e5 type conversion 2020-11-06 00:54:51 +00:00
Jeff Tao 10e951eb2e fix bug in tfile 2020-11-06 00:39:39 +00:00
Jeff Tao 9bf73b64c3 minor changes on debug info 2020-11-05 15:18:34 +00:00
Jeff Tao 9605658fab Merge branch 'develop' into feature/file 2020-11-05 13:28:52 +00:00
Haojun Liao 16219bc630 [TD-225] 2020-11-05 19:15:20 +08:00
Jeff Tao 5b735ad091 second version 2020-11-05 07:28:20 +00:00
Hongze Cheng 053fd486b5 Merge branch 'develop' into feature/update 2020-11-05 10:06:02 +08:00
Jeff Tao 1eabb496dc Merge branch 'develop' into feature/file 2020-11-04 14:27:01 +00:00
Haojun Liao 41d5ee51fa Merge branch 'develop' into feature/query 2020-11-04 16:05:43 +08:00
Hongze Cheng d9d28841ef Merge branch 'develop' into feature/update 2020-11-04 07:52:47 +00:00
Shengliang Guan 30e147df95 TD-1912 2020-11-04 06:37:20 +00:00
Hongze Cheng d0bef0312c Merge branch 'develop' into feature/update 2020-11-04 05:39:00 +00:00
Shengliang Guan ff25a2c4a5 TD-1912 2020-11-03 22:55:14 +08:00
Jeff Tao 428524bd08 first version for taos file 2020-11-03 14:05:21 +00:00
Shengliang Guan 977589dee0 compile err in windows 2020-11-03 20:34:35 +08:00
Shengliang Guan a82ac7de39 TD-1912 2020-11-03 20:06:14 +08:00
Shengliang Guan 00813785ab Merge from origin/develop 2020-11-03 07:56:16 +00:00
Haojun Liao a9f0a30dc5 [TD-1870]<enhance>: optimize the memory consumption. 2020-11-02 23:44:15 +08:00
Haojun Liao 5bbd7dd9d6 [TD-1870] 2020-11-02 14:10:15 +08:00
Shengliang Guan 1f91ac7525 TD-1663 2020-11-01 00:09:39 +08:00
Shengliang Guan 98a1ff7c7a revert codes 2020-10-31 23:59:12 +08:00
Haojun Liao a8e86c9a67 [TD-1870] 2020-10-31 23:14:43 +08:00
Shengliang Guan 3909b3c617 Merge from origin/develop 2020-10-31 23:12:41 +08:00
Shengliang Guan 06b3e87ab7 TD-1663 2020-10-31 10:08:22 +00:00
Haojun Liao d371c840f0 [TD-225] add logs. 2020-10-31 13:18:45 +08:00
Shengliang Guan 249e599bd1 compile error in windows 2020-10-31 11:56:37 +08:00
Shengliang Guan 395bdd2c97 compile error in windows 2020-10-31 11:46:18 +08:00
Shengliang Guan d4fbd7bbab TD-1846 2020-10-30 18:08:48 +08:00
Hongze Cheng 915677cd6e Merge branch 'develop' into feature/update 2020-10-30 10:05:37 +08:00
Shengliang Guan 3679e3724b Merge remote-tracking branch 'origin/develop' into feature/wal 2020-10-29 22:30:55 +08:00
Shengliang Guan 3b65b25541
Merge pull request #4052 from taosdata/feature/race
Feature/race
2020-10-29 22:28:43 +08:00
Jeff Tao e8f509761f change the demo code 2020-10-29 14:24:44 +00:00
Jeff Tao adea18c026 add API taosIterateRef 2020-10-29 14:20:57 +00:00
Shengliang Guan d0e60fdec1 TD-1856 TD-1847 2020-10-29 12:17:56 +00:00
Hongze Cheng af08c4a5a1 Merge branch 'develop' into feature/update 2020-10-29 16:01:23 +08:00
Hongze Cheng 57e93db149 fix some bug 2020-10-29 15:55:59 +08:00
Haojun Liao 713d5d56fb [td-255] merge develop 2020-10-29 15:51:43 +08:00
Hui Li 7d7cf7ac75 [TD-1824] 2020-10-29 14:20:08 +08:00
Hongze Cheng dfc7c836fa Merge branch 'develop' into feature/update 2020-10-29 09:49:49 +08:00
Shengliang Guan e4e544d2b2
Merge pull request #4035 from taosdata/feature/race
link list bug
2020-10-29 08:31:55 +08:00
Jeff Tao c90ec0d712 link list bug 2020-10-28 15:04:21 +00:00
Hongze Cheng f879d6b0f6 merge develop 2020-10-28 18:19:19 +08:00
Hongze Cheng 951a0df6b9 Merge branch 'develop' into feature/update 2020-10-28 18:00:58 +08:00
Hui Li d3ef59d466 [NONE] 2020-10-28 13:57:50 +08:00
Haojun Liao 6ee9d124e6 [td-1830] 2020-10-27 23:32:16 +08:00
Jeff Tao 9307ddac33 Merge branch 'develop' into feature/race 2020-10-27 11:12:32 +00:00
Hongze Cheng ad9cc6c8a1 Merge branch 'develop' into feature/TD-1413 2020-10-27 10:58:47 +08:00
Haojun Liao b1c2ff74b7 [td-1569] 2020-10-26 14:44:56 +08:00
Haojun Liao 00cc76aed9 [td-1569] 2020-10-26 14:42:56 +08:00
Haojun Liao 6c0e357291 [td-225] update CMakeLists.txt 2020-10-26 11:25:04 +08:00
Shengliang Guan 382adfac68 TD-1413 2020-10-26 10:47:46 +08:00
Jeff Tao 0f9fd9a131 first version 2020-10-25 13:17:23 +00:00
Haojun Liao 5b23931687 [td-1739] 2020-10-24 23:07:12 +08:00
Shengliang Guan a5523872e7 TD-1767 2020-10-22 14:39:23 +00:00
Shengliang Guan 44963201ab TD-1767 2020-10-22 06:28:44 +00:00
Haojun Liao 4c22b72d06 [td-225] 2020-10-14 14:31:46 +08:00
Haojun Liao c6479a148a [td-225] merge develop 2020-10-13 11:35:40 +08:00
Shengliang Guan ccb8ab9328 TD-1670 2020-10-11 07:51:17 +00:00
Haojun Liao 6a88d306c8 [td-1641] 2020-10-10 22:38:56 +08:00
Haojun Liao 47a0bc2c71 [td-1641] 2020-10-10 16:33:41 +08:00
Hongze Cheng d8991f1913 fix TD-1640 2020-09-30 11:02:52 +08:00
Shengliang Guan fed24001bc TD1530 2020-09-28 18:36:10 +08:00
Shengliang Guan dec6288006 TD-1530 2020-09-28 07:59:35 +00:00
Shengliang Guan 2811c96b30 TD-1530 2020-09-28 10:29:49 +08:00
Hongze Cheng bbf3677729 TD-1548 2020-09-27 10:27:53 +08:00
Shengliang Guan 7b0ba6bd7d Merge remote-tracking branch 'origin/develop' into feature/ad 2020-09-25 02:20:46 +00:00
Haojun Liao 02d1583725 [td-1523] fix memory leaks and refactor some functions. 2020-09-24 11:09:16 +08:00
Shengliang Guan d627ab2a88 TD-1574 2020-09-23 15:01:18 +00:00
Haojun Liao 8ba206115a [td-1575] 2020-09-23 14:39:14 +08:00
Hongze Cheng 153288bdfb Merge branch 'develop' into feature/update 2020-09-22 15:37:10 +08:00
Haojun Liao eb0f6a1e45 [td-1544] 2020-09-22 14:22:45 +08:00
Haojun Liao 67efcff7ad [td-225] fix bugs in regression test. 2020-09-22 13:47:18 +08:00
Hongze Cheng 5ea611f2c8 TD-1194 2020-09-22 13:44:22 +08:00
Hongze Cheng 4a83966f5c TD-1194 2020-09-22 10:02:23 +08:00
Haojun Liao d8a9ead27a [td-225] fix bugs in regression test. 2020-09-21 16:06:55 +08:00
Haojun Liao fbc4ebb915 [td-225] fix bugs in regression test. 2020-09-21 12:53:11 +08:00
Hongze Cheng 29318b10f4 Merge branch 'develop' into feature/update 2020-09-17 14:09:48 +08:00
Hongze Cheng 3d2a77ea6d fix skiplist crash bug 2020-09-17 11:13:06 +08:00
Bomin Zhang 4456951e66 td-1245: update sql grammar to support offset 2020-09-17 09:43:26 +08:00
Shengliang Guan e1b8d3910e
Merge pull request #3538 from taosdata/feature/query
Feature/query
2020-09-16 17:01:08 +08:00
Haojun Liao d545eb9bb4 [td-225] fix compiler error in win platform 2020-09-16 15:01:10 +08:00
Hongze Cheng 09e91f9ad4 TD-1437 2020-09-16 11:22:49 +08:00
Shengliang Guan 0015100d2b TD-1364 2020-09-15 15:40:10 +00:00
Haojun Liao eaa6ca2701 [td-1391] upate the check of vgroup info. 2020-09-14 17:44:29 +08:00
Haojun Liao 4bed0a0f39 [td-1391] update the error msg output info. 2020-09-14 17:16:23 +08:00
Haojun Liao 2bf6b3de2d [td-225] update test 2020-09-14 13:54:52 +08:00
Haojun Liao a39fbb1fd6 [td-1319] 2020-09-14 13:23:12 +08:00
Haojun Liao 5e8ff5103c Merge branch 'develop' into feature/query 2020-09-12 16:05:39 +08:00
Haojun Liao 2b1519c167 [td-1319] 2020-09-12 15:50:04 +08:00
Shengliang Guan f65e360976 TD-1263 2020-09-08 06:27:11 +00:00
Shengliang Guan 37922f299f TD-1263 2020-09-08 04:27:55 +00:00
Shengliang Guan e69fbd54a2 [TD-1263] add config items, logKeepDays and logbakDir 2020-09-07 14:35:56 +00:00
Shengliang Guan 5e5750bde3
Merge pull request #3406 from taosdata/feature/mqtt
Feature/mqtt
2020-09-07 15:11:08 +08:00
Shengliang Guan fb26143c7c
Merge pull request #3407 from taosdata/master
Master
2020-09-07 14:37:38 +08:00
Shengliang Guan 9487d607ae compile not pass even in some vs2013 environments 2020-09-07 12:35:34 +08:00
root 07b38c1cac Merge remote-tracking branch 'origin/develop' into feature/mqtt 2020-09-07 11:24:24 +08:00
Shengliang Guan 95514381e8
Merge pull request #3394 from taosdata/feature/query
Feature/query
2020-09-06 12:13:27 +08:00