Commit Graph

1293 Commits

Author SHA1 Message Date
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
dapan1121 7156f5257a Merge branch '3.0' into feature/showapps 2022-06-16 10:40:41 +08:00
dapan1121 a2d1987208 show apps 2022-06-16 10:24:01 +08:00
Hongze Cheng 3da422fef7 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-16 01:33:06 +00:00
dapan1121 69eb9daddb
Merge pull request #13851 from taosdata/feature/showqueries
feat: support some show and kill commands
2022-06-16 09:15:02 +08:00
dapan1121 4973739794 show apps 2022-06-15 20:59:33 +08:00
wangmm0220 f2a19c98ef feat:add test for operator encode/decode 2022-06-15 20:35:45 +08:00
Hongze Cheng 76a71b11ed Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-15 11:26:18 +00:00
Shengliang Guan 1b15c3439a
Merge pull request #13859 from taosdata/fix/dnode
feat: increase enable and sysinfo limits for user privilege
2022-06-15 18:24:32 +08:00
Hongze Cheng 241297847f Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-15 08:31:41 +00:00
Shengliang Guan 5ea1f3512f feat: increase enable and sysinfo limits for user privilege 2022-06-15 14:43:30 +08:00
Xiaoyu Wang 19ab15b19f feat: super table join 2022-06-15 13:49:29 +08:00
dapan1121 96f8a0da42 Merge branch '3.0' into feature/showqueries 2022-06-15 11:34:54 +08:00
dapan1121 947aecb74f show queries/connection; kill connection 2022-06-15 11:27:53 +08:00
Hongze Cheng 858474736d Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-15 01:20:18 +00:00
Xiaoyu Wang ddaf616473
Merge pull request #13832 from taosdata/feature/3.0_debug_wxy
feat: execution plan of super table join
2022-06-15 09:18:25 +08:00
Cary Xu cb7d0c2256 feat: tsma insert and query 2022-06-14 20:19:25 +08:00
Xiaoyu Wang b472ed1173 merge 3.0 2022-06-14 19:55:52 +08:00
Hongze Cheng 9b15bc409a Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-14 09:59:41 +00:00