Commit Graph

15303 Commits

Author SHA1 Message Date
Liu Jicong e848dc716b fix test case 2022-09-16 23:49:07 +08:00
Liu Jicong 8e12a1a2d3 Merge branch '3.0' into feature/stream 2022-09-16 18:29:14 +08:00
Liu Jicong 82a3700821
Merge pull request #16863 from taosdata/feature/3_liaohj
fix(query): fix memory leak.
2022-09-16 17:06:03 +08:00
Liu Jicong 273adb9895 fix memory leak 2022-09-16 16:17:02 +08:00
Haojun Liao 15f656e683 refactor(query): add some logs. 2022-09-16 13:06:57 +08:00
Haojun Liao 0e308d29eb fix(query): check the duplicate before adding table into query list 2022-09-16 12:06:37 +08:00
Shengliang Guan 919dd4e949
Merge pull request #16872 from taosdata/3.0
enh(tsc): handle deadlock
2022-09-15 18:45:18 +08:00
Shengliang Guan ef5c9cfc10
Merge pull request #16848 from taosdata/fix/avoidTscDeadlock
enh(tsc): handle deadlock
2022-09-15 18:44:47 +08:00
Shengliang Guan 024b2ca1cd
Merge pull request #16870 from taosdata/3.0
fix: revert the code change
2022-09-15 18:41:33 +08:00
Shengliang Guan 793d632294
Merge pull request #16867 from taosdata/3.0
release: build 3.0.1.1
2022-09-15 18:41:09 +08:00
Cary Xu 3ee376c2c0 fix: revert the code change 2022-09-15 18:37:26 +08:00
Haojun Liao 188c3a9881 Merge remote-tracking branch 'origin/feature/3_liaohj' into feature/3_liaohj 2022-09-15 17:44:57 +08:00
Haojun Liao 0c71d95773 fix(query):set correct block load condition. 2022-09-15 17:44:28 +08:00
yihaoDeng fe29f00019 fix: fix deadlock 2022-09-15 17:23:48 +08:00
Shengliang Guan da45f122b4
Merge pull request #16865 from taosdata/fix/mnode
fix: make it impossible to create and update stable at the same time
2022-09-15 17:13:43 +08:00
Haojun Liao 22afbb5035
Merge branch '3.0' into feature/3_liaohj 2022-09-15 16:56:39 +08:00
Shengliang Guan ac3fc6c06a fix: make it impossible to create and update stable at the same time 2022-09-15 16:35:25 +08:00
Haojun Liao 8e62ebab64 other: remove a typo. 2022-09-15 16:18:44 +08:00
Haojun Liao 04cd42a835 Merge remote-tracking branch 'origin/feature/3_liaohj' into feature/3_liaohj 2022-09-15 16:18:20 +08:00
Haojun Liao 5ba41111b4 refactor: add some logs. 2022-09-15 16:17:39 +08:00
Haojun Liao 79b0d1fcbd fix(query): fix memory leak. 2022-09-15 15:02:23 +08:00
Shengliang Guan 6c65a6d0f7 Merge branch 'main' into 3.0 2022-09-15 13:28:26 +08:00
yihaoDeng 24d0d1d315 Merge branch 'ne' into dev 2022-09-15 12:37:32 +08:00
Haojun Liao dec379586b
Merge pull request #16851 from taosdata/feature/3_liaohj
refactor(query): do some internal refactor.
2022-09-15 11:43:24 +08:00
yihaoDeng 091c8ecfcd enh(tsc): handle deadlock 2022-09-15 11:30:27 +08:00
Liu Jicong deb731c1c4
Merge pull request #16840 from taosdata/enh/3.0_planner_optimize
enh: the delete physical plan increases the timestamp interval of the actual deleted data
2022-09-15 10:56:08 +08:00
yihaoDeng 1091302e8d fix: fix mem leak 2022-09-15 10:30:17 +08:00
Haojun Liao 18924f9a7d refactor(query): do some internal refactor. 2022-09-15 10:26:45 +08:00
Liu Jicong 367552b914 fix delete 2022-09-15 10:12:53 +08:00
afwerar f4be9a60c3 os: mac exit error 2022-09-15 10:04:30 +08:00
Hongze Cheng 26f740f26b fix more 2022-09-15 09:56:56 +08:00
yihaoDeng ef18966fa9 enh(tsc): handle deadlock 2022-09-15 09:53:32 +08:00
Hongze Cheng f2e26de8c5 Merge branch '3.0' of https://github.com/taosdata/TDengine into refact/new_data_format 2022-09-15 09:32:10 +08:00
Shengliang Guan d0df914d8d
Merge pull request #16842 from taosdata/feature/TD-18581-D
enh: tsdb retention and fs optimization
2022-09-15 09:09:37 +08:00
Shengliang Guan ee3445631a
Merge pull request #16845 from taosdata/fix/ZhiqiangWang/TD-13064-mac-exit-error
os: mac exit error
2022-09-15 09:09:08 +08:00
dapan1121 2e0fc608f9
Merge pull request #16846 from taosdata/fix/TD-19038
fix: fix stateduration result error
2022-09-15 08:43:34 +08:00
yihaoDeng ab3f6619b9 enh(tsc): handle deadlock 2022-09-14 23:29:38 +08:00
Hongze Cheng 9a42dca49e Merge branch '3.0' of https://github.com/taosdata/TDengine into refact/new_data_format 2022-09-14 22:47:57 +08:00
Hongze Cheng 3b947f17ad more code 2022-09-14 22:47:44 +08:00
Hongze Cheng dcbdc43ff5 fix some code 2022-09-14 22:38:29 +08:00
Hongze Cheng c163e7ebeb
Merge pull request #16834 from taosdata/fix/TD-19050
fix: deep copy ovfl cells to avoid double free
2022-09-14 21:44:49 +08:00
Hongze Cheng e34115a166 Merge branch '3.0' of https://github.com/taosdata/TDengine into refact/new_data_format 2022-09-14 21:42:13 +08:00
Minglei Jin 66bcf1fad6 fix: deep copy ovfl cells to avoid double free 2022-09-14 19:22:26 +08:00
Cary Xu e05fd1615b fix: remove the code change for commit 2022-09-14 19:19:25 +08:00
Cary Xu f7fe7a4afb fix: remove the code change for commit 2022-09-14 19:18:51 +08:00
dapan1121 cd015bae83 fix: fix stateduration result error 2022-09-14 19:02:26 +08:00
afwerar 760babe7db os: mac exit error 2022-09-14 18:44:58 +08:00
dapan1121 45dfa1c156 Merge remote-tracking branch 'origin/3.0' into fix/TD-19057 2022-09-14 18:17:19 +08:00
Cary Xu aa43876665 enh: tsdb retention and fs optimization 2022-09-14 18:10:51 +08:00
dapan1121 c7efe17177 fix: fix task retry and qnode fetch thread num issue 2022-09-14 18:08:29 +08:00