Commit Graph

737 Commits

Author SHA1 Message Date
Cary Xu e890bcc6f4 enh: tsimplehash remove/iter/ut 2022-08-11 19:12:24 +08:00
shenglian-zhou a96193cfc6
Merge pull request #15983 from taosdata/szhou/fixbug
fix: add multi-timeline support for session and state
2022-08-11 17:15:09 +08:00
slzhou 009777a727 fix: add multi-timeline support for session and state 2022-08-11 16:23:53 +08:00
54liuyao 7836b581a7 feat(stream): delete result 2022-08-11 14:25:16 +08:00
Liu Jicong a28c0781be
Merge pull request #15971 from taosdata/feature/stream
feat(stream): session window trigger delete
2022-08-11 14:10:18 +08:00
Liu Jicong c191f44b14 feat(stream): session window trigger delete 2022-08-11 12:01:20 +08:00
liuyao e1047b4b27
Merge pull request #15965 from taosdata/feature/TD-18091
feat(stream):optimzie stream interval
2022-08-11 11:06:06 +08:00
Ganlin Zhao c6699e19fb
Merge pull request #15941 from taosdata/fix/TD-18115
fix(query): fix linear interpolation issue between two blocks
2022-08-11 10:21:28 +08:00
54liuyao 44123ec8f0 feat(stream):optimzie stream interval 2022-08-11 10:20:42 +08:00
Ganlin Zhao 6fc38165fb fix(query): fix linear interpolation issue between two blocks
TD-18309
2022-08-10 16:29:55 +08:00
wangmm0220 c381ffd38c fix:error in tmq for snapshot 2022-08-09 19:06:24 +08:00
Xiaoyu Wang 07ef00e89f merge 3.0 2022-08-09 11:36:08 +08:00
Ganlin Zhao 35a9e11ed1
Merge pull request #15867 from taosdata/fix/TD-18115
fix(query): interp + fill(linear) not working
2022-08-09 10:25:58 +08:00
Ganlin Zhao 26648a909f fix(query): interp + fill(linear) not working
TD-18220
2022-08-08 20:09:20 +08:00
Haojun Liao 4d8842c21f other:merge 3.0 2022-08-08 16:37:37 +08:00
Ganlin Zhao 1ee558fb63 fix(query): interp + fill(linear) not working
TD-18220
2022-08-08 15:20:12 +08:00
Haojun Liao 447b2cb9f1 fix(query): update the load data log. 2022-08-08 12:56:03 +08:00
wangmm0220 9f9788c205 Merge branch '3.0' into feature/TD-14761 2022-08-08 10:04:03 +08:00
Haojun Liao a74c830125 fix(query): support scalar function in fill operator. 2022-08-06 19:34:15 +08:00
wangmm0220 1309c489e2 fix:error in tmq for snapshot 2022-08-06 19:31:53 +08:00
dapan1121 10281b36ae
Merge pull request #15811 from taosdata/fix/TD-18137
fix: fix taosd memory leak issue
2022-08-06 18:47:38 +08:00
dapan1121 fd654b126a fix: fix taosd memory leak issue 2022-08-06 18:00:26 +08:00
Ganlin Zhao 784752010a fix(query): fix interp fill(next) result errors 2022-08-06 16:18:11 +08:00
Haojun Liao 0d60d54a4a other: merge 3.0 2022-08-06 15:26:15 +08:00
Haojun Liao bf08d7dd0b fix(query): fix bug in fill 2022-08-06 15:23:03 +08:00
wangmm0220 f28155714e fix:confilcts from 3.0 2022-08-06 12:31:15 +08:00
wangmm0220 45e7597df3 feat:get data from snapshot for taosx 2022-08-05 21:12:18 +08:00
Haojun Liao 0e4748771a enh(query): support combine multi datablock to pass to upstream operators 2022-08-05 14:10:45 +08:00
Haojun Liao 3a5fcefc8d other: merge 3.0 2022-08-04 17:24:51 +08:00
shenglian zhou 2f27d0152d fix: get result row add forUpdate parameter 2022-08-04 16:23:54 +08:00
wangmm0220 c3cd858a63 feat:add snapshot for tmq in stable and db 2022-08-04 15:01:59 +08:00
Haojun Liao 4cd7af0ecf other: merge 3.0 2022-08-03 19:02:43 +08:00
slzhou cf9030fab1 fix: prevent result row page swapping so that the result is preserved 2022-08-03 17:03:50 +08:00
Cary Xu 2f19c2d0a5 other: rsma replica restore and memory leak 2022-08-03 10:58:01 +08:00
Haojun Liao 77ed2bc1e1 enh(query): add merge attribute in explain. 2022-08-02 21:25:55 +08:00
shenglian-zhou 16357345ef
Merge pull request #15678 from taosdata/szhou/fix/join
fix: make multi-table table join test case pass CI
2022-08-02 17:02:00 +08:00
slzhou 2a17deec7c fix: extract time condition corretly when join tables together 2022-08-02 16:18:55 +08:00
Haojun Liao 258d50306f refactor: do some internal refactor. 2022-08-02 15:43:45 +08:00
Haojun Liao 781c494c2b refactor: merge data belongs to different data group. 2022-08-02 13:58:54 +08:00
Haojun Liao 8da7aa19b5 fix(query): fix memory leak. 2022-08-01 20:41:03 +08:00
54liuyao b3d104349f feat(stream):optimize stream update scan 2022-08-01 17:09:46 +08:00
Haojun Liao 7bc773b8cd fix(query): remove invalid time window close ops. 2022-07-30 18:11:44 +08:00
Haojun Liao ed57347579 fix(query): fix memory leak. 2022-07-30 11:30:31 +08:00
Haojun Liao d29a60499a
Merge pull request #15554 from taosdata/feature/3_liaohj
refactor: do some internal refactor and opt query performance.
2022-07-29 22:34:37 +08:00
Haojun Liao 9ee13ca254 other: merge 3.0 2022-07-29 18:03:42 +08:00
Haojun Liao 0ff775c46f fix(query): keep order info in fill operator. 2022-07-29 14:33:50 +08:00
Haojun Liao 26e5a7c796 refactor: do some internal refactor. 2022-07-29 13:54:14 +08:00
Haojun Liao 915e4e40c7 fix(query): add attribute to control output order. 2022-07-29 11:00:36 +08:00
Haojun Liao 78bbfcb4bc refactor: do some internal refactor and opt query performance. 2022-07-29 09:56:03 +08:00
Cary Xu 0dcb3a5da1 fix: assign uid for rsma by physical plan 2022-07-28 17:07:47 +08:00
Liu Jicong 3167f158d1
Merge pull request #15454 from taosdata/feature/stream
fix(stream): dispatch
2022-07-27 12:39:37 +08:00
Liu Jicong 3fa5791889 fix(stream): dispatch 2022-07-27 10:52:25 +08:00
54liuyao db8ed3087c feat(stream): free the memory 2022-07-27 10:34:30 +08:00
shenglian zhou 56f067229c Merge branch '2.0' of github.com:taosdata/TDengine into szhou/fix/udf 2022-07-26 17:58:31 +08:00
shenglian zhou cdcb1a368d feat: add input ts order for join operator 2022-07-26 16:05:42 +08:00
shenglian-zhou fd2a53d174
Merge pull request #15415 from taosdata/szhou/fix/udf
fix: set null when all inputs are null for leastsquare function
2022-07-26 15:57:25 +08:00
shenglian zhou b870b6381f fix: save sort exec info into table merge scan struct and use it when explain 2022-07-26 11:14:17 +08:00
54liuyao 35ddd56691 feat(stream): refector some log 2022-07-26 09:55:21 +08:00
Xiaoyu Wang 20cb18d8b0 merge 3.0 2022-07-25 16:59:28 +08:00
Xiaoyu Wang bf18385e00 merge szhou/fix/udf 2022-07-25 15:34:58 +08:00
Xiaoyu Wang 015193e816 feat: super table order by primary key optimization 2022-07-25 15:17:53 +08:00
Haojun Liao baca08d05d refactor: do some internal refactor. 2022-07-25 14:15:49 +08:00
Haojun Liao 6d86ef0c33 other: merge 3.0 2022-07-25 11:22:09 +08:00
Haojun Liao 9bddf99d7d refactor(query): do some internal refactor. 2022-07-25 11:17:45 +08:00
dapan1121 dfe4ed92e3 fix: fix disk page direty issue 2022-07-25 09:01:40 +08:00
Haojun Liao e00528eead refactor: do some internal refactor. 2022-07-23 09:59:37 +08:00
Haojun Liao e9936db95e other: merge 3.0 2022-07-23 09:37:23 +08:00
Haojun Liao 4a7a85ab07 other: merge 3.0 2022-07-23 00:02:53 +08:00
Haojun Liao 4d4a52245d fix(query): update the time range after filter data block. 2022-07-22 23:52:48 +08:00
Haojun Liao 998dedb9fa other: merge 3.0 2022-07-22 21:16:52 +08:00
54liuyao b28553395f feat(stream): adjust stream scan 2022-07-22 20:13:37 +08:00
Ganlin Zhao 51ac32e8ea Merge branch '3.0' into feat/TD-17552 2022-07-22 17:41:48 +08:00
Ganlin Zhao 68854bdea5 enh(query): add wal version to agg result datablock
TD-17552
2022-07-22 17:39:59 +08:00
54liuyao 47cb043f4c feat(stream):optimize update scan range 2022-07-22 16:55:14 +08:00
Haojun Liao 6f4851a6a2 refactor: do some internal refactor. 2022-07-22 14:38:28 +08:00
Haojun Liao 7522c2edf3 refactor: do some internal refactor. 2022-07-21 20:44:36 +08:00
Haojun Liao 9d565752c4 fix(query): extract schema before creating stream scanner. 2022-07-21 13:51:39 +08:00
Haojun Liao ee34c3bb3e fix(query): add query involved column info 2022-07-21 11:20:30 +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 facf3c8648 fix(query): add limit/offset for order by operator. 2022-07-20 14:07:48 +08:00
Haojun Liao 179709f814 fix(query): assign the subplan to belong to task struct 2022-07-19 17:37:40 +08:00
Haojun Liao eebbbce4f3 fix(query): filter new added child table for stream scan operator. 2022-07-18 15:31:39 +08:00
Haojun Liao fc67efb5aa fix(query): fix memory leak. 2022-07-18 13:52:33 +08:00
Haojun Liao f0d1f393fd fix(query): add limit/offset implementation in exchange operator. 2022-07-16 23:24:59 +08:00
54liuyao 352db0febb feat(stream): optimize interval plan 2022-07-16 09:28:15 +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
Haojun Liao 505e14892e
Merge pull request #14932 from taosdata/feature/3_liaohj
fix(query): handle multi group last_row query.
2022-07-15 15:03:10 +08:00
Haojun Liao b9a471624d fix(query): handle multi group last_row query. 2022-07-15 11:19:00 +08:00
Haojun Liao 159d6c47c8
Merge pull request #14911 from taosdata/feature/3_liaohj
fix(query): fix memory leak.
2022-07-14 20:36:30 +08:00
Haojun Liao 5ca810a985 fix(query): fix memory leak. 2022-07-14 19:09:40 +08:00
Haojun Liao 34c973387d
Merge pull request #14904 from taosdata/feature/3_liaohj
fix(query): handle the grouped fill.
2022-07-14 18:36:18 +08:00
Haojun Liao dc4052bd7b fix(query): handle the grouped fill. 2022-07-14 17:04:22 +08:00
Liu Jicong d75e9b8f6a merge from 3.0 2022-07-14 15:35:00 +08:00
Liu Jicong 9ea0ad57ec refactor(stream): destroy stream task 2022-07-14 15:32:21 +08:00
Haojun Liao 2974d826ef
Merge pull request #14850 from taosdata/feature/3_liaohj
fix(query): support last_row(tags) for super table query.
2022-07-13 23:14:57 +08:00
Liu Jicong 8a6e4b877a refactor(stream): simple batch 2022-07-13 16:37:33 +08:00
Haojun Liao 649cf7e55d fix(query): support last_row(tags) for super table query. 2022-07-13 14:21:44 +08:00
54liuyao ab2b1bbf47 feat(stream): sliding window 2022-07-12 17:27:44 +08:00
Haojun Liao 4d73720fb8 fix(query): set the ts to be the time window start key value when filling timestamp column. 2022-07-12 13:45:41 +08:00
Haojun Liao a5955c3dae fix(query): add more check for fetch rsp, and set the correct start time window for fill. 2022-07-11 15:49:13 +08:00
Haojun Liao 75ace4f4ed
Merge pull request #14746 from taosdata/feature/3_liaohj
fix(query): handle the indefinit function  output with partition by
2022-07-11 13:49:13 +08:00
Haojun Liao 9af4cd3165
Merge branch '3.0' into feature/3_liaohj 2022-07-11 11:36:19 +08:00
Haojun Liao 4527447b60 fix(query): handle the indefinit function output with partition by 2022-07-11 11:13:49 +08:00
Xiaoyu Wang ed66440c5c Merge remote-tracking branch 'origin/3.0' into feature/3.0_debug_wxy 2022-07-11 10:08:54 +08:00
Haojun Liao 5c3c418c7f fix(query): set correct the fill column value for in case of no primary timestamp column exists. 2022-07-10 20:59:56 +08:00
Haojun Liao e4446354e9 fix(query): update the timerange. 2022-07-10 20:12:14 +08:00
54liuyao 2465620245 feat(stream): support expressions 2022-07-10 18:31:52 +08:00
54liuyao 75ed474f09 ci(stream): add session test 2022-07-10 18:30:30 +08:00
Xiaoyu Wang 5f0005a7b7 merge 3.0 2022-07-10 17:47:31 +08:00
Xiaoyu Wang b542b8f49a fix: some problem of parser and planner 2022-07-10 17:31:15 +08:00
Haojun Liao b2a8eec15d
Merge pull request #14718 from taosdata/feature/3_liaohj
fix(query): set correct stddev merge input rows.
2022-07-10 17:25:41 +08:00
Liu Jicong 5640036f66 refactor(stream) 2022-07-10 14:48:16 +08:00
Liu Jicong 2225411edc refactor(stream) 2022-07-10 13:57:17 +08:00
Haojun Liao 3ee9d160d9 fix(query): set correct stddev merge input rows. 2022-07-10 11:02:54 +08:00
Haojun Liao 40380ef9c1 refactor: do internal refactor. 2022-07-10 10:15:27 +08:00
Haojun Liao c3d702fe7c refactor: do some internal refactor. 2022-07-10 09:40:35 +08:00
Haojun Liao 3c49b6a633 fix(query): set correct query time window. 2022-07-09 23:32:33 +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
shenglian-zhou 89757d85d5
Merge pull request #14684 from taosdata/szhou/feature/push-project-condition
feat: add filter to operator merge aligned interval agg
2022-07-08 17:01:17 +08:00
slzhou@taodata.com 16b6ce82a4 feat: add filter to operator merge aligned interval agg 2022-07-08 16:20:02 +08:00
dapan1121 0925064d24 Merge branch 'feature/3.0_debug_wxy' into feature/insertselect 2022-07-08 10:28:53 +08:00
Liu Jicong 7872b16d31
Merge pull request #14657 from taosdata/feature/stream
refactor(stream): internal refactor
2022-07-07 21:42:04 +08:00
Liu Jicong 866e4c4be0 refactor(stream): internal refactor 2022-07-07 17:56:52 +08:00
slzhou c8104d5141 Merge branch '3.0' of github.com:taosdata/TDengine into szhou/feature/push-project-condition 2022-07-07 15:31:46 +08:00
slzhou 4482b2dda7 feat: add doFilter to indef operator 2022-07-07 15:26:29 +08:00
Liu Jicong 6b479f4a1f
Merge pull request #14592 from taosdata/feature/stream
refactor(stream): stream reader created in scanner
2022-07-07 14:30:39 +08:00
slzhou cddc989808 feat: add filter to fill operator 2022-07-07 14:30:08 +08:00
slzhou f3c3b0f148 Merge branch '3.0' of github.com:taosdata/TDengine into szhou/feature/push-project-condition 2022-07-07 11:41:56 +08:00
Haojun Liao 82640b2157
Merge pull request #14626 from taosdata/feature/3_liaohj
fix(query): fix memory leak.
2022-07-07 11:26:04 +08:00
slzhou f32cbdee72 Merge branch '3.0' of github.com:taosdata/TDengine into szhou/feature/push-project-condition 2022-07-07 10:26:27 +08:00
slzhou 90b3912061 fix: add filter to session/state/interval operator 2022-07-07 09:29:51 +08:00
dapan1121 d4696ef31f Merge branch '3.0' into feature/insertselect 2022-07-07 09:02:09 +08:00
dapan1121 e1ed9317d4 feat: insert from query 2022-07-07 08:53:23 +08:00
Liu Jicong baa48489b7 merge from 3.0 2022-07-06 21:25:34 +08:00
Liu Jicong db23b07ae1 merge from 3.0 2022-07-06 21:12:46 +08:00
54liuyao 888f79d3f4 feat(stream): session delete 2022-07-06 20:42:54 +08:00
Haojun Liao 1237f9cf15 Merge branch '3.0' into feature/3_liaohj 2022-07-06 18:09:49 +08:00
Haojun Liao d28518b41e fix(query): set correct query time window. 2022-07-06 18:08:23 +08:00
shenglian-zhou 7aebf05699
Merge pull request #14605 from taosdata/szhou/feature/push-project-condition
feat: push condition down the tree
2022-07-06 17:45:37 +08:00
Minglei Jin d843a8ac89
Merge pull request #14486 from taosdata/feat/tsdb_refact
Feat/tsdb refact
2022-07-06 17:43:22 +08:00
dapan1121 0d4fb5bb80 feat: support insert from query 2022-07-06 16:29:51 +08:00
slzhou c710eede6f feat: add filter to interval agg operator 2022-07-06 14:57:53 +08:00
slzhou bd819f5c88 feat: add filter to sort operator 2022-07-06 14:42:56 +08:00
Liu Jicong 8c5dbde918 refactor(stream): stream reader created in scanner 2022-07-06 14:20:07 +08:00
slzhou c040659a4f feat: add filter to aggregate operator 2022-07-06 13:54:11 +08:00
Haojun Liao 29949a965b other: merge 3.0. 2022-07-06 13:46:24 +08:00
Haojun Liao 5f93b8db89 fix(query): copy the column that will not output. 2022-07-05 23:54:51 +08:00
Haojun Liao 15d8ae0fee other: merge 3.0 2022-07-05 19:22:50 +08:00
54liuyao b7bf2bf808 feat(stream):stream interval delete data 2022-07-05 18:17:43 +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
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
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
54liuyao c9f133a5e4 ci(stream): add ignore expired data 2022-07-02 14:17:50 +08:00
Liu Jicong 4a2b266612 feat(stream): support ignore expired flag 2022-07-02 10:59:29 +08:00
Liu Jicong 52d09b4173 refactor(wal) 2022-07-01 14:39:21 +08:00
Liu Jicong 94f07836d6 fix(tmq): set scan rsp offset correctly 2022-06-30 17:25:19 +08:00
Liu Jicong 4695dc2dae feat(tmq): add snapshot test 2022-06-30 14:41:50 +08:00
Liu Jicong 0f0fe6276a merge from 3.0 2022-06-29 21:33:10 +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
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
Haojun Liao 5efd5a3b6d fix(query):adjust api for retrieve lastrow in executor. 2022-06-28 23:24:20 +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 4a59e1300b other: merge 3.0. 2022-06-28 15:22:32 +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 b67c65313b fix: add group to multi-merge operator 2022-06-27 16:25:14 +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 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
Liu Jicong bdd4134fc1
Revert "fix(sma): drop stream when drop sma" 2022-06-25 18:11:11 +08:00
Liu Jicong 3210fdc367 merge from 3.0 2022-06-25 17:49:25 +08:00
Liu Jicong 47ae534c0f fix(sma): drop stream when drop sma 2022-06-25 17:44:54 +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
wangmm0220 a95f98f7e7 feat:merge from 3.0 2022-06-23 20:50:48 +08:00
wangmm0220 26cceaf172 feat:sort table group if needed 2022-06-23 19:58:12 +08:00
Liu Jicong 71bda7e658 feat(tmq): add with meta config 2022-06-23 15:56:54 +08:00
wangmm0220 a28bfd0804 fix:confilct merge from 3.0 2022-06-23 10:21:04 +08:00
WANG MINGMING 9012834531
Merge branch 'feature/3.0_wxy' into 3.0 2022-06-23 10:16:58 +08:00
shenglian-zhou bacd7b6057
Merge pull request #14136 from taosdata/szhou/feature/sort-group-2
feat: add group sort operator
2022-06-23 08:15:25 +08:00
shenglian zhou faf5424b18 feat: add group sort operator 2022-06-22 23:01:55 +08:00
shenglian-zhou d88615f9ad
Merge pull request #14132 from taosdata/szhou/feature/sort-group-2
feat: add multiple group tsdb reads to table merge scan
2022-06-22 21:00:59 +08:00
shenglian zhou 8a8d3f160b feat: add multiple group tsdb reads to table merge scan 2022-06-22 20:26:44 +08:00
shenglian-zhou cc3543d4e3
Merge pull request #14126 from taosdata/szhou/feature/sort-group-2
feat: prepare for multiple group tsdb reads
2022-06-22 19:20:41 +08:00
shenglian zhou c1f5f825b7 feat: prepare for multiple group tsdb reads 2022-06-22 18:51:16 +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
shenglian-zhou 0f67b17f3f
Merge pull request #14106 from taosdata/szhou/feature/merge-interval-2
feat: add merge interval operator
2022-06-22 13:32:38 +08:00
shenglian zhou 0941a4640b fix: add merge interval operator for select mode(expr) + interval 2022-06-22 13:08:20 +08:00
shenglian-zhou 17603ba292
Merge pull request #14098 from taosdata/szhou/feature/merge-interval-2
fix: change merge interval to merge aligned interval
2022-06-22 11:27:41 +08:00