Commit Graph

794 Commits

Author SHA1 Message Date
dapan 85a1613761 Merge remote-tracking branch 'origin/1.0' into feature/qnode 2022-01-08 10:39:15 +08:00
dapan1121 30556c676f feature/qnode 2022-01-08 10:35:29 +08:00
Xiaoyu Wang fda3f09084 Merge remote-tracking branch 'origin/3.0' into feature/3.0_wxy 2022-01-07 16:21:46 -05:00
Shengliang Guan f7a446f239
Merge pull request #9681 from taosdata/feature/index_complete
index integrated into vnode meta
2022-01-08 10:47:58 +08:00
Xiaoyu Wang 6f02179de0 TD-12760 simple memory management code. 2022-01-07 15:02:33 -05:00
Haojun Liao 2942658d81
Merge pull request #9685 from taosdata/feature/3.0_liaohj
[td-11818] support select *
2022-01-07 23:22:07 +08:00
Haojun Liao f2d61c567c [td-11818] fix error. 2022-01-07 23:14:12 +08:00
Haojun Liao 3c88993c96 [td-11818] support select * 2022-01-07 22:54:44 +08:00
yihaoDeng f4389433f6 index integrated into vnode meta 2022-01-07 20:39:23 +08:00
Liu Jicong 4d635478fe fix 2022-01-07 18:59:17 +08:00
Hongze Cheng 0439c52575 more 2022-01-07 10:54:54 +00:00
Shengliang Guan e5732c6d3c
Merge pull request #9677 from taosdata/feature/3.0_wxy
TD-12760 datasink interface code
2022-01-07 18:53:50 +08:00
Hongze Cheng f70c550359 more 2022-01-07 10:45:33 +00:00
dapan1121 896df2bdc6 feature/qnode 2022-01-07 18:38:51 +08:00
Shengliang Guan 0ad1911836
Merge pull request #9676 from taosdata/feature/3.0_liaohj
Feature/3.0 liaohj
2022-01-07 17:54:52 +08:00
Liu Jicong 29cb7c6792 implement client heartbeat 2022-01-07 17:36:34 +08:00
Hongze Cheng 9696e74eaa
Merge pull request #9675 from taosdata/feature/vnode
Feature/vnode
2022-01-07 17:25:24 +08:00
Haojun Liao 1f6ff95bee [td-11818] add test. 2022-01-07 17:17:47 +08:00
dapan1121 3edb51d1bc feature/qnode 2022-01-07 16:50:48 +08:00
Haojun Liao 05c6909843 Merge remote-tracking branch 'origin/3.0' into feature/3.0_liaohj 2022-01-07 16:45:33 +08:00
Haojun Liao dc3ecc0a21 [td-11818] refactor. 2022-01-07 16:38:32 +08:00
dapan1121 374c8b54ec Merge branch 'feature/qnode' of github.com:taosdata/TDengine into feature/qnode 2022-01-07 16:12:48 +08:00
dapan1121 99d602b809 schduler add debug info 2022-01-07 16:12:15 +08:00
Liu Jicong 57d341706b implement client heartbeat 2022-01-07 14:57:45 +08:00
dapan1121 8c4687c2f4
Merge branch '3.0' into feature/qnode 2022-01-07 14:41:47 +08:00
dapan1121 b3c24f6e8f feature/qnode 2022-01-07 14:38:05 +08:00
Haojun Liao bd386044a1 [td-11818] fix invalid free. 2022-01-07 13:50:06 +08:00
Hongze Cheng c9e1dd4e8b Merge branch '3.0' into feature/vnode 2022-01-07 05:43:37 +00:00
Haojun Liao a2a7ac1c93
Merge pull request #9664 from taosdata/feature/3.0_liaohj
Feature/3.0 liaohj
2022-01-07 11:15:00 +08:00
Haojun Liao 57693bf436 Merge remote-tracking branch 'origin/3.0' into feature/3.0_liaohj 2022-01-07 10:55:43 +08:00
Haojun Liao 8a1dafa482 [td-11818] add check for hash iterator, add log config. refactor test script. 2022-01-07 10:40:54 +08:00
Hongze Cheng dc081e5228 Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/vnode 2022-01-07 02:35:03 +00:00
dapan1121 41b8ea6e46 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-01-07 09:58:36 +08:00
dapan1121 c584a88432 feature/qnode 2022-01-07 09:56:11 +08:00
Hongze Cheng 9241af2298 tsdb integration 2022-01-07 01:54:05 +00:00
Xiaoyu Wang 0654fbfef9 TD-12760 datasink interface code 2022-01-06 18:34:51 -05:00
Shengliang Guan 61136183a4
Merge pull request #9656 from taosdata/feature/dnode3
add batch for create_table
2022-01-06 20:04:20 +08:00
Haojun Liao ddacf755de
Merge pull request #9653 from taosdata/feature/3.0_liaohj
[td-11818] fix the usage of hash bug.
2022-01-06 19:47:45 +08:00
Haojun Liao a8f3ccd565 [td-11818] fix the usage of hash bug. 2022-01-06 19:39:55 +08:00
Hongze Cheng 0cffefc835 Merge branch '3.0' into feature/vnode 2022-01-06 09:40:04 +00:00
Haojun Liao 6d82dd6a39
Merge pull request #9648 from taosdata/feature/3.0_liaohj
Feature/3.0 liaohj
2022-01-06 17:34:04 +08:00
Haojun Liao b043c544d4 [td-11818] add log. 2022-01-06 17:33:20 +08:00
Haojun Liao 0f2a175e1b [td-11818] fix a race condition. 2022-01-06 17:30:27 +08:00
dapan1121 d3c67de054 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-01-06 17:05:33 +08:00
Shengliang Guan 93153bd276 minor changes 2022-01-06 01:04:48 -08:00
dapan1121 675cb71e10 feature/qnode 2022-01-06 16:52:52 +08:00
Haojun Liao 651210b596
Merge pull request #9645 from taosdata/feature/3.0_liaohj
[td-11818] add more check.
2022-01-06 16:45:30 +08:00
Haojun Liao 284e794315 [td-11818] add more check. 2022-01-06 16:34:58 +08:00
Haojun Liao 84a1e6e73c
Merge pull request #9644 from taosdata/feature/3.0_liaohj
Feature/3.0 liaohj
2022-01-06 16:26:07 +08:00
Haojun Liao 01cde7cfb1 [td-11818] update log. 2022-01-06 16:19:18 +08:00
Haojun Liao 35adca61fa [td-11818]add error check for hash. 2022-01-06 16:18:21 +08:00
Shengliang Guan 77088a5ee7
Merge pull request #9642 from taosdata/feature/index_complete
refactor code
2022-01-06 16:15:26 +08:00
Hongze Cheng 9e3e40ad6e integrate TFS 2022-01-06 08:15:09 +00:00
dapan1121 32b1e1bf3a Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-01-06 16:12:42 +08:00
dapan1121 e38aeda53e feature/qnode 2022-01-06 16:07:16 +08:00
yihaoDeng 72c4f4ef16 refactor code 2022-01-06 16:00:35 +08:00
dapan1121 9aa87cbf7e feature/qnode 2022-01-06 15:45:31 +08:00
Shengliang Guan c5cd0766ed
Merge pull request #9639 from taosdata/revert-9609-feature/qnode
Revert "Feature/qnode"
2022-01-06 15:45:02 +08:00
Shengliang Guan 70bd0cdcbc
Merge pull request #9630 from taosdata/feature/index_complete
refactor code
2022-01-06 15:44:17 +08:00
dapan1121 ab916a479a
Revert "Feature/qnode" 2022-01-06 15:39:43 +08:00
dapan1121 c85047f34b Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-01-06 15:31:02 +08:00
dapan1121 0adbbe080c feature/qnode 2022-01-06 15:30:32 +08:00
Haojun Liao c8de167e24
Merge pull request #9638 from taosdata/feature/3.0_liaohj
[td-11818] fix memory leak.
2022-01-06 15:13:51 +08:00
Haojun Liao 29fe08d108 [td-11818] fix memory leak. 2022-01-06 15:04:56 +08:00
Haojun Liao 08d5daf98b
Merge pull request #9631 from taosdata/feature/3.0_liaohj
Feature/3.0 liaohj
2022-01-06 14:15:40 +08:00
Haojun Liao ca7ab427f5 [td-11818]fix invalid read. 2022-01-06 14:08:09 +08:00
yihaoDeng 1facebba16 refactor code 2022-01-06 13:15:39 +08:00
Shengliang Guan cf0ecbae0e
Merge pull request #9627 from taosdata/feature/3.0_liaohj
[td-11818] free still reachable buffer.
2022-01-06 11:21:44 +08:00
Shengliang Guan 45f9eaa01c
Merge pull request #9628 from taosdata/feature/tq
Feature/tq
2022-01-06 11:21:21 +08:00
Shengliang Guan c71c111da0
Merge pull request #9621 from taosdata/feature/index_complete
Feature/index complete
2022-01-06 11:21:03 +08:00
Haojun Liao 4725b4e020 [td-11818] fix crash in create database. 2022-01-06 11:16:26 +08:00
Haojun Liao b00bc84157 [td-11818] free still reachable buffer. 2022-01-06 10:55:20 +08:00
Liu Jicong df554c03fc handle merge conflict 2022-01-06 10:44:34 +08:00
Liu Jicong 0ba5427a9b handle subscribe 2022-01-06 10:28:34 +08:00
yihaoDeng ccbbac4eef refactor code 2022-01-05 23:54:05 +08:00
yihaoDeng 2e0dc58890 refactor code 2022-01-05 22:56:08 +08:00
Shengliang Guan ad1e992951
Merge pull request #9619 from taosdata/feature/dnode3
rename some variables
2022-01-05 20:29:30 +08:00
Shengliang Guan ad94dff047 mionr changes 2022-01-05 04:18:56 -08:00
Shengliang Guan d10a47330b
Merge pull request #9615 from taosdata/feature/index_complete
refactor code
2022-01-05 19:36:16 +08:00
yihaoDeng 7d29af7316 refactor code 2022-01-05 19:22:06 +08:00
yihaoDeng 11eb2719f8 refactor code 2022-01-05 19:17:14 +08:00
Haojun Liao f65da854a5
Merge pull request #9613 from taosdata/feature/3.0_liaohj
Feature/3.0 liaohj
2022-01-05 18:06:03 +08:00
Haojun Liao 7916c1e622 [td-11818] fix memory leak and refactor. 2022-01-05 17:49:15 +08:00
Shengliang Guan d32d44f14e
Merge pull request #9609 from taosdata/feature/qnode
Feature/qnode
2022-01-05 17:41:20 +08:00
dapan1121 4728b159c7 feature/qnode 2022-01-05 16:00:06 +08:00
Haojun Liao 27224db24b [td-11818] fix memory leak and refactor code. 2022-01-05 14:09:02 +08:00
Shengliang Guan e4c3d8fb24
Merge pull request #9598 from taosdata/feature/index_complete
Feature/index complete
2022-01-05 11:50:56 +08:00
Xiaoyu Wang 17b9917bfa TD-12696 bug fix for insert 2022-01-04 22:43:29 -05:00
Xiaoyu Wang 0d4490bce8 TD-12696 bug fix for insert 2022-01-04 22:32:38 -05:00
yihaoDeng 5567613976 merge develop 2022-01-05 10:54:08 +08:00
Haojun Liao 4d33cb8f64 Merge remote-tracking branch 'origin/3.0' into feature/3.0_liaohj 2022-01-05 10:34:17 +08:00
Shengliang Guan b697bf9aaf
Merge pull request #9595 from taosdata/feature/dnode3
fix crash while process transmsg
2022-01-05 10:30:33 +08:00
Shengliang Guan 6ae9a421e0 fix crash while process transmsg 2022-01-04 18:27:11 -08:00
Haojun Liao 27d5c71c6c Merge remote-tracking branch 'origin/3.0' into feature/3.0_liaohj 2022-01-05 10:17:54 +08:00
dapan1121 0baa818efc Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-01-05 10:12:55 +08:00
dapan1121 feee87ddfa feature/qnode 2022-01-05 10:11:26 +08:00
Shengliang Guan 507c0c0288
Merge pull request #9590 from taosdata/feature/dnode3
Feature/dnode3
2022-01-05 09:09:46 +08:00
yihaoDeng a75899024c add test case 2022-01-04 23:09:30 +08:00
yihaoDeng 49ef94fb69 refactor code 2022-01-04 22:58:52 +08:00
yihaoDeng 99379fd5a6 add test case 2022-01-04 20:56:55 +08:00