Commit Graph

1991 Commits

Author SHA1 Message Date
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
Xiaoyu Wang 4830b7d9d3 feat: support pseudo columns such as _qstart, _qend and _qduration 2022-07-13 18:12:02 +08:00
Li Minghao 60703bdd05
Merge pull request #14857 from taosdata/feature/3.0_mhli
refactor(sync): add skiplist entry cache
2022-07-13 17:52:45 +08:00
Ganlin Zhao dd8f235e97 feat(query): add count function scalar version
TD-17344
2022-07-13 17:47:56 +08:00
Liu Jicong a717042acf refactor(stream): simple batch 2022-07-13 17:24:36 +08:00
dapan1121 8c83f07fe4 fix: fix natural timestamp issue 2022-07-13 16:43:50 +08:00
Liu Jicong 8a6e4b877a refactor(stream): simple batch 2022-07-13 16:37:33 +08:00
wangmm0220 cd051d40c3 fix:confilct from 3.0 2022-07-13 16:03:39 +08:00
Xiaoyu Wang d2ce16a875 Merge remote-tracking branch 'origin/3.0' into feature/3.0_debug_wxy 2022-07-13 15:37:21 +08:00
Xiaoyu Wang 43b5ca1efe feat: support pseudo columns such as _qstart, _qend and _qduration 2022-07-13 15:13:01 +08:00
Minghao Li 473e134f31 refactor(sync): add resp ttl clean 2022-07-12 16:57:19 +08:00
Liu Jicong d637ffe22c refactor(tmq): prepare only needed 2022-07-12 14:10:22 +08:00
wangmm0220 f9d5c809c9 fix:conflict from 3.0 2022-07-11 19:06:36 +08:00
Liu Jicong 6d9727579b
Merge pull request #14761 from taosdata/feature/stream
feat(wal): add append interface
2022-07-11 16:50:28 +08:00
Liu Jicong c6052fadba feat(wal): add append interface 2022-07-11 16:22:51 +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 711f960827 Merge branch '3.0' into feature/stream 2022-07-10 21:24:18 +08:00
Liu Jicong 219d966b25 fix(wal): read after rolling 2022-07-10 21:02:25 +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
Xiaoyu Wang 651adca80f
Merge pull request #14685 from taosdata/feature/3.0_debug_wxy
fix: some problem of parser and planner
2022-07-10 18:17:51 +08:00
Xiaoyu Wang 5f0005a7b7 merge 3.0 2022-07-10 17:47:31 +08:00
Haojun Liao ac8e9d103c other: merge 3.0 2022-07-10 17:40:55 +08:00
Haojun Liao 7dc7f478de refactor: do some internal refactor and fix some memory leak. 2022-07-10 17:34:21 +08:00
Xiaoyu Wang 6a3124a5f9 Merge remote-tracking branch 'origin/enh/in' into feature/3.0_debug_wxy 2022-07-10 17:31:37 +08:00
dapan1121 6cd21fe04b enh: enhance in operator 2022-07-10 16:52:11 +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
Liu Jicong 9189f886a9 feat(tmq): support consume from tsdb then wal 2022-07-10 16:34:45 +08:00
Xiaoyu Wang a64a0320a0 fix: some problem of parser and planner 2022-07-10 15:21:16 +08:00
Liu Jicong e9077c036f merge from 3.0 2022-07-10 11:24:37 +08:00
Liu Jicong a2107992e2 refactor(stream) 2022-07-10 11:18:15 +08:00
Hongze Cheng 4a4018a31f Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_snapshot 2022-07-10 02:46:01 +00: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
Hongze Cheng 668ca4a4fb Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_snapshot 2022-07-10 01:51:45 +00:00
Shengliang Guan c53a84b733 Merge remote-tracking branch 'origin/3.0' into fix/valgrind 2022-07-09 20:13:26 +08:00
Haojun Liao fceee02622
Merge branch '3.0' into feature/3_liaohj 2022-07-09 11:11:11 +08:00
Haojun Liao c5ccdfd4e9 fix(query): set the correct resource free flag. 2022-07-09 11:06:41 +08:00
Hongze Cheng 0840affc32 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_snapshot 2022-07-08 12:33:12 +00: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
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
Haojun Liao 3e81daf578 fix(query): fix memory leak. 2022-07-08 17:28:37 +08:00
Shengliang Guan 361c21a35c refactor: adjust logs 2022-07-08 17:27:06 +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
Li Minghao d94680c3c4
Merge pull request #14676 from taosdata/feature/3.0_mhli
fix(sync): append entries batch
2022-07-08 16:07:22 +08:00
Minghao Li 1ee5468411 fix(sync): append entries batch 2022-07-08 14:47:00 +08:00
dapan1121 0925064d24 Merge branch 'feature/3.0_debug_wxy' into feature/insertselect 2022-07-08 10:28:53 +08:00
Xiaoyu Wang f3e70272cf Merge remote-tracking branch 'origin/3.0' into feature/3.0_debug_wxy 2022-07-08 09:37:34 +08:00
Liu Jicong 866e4c4be0 refactor(stream): internal refactor 2022-07-07 17:56:52 +08:00
Hongze Cheng 71331d79b7 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_snapshot 2022-07-07 09:02:30 +00:00
Liu Jicong 4a648d711f feat(wal): support filter 2022-07-07 13:56:47 +08:00
Liu Jicong 1ec57798d2 ci: remove unstable case 2022-07-07 11:45:28 +08:00
Liu Jicong 82e0f77715 Merge branch '3.0' into feature/stream 2022-07-07 10:48:09 +08:00
Hongze Cheng 089d5e6150 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_snapshot 2022-07-07 01:37:50 +00:00
Yihao Deng 31655c07d7
Merge pull request #14611 from taosdata/feat/idxFix1
enh: refactor idx code
2022-07-07 09:21:06 +08:00
Hongze Cheng fdf6d22d1b Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_snapshot 2022-07-07 01:17:00 +00:00
dapan1121 d4696ef31f Merge branch '3.0' into feature/insertselect 2022-07-07 09:02:09 +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
dapan1121 d625cc2e47 feat: insert from query 2022-07-06 21:00:31 +08:00
dapan1121 82dbf54719 Merge branch 'fix/dnode' of github.com:taosdata/TDengine into fix/dnode 2022-07-06 20:34:07 +08:00
dapan1121 a3bf5b96c4 fix: fix query redirect issue 2022-07-06 20:33:23 +08:00
Hongze Cheng bf0b37390d Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_snapshot 2022-07-06 12:24:27 +00:00
Xiaoyu Wang 0bf399a67e merge 3.0 2022-07-06 18:53:54 +08:00
Xiaoyu Wang 025b7782e1 feat: add db option 'cachelastsize' 2022-07-06 18:47:33 +08:00
yihaoDeng 1e5ddcb92f merge 3.0 2022-07-06 18:29:11 +08:00
Haojun Liao 65f53993c4
Merge pull request #14606 from taosdata/feature/3_liaohj
fix(query): set results for local query in async APIs.
2022-07-06 18:06:48 +08:00
Hongze Cheng 0901640ba2 make snapshot compile 2022-07-06 09:46:14 +00:00
Minglei Jin d843a8ac89
Merge pull request #14486 from taosdata/feat/tsdb_refact
Feat/tsdb refact
2022-07-06 17:43:22 +08:00
Hongze Cheng 35fb7bbd31 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_snapshot 2022-07-06 09:36:32 +00:00
Li Minghao 767d21fa81
Merge pull request #14604 from taosdata/feature/3.0_mhli
refactor(sync): add term in rpcMsg
2022-07-06 17:35:07 +08:00
Haojun Liao 1e18ba19c8 fix(query): set results for local query in async APIs. 2022-07-06 17:25:39 +08:00
Xiaoyu Wang e9d2587925
Merge pull request #14602 from taosdata/feature/3.0_debug_wxy
feat: sql command 'insert ... select'
2022-07-06 17:24:44 +08:00
Minghao Li b73914fb0d refactor(sync): add term in rpcMsg 2022-07-06 16:52:39 +08:00
dapan1121 0d4fb5bb80 feat: support insert from query 2022-07-06 16:29:51 +08:00
Xiaoyu Wang c1eef9911b feat: sql command 'insert ... select' 2022-07-06 16:16:54 +08:00
Minghao Li cc9888837e refactor(sync): add vnodeSnapshotStopRead into callback 2022-07-06 16:05:57 +08:00
Minghao Li 78efbaabe1 refactor(sync): add syncGetSnapshotByIndex 2022-07-06 15:16:52 +08:00
Liu Jicong 8c5dbde918 refactor(stream): stream reader created in scanner 2022-07-06 14:20:07 +08:00
Haojun Liao 916dbebb00 other: merge 3.0 2022-07-06 13:49:39 +08:00
Xiaoyu Wang fd0202ed99
Merge pull request #14572 from taosdata/feature/3.0_debug_wxy
feat: sql command 'insert ... select'
2022-07-06 13:46:55 +08:00
Haojun Liao 29949a965b other: merge 3.0. 2022-07-06 13:46:24 +08:00
Shengliang Guan 44bdb5111b
Merge pull request #14582 from taosdata/fix/idxMemLeak
fix:  index mem leak
2022-07-06 13:33:21 +08:00
Li Minghao cd71d869a2
Merge pull request #14584 from taosdata/feature/3.0_mhli
refactor(sync): snapshot strategy
2022-07-06 13:15:26 +08:00
Xiaoyu Wang 2a52beb56b Merge remote-tracking branch 'origin/3.0' into feature/3.0_debug_wxy 2022-07-06 13:14:29 +08:00
Minghao Li 8a4e251be7 fix(sync): batch propose 2022-07-06 10:32:17 +08:00
yihaoDeng 5e581cdfbc fix index mem leak 2022-07-06 10:29:44 +08:00
dapan1121 2d6ddba37c Merge branch 'feature/3.0_debug_wxy' into feature/insertselect 2022-07-06 10:16:19 +08:00
yihaoDeng 3d8e6d2e10 Merge branch 'dev' into idx 2022-07-05 21:28:30 +08:00
Xiaoyu Wang c8508248e2 feat: sql command 'insert ... select' 2022-07-05 21:12:10 +08:00
Haojun Liao 15d8ae0fee other: merge 3.0 2022-07-05 19:22:50 +08:00
dapan1121 473ac84f2f fix: fix compile errors 2022-07-05 18:12:01 +08:00
dapan1121 cd0cf055e5 Merge branch '3.0' into feature/insertselect 2022-07-05 16:17:04 +08:00
dapan1121 b5207239b5 enh: refactor scheduler code 2022-07-05 16:10:38 +08:00
dapan1121 39a31e8d25 fix: remove mock code 2022-07-05 10:52:33 +08:00