Commit Graph

5614 Commits

Author SHA1 Message Date
yihaoDeng e495d39220 Merge remote-tracking branch 'origin/3.0' into enh/addDiskUsage 2024-11-29 13:50:09 +08:00
Shengliang Guan fb51956f0a
Merge pull request #28580 from taosdata/fix/TS-5251-add-conflict-check
fix/TS-5251-add-conflict-check
2024-11-28 13:31:01 +08:00
dmchen 6c820cc79c fix/TS-5251-add-conflict-check-add-case 2024-11-26 10:04:13 +08:00
yihaoDeng 407eeb6620 Unable to 2024-11-22 14:43:11 +08:00
Shengliang Guan a607951115 Merge branch 'main' into merge/mainto3.0 2024-11-22 13:39:44 +08:00
Shengliang Guan 36deebdde9
Merge pull request #28873 from taosdata/fix/liaohj
fix(analytics): do some internal refactor and fix the error in parse options.
2024-11-22 09:06:13 +08:00
Haojun Liao e103d3963b fix(analytics): check return value. 2024-11-21 16:40:06 +08:00
Haojun Liao af1c0c98bb fix(analytics): do some internal refactor and fix the error in parse the option string. 2024-11-21 15:14:37 +08:00
Shengliang Guan ba15fb0644 Merge branch '3.0' into merge/mainto3.0 2024-11-21 11:04:36 +08:00
Shengliang Guan cfa7d275f2 Merge branch 'main' into merge/mainto3.0 2024-11-21 11:00:00 +08:00
dmchen 31f5055f21 fix/TS-5639-check-mnode-leader 2024-11-18 19:06:46 +08:00
Haojun Liao 20ad165ae3 Merge branch 'main' into fix/liaohj 2024-11-16 01:31:50 +08:00
Haojun Liao 9cc2aec9d6 fix(stream): set correct value and open inputQ for stream if reset checkpoint. 2024-11-15 17:12:01 +08:00
yihaoDeng 2b2377869f Merge remote-tracking branch 'origin/3.0' into enh/addDiskUsage 2024-11-15 15:36:05 +08:00
Haojun Liao a79f63caeb Merge branch '3.0' into fix/3_liaohj 2024-11-15 10:28:13 +08:00
Shengliang Guan 527def388d
Merge pull request #28778 from taosdata/main
merge: from main to 3.0 branch
2024-11-15 10:14:22 +08:00
Haojun Liao f65651f6ef fix(stream): update the msg encoder. 2024-11-15 00:19:35 +08:00
yihaoDeng 42065bf2e8 Merge remote-tracking branch 'origin/3.0' into enh/addDiskUsage 2024-11-14 17:44:29 +08:00
Haojun Liao 969db55e9f fix(stream): update the checkpoint report info in SCheckpointReport 2024-11-14 17:42:55 +08:00
Haojun Liao b88a786fdf fix(stream): set correct error code and open inputq for upstream . 2024-11-14 17:42:49 +08:00
Haojun Liao fba44da577 fix(test): fix error in unit test. 2024-11-14 17:40:47 +08:00
Haojun Liao 187997d5f0 fix(stream): record the failed checkpointId, after receive reset task info. 2024-11-14 17:40:37 +08:00
Haojun Liao b2b5a14d9d fix(stream): reset task add the failed chkptId info. 2024-11-14 17:38:40 +08:00
yihaoDeng 6ad894b356 support quick cmd 2024-11-14 17:04:11 +08:00
Shungang Li 67da7b1036 feat: alter systable variablesSchema 2024-11-13 16:51:40 +08:00
Shengliang Guan d107976bd3
Merge pull request #28647 from taosdata/fix/3.0/TD-32519_drop_ctb
fix TD-32519 drop child table with tsma caused crash
2024-11-08 12:27:04 +08:00
wangjiaming0909 274a7fd876 refine unused codes 2024-11-08 09:50:32 +08:00
wangjiaming0909 de8576a6a1 refine comments and functions 2024-11-08 09:50:07 +08:00
wangjiaming0909 9a92c136ce fix drop child table with tsma 2024-11-08 09:47:47 +08:00
wangjiaming0909 65dffbda0c fix tsma drop ctb 2024-11-08 09:47:04 +08:00
wangjiaming0909 413cf3e504 sink submit data one-by-one 2024-11-08 09:42:59 +08:00
wangjiaming0909 a5a3d1d8ad fix same timestamp written into same tsma res ctb 2024-11-08 09:40:06 +08:00
WANG MINGMING 1960a4fe86
Merge branch '3.0' into fix/TD-32563 2024-11-08 09:11:55 +08:00
Haojun Liao a8f7f153d9 refactor: do some internal refacrtor. 2024-11-07 16:44:43 +08:00
54liuyao 719a3faa12 Merge branch '3.0' of https://github.com/taosdata/TDengine into fix/TD-30837 2024-11-06 11:13:15 +08:00
Shengliang Guan c3a8daced4
Merge pull request #28401 from taosdata/feat/TS-5484-audit-delete
feat/TS-5484-audit-delete
2024-11-06 10:11:15 +08:00
dmchen 3598b3b917 fix/TS-5251-add-conflict-check-add-case 2024-11-06 09:49:27 +08:00
54liuyao ba31bf2c52 Merge branch '3.0' of https://github.com/taosdata/TDengine into fix/TD-30837 2024-11-06 09:42:50 +08:00
Shengliang Guan 0be118c0aa
Merge pull request #28408 from taosdata/enh/TD-32181/client
Enh/td 32181/client
2024-11-06 09:42:05 +08:00
dongming chen 3671d3c51f
Merge pull request #28654 from taosdata/3.0
3.0
2024-11-05 18:09:31 +08:00
Shengliang Guan cca24b7381
Merge pull request #28634 from taosdata/feat/contrib30
refact: rename version to td_version
2024-11-05 13:33:20 +08:00
Shengliang Guan 2473ad9338
Merge pull request #28521 from taosdata/fix/ref
fix(stream): use refId in timer to avoid invalid read.
2024-11-05 12:56:25 +08:00
Shengliang Guan 521b86ea89
Merge pull request #28637 from taosdata/fix/3_liaohj
fix(stream): check the right return code for concurrent checkpoint trans.
2024-11-05 11:18:14 +08:00
Haojun Liao 8148f26d30
Merge branch '3.0' into fix/ref 2024-11-05 10:50:28 +08:00
WANG MINGMING 226a766a17
Merge branch '3.0' into fix/TD-32563 2024-11-05 10:08:19 +08:00
Shengliang Guan 1539e04e8b
Merge pull request #28639 from taosdata/main
merge: from main to 3.0 branch
2024-11-05 09:04:38 +08:00
Shengliang Guan 74e514dc87 fix: compile errors 2024-11-04 20:22:14 +08:00
Shengliang Guan 47f2c60b25 fix: compile errors 2024-11-04 20:21:32 +08:00
Shengliang Guan 8c9f80455e
Merge pull request #28597 from taosdata/fix/TD-32271-main
fix: mndProcessArbCheckSyncTimer no check for sync
2024-11-04 20:15:47 +08:00
Haojun Liao 0614efdffd fix(stream): check the right return code for concurrent checkpoint trans. 2024-11-04 20:06:36 +08:00