Commit graph

4730 commits

Author SHA1 Message Date
Shengliang Guan
84b7e9b312
Merge pull request #28791 from taosdata/fix/TS-4937-2
enh(tsdb/cache): update lru when committing
2024-12-16 15:46:48 +08:00
Shengliang Guan
6b49eededd
Merge pull request #29105 from taosdata/fix/3_liaohj
enh: update the mnode epset in stream hb rsp.
2024-12-16 09:23:38 +08:00
Minglei Jin
7e6ffb12a8 Merge branch '3.0' into fix/TS-4937-2 2024-12-16 08:43:37 +08:00
Minglei Jin
d18caf6606
Merge branch '3.0' into fix/TS-4937-2 2024-12-15 13:23:17 +08:00
Hongze Cheng
72abbd0e5b Merge branch '3.0' of https://github.com/taosdata/TDengine into enh/TD-32403-3.0 2024-12-15 11:25:48 +08:00
Hongze Cheng
1c54d67572 fix: merge problem 2024-12-15 00:41:53 +08:00
Hongze Cheng
37c1be4818 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/TS-4994-3.0 2024-12-14 23:51:25 +08:00
Hongze Cheng
5086bfae48 Merge branch '3.0' of https://github.com/taosdata/TDengine into enh/TD-32403-3.0 2024-12-14 20:06:14 +08:00
Hongze Cheng
ca4ae6739f alright, i give up 2024-12-14 15:29:40 +08:00
Hongze Cheng
5dca962814 more fix 2024-12-14 15:19:19 +08:00
Hongze Cheng
7905c80fd4 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/TS-4994-3.0 2024-12-13 18:12:53 +08:00
Hongze Cheng
921704e043 more code 2024-12-13 15:28:15 +08:00
xiao-77
a6e1af6b42 Merge branch '3.0' into enh/3.0/TS-5007 2024-12-13 15:04:36 +08:00
Hongze Cheng
cc4a6608df Merge branch '3.0' of https://github.com/taosdata/TDengine into enh/TD-32403-3.0 2024-12-13 15:03:09 +08:00
Hongze Cheng
dea8d6fd62 fix some code 2024-12-13 15:03:01 +08:00
xiao-77
c8bc3b391d Set tsDiskIDCheckEnabled default = false. 2024-12-13 14:05:44 +08:00
Hongze Cheng
8bf5f3f62b Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/TS-4994-3.0 2024-12-13 13:54:45 +08:00
dapan1121
9b76aae7a7 fix: code merge issues 2024-12-12 14:09:10 +08:00
dapan1121
ca15163215 Merge remote-tracking branch 'origin' into feat/TD-30268 2024-12-12 11:41:00 +08:00
xiao-77
a79fbfd318 Merge branch '3.0' into enh/3.0/TS-5007 2024-12-12 09:49:17 +08:00
Shengliang Guan
ebcf538c05 Merge branch 'main' into merge/mainto3.0 2024-12-11 20:12:50 +08:00
Haojun Liao
fa591f4667 other: merge 3.0 2024-12-11 19:07:30 +08:00
Haojun Liao
cfcb85ef94 refactor(stream): update mnode epset in hb. 2024-12-11 17:25:01 +08:00
xiao-77
94c91085d6 Add file version in json file. 2024-12-11 16:40:23 +08:00
Minglei Jin
fd29d6ad44 Merge branch '3.0' into fix/TS-4937-2 2024-12-11 11:20:28 +08:00
xiao-77
28ea9b9f60 Fix review errors. 2024-12-10 20:13:53 +08:00
xiao-77
b34dd6f347 Fix some review errors. 2024-12-10 18:56:59 +08:00
kailixu
eaf5978b2c Merge branch '3.0' into feat/TD-30268 2024-12-10 18:49:15 +08:00
xiao-77
ea767b28fe Fix merge errors. 2024-12-10 15:12:01 +08:00
xiao-77
1455bb2a41 Fix some review errors. 2024-12-10 14:43:58 +08:00
Zhixiao Bao
405d924a6f
Merge branch '3.0' into enh/3.0/TS-5007 2024-12-10 14:32:43 +08:00
xiao-77
2e1b94ff87 Fix review errors. 2024-12-10 11:33:03 +08:00
dapan1121
7fd0d024fc fix: windows compile issue 2024-12-10 09:15:15 +08:00
xiao-77
23415cc6d7 Fix some review errors. 2024-12-09 19:07:27 +08:00
xiao-77
e68cff0427 Add config param diskIDCheckEnabled. 2024-12-09 17:11:03 +08:00
wangmm0220
67a1df6269 feat:[TD-32642] fix problems reviewd 2024-12-09 16:15:48 +08:00
xiao-77
7cb2de940a Add docs. 2024-12-09 15:35:20 +08:00
dapan1121
8b70ebb2af fix: disable mempool 2024-12-09 14:08:01 +08:00
Minglei Jin
f61dbfc459 Merge branch '3.0' into fix/TS-4937-2 2024-12-09 11:32:37 +08:00
dapan1121
d77147d296 Merge remote-tracking branch 'origin/3.0' into feat/TD-30268 2024-12-06 17:43:19 +08:00
wangmm0220
5cfadb657f feat:[TD-32642] add timezone support in windows 2024-12-06 17:00:50 +08:00
xiao-77
ef16c33088 Add more cases. 2024-12-06 16:48:15 +08:00
xiao-77
36c7d0f146 Fix ci cases. 2024-12-06 14:17:43 +08:00
xiao-77
c653daf5dc Fix unit test. 2024-12-06 11:37:45 +08:00
kailixu
f8343dcaac chore: merge 3.0 and update test case of show_create_db.py 2024-12-06 11:09:22 +08:00
wangmm0220
0165684131 feat:[TD-32642] merge from 3.0 2024-12-05 23:47:46 +08:00
dapan1121
aa7b0e1a61 fix: async launch trim 2024-12-05 18:41:38 +08:00
dapan1121
011ff04234 fix: scheduler dead lock issue 2024-12-05 18:07:37 +08:00
xiao-77
3a32980577 Fix some ci case errors. 2024-12-05 17:00:57 +08:00
yihaoDeng
c5c56606c4 use safe sys func 2024-12-05 16:35:45 +08:00