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

18216 Commits

Author SHA1 Message Date
wangmm0220 da6eda6912 Merge branch 'feat/TS-4243-3.0' of https://github.com/taosdata/TDengine into feat/TS-4243-tmq 2024-04-09 13:44:09 +08:00
54liuyao 9ed74085d8 Merge branch 'feat/TS-4243-3.0' of https://github.com/taosdata/TDengine into feat/ly-TS-4243-3.0 2024-04-09 09:16:57 +08:00
kailixu fcb605cac6 Merge branch 'feat/TS-4243-3.0' of https://github.com/taosdata/TDengine into feat/TS-4243-3.0 2024-04-08 18:23:23 +08:00
kailixu 7d34c767e9 fix: insert from select and sort merge 2024-04-08 18:23:16 +08:00
Haojun Liao 5ed81f9cab fix(tsdb): prepare pk buf 2024-04-08 18:04:06 +08:00
54liuyao 53265e9e09 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/ly-TS-4243-3.0 2024-04-08 17:24:09 +08:00
54liuyao 858d61072e check preversion data 2024-04-08 17:23:46 +08:00
Hongze Cheng 200d2b506c Merge branch 'feat/TS-4243-3.0' of https://github.com/taosdata/TDengine into feat/TS-4243-3.0 2024-04-08 11:19:33 +08:00
Hongze Cheng c0e895a4d3 more code 2024-04-08 11:18:53 +08:00
Haojun Liao 97f7e67234 fix(tsdb): set correct merge row. 2024-04-08 10:44:10 +08:00
54liuyao 3ba45df0a0 check pk column 2024-04-08 09:22:05 +08:00
54liuyao 3b00729cf0 Merge branch 'feat/TS-4243-3.0' of https://github.com/taosdata/TDengine into feat/ly-TS-4243-3.0 2024-04-08 09:10:34 +08:00
Haojun Liao 7c139e9ff9
Merge pull request #25275 from taosdata/fix/3_liaohj 
Fix/3 liaohj
 2024-04-07 22:37:33 +08:00
Haojun Liao fb58ca8592 fix(stream): not wait for the timer stopped. 2024-04-07 18:53:25 +08:00
Haojun Liao 96fc85017b fix(query): fix error in interp 2024-04-07 16:51:40 +08:00
Haojun Liao 16c17bbf72 fix(tsdb): fix error in tsdbread. 2024-04-07 14:46:22 +08:00
Haojun Liao f82505ba16 fix(stream): remove invalid assert 2024-04-07 14:06:25 +08:00
dapan1121 b7de83b086
Merge pull request #25253 from taosdata/fix/3.0/TS-4624 
fix taosd crash query ins_tags with empty nchar tag
 2024-04-07 14:06:15 +08:00
54liuyao ece59a7cf0 create pk stable 2024-04-07 10:18:36 +08:00
Haojun Liao 1b343e662c fix(stream): retry stop timer for trigger tmr. 2024-04-07 10:18:01 +08:00
Hongze Cheng 456cec5b2d
Merge pull request #25244 from taosdata/fix/portMainTo30 
port main to 30
 2024-04-07 09:57:47 +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
yihaoDeng a0bf82878d free handle 2024-04-03 09:11:49 +00:00
kailixu 1e8aaa273e chore: more logic for num of pks 2024-04-03 16:32:59 +08:00
slzhou d4b8460baa fix: change delete condition error message 2024-04-03 15:48:56 +08:00
Haojun Liao 94f703889d fix(stream): remove invalid assert. 2024-04-03 12:42:53 +08:00
wangjiaming0909 c2afd95c4e fix taosd crash query ins_tags with empty nchar tag 2024-04-03 10:07:02 +08:00
54liuyao 537395e845 Merge branch 'feat/TS-4243-3.0' of https://github.com/taosdata/TDengine into feat/ly-TS-4243-3.0 2024-04-03 09:54:10 +08:00
kailixu 62ab1b1c41 chore: allow source table with primary key 2024-04-03 09:39:58 +08:00
kailixu cc660de9d0 chore: error prompt for null primary key column 2024-04-03 08:14:30 +08:00
Haojun Liao 3619518d54 fix(stream): add logs. 2024-04-02 21:57:21 +08:00
Haojun Liao dcc97472d3 fix(stream): add strict check for checkpoint-trigger msg dispatach rsp confirmation flag. 2024-04-02 21:53:50 +08:00
kailixu 6e56e61ad5 fix: target table has less primary keys than source 2024-04-02 19:49:30 +08:00
Haojun Liao 5184e444df Merge branch '3.0' into fix/3_liaohj 2024-04-02 18:45:49 +08:00
Haojun Liao 24559725da fix(stream): add lock for when set checkpoint dispatch msg. 2024-04-02 18:45:30 +08:00
kailixu f6dc3205ee Merge branch 'feat/TS-4243-3.0' of https://github.com/taosdata/TDengine into feat/TS-4243-3.0 2024-04-02 17:33:19 +08:00
kailixu adb6de0595 fix: null value check for target column with pk 2024-04-02 17:33:11 +08:00
yihaoDeng 588f05c7dd port main to 30 2024-04-02 08:49:48 +00:00
Haojun Liao 15f2882bba Merge remote-tracking branch 'origin/feat/TS-4243-3.0' into feat/TS-4243-3.0 2024-04-02 16:10:54 +08:00
Haojun Liao 5a546e37d7 fix(query): set correct forward step for twa query. 2024-04-02 16:10:42 +08:00
kailixu dc60812183 chore: unify the prompt msg 2024-04-02 15:04:13 +08:00
kailixu 6c8995984e Merge branch 'feat/TS-4243-3.0' of https://github.com/taosdata/TDengine into feat/TS-4243-3.0 2024-04-02 14:39:21 +08:00
kailixu 77d912c210 fix: primary key should not be null or none 2024-04-02 14:39:13 +08:00
slzhou 771c6940b1 fix: initialize pk type and pk data of output SFirstLastRes when merge 2024-04-02 13:39:52 +08:00
Haojun Liao 94e6f96a75 other: merge 3.0 2024-04-02 13:39:26 +08:00
Haojun Liao bcb4d62996
Merge pull request #25229 from taosdata/fix/3_liaohj 
fix(stream): reset the ready upstream counter after task-reset.
 2024-04-02 10:05:33 +08:00
54liuyao 204c5acefe Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/ly-TS-4243-3.0 2024-04-02 09:10:52 +08:00
54liuyao 2e11f3674d Merge branch 'feat/TS-4243-3.0' of https://github.com/taosdata/TDengine into feat/ly-TS-4243-3.0 2024-04-01 18:35:44 +08:00
54liuyao 5369448bda adj log 2024-04-01 16:43:36 +08:00
Haojun Liao 9ca84091df fix(stream): reset the ready upstream counter after task-reset. 2024-04-01 16:31:10 +08:00