Commit Graph

689 Commits

Author SHA1 Message Date
kailixu 123090e18a fix: solve conflicts 2024-04-15 16:12:15 +08:00
dm chen 4d660d89c0
Merge branch '3.0' into feat/TD-24834 2024-04-15 15:12:32 +08:00
Minglei Jin 6eb014e32b Merge branch 'feat/TS-4243-3.0' into enh/TD-28945-pk 2024-04-09 19:11:46 +08:00
Minglei Jin a407f76165 Merge branch '3.0' into enh/TD-28945 2024-04-08 10:55:47 +08:00
Minglei Jin ca1262c5c5 cos/multi-write: parser part 2024-04-08 10:31:26 +08:00
54liuyao 1240a4eb77 Merge branch 'feat/TS-4243-3.0' of https://github.com/taosdata/TDengine into feat/ly-TS-4243-3.0 2024-04-07 09:37:09 +08:00
kailixu 1e8aaa273e chore: more logic for num of pks 2024-04-03 16:32:59 +08:00
kailixu f99d193335 feat: user config dnode procedure 2024-03-29 10:25:19 +08:00
kailixu 374ef4593c feat: encryptions/encrypt_key grammar 2024-03-26 19:56:15 +08:00
54liuyao aa9962318f read preversion data of primary key 2024-03-26 16:38:24 +08:00
54liuyao a02535c3ab Merge branch 'feat/TS-4243-3.0' of https://github.com/taosdata/TDengine into feat/ly-TS-4243-3.0 2024-03-25 11:15:21 +08:00
Haojun Liao ef6ea16d64 other: merge 3.0 2024-03-22 17:57:25 +08:00
54liuyao a60f390cdc stream primary key 2024-03-21 10:50:07 +08:00
54liuyao 623afe3dc8 fix issue 2024-03-20 16:12:25 +08:00
slzhou 1da0def82d fix: add isPk to SColumnNode 2024-03-20 13:09:59 +08:00
slzhou 61f91b57fa fix: column node and function node util copy/json/msg 2024-03-19 17:19:14 +08:00
Shungang Li 3a656c3595 feat: support 2 replica with arbitrator 2024-03-19 09:30:35 +08:00
Hongze Cheng d9db5b015c Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/TS-4243-3.0 2024-03-13 13:31:59 +08:00
shenglian zhou 3db2c1edf5 feat: add hint smalldata_ts_sort to disable row id sort 2024-03-08 14:36:55 +08:00
Hongze Cheng a6423b7816 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/TS-4243-3.0 2024-02-23 14:47:10 +08:00
slzhou 6b331594d9 fix: change typo error 2024-02-21 13:38:49 +08:00
slzhou 87c8f1aa82 Merge branch '3.0' of github.com:taosdata/TDengine into feat/TS-4243-3.0 2024-02-21 13:09:36 +08:00
dapan1121 ba41231373
Merge pull request #24614 from taosdata/szhou/tms/port-3
feat: multi-readers and one merge tree
2024-02-21 10:00:52 +08:00
slzhou 73cced005d Merge branch '3.0' of github.com:taosdata/TDengine into szhou/tms/port-3 2024-02-20 13:22:45 +08:00
54liuyao b53dc5602e Merge branch '3.0' of https://github.com/taosdata/TDengine into 3.0 2024-02-19 10:58:20 +08:00
Hongze Cheng 45684e49c7 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/TS-4243-3.0 2024-02-19 09:08:58 +08:00
wangmm0220 a8e45440c0 fix:conflicts from 3.0 2024-02-18 18:02:14 +08:00
Hongze Cheng 52ed1ec5f7 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/TS-4243-3.0 2024-02-18 09:52:53 +08:00
54liuyao c588770699 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/TD-22023 2024-02-05 15:10:34 +08:00
kailixu 6098538162 feat: support uniq grant 2024-02-04 18:00:02 +08:00
kailixu 3ebc26e1fb feat: support uniq grant 2024-02-04 16:33:43 +08:00
54liuyao ea9353b9fd merge 3.0 2024-02-04 16:04:23 +08:00
kailixu a9316c3710 feat: support uniq grant 2024-02-04 12:28:00 +08:00
shenglian zhou f77b602da9 fix: change from seq_blocks_sort to para_tables_sort 2024-02-02 14:45:04 +08:00
slzhou 4a6317a047 Merge branch '3.0' of github.com:taosdata/TDengine into feat/TS-4243-3.0 2024-02-02 11:29:04 +08:00
Haojun Liao 0fe9c05c5f
Merge pull request #24704 from taosdata/fix/3_liaohj
fix(stream): take ver snapshot for all vgroups
2024-02-01 17:07:36 +08:00
Haojun Liao cb2ea4a721 fix(stream): take ver snapshot for all vgroups before launching stream with fill-history option opened. 2024-02-01 11:37:57 +08:00
wangmm0220 a9fcc67321 fix:conflicts from 3.0 2024-02-01 11:13:03 +08:00
shenglian zhou 7dcb477933 feat: add front end for ordered blocks in mem sort 2024-02-01 09:38:35 +08:00
kailixu a860e9039d feat: support uniq grant 2024-01-31 13:52:03 +08:00
54liuyao 9e86dfaee7 stream count window sliding 2024-01-26 15:56:26 +08:00
slzhou 993728c200 feat: passed parser/ast 2024-01-25 11:20:04 +08:00
54liuyao 7105b0ffe3 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/TD-22023 2024-01-25 10:12:13 +08:00
kailixu e13e61f4d5 Merge branch '3.0' into feat/TD-27463-3.0 2024-01-24 14:26:17 +08:00
factosea 251585b49c fix: orderby function first hit column 2024-01-23 15:37:50 +08:00
kailixu 5208829f23 Merge branch '3.0' into feat/TD-27463-3.0 2024-01-22 13:20:00 +08:00
54liuyao 5a7d72d6ef Merge branch '3.0' of https://github.com/taosdata/TDengine into 3.0 2024-01-19 10:39:11 +08:00
wangmm0220 7246fedfef Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/ly_multi_marks 2024-01-18 19:08:35 +08:00
kailixu 1daa224651 feat: support uniq grant 2024-01-18 17:49:11 +08:00
kailixu 5d189f69ec feat: support uniq grant 2024-01-18 15:51:45 +08:00