Commit Graph

378 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 6ce0616ffd fix ci and TODOs 2024-04-16 14:25:34 +08:00
wangjiaming0909 a2cbbba24d find TODO 2024-04-16 14:23:26 +08:00
wangjiaming0909 fa85d1caa7 support other tsma funcs 2024-04-16 14:23:25 +08:00
wangjiaming0909 70ca830378 support recursive tsma creation 2024-04-16 14:17:12 +08:00
wangjiaming0909 0fd66d7e8a tsma optimization 2024-04-16 14:14:39 +08:00
wangjiaming0909 ef47fd57d6 support tsma catalog cache 2024-04-16 14:14:34 +08:00
wangjiaming0909 d2106e0ade sql syntax and create translate 2024-04-16 14:13:10 +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 319ab5f2c2 enh: support hash join 2024-04-12 15:44:23 +08:00
dapan1121 86db8efcda enh: support hash join 2024-04-10 19:27:36 +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
factosea 9ddc0b51cb merge 2024-03-29 10:37:59 +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
dapan1121 65c57e88cd Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-03-20 15:48:43 +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
dapan1121 6e674bc1de Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-03-15 18:11:37 +08:00
factosea aaff23b4b8 fix: sColumnOption->json 2024-03-15 13:56:42 +08:00
facetosea 6678a65dc4 merge ts-4243 2024-03-14 19:06:34 +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 97aca25633 enh: support group join 2024-02-23 17:59:45 +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
dapan1121 a745319b81 Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-02-23 08:59:16 +08:00
dapan1121 807bba9215 fix: window join issues 2024-02-22 18:59: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
dapan1121 98ed2458ea Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-02-20 17:39:51 -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
dapan1121 b26716f2e8 Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-02-18 22:15:43 -08:00