Commit Graph

21215 Commits

Author SHA1 Message Date
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
Hongze Cheng cb96d68596 add 2.0 tsdb 2022-01-06 08:43:09 +00:00
Shengliang Guan f17bf4bbd0 Merge remote-tracking branch 'origin/3.0' into feature/dnode3 2022-01-06 00:41:18 -08:00
Hongze Cheng 87c2a31ab6 fix 2022-01-06 08:39:58 +00:00
Shengliang Guan 283b5341da add batch for create_table 2022-01-06 00:39:55 -08:00
Hongze Cheng 9869d98ac6 fix 2022-01-06 08:39:48 +00: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 d10df1e3a8 minor changes 2022-01-06 00:17:41 -08:00
Shengliang Guan 77088a5ee7
Merge pull request #9642 from taosdata/feature/index_complete
refactor code
2022-01-06 16:15:26 +08:00
Shengliang Guan 5d1058be79
Merge pull request #9640 from taosdata/feature/dnode3
minor changes
2022-01-06 16:15:13 +08:00
Hongze Cheng 9e3e40ad6e integrate TFS 2022-01-06 08:15:09 +00:00
Minghao Li b76938130e TD-12666 add vnode into vgroup one by one 2022-01-06 16:13:59 +08: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
Hongze Cheng 961b4d82fa Merge branch '3.0' into feature/vnode 2022-01-06 07:52:09 +00: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
Shengliang Guan 11a07e7dc3 Merge remote-tracking branch 'origin/3.0' into feature/dnode3 2022-01-05 23:14:39 -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
Hongze Cheng 96f2aea215 Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/vnode 2022-01-06 14:49:21 +08:00
Hongze Cheng 5c66e5f2c2 more work 2022-01-06 06:34:20 +00: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
Shengliang Guan 41d8c7a612 minor changes 2022-01-05 21:20:20 -08:00
yihaoDeng 1facebba16 refactor code 2022-01-06 13:15:39 +08:00
Shengliang Guan 8ab7ff1af6
Merge pull request #9629 from taosdata/feature/dnode3
pullup trans when mnode restart
2022-01-06 13:09:37 +08:00
Shengliang Guan d2238d38d4 Merge remote-tracking branch 'origin/3.0' into feature/dnode3 2022-01-05 20:22:36 -08:00
Shengliang Guan db2dbe5f51 pullup trans when mnode restart 2022-01-05 20:22:33 -08:00
Haojun Liao 20c264ba02 [td-11818] fix invalid write. 2022-01-06 11:37:45 +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
Liu Jicong f7a4eb00a8 Merge branch '3.0' into feature/tq 2022-01-06 10:57:06 +08:00
Liu Jicong b0d935ba7d merge from 3.0 2022-01-06 10:56:25 +08:00
Haojun Liao b00bc84157 [td-11818] free still reachable buffer. 2022-01-06 10:55:20 +08:00
Shengliang Guan 33d8177e13
Merge pull request #9626 from taosdata/CI/3.0
[TD-12758]<CI>add unit test in 3.0 CI
2022-01-06 10:52:50 +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
liuyq-617 0d4169102c udpate 2022-01-06 10:27:00 +08:00
liuyq-617 d7fc6e17f9 revert 2022-01-06 10:26:22 +08:00