Commit Graph

1438 Commits

Author SHA1 Message Date
Haojun Liao 3bae30412c refactor: do some internal refactor. 2022-07-05 13:57:07 +08:00
slzhou 43047bc265 Merge branch '3.0' of github.com:taosdata/TDengine into szhou/feature/push-cond-child-proj 2022-07-05 13:43:11 +08:00
slzhou 73e0e09dd8 feat: split join on condition into merge condition and on condition 2022-07-05 13:42:49 +08:00
dapan1121 39a31e8d25 fix: remove mock code 2022-07-05 10:52:33 +08:00
Haojun Liao 6bfe5df94a other: merge 3.0 2022-07-05 09:47:39 +08:00
Haojun Liao c7559a81ca refactor: do some internal refactor. 2022-07-04 23:28:27 +08:00
Liu Jicong d3a05cc260
Merge pull request #14525 from taosdata/feature/stream
fix(tmq): prepare scan should reset operator status
2022-07-04 21:10:36 +08:00
Liu Jicong 8127887dc4 fix(tmq): prepare scan should reset operator status 2022-07-04 20:47:56 +08:00
slzhou 024796599c Merge branch '3.0' of github.com:taosdata/TDengine into szhou/feature/push-cond-child-proj 2022-07-04 20:14:15 +08:00
slzhou a380e0cd7c feat: merge condition, on condition and other conditions 2022-07-04 19:49:16 +08:00
yihaoDeng bd77e5b107 refactor index 2022-07-04 16:01:45 +08:00
yihaoDeng 1f74676954 refactor index 2022-07-04 15:41:36 +08:00
Haojun Liao 16d18b8046 refactor: do some internal refactor. 2022-07-04 14:10:29 +08:00
Hongze Cheng 38ca993452 make merge compile 2022-07-04 05:21:02 +00: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 361ff046a5
Merge pull request #14465 from taosdata/fix/tsim
refactor: temporarily comment out some code and use cases
2022-07-02 21:25:53 +08:00
Liu Jicong 31bbef82d1 fix(tmq): seek snapshot offset 2022-07-02 20:18:40 +08: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
Xiaoyu Wang ae0e956837 Merge remote-tracking branch 'origin/fix/dnode' into fix/dnode_wxy 2022-07-02 19:01:36 +08:00
Xiaoyu Wang c08b3c9313 fix: a problem of show indexes 2022-07-02 19:01:16 +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
WANG MINGMING e4a711975d
Merge pull request #14458 from taosdata/feature/TD-13041
fix: erro in json in operator
2022-07-02 17:52:43 +08:00
afwerar b9a1c6744c os: add Mac compile support 2022-07-02 17:40:23 +08:00
54liuyao 0d10895721 fix(stream): project ignore retrive datablock 2022-07-02 15:40:15 +08:00
wangmm0220 3dafc6556c fix: erro in json in operator 2022-07-02 14:47:07 +08:00
54liuyao c9f133a5e4 ci(stream): add ignore expired data 2022-07-02 14:17:50 +08:00
Liu Jicong 06514e13df
Merge pull request #14454 from taosdata/feature/stream
feat(stream): support ignore expired flag
2022-07-02 13:20:58 +08:00
Liu Jicong 4a2b266612 feat(stream): support ignore expired flag 2022-07-02 10:59:29 +08:00
slzhou dbbff4ea2c feat: push cond to join child through generating plan 2022-07-01 20:00:01 +08:00
wangmm0220 75e5aebbec fix:error in json 2022-07-01 17:35:23 +08:00
wangmm0220 4e6b3d72ac Merge branch '3.0' into feature/TD-13041 2022-07-01 16:54:18 +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
Haojun Liao 34e4980a51 refactor(query): do some internal refactor. 2022-07-01 15:19:02 +08:00
Liu Jicong 269b33c02d Merge branch '3.0' into feature/stream 2022-07-01 14:39:52 +08:00
Liu Jicong 52d09b4173 refactor(wal) 2022-07-01 14:39:21 +08:00
afwerar 4e8f3db596 os: replace win qsort func 2022-07-01 11:54:21 +08:00
liuyao 2f865a43ec
Merge pull request #14407 from taosdata/feature/TD-16874
feat(stream): ignore close window
2022-06-30 20:57:49 +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
54liuyao 68cfa54e26 feat(stream): ignore close window 2022-06-30 20:21:24 +08:00
Liu Jicong 4f107908db fix(tmq): reset window 2022-06-30 19:51:48 +08:00
shenglian-zhou d6e1d1bcd0
Merge pull request #14389 from taosdata/szhou/feature/pushdown-agg-cond
feat: support push agg operator condition to scan
2022-06-30 19:07:06 +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
dapan1121 068924cc62
Merge pull request #14385 from taosdata/feature/queryredirect
feat: support query redirect
2022-06-30 18:03:17 +08:00
Xiaoyu Wang 42fba6480c merge 3.0 2022-06-30 17:54:34 +08:00
slzhou 82bd8a560f fix: reserved column should not be copied 2022-06-30 17:28:49 +08:00
Liu Jicong 94f07836d6 fix(tmq): set scan rsp offset correctly 2022-06-30 17:25:19 +08:00
wangmm0220 77fcf17ae1 fix:error in lock meta if group by json tag, need unlock if error happens 2022-06-30 17:10:34 +08:00
Liu Jicong ca1c961f9c fix(tmq): set last scan status 2022-06-30 16:40:17 +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
Liu Jicong 4695dc2dae feat(tmq): add snapshot test 2022-06-30 14:41:50 +08:00
dapan1121 c28c77a099 Merge branch '3.0' into feature/queryredirect 2022-06-30 14:35:15 +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 06552626e0 fix:disable some json test cases 2022-06-29 20:15:49 +08:00
wangmm0220 3725adc861 fix:merge from 3.0 2022-06-29 18:45:34 +08:00
wangmm0220 665e1ddde8 fix:add switch for buffer page debug log 2022-06-29 18:11:28 +08:00
liuyao 7069332321
Merge pull request #14349 from taosdata/feature/TD-16874
feat(stream): ignore close window
2022-06-29 17:15:31 +08:00
dapan1121 914e06e8cb feat: query redirect 2022-06-29 17:15:08 +08:00
Haojun Liao 3a566d5e5e refactor(query): do some internal refactor. 2022-06-29 17:14:00 +08:00
Haojun Liao 0fc154982f
Merge pull request #14353 from taosdata/feature/3_liaohj
enh(query): add api to extract scan  status
2022-06-29 16:50:49 +08:00
54liuyao 5e0cbdf0b7 feat(stream): ignore close window 2022-06-29 16:49:45 +08:00
Haojun Liao 1b8c5d9269 enh(query): add api to extract scan status 2022-06-29 16:19:19 +08:00
wangmm0220 873546bee5 fix:add log 2022-06-29 15:03:17 +08:00
dapan1121 07b46f9e3c Merge branch '3.0' into feature/queryredirect 2022-06-29 10:53:52 +08:00
Haojun Liao f2b83dfb4a fix(query):check null ptr. 2022-06-29 10:35:07 +08:00
Haojun Liao 5efd5a3b6d fix(query):adjust api for retrieve lastrow in executor. 2022-06-28 23:24:20 +08:00
dapan1121 b99fd13152 add mock code 2022-06-28 17:21:24 +08:00
dapan1121 bd7a2adc5f add mock code 2022-06-28 17:13:51 +08:00
Liu Jicong 58803fafcf fix(query): check datablock should check output flag 2022-06-28 16:05:00 +08:00
Haojun Liao 03fa247a2d other: merge 3.0. 2022-06-28 15:38:54 +08:00
Haojun Liao be08ccaedc refactor:do internal refactor. 2022-06-28 15:35:51 +08:00
Haojun Liao 4a59e1300b other: merge 3.0. 2022-06-28 15:22:32 +08:00
Liu Jicong 383e7a495b fix(query): enable output check 2022-06-28 13:45:50 +08:00
54liuyao acb7f040aa fix(stream): taosd crash when partition by tbname 2022-06-28 11:48:10 +08:00
dapan1121 4a55ed07b3 feature: query redirect 2022-06-28 10:34:51 +08:00
dapan1121 7da915fa67 Merge branch '3.0' into feature/queryredirect 2022-06-28 09:31:03 +08:00
wangmm0220 e2f4a2a03c Merge branch 'feature/TD-13041' of github.com:taosdata/TDengine into feature/TD-13041 2022-06-27 21:21:22 +08:00
wangmm0220 b6b4455689 fix:error in group by tag 2022-06-27 21:21:08 +08:00
wangmm0220 8e5099c44c Merge branch '3.0' into feature/TD-13041 2022-06-27 20:02:00 +08:00
slzhou 11f8d302fa feat: multiway merge handles group+mergekeys, group and only merge keys 2022-06-27 17:51:50 +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 c55bef32ff Merge branch 'feature/3.0_debug_wxy' of github.com:taosdata/TDengine into feature/3.0_debug_wxy 2022-06-27 16:25:40 +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
Xiaoyu Wang a334337755 feat: merge and merge scan add group sort field 2022-06-27 15:57:02 +08:00
Cary Xu e2ec8b57d9 Merge branch '3.0' into feature/TD-11274-3.0 2022-06-27 14:47:31 +08:00
Cary Xu e6dd04f573 refactor: rsma restore 2022-06-27 14:47:14 +08:00
Haojun Liao 02e450c590 fix(query): fix invalid object type. 2022-06-27 11:34:06 +08:00
wangmm0220 c190fa5bd9 fix: keep n rows if limit n 2022-06-27 10:51:47 +08:00
Haojun Liao dbd8c300fa refactor: do tsdbread refactor. 2022-06-27 10:46:20 +08:00
wangmm0220 9fb4f943e7 fix: enable group by test cases 2022-06-27 10:14:36 +08:00
Haojun Liao 2e5d563ec0 other: merge 3.0. 2022-06-27 10:11:11 +08:00
Haojun Liao ff72e66dba fix(query): support scalar function before applying interval aggregate. 2022-06-27 10:07:48 +08:00
Cary Xu 0597f3b9cd refactor: rsma resource release 2022-06-26 18:44:49 +08:00
dapan1121 e851977da0 Merge branch '3.0' into enh/stopquery 2022-06-26 15:19:35 +08:00
Yihao Deng a081c7c154
Merge branch '3.0' into feat/idxFix 2022-06-25 20:40:16 +08:00