xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
63,621 Commits 3 Branches 0 Tags 479 MiB
Commit Graph

3664 Commits

Author SHA1 Message Date
wangmm0220 ac9582b24a fix:[TD-28567] do not add md5 to the end of subtable if create stream by sma 2024-02-19 13:58:58 +08:00
facetosea 53a3ab3edc fix: delete slowSQLLog switch 2024-02-19 11:41:58 +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
54liuyao 05eaa90c11 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/TD-22023 2024-02-19 08:59:15 +08:00
wangmm0220 a8e45440c0 fix:conflicts from 3.0 2024-02-18 18:02:14 +08:00
dapan1121 8f63952ad5
Merge pull request #24750 from taosdata/mark/3.0 
fix:[TD-28590]add logic for consume excluded
 2024-02-18 10:13:25 +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
kailixu f76a61c777 feat: support uniq grant 2024-02-13 23:17:05 +08:00
dm chen 6d2d37d964
Merge pull request #24751 from taosdata/3.0 
merge 3.0
 2024-02-06 19:16:53 +08:00
wangmm0220 478e1a67ae fix:[TD-28590]add logic for consume excluded 2024-02-06 18:14:06 +08:00
wangmm0220 871ebfa7ba Merge branch '3.0' of https://github.com/taosdata/TDengine into mark/3.0 2024-02-06 14:02:46 +08:00
Haojun Liao 2bba011e4e Merge remote-tracking branch 'origin/feat/TD-22023' into feat/TD-22023 2024-02-05 17:51:23 +08:00
Haojun Liao 7a18e5910c enh(stream): halt the initial stream tasks when fill-history is set for count window agg 2024-02-05 17:51:09 +08:00
wangmm0220 5796f411e4 Merge branch 'mark/3.0' of https://github.com/taosdata/TDengine into mark/3.0 2024-02-05 17:08:05 +08:00
wangmm0220 a656d75ca7 opti:consume data excluded from some source 2024-02-05 17:07:50 +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 021247c45b feat: support uniq grant 2024-02-05 06:51:44 +08:00
kailixu 6098538162 feat: support uniq grant 2024-02-04 18:00:02 +08:00
kailixu d281bc70b0 feat: remove hb of grantInfo 2024-02-04 16:46:24 +08:00
kailixu 3ebc26e1fb feat: support uniq grant 2024-02-04 16:33: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
kailixu 6cf7809e8d feat: support uniq grant 2024-02-04 14:59:47 +08:00
kailixu f53d0bce5d feat: support uniq grant 2024-02-04 00:24:42 +08:00
kailixu 3a08926319 feat: support uniq grant 2024-02-03 17:32:02 +08:00
shenglian zhou f77b602da9 fix: change from seq_blocks_sort to para_tables_sort 2024-02-02 14:45:04 +08:00
kailixu 3f061a8460 feat: support uniq grant 2024-02-02 13:44:33 +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
kailixu 231cf000da Merge branch 'feat/TD-27463-3.0a' into feat/TD-27463-3.0 2024-02-02 00:07:15 +08:00
kailixu adee720128 feat: support uniq grant 2024-02-01 17:48:29 +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
kailixu 4d8ba0f60f feat: support uniq grant 2024-02-01 17:02:08 +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 87e2027475 Merge branch '3.0' of github.com:taosdata/TDengine into szhou/tms/port-3-fe 2024-02-01 09:38:54 +08:00
shenglian zhou 7dcb477933 feat: add front end for ordered blocks in mem sort 2024-02-01 09:38:35 +08:00
kailixu e5b47eeeb9 feat: support uniq grant 2024-02-01 07:32:43 +08:00
54liuyao 0afed5263e add mid operator retrive 2024-01-31 18:09:13 +08:00
kailixu 9458b86b41 feat: support uniq grant 2024-01-31 16:09:06 +08:00
kailixu a860e9039d feat: support uniq grant 2024-01-31 13:52:03 +08:00
kailixu e945586ad9 feat: support uniq grant 2024-01-31 13:44:00 +08:00
kailixu 4ffc4017bd feat: support uniq grant 2024-01-31 13:02:17 +08:00
kailixu f50867831b feat: support uniq grant 2024-01-31 10:43:31 +08:00
kailixu 41072348b9 Merge branch '3.0' into feat/TD-27463-3.0 2024-01-31 10:02:12 +08:00
dapan1121 e0583cb343
Merge pull request #24661 from taosdata/fix/xsren/TD-28453/countOnNullTag 
fix: count error on tag which is null
 2024-01-31 09:30:28 +08:00
kailixu 93c0890f68 feat: support uniq grant 2024-01-31 09:13:10 +08:00
kailixu 2b1a0cdbfe feat: support uniq grant 2024-01-31 08:53:45 +08:00
dapan1121 50c420e6b9 enh: support window join 2024-01-30 19:19:44 +08:00
factosea 5d731dc9a4 fix: use blank data flag 2024-01-30 17:34:06 +08:00
dapan1121 dc309d67b8 Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-01-29 17:08:41 +08:00
54liuyao d7fb8db086 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/TD-22023 2024-01-29 16:13:39 +08:00
wangmm0220 51b7cd99d6 feat:[TD-28247]add grant for subscribe and stream 2024-01-29 14:28:48 +08:00
Haojun Liao f4f01e4bf4
Merge pull request #24654 from taosdata/fix/3_liaohj 
feat(stream): drop orphan tasks.
 2024-01-29 13:10:47 +08:00
Haojun Liao 9087a0d9d0 feat(stream): drop orphan tasks. 2024-01-29 11:03:50 +08:00
kailixu e0d61c40f5 feat: support uniq grant 2024-01-26 19:06:56 +08:00
Haojun Liao bfbd61a02f
Merge pull request #24634 from taosdata/fix/3_liaohj 
refactor: do some internal refactor.
 2024-01-26 18:08:54 +08:00
Hongze Cheng e7177dae57 more code 2024-01-26 17:14:00 +08:00
wangmm0220 7c828d3506 feat:[TD-28247]add grant for subscribe and stream 2024-01-26 16:42:26 +08:00
wangmm0220 35e2b681c7 fix:conflicts from 3.0 2024-01-26 16:32:40 +08:00
Haojun Liao ac08f659c3 refactor: remove invalid procedure in fill-history. 2024-01-26 16:20:43 +08:00
54liuyao bc4f3d1296 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/TD-22023 2024-01-26 15:55:06 +08:00
Hongze Cheng cd4c188a8a Merge branch 'feat/primary-key' of https://github.com/taosdata/TDengine into feat/TS-4243-3.0 2024-01-25 17:24:07 +08:00
Haojun Liao 834f08a2e0
Merge pull request #24552 from taosdata/fix/3_liaohj 
fix(stream): do checkpoint after fill-history task completed.
 2024-01-25 16:53:11 +08:00
Hongze Cheng d33676942b fix: keep backward compatibility 2024-01-25 16:49:10 +08:00
wangmm0220 2798ff824c feat:[TD-28247]add grant for subscribe and stream 2024-01-25 16:07:09 +08:00
slzhou 993728c200 feat: passed parser/ast 2024-01-25 11:20:04 +08:00
shenglian zhou 618e60cffc feat: primary key to SField and SSchema 2024-01-25 11:00:38 +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 4d345b819a feat: support uniq grant 2024-01-24 19:08:19 +08:00
dmchen d9af07de6f new table structure 2024-01-24 09:44:44 +00:00
kailixu e13e61f4d5 Merge branch '3.0' into feat/TD-27463-3.0 2024-01-24 14:26:17 +08:00
wade zhang 86272dee4e
Merge pull request #24542 from taosdata/fix/refactorRetry1 
refactor retry
 2024-01-24 09:57:55 +08:00
dapan1121 6640809638 Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-01-23 14:48:12 +08:00
54liuyao 0975e37845 Merge branch '3.0' of https://github.com/taosdata/TDengine into 3.0 2024-01-23 10:07:50 +08:00
Yihao Deng 04538f9049 add test case 2024-01-22 08:59:40 +00:00
kailixu dbd3c53182 feat: support uniq grant 2024-01-22 13:20:15 +08:00
kailixu 5208829f23 Merge branch '3.0' into feat/TD-27463-3.0 2024-01-22 13:20:00 +08:00
kailixu 5d6703c3ef feat: support uniq grant 2024-01-19 14:59:02 +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
dapan1121 fb20dd51de Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-01-18 17:11:25 +08:00
Haojun Liao 76e6c453e7 enh(stream): send msg to mnode when the transferring state completed. 2024-01-18 15:43:36 +08:00
kailixu 76558da849 feat: support uniq grant 2024-01-18 15:23:38 +08:00
Haojun Liao f8d0c52483 fix(stream): remove this unused drop history task msg and corresponding functions. 2024-01-18 14:32:48 +08:00
wangmm0220 d5d1dd9127 opti:[TD-28118] raw block data for tmq 2024-01-17 20:08:26 +08:00
54liuyao 3bbfb26e09 stream count window 2024-01-17 14:22:19 +08:00
kailixu bf0205b54d Merge branch '3.0' into feat/TD-27463-3.0 2024-01-17 11:29:47 +08:00
kailixu 95cb004f80 feat: support uniq active code 2024-01-17 11:24:48 +08:00
jiajingbin d59ede5196 Merge branch '3.0' of https://github.com/taosdata/TDengine into fix/TD-28032 2024-01-16 15:05:13 +08:00
wangmm0220 2ab54a1335 fix:conflicts from 3.0 2024-01-15 16:54:52 +08:00
kailixu 414e15a810 chore: merge 3.0 2024-01-15 10:42:45 +08:00
dapan1121 737140a09b
Merge pull request #24430 from taosdata/feat/TD-28267 
add PARTITION_FIRST hint to use partition node before agg
 2024-01-15 09:12:34 +08:00
dapan1121 dec6e3fffe enh: support asof join 2024-01-12 18:29:27 +08:00
wangjiaming0909 bc1eacf626 add PARTITION_BEFORE_GROUP hint to use partition node before agg 2024-01-12 17:41:34 +08:00
Haojun Liao ea0ea09b0f
Merge pull request #24409 from taosdata/opt/optMsgOnMnode 
opt msg on mnd
 2024-01-12 09:36:37 +08:00
Haojun Liao 578edd447f
Merge pull request #24421 from taosdata/szhou/fix/2/td-28154 
fix: windows calculation when offset >0 and calendar sliding
 2024-01-12 09:35:09 +08:00
kailixu ddefc5f46a chore: merge 3.0 2024-01-11 20:05:23 +08:00
slzhou ab137a56f0 fix: more interval end calculation with slide-start/slide-end as anchor 2024-01-11 08:31:16 +08:00
dapan1121 e784a5c210 Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-01-10 18:57:19 +08:00
Yihao Deng b5e5167b8f split sync/status channel 2024-01-10 09:57:08 +00:00
Benguang Zhao 485bad1ebd refact: use config syncSnapReplMaxWaitN instead 2024-01-10 11:31:00 +08:00
Benguang Zhao 7979d4532b enh: let max num of concurrent msgs of snap replication be configurable 2024-01-09 16:49:27 +08:00
kailixu 1169fe357a feat: uniq grant 2024-01-05 00:53:38 +08:00
dm chen 39f2e75a9e
Merge branch '3.0' into feat/TD-26529-3.0 2024-01-04 15:46:23 +08:00
Shungang Li de631e20a5 fix: refactor logdebugs 2024-01-03 19:57:22 +08:00
wangmm0220 b200e6807f fix:[TD-28032]concat subtable and hash val as new subtable name to avoid data from multi time line write to one time line 2024-01-03 19:44:30 +08:00
wangmm0220 317f0c6a39 fix:[TD-28032]concat subtable and hash val as new subtable name to avoid data from multi time line write to one time line 2024-01-03 18:48:54 +08:00
dapan1121 8d9c093b99 Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-01-03 16:26:17 +08:00
wangmm0220 8add4dc177 fix:[TD-28032]concat subtable and hash val as new subtable name to avoid data from multi time line write to one time line 2024-01-02 18:37:29 +08:00
wangmm0220 b58a23df49 fix:[TS-4391] rebalance cnt always 1 if msg lost 2023-12-29 13:57:13 +08:00
dapan1121 e570fcef99 Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2023-12-25 09:22:01 +08:00
dapan1121 8bdf3df6a9 enh: left join ut 2023-12-22 19:25:55 +08:00
wangjiaming0909 153221e1d6 fix: cache scan heap overflow and forbid DDD for to_char in windows 2023-12-21 19:46:33 +08:00
kailixu 3005ab1953 chore: more code 2023-12-21 19:45:09 +08:00
kailixu 47fedce263 chore: more code 2023-12-21 12:11:00 +08:00
kailixu 1f5384ad40 feat: support uniq active code 2023-12-19 18:02:53 +08:00
dapan1121 bc38885856 Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2023-12-19 11:22:41 +08:00
dapan1121 279b2aa10a enh: add join ut 2023-12-19 11:17:39 +08:00
wangmm0220 81b5f59fa5 Merge branch 'feat/ly_multi_marks' of https://github.com/taosdata/TDengine into feat/ly_multi_marks 2023-12-19 10:54:12 +08:00
wangmm0220 3a0af1ea49 fix:aggCnt must bigger than 1 & move msg code to the end to be compatible with old version 2023-12-19 10:53:46 +08:00
Haojun Liao bba5a4f08b other: merge main into 3.0 2023-12-18 18:26:42 +08:00
kailixu 70006bb711 feat: support alter cluster 2023-12-18 16:34:31 +08:00
WANG MINGMING 6f23b63d9e
Merge branch '3.0' into feat/ly_multi_marks 2023-12-18 16:22:56 +08:00
kailixu 9fa90fc953 Merge branch '3.0' into feat/TD-27463-3.0 2023-12-18 14:20:10 +08:00
kailixu b54f816c2a feat: support uniq grant 2023-12-18 14:18:52 +08:00
dapan1121 5bbec0108a
Merge pull request #24081 from taosdata/szhou/add-experimental-flag 
fix: add experimental flag
 2023-12-15 17:31:35 +08:00
shenglian zhou 617d4bfb95 fix: add experimental flag 2023-12-15 10:40:54 +08:00
kailixu 8a23afbb32 fix: msgdef and uniq active len 2023-12-15 10:16:02 +08:00
dm chen 81767dfa32
Merge branch '3.0' into feat/TS-4229 2023-12-14 17:02:51 +08:00
dapan1121 6d24c08651 fix: compile errors 2023-12-14 14:13:01 +08:00
kailixu d7e16bb91d chore: merge 3.0 2023-12-14 10:09:32 +08:00
dapan1121 7171d38415 Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2023-12-14 09:02:00 +08:00
dapan1121 b2fb30f6c0 feat: support hash join 2023-12-13 18:54:16 +08:00
dapan1121 13ab89bd1b Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2023-12-13 08:25:25 +08:00
dmchen daa2c2238a fix/TS-4251 2023-12-12 12:17:49 +08:00
Minglei Jin c4bf9a92bc Merge branch '3.0' into enh/TD-27119 2023-12-11 19:38:04 +08:00
slzhou 2743228217 Merge branch '3.0' of github.com:taosdata/TDengine into feat/TS-4229 2023-12-11 14:15:17 +08:00
wade zhang 0082c071b7
Merge pull request #23968 from taosdata/fix/TS-4251-main 
fix/TS-4251
 2023-12-11 11:19:41 +08:00
Haojun Liao 39ea7d7567
Merge pull request #23980 from taosdata/fix/3_liaohj 
fix(tsdb): opt read stt file
 2023-12-09 21:28:52 +08:00
wangmm0220 d6114f90de feat:add configure for agg cnt 2023-12-08 19:00:10 +08:00
kailixu fe01fb635d feat: support uniq grant 2023-12-08 18:07:17 +08:00
Haojun Liao f020c34c62
Merge pull request #23954 from taosdata/enh/validMsgMain 
refactor code
 2023-12-08 17:29:07 +08:00
Haojun Liao a4399d761c
Merge pull request #23955 from taosdata/enh/validMsg 
refactor code
 2023-12-08 17:28:44 +08:00
wangmm0220 d1c2a03dc7 fix:conflicts from 3.0 2023-12-08 15:58:52 +08:00
Minglei Jin 2dbb718101 Merge branch '3.0' into enh/TD-27119 2023-12-08 14:48:17 +08:00
Haojun Liao 4ffaff4d50 other: merge 3.0 2023-12-08 10:14:42 +08:00
Haojun Liao 446c14da72 fix(tsdb): opt read stt file 2023-12-08 10:03:36 +08:00
Haojun Liao 7c17d6f313 fix(tsdb): opt read performance by check clean stt block if only row number required. 2023-12-07 23:12:54 +08:00
kailixu 2309e577c6 feat: support uniq grant 2023-12-07 19:50:16 +08:00
dapan1121 d7535f832a enh: support cart in join 2023-12-07 19:22:46 +08:00
dapan1121 4d993e8f9a
Merge pull request #23912 from taosdata/enh/3.0/TD-27276 
enh : accept float data as int field input
 2023-12-07 19:14:59 +08:00
Hongze Cheng aee070918b more dev 2023-12-07 17:37:47 +08:00
kailixu 4adce7ed52 feat: support uniq grant 2023-12-07 14:11:41 +08:00
dapan1121 840690b59b Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2023-12-06 19:22:52 +08:00
kailixu 780f3d9cad Merge branch '3.0' into feat/TD-27463-3.0 2023-12-06 19:14:24 +08:00
kailixu b015077120 feat: support uniq grant 2023-12-06 19:13:54 +08:00
Hongze Cheng 04e84ba152 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/TS-4229 2023-12-06 16:43:00 +08:00
dmchen dc9408ed5f fix/TS-4251 2023-12-06 07:48:40 +00:00
kailixu 67fd9993b0 feat: support uniq grant 2023-12-06 15:30:26 +08:00
yihaoDeng f48c37039c refactor code 2023-12-06 14:39:50 +08:00
yihaoDeng 5b796cd749 refactor code 2023-12-06 13:33:18 +08:00
yihaoDeng 1bb4d1b34d refactor code 2023-12-06 11:51:23 +08:00
yihaoDeng 88e88a1ac8 refactor code 2023-12-06 11:50:55 +08:00
yihaoDeng f48045d9c0 refactor code 2023-12-06 11:47:08 +08:00
yihaoDeng 203580a8e1 refactor code 2023-12-06 11:45:59 +08:00
Haojun Liao 8e1970be49
Merge pull request #23950 from taosdata/enh/validMsgMain 
Enh/valid msg main
 2023-12-06 11:21:40 +08:00
yihaoDeng b1e8c21903 valid msg 2023-12-06 10:10:49 +08:00
dapan1121 ee03cbc404 Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2023-12-06 08:38:30 +08:00
Bob Liu d2b2dee256 opt & add test case 2023-12-05 22:00:33 +08:00
yihaoDeng 4cfcbf71ad valid msg 2023-12-05 21:04:29 +08:00
Shungang Li b642f0fc83 enh: adjust ENodeType for show statements nodes 2023-12-05 18:02:29 +08:00
Minglei Jin e9cc54d87b cos_cp/load: load checkpoint from json 2023-12-05 16:37:28 +08:00
Haojun Liao 4e68fbd744
Merge pull request #23904 from taosdata/enh/validMsg 
valid msg
 2023-12-05 09:40:33 +08:00
Haojun Liao cc5890d56a
Merge pull request #23924 from taosdata/fix/3_liaohj 
enh(tsdb): extract rows for the given tables in all stt files.
 2023-12-04 19:21:19 +08:00
Haojun Liao 24d9337632 enh(tsdb): extract rows for the given tables in all stt files. 2023-12-04 15:38:24 +08:00
kailixu e623c9c3c8 feat: support machine id 2023-12-04 11:44:02 +08:00
yihaoDeng d4f237d2fe rm invalid code 2023-12-04 10:19:19 +08:00
Bob Liu 7e8f3579de accept float data as int data input 2023-12-01 18:33:01 +08:00
kailixu 042291c35b feat: support machine id 2023-12-01 18:15:47 +08:00
yihaoDeng c5d9a2b24d add valid msg 2023-12-01 17:19:34 +08:00
yihaoDeng 0aa9db4fd5 valid msg 2023-12-01 17:16:12 +08:00
yihaoDeng f029995142 valid msg 2023-12-01 16:22:55 +08:00
yihaoDeng 50bda0b719 add valid msg 2023-12-01 15:15:12 +08:00
yihaoDeng 5a05f1019f valid msg 2023-12-01 14:52:37 +08:00
yihaoDeng 3ae0e2d74f valid msg 2023-12-01 14:20:16 +08:00
Haojun Liao 2b03d64850 fix(stream): drop the related fill-history task & set the task to be ready, if the drop fill-history task msg is missing due to the vnode restarting. 2023-12-01 10:18:15 +08:00
dapan1121 3b4a8f6ead Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2023-12-01 08:33:04 +08:00
dapan1121 32030ca130
Merge pull request #23886 from taosdata/revert-23730-enh/TD-26976-3.0 
Revert "enh:  grant and active codes"
 2023-11-30 19:04:50 +08:00
Minglei Jin 49ecb1093f cos/put: new arg withcp to control resumable uploading 2023-11-30 17:20:21 +08:00
Minglei Jin 3deaea9abf enh(cos/put): put object with cp 2023-11-30 16:19:15 +08:00
dapan1121 215dbeaa3d
Merge pull request #23882 from taosdata/revert/TD-27277 
revert nodes func
 2023-11-30 14:10:44 +08:00
Cary Xu f96044e09f
Revert "enh: grant and active codes" 2023-11-30 13:39:54 +08:00
Bob Liu d5989b0f74 revert nodes func 2023-11-30 11:56:33 +08:00
yihaoDeng 5c32680cd8 Merge branch '3.0' into enh/refactorBackend 2023-11-30 10:31:27 +08:00
dapan1121 72e04d4f6c
Merge pull request #23670 from taosdata/style/3.0/TD-27277 
rewrite nodesNodeName
 2023-11-29 13:29:19 +08:00
wangmm0220 1433481989 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/ly_multi_marks 2023-11-28 15:01:02 +08:00
dapan1121 75881e0f7c Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2023-11-28 14:37:15 +08:00
dapan1121 84cc80be1c fix: add window_offset translate 2023-11-28 14:35:11 +08:00
yihaoDeng 08eeee0794 Merge branch '3.0' into enh/refactorBackend 2023-11-28 11:52:49 +08:00
dapan1121 19752b020f feat: support more join type 2023-11-27 20:01:00 +08:00
wangmm0220 06e2fbfb1c fix:conflicts from 3.0 2023-11-27 17:53:53 +08:00
yihaoDeng e9bec34c44 Merge branch '3.0' into enh/refactorBackend 2023-11-27 10:01:12 +08:00
wangmm0220 d249892b2a fix:conflicts from 3.0 2023-11-23 20:29:46 +08:00
dmchen 75810bbdbb audit 2023-11-23 11:26:14 +00:00
Haojun Liao 0a90c33b4d fix(stream): drop the related fill-history task & set the task to be ready, if the drop fill-history task msg is missing due to the vnode restarting. 2023-11-23 15:49:07 +08:00
slzhou c53bd04894 feat: after select compacts 2023-11-23 15:26:21 +08:00
dmchen d4d55ab395 msg 2023-11-23 04:54:28 +00:00
dmchen 4e1a355052 mnode for compact 2023-11-23 04:43:28 +00:00
Haojun Liao 8ad071e69a other: merge main. 2023-11-23 10:25:51 +08:00
Haojun Liao ff9c0c0df4 fix(stream): fix error in check trans conflict. 2023-11-23 09:38:11 +08:00
Haojun Liao 7b1f586d4f
Merge pull request #23762 from taosdata/fix/3_liaohj 
fix(stream): fix error in generating token in bucket.
 2023-11-23 09:32:14 +08:00
wangmm0220 6dc91d12d5 fix:add msg type 2023-11-22 20:23:58 +08:00
Haojun Liao 9988720a1e fix(stream): fix the invalid check of trans conflict. 2023-11-22 16:39:29 +08:00
Haojun Liao ebb1993900 fix(stream): fix error in check trans conflict. 2023-11-22 16:20:59 +08:00
Haojun Liao 91e7000433 Merge branch 'enh/refactorBackend' of github.com:taosdata/tdengine into enh/refactorBackend 2023-11-22 15:29:31 +08:00
Haojun Liao c96f7cf182 fix(stream): scheduler the checkpoint generating. 2023-11-22 15:17:21 +08:00
yihaoDeng 0eba15b4a4 Merge branch '3.0' into enh/refactorBackend 2023-11-22 10:57:41 +08:00
shenglian zhou cc932b5ac9 fix: change compact id to 32-bit int 2023-11-21 17:01:24 +08:00
yihaoDeng 20de2f3cb5 Merge branch '3.0' into enh/refactorBackend 2023-11-17 17:15:14 +08:00
kailixu 3b62d555ab enh: code optimization for active code 2023-11-17 15:50:08 +08:00
slzhou 9ad86d7753 commit: add create show stmt support 2023-11-16 11:41:02 +08:00
shenglian zhou b51e4b18ce feat: compact return id and kill compact id 2023-11-16 11:03:56 +08:00
kailixu 188a4ce6a5 enh: the latest active code take effect 2023-11-15 16:33:05 +08:00
dapan1121 22a97ee44a
Merge pull request #23672 from taosdata/fix/3.0/TS-4241 
fix to_iso8601
 2023-11-14 18:17:12 +08:00
yihaoDeng f4d6cf7c74 Merge branch '3.0' into enh/refactorBackend 2023-11-14 18:12:48 +08:00
yihaoDeng 4476e46a5f rm dup data 2023-11-14 17:43:13 +08:00
Bob Liu 82ad690eb4 rewrite nodesNodeName 2023-11-13 20:20:45 +08:00
Shungang Li a96e21aabd enh: refactor dynamic config 2023-11-13 16:28:42 +08:00
yihaoDeng de7f2a2d1a Merge branch '3.0' into enh/refactorBackend 2023-11-13 11:11:28 +08:00
dapan1121 a51df86e43
Merge pull request #23636 from taosdata/enh/TD-25601-3.0 
enh: support delete msg for rsma
 2023-11-13 08:47:42 +08:00
Bob Liu ba8a410d6d fix toISO8601Function 2023-11-12 19:15:41 +08:00
kailixu 2a14a10d0d Merge branch '3.0' into enh/TD-25601-3.0 2023-11-10 14:45:45 +08:00
kailixu 674e878ffa enh: rsma support delete 2023-11-10 14:44:29 +08:00
dapan1121 350fac01a0 Merge remote-tracking branch 'origin/3.0' into feat/TD-24802 2023-11-10 11:48:55 +08:00
dapan1121 4cba023447 fix: case issue 2023-11-10 11:47:02 +08:00
yihaoDeng 3e2314b09b Merge branch '3.0' into enh/refactorBackend 2023-11-10 09:22:16 +08:00
Hongze Cheng ec3685db94
Merge pull request #23600 from taosdata/fix/TD-27206 
fix(vnode/cos): fix error printing to avoid buffer overflow
 2023-11-09 06:06:54 -06:00
yihaoDeng 757425bff8 Merge branch '3.0' into enh/refactorBackend 2023-11-09 17:58:49 +08:00
dapan1121 8314cb6013
Merge pull request #23494 from taosdata/enh/TD-23769-3.0x 
enh: checkpoint for rsma
 2023-11-09 14:51:37 +08:00
Minglei Jin 398771da5b Merge branch '3.0' into fix/TD-27206 2023-11-09 14:06:15 +08:00
dapan1121 38196f37b9 Merge remote-tracking branch 'origin/3.0' into feat/TD-24802 2023-11-08 18:48:13 +08:00
yihaoDeng 3abf0ae4b2 Merge branch 'feat/TD-26060' into enh/refactorBackend 2023-11-08 17:31:16 +08:00
xinsheng Ren 96a3c373e0
Merge branch '3.0' into feat/TD-26529-3.0 2023-11-08 09:28:27 +08:00
facetosea 0a16b75831 monitor client 2023-11-08 09:18:22 +08:00
kailixu 6b738884a4 chore: rsma checkpoint 2023-11-07 19:59:05 +08:00
wangmm0220 c0068abc9a fix:merge from 3.0 2023-11-07 18:55:46 +08:00
wangmm0220 f0b2ed567c fix:upload checkpoint to s3 2023-11-07 18:49:12 +08:00
yihaoDeng 95b14ee39b merge 3.0 2023-11-07 17:15:49 +08:00
dapan1121 c2ec373557 Merge remote-tracking branch 'origin/3.0' into feat/TD-24802 2023-11-07 10:09:10 +08:00