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

1911 Commits

Author SHA1 Message Date
dapan1121 62f3adf7fc Merge branch '3.0' into fix/TD-17819 2022-07-28 19:11:08 +08:00
Cary Xu 21fba3cb1f other: revert the walWrite.c 2022-07-28 17:15:31 +08:00
dapan1121 fbdd8bfd39 fix: fix datablock windows error 2022-07-28 17:12:53 +08:00
Cary Xu 0dcb3a5da1 fix: assign uid for rsma by physical plan 2022-07-28 17:07:47 +08:00
Shengliang Guan 239a988cdf fix: adjust config parameters 2022-07-28 15:48:37 +08:00
Shengliang Guan c05f0950de fix: adjust config items 2022-07-28 14:20:32 +08:00
WANG MINGMING 7badec9ecc
Merge pull request #15477 from taosdata/feature/TD-14761 
feat:add ts,table name from SDeleterRes
 2022-07-27 20:16:00 +08:00
wangmm0220 2ba6ac5fba feat:add ts,table name from SDeleterRes 2022-07-27 17:11:57 +08:00
Xiaoyu Wang cd25d2dc60
Merge pull request #15456 from taosdata/feature/3.0_debug_wxy 
fix: db options rename
 2022-07-27 15:02:20 +08:00
Xiaoyu Wang f977117c6c fix: db options rename 2022-07-27 11:55:19 +08:00
WANG MINGMING 98fb54bf02
Merge pull request #15439 from taosdata/feature/TD-14761 
feat:add tmq get data interface
 2022-07-27 11:05:06 +08:00
Shengliang Guan a607cd0ae2
Merge pull request #15438 from taosdata/fix/dboption 
enh: add wal option to show database command
 2022-07-26 20:42:52 +08:00
wangmm0220 915d3c4203 fix:conflicts from 3.0 2022-07-26 17:47:10 +08:00
Minglei Jin 7974d672b4 fix: make tdbDebugFlag work 2022-07-26 17:46:47 +08:00
wangmm0220 ba1962cacf feat:add tmq get data interface 2022-07-26 17:43:22 +08:00
Shengliang Guan e4b6fa744e enh: add wal option to show database command 2022-07-26 17:30:07 +08:00
Liu Jicong e6e95dffce fix(wal): config error 2022-07-26 16:03:00 +08:00
Shengliang Guan 9d5acf1812 enh: add wal options to db 2022-07-26 13:26:52 +08:00
54liuyao 35ddd56691 feat(stream): refector some log 2022-07-26 09:55:21 +08:00
Xiaoyu Wang 9571f3462d
Merge pull request #15403 from taosdata/feature/3.0_debug_wxy 
feat: add db options of wal
 2022-07-26 08:21:12 +08:00
Xiaoyu Wang 1ddbff0acf feat: add db options of wal 2022-07-25 21:09:06 +08:00
Cary Xu 4c57ed3d2a
Merge pull request #15382 from taosdata/feature/TD-11274-3.0 
fix: add data len for multiple rows
 2022-07-25 19:42:36 +08:00
Shengliang Guan 49c42ef289 fix: compile error in unitest 2022-07-25 17:39:05 +08:00
Shengliang Guan b859e6bde2 fix: the modification of alter dnode does not take effect through show dnode variables 2022-07-25 15:27:47 +08:00
Cary Xu 135d2673d6 fix: add data len for multiple rows 2022-07-25 14:50:13 +08:00
Zhiqiang Wang cdcbfc31f7
Merge pull request #15373 from taosdata/fix/ZhiqiangWang/TD-17773-fix-multi-level-storage-mount-error 
os: multi-level storage mount error
 2022-07-25 11:05:13 +08:00
shenglian zhou d3149ce8fd fix: change tag_type to string and remove quote from tag_value and normal notation is used for float/double 2022-07-24 19:59:19 +08:00
afwerar 34e4f79557 os: multi-level storage mount error 2022-07-23 19:57:10 +08:00
Cary Xu 381d378b58 fix: grant check for create table 2022-07-23 19:38:41 +08:00
WANG MINGMING b40325705d
Merge branch '3.0' into feature/TD-14761 2022-07-23 16:03:19 +08:00
wangmm0220 d6399cafc3 feat: add interface for tmq writing raw data 2022-07-23 15:59:29 +08:00
Haojun Liao 72574b69de test: update the block merge. 2022-07-23 14:09:26 +08:00
Haojun Liao b9b53f04c1 fix(query):ignore null type. 2022-07-23 13:18:36 +08:00
Haojun Liao 4a7a85ab07 other: merge 3.0 2022-07-23 00:02:53 +08:00
Haojun Liao 998dedb9fa other: merge 3.0 2022-07-22 21:16:52 +08:00
Zhiqiang Wang 3e0942aa2b
Merge pull request #15306 from taosdata/fix/ZhiqiangWang/TD-17736-fix-multi-level-storage-conf-error 
os: fix multi level storage conf error
 2022-07-22 19:38:03 +08:00
afwerar 1404632d3e os: fix multi level storage conf error 2022-07-22 17:11:57 +08:00
Liu Jicong 0a47ebc580 merge 3.0 2022-07-22 16:06:57 +08:00
Liu Jicong 2441ec22bd feat(tmq): check alter for ntb 2022-07-22 16:05:28 +08:00
WANG MINGMING 2c3e0cfe9e
Merge pull request #15277 from taosdata/feature/TD-14761 
fix:modify lock scope when receive ttl message
 2022-07-22 14:42:15 +08:00
Haojun Liao ab2ad2cc54
Merge pull request #15269 from taosdata/feature/3_liaohj 
refactor: do some internal refactor.
 2022-07-22 12:50:03 +08:00
Haojun Liao 72bbc27e8c fix(query): remove the invalid update ops. 2022-07-22 10:50:54 +08:00
wangmm0220 6ca882510b Merge branch 'feature/TD-14761' of https://github.com/taosdata/TDengine into feature/TD-14761 2022-07-22 10:29:12 +08:00
wangmm0220 6d0c718fbf fix:modify ttl push interval to 86400 & modify lock scope when receive ttl message 2022-07-22 10:28:28 +08:00
Haojun Liao 8a2fb51129
Merge pull request #15230 from taosdata/feature/3_liaohj 
fix(query): add query involved column info
 2022-07-21 20:29:25 +08:00
Cary Xu ada2eb232e fix: resource cleanup and rsma result build 2022-07-21 19:46:55 +08:00
Cary Xu f2a3f1591b
Merge pull request #15260 from taosdata/feature/TD-11274-3.0 
fix: merge dup rows in client
 2022-07-21 19:21:26 +08:00
Cary Xu 87c6f5805e fix: add and adapt cases for merge dup rows in taosc 2022-07-21 17:11:13 +08:00
Haojun Liao 0c326410fd fix(query): set value for varchar type in fill and check for null ptr before cleanup. 2022-07-21 16:54:07 +08:00
Haojun Liao 8e42bf85e8 fix(query): fix border check. 2022-07-21 15:47:22 +08:00
dapan1121 113dfdde0a fix: increase query thread number 2022-07-21 10:38:36 +08:00
Cary Xu 65871c2d73 Merge branch '3.0' into feature/TD-11274-3.0 2022-07-21 09:44:20 +08:00
dapan1121 976d4670a9 Merge branch '3.0' into fix/TD-15197 2022-07-21 09:11:03 +08:00
Cary Xu e39f2e5ce9 fix: the calculation of max row length 2022-07-20 21:32:28 +08:00
Cary Xu 0f5983ad88 fix: merge dup rows in client 2022-07-20 20:30:54 +08:00
Haojun Liao e6febe45dd
Merge pull request #15180 from taosdata/feature/3_liaohj 
fix(query): fix time window generating bug.
 2022-07-20 19:15:28 +08:00
Liu Jicong 8a9e729db2
Merge pull request #15195 from taosdata/feature/stream 
feat(wal): remove wal log size limitation
 2022-07-20 17:59:30 +08:00
Haojun Liao fc7887e6b7 fix(query): update the sim. 2022-07-20 17:24:49 +08:00
Liu Jicong bf37f3fa68 feat(wal): remove wal log size limitation 2022-07-20 16:15:53 +08:00
Haojun Liao df58a9bb30 fix(query): handle fraction of ts in add ts offset. 2022-07-20 15:30:52 +08:00
Haojun Liao 3fba8182a5 fix(query): fix time window generating bug. 2022-07-20 13:02:33 +08:00
Shengliang Guan ebd02be60d fix: definite lost while get sma meta 2022-07-20 10:50:36 +08:00
dapan1121 5ed719c727 fix: fix catalog memory leak 2022-07-20 09:39:58 +08:00
afwerar 622ab28e6e os: backend run fail error 2022-07-19 14:59:07 +08:00
Ganlin Zhao e5aadc9323 Merge branch '3.0' into fix/TD-17381 2022-07-18 17:34:28 +08:00
Ganlin Zhao 1ab22f9d9e fix(query): fix taosd crashed when using first(col+null) 
TD-17381
 2022-07-18 17:29:40 +08:00
afwerar fa96e64ee0 os: win format negative timestamp error 2022-07-18 16:53:20 +08:00
Liu Jicong 6fb3072b43 Merge branch '3.0' into feature/stream 2022-07-18 11:46:59 +08:00
Liu Jicong 500553d581 refactor: add debug log 2022-07-18 11:41:56 +08:00
Haojun Liao 1ed388c0ce
Merge pull request #15016 from taosdata/feature/3_liaohj 
fix(query): add limit/offset implementation in exchange operator.
 2022-07-18 10:57:46 +08:00
Haojun Liao 95db2fb8a8
Merge branch '3.0' into feature/3_liaohj 2022-07-18 10:01:32 +08:00
Minglei Jin 677fd4764f fix: dismiss memory issues 2022-07-18 09:42:40 +08:00
Cary Xu 5ef9239c74
Merge pull request #14979 from taosdata/feature/grant-3.0 
feat: support grant
 2022-07-17 22:16:00 +08:00
Haojun Liao ad058e8c97 Merge branch '3.0' into feature/3_liaohj 2022-07-17 11:06:49 +08:00
shenglian zhou de1ca5b68f Merge branch '3.0' of github.com:taosdata/TDengine into szhou/feature/user-tags 2022-07-17 05:07:17 +08:00
Haojun Liao f0d1f393fd fix(query): add limit/offset implementation in exchange operator. 2022-07-16 23:24:59 +08:00
54liuyao 069778c676 feat(stream): add log 2022-07-16 17:32:40 +08:00
shenglian zhou 97d30c6858 feat: add user tags to system table 2022-07-16 17:25:05 +08:00
shenglian zhou 9fccdce05a feat: add user tags to information schema 2022-07-16 14:38:03 +08:00
Cary Xu 2e9e36d0f8 Merge branch '3.0' into feature/grant-3.0 2022-07-16 11:54:26 +08:00
Xiaoyu Wang 7c585d8ed9 fix: database options 'strict' and 'cachelast' syntax adjustments 2022-07-16 11:47:26 +08:00
54liuyao 352db0febb feat(stream): optimize interval plan 2022-07-16 09:28:15 +08:00
shenglian zhou fcc87f09fe feat: add user tags 2022-07-15 21:33:30 +08:00
Liu Jicong af0f398121
Merge pull request #14960 from taosdata/feature/stream 
feat(stream): recover from failure
 2022-07-15 18:32:48 +08:00
Liu Jicong 9394e3380f feat(stream): recover from failure 2022-07-15 17:58:53 +08:00
yihaoDeng baa21c8398 Merge branch '3.0' of https://github.com/taosdata/TDengine into dev 2022-07-15 14:58:00 +08:00
yihaoDeng 35e8ad2811 feat: add time unsynced check 2022-07-15 14:51:20 +08:00
Haojun Liao b23e08db85
Merge pull request #14893 from taosdata/feature/3_liaohj 
fix(query): set correct fill output column index and fix some memory leaks
 2022-07-14 14:25:24 +08:00
Cary Xu 1175bda094 Merge branch '3.0' into feature/grant-3.0 2022-07-14 14:10:14 +08:00
Haojun Liao 75aca0b031 fix(query): set correct fill output column index, fix some memory leak, and do some internal refactor, 2022-07-14 13:53:23 +08:00
WANG MINGMING 131f87ffed
Merge pull request #14778 from taosdata/feature/TD-13041 
feat: get meta and write meta from tmq
 2022-07-14 13:28:57 +08:00
Haojun Liao 6fd4684a26 fix(query): ensure buffer before load data. 2022-07-14 11:16:15 +08:00
wangmm0220 3b4c2826b4 Merge branch '3.0' into feature/TD-13041 2022-07-14 10:22:15 +08:00
Haojun Liao 38b395147a Merge branch '3.0' into feature/3_liaohj 2022-07-13 23:27:51 +08:00
Haojun Liao 083de75afc fix(query):fix memory leak. 2022-07-13 23:15:58 +08:00
Cary Xu 67a5f12ac0 Merge branch '3.0' into feature/grant-3.0 2022-07-13 19:56:03 +08:00
wangmm0220 d3cdd75b94 Merge branch '3.0' into feature/TD-13041 2022-07-13 19:40:26 +08:00
dapan1121 f69a995ea7
Merge pull request #14861 from taosdata/fix/TD-16763 
fix: fix natural timestamp issue
 2022-07-13 19:03:49 +08:00
wangmm0220 8aa04f8e55 fix:error in tmq meta 2022-07-13 18:49:57 +08:00
Shengliang Guan 699f295aa8
Merge pull request #14859 from taosdata/fix/dnode 
enh: add stream queue to vnode
 2022-07-13 17:03:38 +08:00
dapan1121 8c83f07fe4 fix: fix natural timestamp issue 2022-07-13 16:43:50 +08:00
Shengliang Guan c2aebfa322 enh: add stream queue to vnode 2022-07-13 16:26:22 +08:00
wangmm0220 cd051d40c3 fix:confilct from 3.0 2022-07-13 16:03:39 +08:00
Shengliang Guan 480de34a0e enh: support alter debugflag in dnode 2022-07-13 14:13:12 +08:00
Hongze Cheng a67c8560a0
Merge pull request #14787 from taosdata/feat/row_refact 
refact: row format
 2022-07-12 20:45:02 +08:00
Shengliang Guan 148e3a5f97
Merge pull request #14818 from taosdata/fix/mnode 
enh: adjust vnode fetch queue number
 2022-07-12 20:43:05 +08:00
Hongze Cheng fefa18c0ec Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/row_refact 2022-07-12 11:57:02 +00:00
wangmm0220 2b442621e8 feat:get child table name in tmq meta 2022-07-12 18:58:33 +08:00
Liu Jicong a34d344225
Merge pull request #14808 from taosdata/feature/stream 
refactor(tmq): prepare only needed
 2022-07-12 18:09:31 +08:00
dapan1121 558829dccc
Merge pull request #14829 from taosdata/fix/scalarNullissue 
fix: fix null bytes issue
 2022-07-12 18:03:17 +08:00
Shengliang Guan 037f84fafd Merge remote-tracking branch 'origin/3.0' into fix/mnode 2022-07-12 17:29:23 +08:00
dapan1121 25f80f8d3e fix: fix null bytes issue 2022-07-12 17:10:55 +08:00
Minglei Jin 81d5282b29 fix: use Ex version of tDecodeSSchemaWrapper 2022-07-12 16:45:04 +08:00
wangmm0220 824d3db96b fix:conflict from 3.0 2022-07-12 16:01:55 +08:00
Xiaoyu Wang 12f9027b8e
Merge pull request #14819 from taosdata/feature/3.0_debug_wxy 
fix: some problems of parser
 2022-07-12 16:01:14 +08:00
Xiaoyu Wang 8b89492101 fix: some problems of parser 2022-07-12 15:11:55 +08:00
Liu Jicong 7cf99d5359 refactor(tmq): prepare only needed 2022-07-12 15:11:14 +08:00
Shengliang Guan 2aee76ab63 Merge remote-tracking branch 'origin/3.0' into fix/mnode 2022-07-12 15:07:47 +08:00
Shengliang Guan 75804db990 Merge remote-tracking branch 'origin/3.0' into fix/dnode 2022-07-12 14:22:10 +08:00
Shengliang Guan 48dee594d3 refactor: adjust the minimum number of fetch threads to 4 2022-07-12 14:21:58 +08:00
Liu Jicong ac57956a56 Merge branch '3.0' into feature/stream 2022-07-12 14:12:18 +08:00
Liu Jicong d637ffe22c refactor(tmq): prepare only needed 2022-07-12 14:10:22 +08:00
dapan1121 8957a91ab3 fix: add more columns in show stable res 2022-07-12 13:56:15 +08:00
Shengliang Guan c1498e4a85 fix: invalid vnode ref while drop stream 2022-07-12 10:31:25 +08:00
Hongze Cheng 31d3ae244e make it compile 2022-07-12 02:19:38 +00:00
Hongze Cheng 28fa84b1d6 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/row_refact 2022-07-11 12:48:47 +00:00
Hongze Cheng 85b4896fa4 more row refact 2022-07-11 12:48:16 +00:00
Hongze Cheng 09b76a8abb more tsdb row refact 2022-07-11 12:36:34 +00:00
Hongze Cheng 34e5bad70b refact row 2022-07-11 11:43:16 +00:00
Shengliang Guan afc316ef90 Merge remote-tracking branch 'origin/3.0' into fix/dnode 2022-07-11 19:19:25 +08:00
Hongze Cheng dced0deaca Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/retention 2022-07-11 11:19:22 +00:00
wangmm0220 f9d5c809c9 fix:conflict from 3.0 2022-07-11 19:06:36 +08:00
Shengliang Guan 943de8bc15 enh: adjust vnode fetch queue number 2022-07-11 17:52:30 +08:00
Hongze Cheng 61fb45af56 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_snapshot 2022-07-11 09:48:43 +00:00
54liuyao 66f0c47ec3 feat(stream): adjust print log 2022-07-11 17:34:28 +08:00
Cary Xu 85d7e46ff9 Merge branch '3.0' into feature/grant-3.0 2022-07-11 17:20:05 +08:00
Shengliang Guan a846bb9381 refactor: rename cacheLastRow to cacheLast 2022-07-11 15:45:40 +08:00
Shengliang Guan e63b96fb3a fix: rollback vnode fetch threads 2022-07-11 15:31:32 +08:00
Shengliang Guan 6f4d17420c Merge remote-tracking branch 'origin/3.0' into fix/valgrind 2022-07-11 15:21:12 +08:00
Shengliang Guan 150489dc98 Merge branch 'feat/tsdb_snapshot' of https://github.com/taosdata/TDengine into feat/tsdb_snapshot 2022-07-11 15:16:22 +08:00
Shengliang Guan 080f30d014 feat: trim db 2022-07-11 15:16:10 +08:00
slzhou@taodata.com 0fb06cbc4c fix: set capacity for newly created datablock 2022-07-11 11:40:44 +08:00
Shengliang Guan 9c21af8197 refactor: adjust threads number 2022-07-11 10:55:20 +08:00
Xiaoyu Wang 0bc700eb82 feat: sql command 'trim database' 2022-07-11 10:53:06 +08:00
Liu Jicong f9ba552496
Merge pull request #14739 from taosdata/feature/stream 
fix(wal): read after rolling
 2022-07-10 21:45:31 +08:00
Liu Jicong 219d966b25 fix(wal): read after rolling 2022-07-10 21:02:25 +08:00
Shengliang Guan e587be2545
Merge pull request #14737 from taosdata/fix/valgrind 
refactor: adjust logs
 2022-07-10 19:44:39 +08:00
wangmm0220 b1c290f6dc fix:conflicts 2022-07-10 18:57:34 +08:00
wangmm0220 607f8163d3 feat:add logic for get_tmq_meta_json 2022-07-10 18:54:58 +08:00
Shengliang Guan 9fe73acc86 refactor: adjust logs 2022-07-10 18:53:52 +08:00
54liuyao 2465620245 feat(stream): support expressions 2022-07-10 18:31:52 +08:00
Xiaoyu Wang 5f0005a7b7 merge 3.0 2022-07-10 17:47:31 +08:00
Xiaoyu Wang bd210bf392 Merge remote-tracking branch 'origin/3.0' into feature/3.0_debug_wxy 2022-07-10 16:45:14 +08:00
Haojun Liao 5819b616ce fix(query): update the number of query threads. 2022-07-10 16:33:38 +08:00
dapan1121 5250f305bc
Merge pull request #14719 from taosdata/enh/redirect 
enh: enhance query redirect processing
 2022-07-10 13:29:52 +08:00
dapan1121 e733f8067d enh: enhance query redirect 2022-07-10 11:21:13 +08:00
Shengliang Guan 998de54728 feat:write meta from tmq to taosd 2022-07-10 11:17:51 +08:00
Shengliang Guan c6591c3cd3 Merge remote-tracking branch 'origin/3.0' into feature/TD-13041 2022-07-10 10:59:47 +08:00
Shengliang Guan f2f45a1ec7 feat:write meta from tmq to taosd 2022-07-10 10:59:34 +08:00
Xiaoyu Wang 2454298b0b Merge remote-tracking branch 'origin/3.0' into feature/3.0_debug_wxy 2022-07-10 10:24:55 +08:00
WANG MINGMING 30b1af3feb
Merge pull request #14700 from taosdata/feature/TD-13041 
feat:write meta from tmq to taosd
 2022-07-10 10:22:51 +08:00
Shengliang Guan c53a84b733 Merge remote-tracking branch 'origin/3.0' into fix/valgrind 2022-07-09 20:13:26 +08:00
Shengliang Guan e4a855e591 Merge remote-tracking branch 'origin/3.0' into fix/valgrind 2022-07-08 19:54:26 +08:00
wangmm0220 6b46423a97 feat:write meta from tmq to taosd 2022-07-08 18:37:47 +08:00
Shengliang Guan a5e8ddbc56 refactor: adjust logs 2022-07-08 18:00:19 +08:00
Liu Jicong 938868e39f merge from 3.0 2022-07-08 17:57:11 +08:00
Liu Jicong 3cd5a35054 refactor(stream): internal refactor 2022-07-08 17:48:34 +08:00
Xiaoyu Wang df06d22cb3 fix: some problem of parser and planner 2022-07-08 17:35:11 +08:00
Ganlin Zhao 8cbd88b6f4
Merge pull request #14675 from taosdata/fix/TD-17155 
fix(query): taosd crash in stream when use max(cast())
 2022-07-08 17:03:17 +08:00
dapan1121 50a6ef7f39
Merge pull request #14635 from taosdata/feature/insertselect 
feat: support insert from query res
 2022-07-08 16:59:21 +08:00
Shengliang Guan 7c39d6076c
Merge pull request #14681 from taosdata/fix/tsim 
refactor: delete redundant files
 2022-07-08 16:30:00 +08:00
Shengliang Guan 96db676995 refactor: delete redundant files 2022-07-08 15:37:53 +08:00
Shengliang Guan 6e12d8e707 refactor: adjust log 2022-07-08 15:20:15 +08:00
Ganlin Zhao 6eb40c4090 Merge branch '3.0' into fix/TD-17155 2022-07-08 14:31:01 +08:00
Ganlin Zhao f8ff52b451 fix(query): taosd crash in stream when use max(cast()) 
TD-17155
 2022-07-08 14:29:32 +08:00
dapan1121 0925064d24 Merge branch 'feature/3.0_debug_wxy' into feature/insertselect 2022-07-08 10:28:53 +08:00
Shengliang Guan 7afdd3603d fix: definite lost while send msg on dnode exiting 2022-07-07 17:28:28 +08:00
54liuyao c35e9d0dd3 fix(rmsa): print datablock crash 2022-07-07 10:59:11 +08:00
dapan1121 d4696ef31f Merge branch '3.0' into feature/insertselect 2022-07-07 09:02:09 +08:00
dapan1121 d625cc2e47 feat: insert from query 2022-07-06 21:00:31 +08:00
Cary Xu cc488bdc07 other: change grant hb to 60 sec 2022-07-06 20:48:14 +08:00
Cary Xu b22986ced0 feat: support grant 2022-07-06 20:46:41 +08:00
dapan1121 0d4fb5bb80 feat: support insert from query 2022-07-06 16:29:51 +08:00
Cary Xu 2fbc6a5343 other: enable kv row 2022-07-06 10:30:23 +08:00
Cary Xu 3091f111b7 other: use tp row 2022-07-06 09:13:24 +08:00
Cary Xu 6ef9f0c9e9 fix: rsma version adjust 2022-07-05 14:57:01 +08:00
Haojun Liao 6bfe5df94a other: merge 3.0 2022-07-05 09:47:39 +08:00
Xiaoyu Wang ba056f7fbb
Merge pull request #14508 from taosdata/feature/3.0_debug_wxy 
fix: automatically supplement primary key columns when creating stream
 2022-07-05 09:27:52 +08:00
Xiaoyu Wang ac34cde0af fix: increase the validity check of the rollup parameter in the create table statement 2022-07-04 19:27:27 +08:00
Shengliang Guan 63e3529e0f fix: system memory not set in ut 2022-07-04 19:03:10 +08:00
Shengliang Guan 07fa747429 fix: valgrind error 2022-07-04 18:30:10 +08:00
Shengliang Guan c58a84750e Merge remote-tracking branch 'origin/3.0' into fix/tsim 2022-07-04 17:54:25 +08:00
Shengliang Guan 630eebecd5 enh: check available memory of dnode while creating db 2022-07-04 17:50:35 +08:00
Xiaoyu Wang 8b486765d3 fix: sort operator exception error 2022-07-04 16:23:38 +08:00
Hongze Cheng ddb198de23 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-07-04 03:42:50 +00:00
Shengliang Guan d28c97ba5a Merge remote-tracking branch 'origin/fix/dnode_wxy' into fix/tsim 2022-07-02 19:16:31 +08:00
Xiaoyu Wang dd564e551c fix: a problem of show indexes 2022-07-02 19:16:03 +08:00
Shengliang Guan a6221e654a fix: show indexes 2022-07-02 18:45:07 +08:00
Zhiqiang Wang b45702be6f
Merge pull request #14466 from taosdata/fix/ZhiqiangWang/TD-13064-add-Mac-compile-support 
os: add Mac compile support
 2022-07-02 18:02:28 +08:00
afwerar b9a1c6744c os: add Mac compile support 2022-07-02 17:40:23 +08:00
Ganlin Zhao a6657a5905
Merge pull request #14463 from taosdata/fix/cast_binary_2_timestamp 
enh(query): add cast from binary/nchar -> timestamp for date-time string
 2022-07-02 17:22:31 +08:00
Ganlin Zhao 5e55164e96 fix bugs in convertStringToTimestamp 2022-07-02 16:29:03 +08:00
Cary Xu ef7a25fdc3 fix: fix the var data len 2022-07-02 16:01:19 +08:00
Cary Xu 576777a63c fix: fix the var data len 2022-07-02 15:57:25 +08:00
54liuyao 0d10895721 fix(stream): project ignore retrive datablock 2022-07-02 15:40:15 +08:00
wangmm0220 4e6b3d72ac Merge branch '3.0' into feature/TD-13041 2022-07-01 16:54:18 +08:00
wangmm0220 085ace59e0 fix:to_json() function 2022-07-01 16:47:54 +08:00
shenglian-zhou 1920980d4c
Merge pull request #14432 from taosdata/szhou/feature/push-cond-child-proj 
feat: push condition to child projection
 2022-07-01 16:30:02 +08:00
slzhou 1003cd8549 feat: push condition to child projection 2022-07-01 15:25:02 +08:00
Shengliang Guan 4810e25a44 Merge remote-tracking branch 'origin/3.0' into fix/tsim 2022-07-01 14:56:16 +08:00
dapan1121 5b018f399a
Merge pull request #14418 from taosdata/hotfix/streamcrash 
fix: fix stream crash issue
 2022-07-01 13:22:20 +08:00
afwerar 4e8f3db596 os: replace win qsort func 2022-07-01 11:54:21 +08:00
Shengliang Guan 35017bdfcc refactor: stable mgmt 2022-07-01 11:16:20 +08:00
Shengliang Guan 1b3fde4a60 refactor: stable mgmt 2022-07-01 11:12:08 +08:00
dapan1121 ba265d51b8 fix: fix stream crash issue 2022-07-01 10:29:37 +08:00
Liu Jicong c40c22c386
Merge pull request #14401 from taosdata/feature/stream 
fix(tmq): reset window
 2022-06-30 20:21:26 +08:00
Liu Jicong 4f107908db fix(tmq): reset window 2022-06-30 19:51:48 +08:00
Xiaoyu Wang 8c2e9842e2
Merge pull request #14393 from taosdata/feature/3.0_debug_wxy 
feat: support 'select *, expr from ...' syntax
 2022-06-30 18:25:12 +08:00
wangmm0220 e751e20c76 fix:merge from 3.0 2022-06-30 16:25:43 +08:00
Xiaoyu Wang 1530b33991 feat: support 'select *, expr from ...' syntax 2022-06-30 16:16:05 +08:00
dapan1121 c28c77a099 Merge branch '3.0' into feature/queryredirect 2022-06-30 14:35:15 +08:00
wangmm0220 6215c460a1 fix:error in limit offset 2022-06-30 14:30:35 +08:00
dapan1121 a535df7590 feat: query redirect 2022-06-30 11:04:49 +08:00
Liu Jicong 0f0fe6276a merge from 3.0 2022-06-29 21:33:10 +08:00
Liu Jicong c2955a807b feat(tmq): offset support snapshot 2022-06-29 21:04:51 +08:00
wangmm0220 3725adc861 fix:merge from 3.0 2022-06-29 18:45:34 +08:00
54liuyao 5e0cbdf0b7 feat(stream): ignore close window 2022-06-29 16:49:45 +08:00
Xiaoyu Wang 19874daf93 fix: illegal memory access in tDeserializeSMCreateStbReq function 2022-06-29 13:49:39 +08:00
Hongze Cheng 18afc81a48 finish delete func 2022-06-28 10:01:56 +00:00
Liu Jicong 58803fafcf fix(query): check datablock should check output flag 2022-06-28 16:05:00 +08:00
Haojun Liao 4a59e1300b other: merge 3.0. 2022-06-28 15:22:32 +08:00
Minglei Jin d262ca1b81 trow/STSRow: new ts row from array of colvals 2022-06-27 20:32:11 +08:00
wangmm0220 8e5099c44c Merge branch '3.0' into feature/TD-13041 2022-06-27 20:02:00 +08:00
Xiaoyu Wang 87b8131409
Merge pull request #14266 from taosdata/feature/3.0_debug_wxy 
feat: tail function rewrite to statement
 2022-06-27 17:16:37 +08:00
slzhou 73c42c911b fix: fix compilation error 2022-06-27 16:29:20 +08:00
slzhou b67c65313b fix: add group to multi-merge operator 2022-06-27 16:25:14 +08:00
wangmm0220 5557c2ef93 fix: add limit for json operator 2022-06-27 16:17:58 +08:00
Cary Xu e6dd04f573 refactor: rsma restore 2022-06-27 14:47:14 +08:00
wangmm0220 c190fa5bd9 fix: keep n rows if limit n 2022-06-27 10:51:47 +08:00
Cary Xu 0597f3b9cd refactor: rsma resource release 2022-06-26 18:44:49 +08:00
Liu Jicong 0c1a51bad6 enh(stream): refine tqRetrieveDataBlock api 2022-06-25 20:03:29 +08:00
54liuyao 10e90ce973 feat(stream): auto pull data 2022-06-25 16:44:14 +08:00
Haojun Liao 916adb82c6 enh(query): add user name when retrieving meta-data from mnode. 2022-06-25 12:10:34 +08:00
WANG MINGMING f0b50add27
Merge pull request #14184 from taosdata/feature/TD-13041 
feat:sort table group if needed & optimize partition by tag
 2022-06-25 09:41:30 +08:00
wangmm0220 f3c2957628 opti:ttl/comment log and parameters 2022-06-24 18:38:06 +08:00
dapan1121 f7ece71ff7
Merge pull request #14204 from taosdata/enh/showvariables 
enh: refactor show variables
 2022-06-24 16:41:48 +08:00
dapan1121 94a2b6d945 enh: refactor show variables 2022-06-24 15:18:40 +08:00
dapan1121 53755c2365
Merge pull request #14188 from taosdata/feature/alterlocal 
feat: alter local command
 2022-06-24 15:15:47 +08:00
Xiaoyu Wang 096c292d78
Merge pull request #14179 from taosdata/feature/3.0_debug_wxy 
feat: sql command 'show consumers' and 'show subscriptions'
 2022-06-24 12:51:21 +08:00
dapan1121 b092a9c5c9 Merge branch '3.0' into feature/alterlocal 2022-06-24 08:22:11 +08:00
dapan1121 abc69e1e2b feat: add new api 2022-06-24 08:20:54 +08:00
Liu Jicong f2f5d68f3b fix(stream): memory leak 2022-06-23 22:05:00 +08:00
Liu Jicong 5cdef06f8c
Merge pull request #14119 from taosdata/feature/3_liaohj 
refactor(query): do some internal refactor.
 2022-06-23 20:08:15 +08:00
Xiaoyu Wang 0b9eb79bf7 merge 3.0 2022-06-23 18:08:47 +08:00
Xiaoyu Wang 4fcd667bf6 feat: sql command 'show consumers' and 'show subscriptions' 2022-06-23 18:03:15 +08:00
Shengliang Guan eb86ecfa78 Merge remote-tracking branch 'origin/3.0' into fix/dnode 2022-06-23 17:57:34 +08:00
Haojun Liao e3c4215ac9 Merge branch '3.0' into feature/3_liaohj 2022-06-23 17:39:58 +08:00
Haojun Liao e071649619 test: update the unit test. 2022-06-23 16:34:43 +08:00
Shengliang Guan 0811e5fc93 feat: make config dnode work 2022-06-23 15:35:22 +08:00
Shengliang Guan 147a984c17 feat: make config dnode work 2022-06-23 15:11:23 +08:00
shenglian zhou f4ec009a00 Merge branch '3.0' of github.com:taosdata/TDengine into feature/3_liaohj 2022-06-23 13:49:10 +08:00
shenglian zhou e69a767f1b Merge branch 'feature/3_liaohj' of github.com:taosdata/TDengine into feature/3_liaohj 2022-06-23 13:45:03 +08:00
shenglian zhou a31569f116 fix: set correct datablock rows and columns 2022-06-23 13:38:20 +08:00
Ganlin Zhao 7e6b99b089 Merge branch '3.0' into fix/revert_parse_time 2022-06-23 13:28:29 +08:00
dapan1121 b2ff536050
Merge pull request #14118 from taosdata/feature/showdnodevariables 
feat: show dnode variables
 2022-06-23 13:23:06 +08:00
Ganlin Zhao 1a1704f26b refactor(query): refactor taosParseTime to support ISO8601 date-time 
format and timestamp shortcut format

TD-16770
 2022-06-23 12:59:33 +08:00
Haojun Liao 2d31d3cb43 other: merge 3.0 2022-06-23 10:37:07 +08:00
WANG MINGMING 9012834531
Merge branch 'feature/3.0_wxy' into 3.0 2022-06-23 10:16:58 +08:00
WANG MINGMING 77f34c8fca
Merge pull request #14094 from taosdata/feature/TD-16524 
fix: error in windows
 2022-06-23 10:08:56 +08:00
Zhiqiang Wang 3d9ed4006a
Merge pull request #14116 from taosdata/fix/ZhiqiangWang/TD-16357-fix-shell-chinese-error 
shell: fix shell chinese error
 2022-06-23 10:04:57 +08:00
Haojun Liao a0795fdd10 fix(query): set correct varchar length. 2022-06-23 00:47:28 +08:00
Haojun Liao 32e479858f fix(query): disable type check. 2022-06-22 23:48:23 +08:00
Haojun Liao 300f35188e fix(query): prepare the SColumnInfoData. 2022-06-22 21:18:11 +08:00
Haojun Liao ecc05bf75c fix(query): check pointer before use it. 2022-06-22 21:12:08 +08:00
Haojun Liao 02a53ee81f fix(query): set correct memory buffer size. 2022-06-22 21:03:59 +08:00
Haojun Liao bf0caa2038 Merge branch '3.0' into feature/3_liaohj 2022-06-22 20:32:02 +08:00
Haojun Liao 324eecdd99 fix(query): prepare the buffer before assigning result. 2022-06-22 20:24:26 +08:00
Haojun Liao 72a942b09e refactor(query): do internal refactor. 2022-06-22 19:44:14 +08:00
Haojun Liao b097e78708 fix(query): clear buffer before set data. 2022-06-22 19:40:59 +08:00
Haojun Liao c79eda9f70 fix(query): prepare the buffer before serialize the retrieved data. 2022-06-22 19:34:56 +08:00
Hongze Cheng 5d2491de52 more work 2022-06-22 09:28:59 +00:00
Haojun Liao 5c1e7f3114 Merge branch '3.0' into feature/3_liaohj 2022-06-22 17:23:57 +08:00
Haojun Liao 14ddf539e0 refactor(query): do some internal refactor. 2022-06-22 17:21:04 +08:00
dapan1121 66cfe3a3fc feat: show dnode variables 2022-06-22 17:17:18 +08:00
wangmm0220 d9dc806a21 feat: add configure for ttl 2022-06-22 17:11:18 +08:00
afwerar c234adbb85 shell: fix shell chinese error 2022-06-22 17:07:49 +08:00
Xiaoyu Wang acd1bbd8e3 merge 3.0 2022-06-22 17:00:11 +08:00
Hongze Cheng b20d7d56b5 more work 2022-06-22 08:45:26 +00:00
Xiaoyu Wang a5ca4965a4 feat: some sql syntax adjustments 2022-06-22 16:35:14 +08:00
WANG MINGMING 15eb9c485e
Merge pull request #14069 from taosdata/3.0 
feat:merge from 3.0
 2022-06-22 16:33:15 +08:00
wangmm0220 db34294bed opt: filter by tag 2022-06-22 16:32:10 +08:00
Shengliang Guan adce85f977 Merge remote-tracking branch 'origin/3.0' into feature/TD-16524 2022-06-22 11:20:08 +08:00
Shengliang Guan ab37b6e546 refactor: adjust code styles 2022-06-22 11:18:10 +08:00
Haojun Liao ac656dcc46
Merge pull request #14090 from taosdata/feature/3_liaohj 
fix(query): reserve correct buffer before loading data
 2022-06-22 10:55:47 +08:00
Haojun Liao 1568722e8e fix(query): reserve correct buffer size before retrieve datablock from vnode. 2022-06-22 09:31:45 +08:00
dapan1121 4a8c9db884 Merge branch '3.0' into feature/showdnodevariables 2022-06-21 21:07:44 +08:00
dapan1121 692f5f0e01 feat: show dnode variables 2022-06-21 21:05:47 +08:00
dapan1121 a23418d1fa
Merge pull request #14070 from taosdata/feature/showcreate 
feat: show create table
 2022-06-21 21:05:30 +08:00
wangmm0220 f2ad546666 fix: add configure for ttl unit 2022-06-21 18:37:47 +08:00
Shengliang Guan 55c524e811
Merge pull request #14057 from taosdata/fix/mnode 
refactor: add gtid to log
 2022-06-21 18:28:32 +08:00
Shengliang Guan 23e921d41b fix: invalid write while encode password 2022-06-21 18:03:54 +08:00
WANG MINGMING a94f90a343
Merge pull request #14062 from taosdata/feature/TD-14761 
fix:affect row in schemaless & md5
 2022-06-21 17:57:05 +08:00
dapan1121 88b48ec46c Merge branch '3.0' into feature/showcreate 2022-06-21 17:40:52 +08:00
dapan1121 0f148c6f47 feat: show create table 2022-06-21 16:45:59 +08:00
wangmm0220 572e106691 fix:affect row in schemaless & md5 2022-06-21 16:17:53 +08:00
Liu Jicong 3f6ce2da73 feat(tmq): support topic with meta 2022-06-21 15:18:09 +08:00
Xiaoyu Wang aca91eb831
Merge pull request #14033 from taosdata/feature/3.0_debug_wxy 
feat: sql command 'show local variables' and 'show dnode variables'
 2022-06-21 10:31:13 +08:00
dapan1121 b084be71f6 feat: show create table 2022-06-21 09:18:53 +08:00
dapan1121 be2935cba6 feat: show create table 2022-06-20 20:58:36 +08:00
Xiaoyu Wang 33d7551cd4 merge 3.0 2022-06-20 20:38:08 +08:00
Liu Jicong f5f8100d25
Merge branch '3.0' into feature/stream 2022-06-20 20:19:08 +08:00
Liu Jicong 450675f672 feat(stream): support snode 2022-06-20 20:18:34 +08:00
Cary Xu 20508c42f2 Merge branch '3.0' into feature/TD-14481-3.0 2022-06-20 19:27:38 +08:00
Cary Xu ba94a44bec refactor: rsma support max_delay/watermark params 2022-06-20 19:27:26 +08:00
Shengliang Guan 96434756de refactor: save sdb file on needed 2022-06-20 16:23:04 +08:00
Xiaoyu Wang b4057d657e feat: group by tags optimize 2022-06-20 15:42:31 +08:00
dapan1121 88aff7bae1 Merge branch '3.0' into feature/showcreate 2022-06-20 13:35:18 +08:00
dapan1121 40879a80fe feat: show create table 2022-06-20 13:32:21 +08:00
Hongze Cheng bdc427dc78 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-20 01:26:31 +00:00
wangmm0220 e169d19dd4 fix:heap overflow in comment 2022-06-18 21:08:12 +08:00
wangmm0220 746f4759b0 fix:merge from 3.0 2022-06-18 19:40:36 +08:00
Hongze Cheng afb5be516f Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-18 10:35:57 +00:00
Xiaoyu Wang 3599b26526
Merge pull request #13943 from taosdata/feature/3.0_debug_wxy 
feat: rollup options adjust
 2022-06-18 16:26:48 +08:00
Hongze Cheng 709e9fd78b more work 2022-06-18 03:35:49 +00:00
WANG MINGMING a64013461f
Merge branch '3.0' into feature/TD-16524 2022-06-18 11:11:54 +08:00
Hongze Cheng 2e590c3036 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-18 01:53:01 +00:00
Liu Jicong 4043e5c699
Merge pull request #13954 from taosdata/feature/stream 
fix(stream): build ctb name
 2022-06-17 22:40:56 +08:00
Liu Jicong 9744dd31fb Merge branch '3.0' into feature/stream 2022-06-17 21:36:22 +08:00
Liu Jicong 342a1ae42d fix(stream): build ctb name 2022-06-17 21:00:10 +08:00
Hongze Cheng a200ea85db Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-17 12:23:01 +00:00
Shengliang Guan 4ab601279d Merge remote-tracking branch 'origin/3.0' into fix/mnode 2022-06-17 19:05:20 +08:00
Xiaoyu Wang 64f8a9cea8 merge 3.0 2022-06-17 18:45:17 +08:00
Xiaoyu Wang aea4f9c69b feat: rollup options adjust 2022-06-17 17:27:42 +08:00
wangmm0220 66163539bd Merge branch 'feature/TD-16524' of github.com:taosdata/TDengine into feature/TD-16524 2022-06-17 15:57:31 +08:00
wangmm0220 6184d33011 fix: comment & ttl 2022-06-17 15:55:59 +08:00
dapan1121 b864da2a9c fix app release issue 2022-06-17 15:26:45 +08:00
WANG MINGMING b3d2daeb72
Merge branch '3.0' into feature/TD-16524 2022-06-17 14:51:33 +08:00
wangmm0220 8ace8dfd8b feat:add ttl/comment function & fix global version shadows a variable 2022-06-17 14:47:37 +08:00
dapan1121 f0c53fb982 Merge branch '3.0' into feature/showapps 2022-06-17 14:44:44 +08:00
dapan1121 d320326371 reset query cache 2022-06-17 14:41:17 +08:00
Shengliang Guan 5ae355077c enh(mnode): transaction conflict supports two db 2022-06-17 11:11:29 +08:00
dapan1121 b3f9f81b61 support show apps 2022-06-16 21:06:04 +08:00
wangmm0220 2bd2996e74 feat:add comment function 2022-06-16 20:45:00 +08:00
wangmm0220 e28e92ea35 feat:add ttl 2022-06-16 20:44:25 +08:00
Hongze Cheng 0bdbf866c0 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-16 10:19:26 +00:00
Cary Xu 111c3451f8
Merge pull request #13893 from taosdata/feature/TD-14481-3.0 
fix: not submit for stables without rollup in rsma database
 2022-06-16 18:14:05 +08:00
Hongze Cheng 3c18269c29 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-16 08:34:43 +00:00
Haojun Liao 2c746848fc
Merge pull request #13877 from taosdata/feature/3_liaohj 
enh(query): partition by supports arithmetic expr
 2022-06-16 16:18:50 +08:00
Cary Xu dbef3dfc55 fix: not submit for rsma without rollup 2022-06-16 15:34:33 +08:00
Haojun Liao 63884b554b fix(query): set correct sort buffer page size. 2022-06-16 10:51:29 +08:00