Elgato_dark/TDengine
1
0
Fork 0
mirror of https://github.com/taosdata/TDengine synced 2026-05-24 10:09:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
57991 commits 554 branches 514 tags 1.7 GiB
Commit graph

7662 commits

Author SHA1 Message Date
Haojun Liao
779c0c5f19
Merge pull request #22970 from taosdata/fix/liaohj 
fix(stream): keep the status entry in hash table, instead entry index.
 2023-09-20 10:33:05 +08:00
wangmm0220
2881a2504c fix:conflicts from 3.0 2023-09-19 18:39:40 +08:00
dmchen
1a7bffb079 ci break 2023-09-19 18:01:38 +08:00
Haojun Liao
b99232fd7a fix(stream): limit the max scan times. 2023-09-19 17:45:28 +08:00
Haojun Liao
271e492188 refactor: update the log level. 2023-09-19 17:40:26 +08:00
wangmm0220
766652a88a fix:vnode tranform support in tmq 2023-09-19 17:27:19 +08:00
dm chen
ee913cbfbc
Merge branch 'main' into feat/TD-26127-audit-sql 2023-09-19 14:39:20 +08:00
dmchen
e36ff1282c revert dependency 2023-09-19 13:42:02 +08:00
wangmm0220
ad70dc178f fix:conflicts from 3.0 2023-09-19 11:56:52 +08:00
wangmm0220
edb42aa2aa fix:move from main to 3.0 2023-09-19 11:51:52 +08:00
Haojun Liao
e76bab7122 fix(stream): not handle the check msg for follower tasks. 2023-09-19 09:43:14 +08:00
slzhou
900aacd428 fix: fix sanitizer error 2023-09-19 09:40:00 +08:00
kailixu
6698861c8b chore: timeseries distribute 2023-09-19 08:29:51 +08:00
Hongze Cheng
b1797834c1 fix: set snapshot writer compression 2023-09-18 20:58:20 +08:00
wangmm0220
1e859084b7 fix:conflicts from 3.0 2023-09-18 19:57:33 +08:00
wangmm0220
4b74135350 fix:vnode tranform support in tmq 2023-09-18 19:47:28 +08:00
Haojun Liao
101161c52e
Merge pull request #22954 from taosdata/fix/TD-26323 
fix:core in race condition for pTq->pExecStore & return if poll too l…
 2023-09-18 17:41:01 +08:00
Haojun Liao
c33ef4ce88 fix(stream): add null check 2023-09-18 15:14:51 +08:00
wangmm0220
c3498fbfe8 fix:core in race condition for pTq->pExecStore & return if poll too long & fix test cases if submit empty 2023-09-18 14:35:07 +08:00
wangmm0220
7869b693f2 add test case for tmq in vnode transform & fix core in race condition for pTq->pExecStore 2023-09-18 14:09:28 +08:00
dmchen
b473122dac break dependency 2023-09-18 12:29:08 +08:00
dm chen
fda32dcc51
Merge branch 'main' into feat/TD-26127-audit-sql 2023-09-18 09:41:47 +08:00
dmchen
c674e025e2 skip auto create tb 2023-09-18 09:29:51 +08:00
kailixu
8111c18cc4 chore: merge 3.0 2023-09-18 09:20:43 +08:00
Haojun Liao
8aa9960760
Merge pull request #22944 from taosdata/fix/liaohj 
refactor: do some internal refactor, and fix some bugs.
 2023-09-17 21:25:33 +08:00
Haojun Liao
01144c58a7 fix(stream): fix stream task id error. 2023-09-17 01:19:59 +08:00
Haojun Liao
4846194bbb refactor: do some internal refactor, remove the related fill-history task by sending mesg to replay it in follower node. 2023-09-16 21:37:30 +08:00
Haojun Liao
caa7542cea
Merge pull request #22913 from taosdata/fix/liaohj 
fix(stream): fix error in drop task.
 2023-09-16 21:36:38 +08:00
Haojun Liao
91e3d70796 fix(stream): remove fill-history sink task. 2023-09-15 17:46:17 +08:00
Minglei Jin
0181bb24d3 tsdb/readerwriter: use PRId64 instead of lld 2023-09-15 16:40:04 +08:00
Alex Duan
47f2c38a56
Merge pull request #22910 from taosdata/fix/TS-3987 
fix: delete data error
 2023-09-15 16:19:29 +08:00
Minglei Jin
318281356b s3/block_cache: new tsdb block cache 2023-09-15 16:19:21 +08:00
kailixu
03aea454d7 chore: more code 2023-09-15 14:33:35 +08:00
wade zhang
b123dd7df3
Merge pull request #22904 from taosdata/FIX/TD-26292-main 
enh: ignore compact req during restoring
 2023-09-15 11:05:18 +08:00
Haojun Liao
2bfd6e3355 refactor: do some internal refactor. 2023-09-15 09:25:22 +08:00
Haojun Liao
117de7ab7d fix(stream): fix error in drop task. 2023-09-15 00:51:13 +08:00
Haojun Liao
500fcad36c
Merge pull request #22892 from taosdata/fix/liaohj 
refactor: do some internal refactor.
 2023-09-15 00:46:46 +08:00
Haojun Liao
73c2782d78 fix(stream): update some logs. 2023-09-14 23:17:23 +08:00
Haojun Liao
5f55f489d8 fix(stream): fix memory leak. 2023-09-14 22:59:11 +08:00
Haojun Liao
303e8caf0c fix(stream): set the correct guard flag. 2023-09-14 22:44:16 +08:00
kailixu
449092c5dc enh: timeseries update optimize 2023-09-14 20:16:02 +08:00
Haojun Liao
27f626769e fix(stream): fix memory leak. 2023-09-14 19:33:05 +08:00
Haojun Liao
f2c3e0a6e8 fix(stream): disable follower send hb to mnode. and do some internal refactor. 2023-09-14 17:22:31 +08:00
Hongze Cheng
925cc8f55f fix: delete data error 2023-09-14 17:20:10 +08:00
Benguang Zhao
bbcbe460d4 enh: ignore compact req during restoring 2023-09-14 16:17:17 +08:00
Benguang Zhao
2886913fd8 enh: ignore compact req during restoring 2023-09-14 16:09:00 +08:00
Haojun Liao
fce5be0eb4 fix(stream): fix dead lock. 2023-09-14 14:09:05 +08:00
Haojun Liao
fd6344b319 fix(tsdb): check return code. 2023-09-14 09:25:35 +08:00
Haojun Liao
9b70c0c457 fix:fix coverity issue and remove unnecessary files. 2023-09-14 09:06:10 +08:00
wangmm0220
39fb5f4334 fix:add vnode snaphot for tmq 2023-09-13 18:09:47 +08:00
Haojun Liao
7305c8dbe1 refactor: do some internal refactor about the sched status set 2023-09-13 14:00:34 +08:00
wangmm0220
1dbd322fa0 fix:remove useless code 2023-09-13 11:42:09 +08:00
Haojun Liao
99477babca
Merge pull request #22872 from taosdata/fix/coverityScanDyh 
fix coverity scan problem
 2023-09-13 09:18:27 +08:00
Haojun Liao
09a15bf340 refactor: do some internal refactor. 2023-09-12 22:07:52 +08:00
Haojun Liao
60f5056ab7 other: merge 3.0 2023-09-12 22:00:40 +08:00
Haojun Liao
f6a097d96f refactor: do some internal refactor. 2023-09-12 21:58:22 +08:00
Haojun Liao
4325a0a433
Merge pull request #22866 from taosdata/fix/3_liaohj 
refactor: do  some internal refactor.
 2023-09-12 21:56:44 +08:00
yihaoDeng
8fc33dd74d fix coverity scan problem 2023-09-12 18:52:16 +08:00
Haojun Liao
e457d94ac6 refactor: do some internal refactor. 2023-09-12 18:09:02 +08:00
yihaoDeng
8e064cdd03 fix merge error 2023-09-12 16:41:14 +08:00
Haojun Liao
4d33387e80
Merge pull request #22814 from taosdata/fix/fixTransferCrash2 
fix merge error
 2023-09-12 16:10:07 +08:00
Haojun Liao
52931b530d
Merge pull request #22855 from taosdata/fix/3_liaohj 
fix(stream):check error when vnode is closing.
 2023-09-12 15:58:02 +08:00
dapan1121
ef7eb478e4
Merge pull request #22834 from taosdata/fix/TS-3945 
fix: remove incorrect assert
 2023-09-12 15:55:51 +08:00
yihaoDeng
63c53b6a3a fix transfer crash 2023-09-12 15:03:13 +08:00
yihaoDeng
ccb75a9c11 fix transfer crash 2023-09-12 14:46:56 +08:00
yihaoDeng
3e48f3639c fix transfer crash 2023-09-12 14:46:32 +08:00
wade zhang
f4e785788a
Merge pull request #22833 from taosdata/fix/TS-3943-3.m 
fix: neighbor block overlap judgement
 2023-09-12 11:51:03 +08:00
Haojun Liao
93159729f6 fix(stream):check error when vnode is closing. 2023-09-12 11:45:51 +08:00
Haojun Liao
025a2a3b50
Merge pull request #22846 from taosdata/fix/3_liaohj 
fix(tsdb): check the schema before merge rows in buffer
 2023-09-12 11:43:27 +08:00
yihaoDeng
6ce85f5cae fix transfer crash 2023-09-12 10:44:56 +08:00
Haojun Liao
f602aa965f fix(stream): fix coverity scan issues. 2023-09-12 09:16:18 +08:00
Haojun Liao
a5b93aaf97 fix(tsdb): fix invalid read. 2023-09-11 23:55:34 +08:00
Haojun Liao
e8f7146a2c fix(tsdb): check the schema before merge rows in buffer, and do some refactor. 2023-09-11 22:19:10 +08:00
Haojun Liao
cd1f0ea414
Merge pull request #22826 from taosdata/fix/3_liaohj 
fix(stream): set the correct start version for the step 2 stage in fill history.
 2023-09-11 21:43:58 +08:00
Haojun Liao
5ab739ae46 fix(stream): fix memory leak. 2023-09-11 15:29:12 +08:00
dapan1121
5c21f1ca22 fix: remove incorrect assert 2023-09-11 15:16:22 +08:00
kailixu
78d136dffd fix: neighbor block overlap judgement 2023-09-11 15:10:39 +08:00
Haojun Liao
c729fc989f fix(stream): set the init start timestamp. 2023-09-11 13:49:43 +08:00
Haojun Liao
0980e021e5 fix(stream): set the correct start version for the step 2 stage in fill history. 2023-09-11 13:37:19 +08:00
Haojun Liao
50ef500f51 refactor(stream): do sink module refactor. 2023-09-11 10:09:31 +08:00
Minglei Jin
443756c6ff fix(meta): null txn after abort 2023-09-11 08:55:30 +08:00
Haojun Liao
372747cc23
Merge pull request #22818 from taosdata/fix/3_liaohj 
fix(stream): fix error in fill history and check quit status of vnode.
 2023-09-10 20:47:06 +08:00
Haojun Liao
85a5c45098 fix(stream): limit the already processed data. 2023-09-10 00:01:25 +08:00
Haojun Liao
9a30573b8b fix(stream): disable scan wal when halt is set. 2023-09-09 16:12:08 +08:00
Haojun Liao
aa8909b267 other: add some logs. 2023-09-09 15:18:54 +08:00
Haojun Liao
6f5c855a4b fix(stream): fix msg lost bug. 2023-09-09 15:08:36 +08:00
Haojun Liao
47fd144447 other: add some logs. 2023-09-09 11:19:51 +08:00
yihaoDeng
af08289a06 Merge branch 'fix/mainNew' into fix/fixTransferCrash2 2023-09-08 19:58:21 +08:00
yihaoDeng
a0494695de fix merge error 2023-09-08 19:48:06 +08:00
Haojun Liao
b317c8ebff fix(stream): disable merge submit blocks. 2023-09-08 12:46:15 +08:00
Benguang Zhao
55a9668908 fix: next merger iter of tombs in loop of tsdbSnapWriteTombRecord 2023-09-07 17:26:30 +08:00
Benguang Zhao
2d5b18039d fix: next merger iter of tombs in loop of tsdbSnapWriteTombRecord 2023-09-07 17:14:50 +08:00
wade zhang
d3f0c5ac3e
Merge pull request #22770 from taosdata/fix/TD-25445-main 
fix/TD-25445: search memory in ttlMgrFindExpired
 2023-09-07 16:13:32 +08:00
Haojun Liao
55ac835294 Merge branch 'main' into fix/3_liaohj 2023-09-07 11:47:25 +08:00
Haojun Liao
b240e91c91 enh(stream): add token bucket to limit the rate of sink operation. 2023-09-07 09:58:48 +08:00
Shungang Li
a6ba7e678f fix: search memory in ttlMgrFindExpired 2023-09-07 09:33:26 +08:00
Haojun Liao
0f909285c4
Merge pull request #22684 from taosdata/mark/tmq-3.0 
fix:use vgstatus before if rebalance
 2023-09-07 09:20:27 +08:00
Haojun Liao
2b84e0b02e refactor: check if the put data into queue is success or failed. 2023-09-06 19:39:00 +08:00
Haojun Liao
8edf86b3bb fix(stream): add some logs. 2023-09-06 19:08:09 +08:00
Haojun Liao
5ba6a68e7a fix(stream): fix syntax error. 2023-09-06 19:00:39 +08:00
Haojun Liao
a82027f492 enh(stream): pack multi-datablock into one submit message. 2023-09-06 18:58:47 +08:00
wade zhang
e493f983ed
Merge pull request #22735 from taosdata/fix/TD-26133 
fix: coverity scan
 2023-09-06 18:45:23 +08:00
Haojun Liao
f8a321695a
Merge pull request #22711 from taosdata/fix/TD-26069-1 
fix rc
 2023-09-06 17:58:33 +08:00
Hongze Cheng
1d343fa57e more fix 2023-09-06 17:10:36 +08:00
Haojun Liao
926cc01cff refactor: do some internal refactor. 2023-09-06 16:48:43 +08:00
Hongze Cheng
cd88c8ec31 fix: little test 2023-09-06 14:45:53 +08:00
Haojun Liao
b382cba58c fix(stream): fix syntax error. 2023-09-06 14:37:58 +08:00
Haojun Liao
236b363996 fix(stream): fix syntax error. 2023-09-06 14:37:11 +08:00
Haojun Liao
8783ebcb02 enh(stream): add some logs and record the submit package performance. 2023-09-06 14:34:36 +08:00
Hongze Cheng
a6743a31b5 Merge branch 'main' of https://github.com/taosdata/TDengine into fix/TD-26133 2023-09-06 14:12:21 +08:00
dapan1121
698b0b21f7
Merge pull request #22630 from taosdata/enh/TS-3812-3.0 
enh: report time series by period and quantity
 2023-09-06 13:38:24 +08:00
Haojun Liao
e607a0a5cb fix(stream): add some logs. 2023-09-06 11:39:07 +08:00
dmchen
231ba12f70 feat/TD-26127 2023-09-06 11:00:24 +08:00
Haojun Liao
c86eeb3938 fix(stream): add task status check when waiting for the table create. 2023-09-06 10:58:33 +08:00
wangmm0220
ef87b9c571 fix:conflicts from 3.0 2023-09-05 16:19:04 +08:00
wangmm0220
4e46ce4c03 fix:wait pHandle idle if vnode receives subscribe msg 2023-09-05 16:04:44 +08:00
Haojun Liao
ac8f4f1558
Merge pull request #22736 from taosdata/fix/fixTransferCrash 
fix invalid read
 2023-09-05 15:42:03 +08:00
yihaoDeng
d0503a8a3f fix invalid read 2023-09-05 12:11:58 +08:00
Hongze Cheng
8dbdeccc8f fix: coverity scan 2023-09-05 11:41:36 +08:00
wade zhang
8f27724f1f
Merge pull request #22701 from taosdata/fix/test_1x 
test: add stream cases to main
 2023-09-05 10:57:38 +08:00
Haojun Liao
0441c7a870 Merge branch 'fix/3_liaohj' of github.com:taosdata/tdengine into fix/3_liaohj 2023-09-05 10:40:48 +08:00
Haojun Liao
5b3cb8ec42 fix(stream): fix memory leak. 2023-09-05 09:27:16 +08:00
Haojun Liao
db8073dadd fix(stream): fix memory leak. 2023-09-04 23:13:57 +08:00
Haojun Liao
77eed06bcd
Merge branch '3.0' into fix/3_liaohj 2023-09-04 18:51:07 +08:00
Haojun Liao
aeea699c9c Merge branch '3.0' into fix/3_liaohj 2023-09-04 15:53:39 +08:00
Haojun Liao
ed22dd5f26 fix(stream): fix deadlock caused during merging branch. 2023-09-04 14:09:39 +08:00
Haojun Liao
375d0abea5 fix(stream): merge main. 2023-09-04 13:12:53 +08:00
Haojun Liao
21dab8ceab other: merge 3.0 2023-09-04 13:08:19 +08:00
yihaoDeng
03cddfa7ce fix rc 2023-09-04 10:33:01 +08:00
wangmm0220
fd85d5885a fix:add limit time for consume in 1 seconds 2023-09-01 16:57:49 +08:00
wangmm0220
02ac3eac5a fix:logic error 2023-09-01 16:51:44 +08:00
Haojun Liao
4fee5ba59a fix(stream): even in ck, start stream tasks. 2023-09-01 14:40:30 +08:00
dapan1121
cc17848b78 fix: merge 3.0 to main 2023-09-01 13:24:47 +08:00
dapan1121
2141ac8460 Merge remote-tracking branch 'origin/main' into fix/m23.2 2023-09-01 11:21:38 +08:00
Hongze Cheng
113867081e enh: upgrade more efficiently 2023-09-01 10:16:10 +08:00
dapan1121
228e6c6acd Merge remote-tracking branch 'origin/main' into 3.0 2023-09-01 10:01:10 +08:00
Haojun Liao
e8294ed8dc fix(stream): fix bug in multi-replica vnode redistribute. 2023-09-01 03:10:12 +08:00
Haojun Liao
e816d0efa5
Merge pull request #22669 from taosdata/fix/TD-26069 
fix invalid insert
 2023-08-31 18:29:25 +08:00
wangmm0220
a02ab4ccfb fix:coredump if saved epoch bigger than request epoch & modify test cases 2023-08-31 17:35:41 +08:00
yihaoDeng
1833be028f fix invalid insert 2023-08-31 15:28:31 +08:00
yihaoDeng
9fd0bff673 fix invalid insert 2023-08-31 14:57:26 +08:00
Haojun Liao
92e258617a refactor: do some internal refactor. 2023-08-31 14:31:45 +08:00
Haojun Liao
e2bb64eb18 refactor: do some internal refactor. 2023-08-31 14:23:46 +08:00
Haojun Liao
3fc3dafca6 refactor: do some internal refactor. 2023-08-31 13:46:48 +08:00
Haojun Liao
e53b5d4392 refactor: do some internal refactor. 2023-08-31 11:01:53 +08:00
Haojun Liao
0facde6ddc
Merge pull request #22659 from taosdata/fix/TD-26035 
fix(stream): do not restart the stream tasks when it is running.
 2023-08-31 10:16:59 +08:00
Haojun Liao
0c599fa869
Merge pull request #22415 from taosdata/szhou/tsdb-neigh-block 
tsdb neighbouring block search and set it to global block iterator
 2023-08-31 09:46:37 +08:00
wangmm0220
7f2a9a7262 fix:cancel the limit time for consume 2023-08-31 09:07:40 +08:00
wade zhang
68e4a72021
Merge pull request #22643 from taosdata/feat/audit-user-typestr 
alter user type to str
 2023-08-31 07:59:31 +08:00
wangmm0220
4f20359f43 fix:modify log level to trace 2023-08-30 23:57:48 +08:00
Haojun Liao
a2c6e4306a fix(stream): reset the counter. 2023-08-30 20:20:20 +08:00
Haojun Liao
fd2f988cdb fix(stream): reset the counter. 2023-08-30 20:19:51 +08:00
Haojun Liao
5d23df100c fix(stream): ignore the fill-history tasks. 2023-08-30 19:07:06 +08:00
Haojun Liao
65eaa9b15f fix(stream): add task release. 2023-08-30 19:06:12 +08:00
wangmm0220
23c4d7eb0a fix:dead lock 2023-08-30 18:10:19 +08:00
dmchen
3d9274d713 create table db name 2023-08-30 17:28:03 +08:00
Haojun Liao
d99d8875e1 fix(stream): if stream task is running, do not recheck its status. 2023-08-30 17:24:13 +08:00
Haojun Liao
c5b279f045 Merge remote-tracking branch 'origin/enh/triggerCheckPoint2' into enh/triggerCheckPoint2 2023-08-30 16:01:08 +08:00
Haojun Liao
24b1a050fc other: merge 3.0 2023-08-30 16:00:14 +08:00
liuyao
0a72e576bd op stream pause 
pause data dispatch

opt stream pause
 2023-08-30 14:53:49 +08:00
kailixu
1a34cd1020 chore: optimize of report time series by quantity 2023-08-30 11:45:07 +08:00
kailixu
8e20740622 enh: report time series by quantity 2023-08-30 11:39:21 +08:00
dapan1121
f6321d0c4f Merge remote-tracking branch 'origin/main' into fix/m23.1 2023-08-30 11:03:33 +08:00
Haojun Liao
dec4d69529 fix(stream): set correct user-define table name in sink table info cache. 2023-08-30 10:52:39 +08:00
Haojun Liao
3a7a220d43 fix(stream): fix error found by ci. 2023-08-30 10:14:01 +08:00
kailixu
9d1ac801ed Merge branch '3.0' into enh/TS-3812-3.0 2023-08-30 09:27:17 +08:00
Haojun Liao
610132e29a
Merge pull request #22633 from taosdata/fix/update_db_attr 
fix(tsdb): add more check for block rows
 2023-08-29 22:05:57 +08:00
wade zhang
701ac939c1
Merge pull request #22632 from taosdata/fix/ttl 
fix/TD-26032: ttl cache entry record the original information for deletion
 2023-08-29 18:27:50 +08:00
Haojun Liao
8dadae5d3a fix(stream): fix invalid read. 2023-08-29 18:24:32 +08:00
Haojun Liao
d6368798da fix(query): disable the set quit flag for tsdbreader. 2023-08-29 18:11:17 +08:00
Haojun Liao
b740ce8ad6 fix(tsdb): add more check for block rows to detect the duplicate rows in data block. 2023-08-29 17:49:43 +08:00
Haojun Liao
204fb97f68 fix(stream): fix error in snode, fix memory leaks, fix repeatly create bug in sink task. 2023-08-29 17:34:31 +08:00
Shungang Li
df2b2484df fix: ttl cache entry record the original information for deletion 2023-08-29 17:18:22 +08:00
Minglei Jin
82fc1f41fb fix(tsdb/cache read): remove all null row 2023-08-29 16:15:00 +08:00
kailixu
f00596868f fix: remove duplicated line 2023-08-29 16:12:49 +08:00
kailixu
db07511c93 enh: report time series by period and quantity 2023-08-29 16:08:51 +08:00
wade zhang
53a24e04f2
Merge pull request #22604 from taosdata/feat/audit-db-detail 
audit db detail
 2023-08-29 15:46:10 +08:00
Haojun Liao
6e4acddd96
Merge pull request #22603 from taosdata/fix/TD-25962 
fix:unregister push manager if delete subscribe to avoid tqProcessPol…
 2023-08-29 10:58:49 +08:00
Minglei Jin
432eaf5110 Merge branch '3.0' into fix/TD-25963 2023-08-29 10:51:53 +08:00
Minglei Jin
b88d79d2ef fix(tsdb/open fs): fix retval 2023-08-29 10:33:20 +08:00
wade zhang
ff6de8ebe2
Merge pull request #22600 from taosdata/fix/TD-25010-10 
enh(s3/evict): evict cache data files for other migrated head, stt, etc.
 2023-08-28 18:12:40 +08:00
dmchen
1372cede48 init 2023-08-28 17:44:10 +08:00
dapan1121
778e50da79
Merge pull request #22592 from taosdata/fix/m23.0 
Fix/m23.0
 2023-08-28 17:35:35 +08:00
wangmm0220
2e04d513a4 fix:unregister push manager if delete subscribe to avoid tqProcessPollPush 2023-08-28 16:41:28 +08:00
Minglei Jin
9ef455a454 enh(s3/evict): evict cache data files for other migrated head, stt, etc. 2023-08-28 15:57:13 +08:00
Haojun Liao
05bb164675 fix(stream): release tasks. 2023-08-28 15:56:02 +08:00
Haojun Liao
391103bc5a fix(stream): do dome internal refactor. 2023-08-28 15:54:01 +08:00
Haojun Liao
33672f2f35 fix(stream): release stream tasks. 2023-08-28 15:52:54 +08:00
wade zhang
cd3702e91c
Merge pull request #22596 from taosdata/fix/TD-25963 
fix(tsdb/s3): fix scan and fix with s3 files
 2023-08-28 15:19:47 +08:00
Minglei Jin
f299ae9bc3 fix(tsdb/s3): fix scan and fix with s3 files 2023-08-28 12:22:53 +08:00
Haojun Liao
da0b4e1f92 Merge branch '3.0' into enh/triggerCheckPoint2 2023-08-28 10:55:38 +08:00
dapan1121
0cce255a02 Merge remote-tracking branch 'origin/3.0' into fix/m23.0 2023-08-28 10:06:53 +08:00
Haojun Liao
b75ae217f6 fix(stream): notify close for snode. 2023-08-28 09:53:08 +08:00
Haojun Liao
b11975f00c
Merge pull request #22534 from taosdata/mark/tmq 
fix:[TD-258900]modify tmq trans conflict to db level
 2023-08-28 09:45:47 +08:00
dapan1121
1f40da6fef Merge remote-tracking branch 'origin/main' into 3.0 2023-08-28 09:28:55 +08:00
dmchen
06083e1eb9 init 2023-08-28 09:15:51 +08:00
dapan1121
cda08087b9
Merge pull request #22586 from taosdata/fix/TD-25936.3 
fix: no explain response issue
 2023-08-28 08:52:13 +08:00
Haojun Liao
6b327886e9 fix(stream): add null ptr check. 2023-08-27 00:27:04 +08:00
Haojun Liao
d8a6ec024a Merge remote-tracking branch 'origin/enh/triggerCheckPoint2' into enh/triggerCheckPoint2 2023-08-25 19:21:00 +08:00
Haojun Liao
7ceb8dc627 fix(stream): disable the follower to execute the stop/resume instruction. 2023-08-25 19:20:49 +08:00