Commit Graph

226 Commits

Author SHA1 Message Date
dm chen 1196ea72da
Merge branch '3.0' into feat/TD-24834 2024-04-17 17:13:29 +08:00
Yihao Deng 04e78d0ce7 Merge branch 'feat/3.0' into feat/compress_3.0 2024-04-17 03:23:02 +00:00
kailixu 74afb8deae chore: solve conflicts 2024-04-17 10:52:34 +08:00
Yihao Deng 6f9de676f0 Merge branch 'fix/compress_3.0' into feat/compress_3.0 2024-04-16 09:27:26 +00:00
wangjiaming0909 7de0a34ae6 support maxTsmaCalcDelay, maxTsmaNum, skip_tsma 2024-04-16 14:25:01 +08:00
wangjiaming0909 09bb7c3814 rebase fix 2024-04-16 14:18:10 +08:00
wangjiaming0909 ef47fd57d6 support tsma catalog cache 2024-04-16 14:14:34 +08:00
dapan1121 55d118d17c Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-04-16 09:12:04 +08:00
Yihao Deng ea9385912f Merge branch '3.0' into feat/compress_3.0 2024-04-15 09:06:30 +00:00
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
yihaoDeng 4948bd690d 3.0 merge compress 2024-04-15 11:38:44 +08:00
dapan1121 86db8efcda enh: support hash join 2024-04-10 19:27:36 +08:00
Minglei Jin 0761692b14 Merge branch 'feat/TS-4243-3.0' into enh/TD-28945-pk 2024-04-10 16:30:06 +08:00
Minglei Jin 49a9c5abad Merge branch '3.0' into feat/TS-4243-3.0 2024-04-10 16:24:24 +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 44b9785853 cos/multi-write: include headers part 2024-04-08 10:33:02 +08:00
dapan1121 6d52120bf7 Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-04-07 13:54:39 +08:00
yihaoDeng e9faf4ab08 fix ci error 2024-04-01 07:58:00 +00:00
factosea bbbb605d8f lemon rebuild 2024-03-29 10:40:24 +08:00
factosea 9ddc0b51cb merge 2024-03-29 10:37: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
Haojun Liao ef6ea16d64 other: merge 3.0 2024-03-22 17:57:25 +08:00
Haojun Liao 9f492a8962 other: merge 3.0 2024-03-22 17:53:11 +08:00
dapan1121 65c57e88cd Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-03-20 15:48:43 +08:00
dapan1121 dcc650521a Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-03-19 16:04:15 +08:00
Shungang Li 3a656c3595 feat: support 2 replica with arbitrator 2024-03-19 09:30:35 +08:00
dapan1121 6e674bc1de Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-03-15 18:11:37 +08:00
factosea c6adba9bfc fix: merge error 2024-03-14 19:56:19 +08:00
facetosea 6678a65dc4 merge ts-4243 2024-03-14 19:06:34 +08:00
kailixu d0f825e1f5 Merge branch '3.0' into fix/TS-4421-3.0 2024-03-14 08:41:55 +08:00
kailixu 9901825bb0 enh: support binary/hex integer 2024-03-13 15:12:21 +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
factosea 30e52bb71a col compress sql parse 2024-03-07 18:06:15 +08:00
dapan1121 a745319b81 Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-02-23 08:59:16 +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
dapan1121 98ed2458ea Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-02-20 17:39:51 -08:00
dapan1121 b26716f2e8 Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-02-18 22:15:43 -08:00
54liuyao 49ddc87667 merge 3.0 2024-02-04 16:11:50 +08:00
54liuyao ea9353b9fd merge 3.0 2024-02-04 16:04:23 +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
shenglian zhou 7dcb477933 feat: add front end for ordered blocks in mem sort 2024-02-01 09:38:35 +08:00
kailixu e945586ad9 feat: support uniq grant 2024-01-31 13:44:00 +08:00
dapan1121 50c420e6b9 enh: support window join 2024-01-30 19:19:44 +08:00
slzhou 993728c200 feat: passed parser/ast 2024-01-25 11:20:04 +08:00