Commit Graph

1401 Commits

Author SHA1 Message Date
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
Xiaoyu Wang 6a845b746c fix: some problems of parser 2022-07-11 15:15:39 +08:00
dapan1121 8ffb501219 enh: enhance stop query 2022-07-11 13:54:04 +08:00
wangmm0220 3d2e129dd6 feat:add tmq get meta 2022-07-11 10:18:01 +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
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
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
dapan1121 2a8455bee1
Merge pull request #14688 from taosdata/fix/bugs
fix: fix aggregate function and null issue
2022-07-10 16:01:08 +08:00
Liu Jicong 5f36406b7d
Merge pull request #14724 from taosdata/feature/stream
refactor(stream)
2022-07-10 15:53:48 +08:00
Liu Jicong 5640036f66 refactor(stream) 2022-07-10 14:48:16 +08:00
dapan1121 3169b5e6c3 fix: fix hb crash issue 2022-07-10 13:58:30 +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
dapan1121 f530607359 Merge branch '3.0' into fix/bugs 2022-07-10 11:18:01 +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
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
wangmm0220 054b16c2db feat:write meta from tmq to taosd 2022-07-08 18:56:36 +08:00
wangmm0220 cefd65f69e feat:write meta from tmq to taosd 2022-07-08 18:51:51 +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
dapan1121 17f5f3ee82 fix: fix server_status() issue 2022-07-08 17:51:03 +08:00
Haojun Liao 1711d646c1
Merge pull request #14671 from taosdata/feature/3_liaohj
enh(query): add block sma for int type column data.
2022-07-08 16:23:13 +08:00
huolibo 9354c8d520 fix: change fetchRawBlock method for tmq 2022-07-07 19:13:59 +08:00
Haojun Liao 557873c1bc other: merge 3.0 2022-07-07 16:50:00 +08:00
Haojun Liao 6ac3ce0213 fix(query): fix syntax error. 2022-07-07 15:34:59 +08:00
Haojun Liao 44d7397e18 test:update the unit test. 2022-07-07 15:33:53 +08:00
Haojun Liao d9e5172357 fix(query): set the correct sma data 2022-07-07 15:32:56 +08:00
Haojun Liao 4d2bc796e7 enh(query): add block sma for int type column data. 2022-07-07 11:26:58 +08:00
Liu Jicong 82e0f77715 Merge branch '3.0' into feature/stream 2022-07-07 10:48:09 +08:00
huolibo f9331de306 fix: add windows h 2022-07-07 09:45:02 +08:00
Yihao Deng 31655c07d7
Merge pull request #14611 from taosdata/feat/idxFix1
enh: refactor idx code
2022-07-07 09:21:06 +08:00
huolibo 0feb11bdf0
Merge pull request #14488 from taosdata/feature/TD-13599
feat(driver): add jni function for jdbc
2022-07-06 23:21:50 +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
Shengliang Guan c1667cdd84
Merge pull request #14600 from taosdata/fix/dnode
refactor: redirect vnode msg
2022-07-06 21:01:57 +08:00
wangmm0220 aae8adeb5b fix:timestamp precision in josn protocol 2022-07-06 20:57:42 +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
WANG MINGMING 73e094d77f
Merge pull request #14505 from taosdata/feature/TD-13041
fix:<TD-16840> meta ttl index core if insert with benchmark
2022-07-06 19:15:43 +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
Haojun Liao 1e18ba19c8 fix(query): set results for local query in async APIs. 2022-07-06 17:25:39 +08:00
wangmm0220 187aca4d6b fix:conflict from 3.0 2022-07-06 16:35:39 +08:00
wangmm0220 2c6f3e6971 feat: tmq get meta with json format 2022-07-06 16:02:55 +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
Haojun Liao 29949a965b other: merge 3.0. 2022-07-06 13:46:24 +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
Xiaoyu Wang a67eb1a9a0 eat: sql command 'insert ... select' 2022-07-06 11:55:47 +08:00
wangmm0220 f47c3595a2 Merge branch '3.0' into feature/TD-13041 2022-07-06 10:07:19 +08:00
dapan1121 8b896332d6
Merge pull request #14558 from taosdata/feature/insertselect
enh: refactor scheduler code
2022-07-06 09:44:38 +08:00
Minglei Jin fc20a61c85
Merge branch '3.0' into feat/tsdb_refact 2022-07-06 00:37:21 +08:00
yihaoDeng b6fce4b84f refactor epset update 2022-07-05 21:36:42 +08:00
Xiaoyu Wang 811bdc2b06 Merge remote-tracking branch 'origin/3.0' into feature/3.0_debug_wxy 2022-07-05 21:12:53 +08:00
Xiaoyu Wang c8508248e2 feat: sql command 'insert ... select' 2022-07-05 21:12:10 +08:00
wangmm0220 a74f19671d feat: add get meta interface for tmq 2022-07-05 19:16:00 +08:00
Haojun Liao 0f595e8be1 refactor: do some internal refactor. 2022-07-05 19:09:00 +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
huolibo df32da247a fix(driver): linux compile 2022-07-05 11:53:49 +08:00
huolibo d4fb82e414 fix(driver): compile in windows 2022-07-05 10:26:34 +08:00
Haojun Liao 6bfe5df94a other: merge 3.0 2022-07-05 09:47:39 +08:00
yihaoDeng 47ec187231 merge int kill 2022-07-04 16:10:59 +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
huolibo d55d057aaa feat(driver): add jni function for jdbc 2022-07-04 11:15:13 +08:00
dapan1121 3ffd975917 enh: refactor scheduler code 2022-07-04 09:08:57 +08:00
yihaoDeng e4de1da8d3 add task queue 2022-07-02 17:00:57 +08:00
dapan1121 211ae46a05 enh: refactor scheduler code 2022-07-02 16:59:49 +08:00
dapan1121 f9c9afe61a Merge branch '3.0' into enh/killQuery 2022-07-02 12:31:45 +08:00
Haojun Liao 99fb3c678c refactor: do some internal refactor. 2022-07-02 12:05:03 +08:00
dapan1121 817a319a2e enh: kill query 2022-07-01 21:01:35 +08:00
dapan1121 1a83250215 fix: fix redirect crash issue 2022-07-01 15:28:45 +08:00
dapan1121 a657413fa6 enh: kill query 2022-07-01 11:10:35 +08:00
Liu Jicong 98d2f42640
Merge pull request #14415 from taosdata/feature/stream
feat(wal): add api to check log existance
2022-07-01 11:00:26 +08:00
Liu Jicong 7a65589525 feat(wal): add api to check log existance 2022-07-01 10:15:05 +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
dapan1121 068924cc62
Merge pull request #14385 from taosdata/feature/queryredirect
feat: support query redirect
2022-06-30 18:03:17 +08:00
Liu Jicong d8da0c0e70
Merge pull request #14386 from taosdata/feature/stream
feat(tmq): add snapshot test
2022-06-30 17:51:02 +08:00
wangmm0220 abcd8a8f5b q 2022-06-30 16:11:56 +08:00
WANG MINGMING 80f6ca1a58
Merge pull request #14370 from taosdata/feature/TD-14761
fix:error if num of line is invalid
2022-06-30 15:58:51 +08:00
wangmm0220 9a2af8580c fix:compile error in sml 2022-06-30 15:06:52 +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 e79fcc07f5 fix: fix stmt async issue 2022-06-30 14:00:48 +08:00
dapan1121 47bc36872f feat: query redirect 2022-06-30 13:44:26 +08:00
Liu Jicong 94c3eb29d2 fix(tmq): rsp error offset 2022-06-29 23:25:04 +08:00
Liu Jicong e74187248b fix(tmq): offset 2022-06-29 22:29:02 +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 8faf37f1d0 fix:error if num of line is invalid 2022-06-29 20:30:16 +08:00
wangmm0220 90dcf118ea Merge branch 'feature/TD-14761' of github.com:taosdata/TDengine into feature/TD-14761 2022-06-29 20:21:33 +08:00
Yihao Deng 2001be5996
Merge branch '3.0' into enh/stopquery 2022-06-29 17:24:52 +08:00
dapan1121 914e06e8cb feat: query redirect 2022-06-29 17:15:08 +08:00
dapan1121 4c82ce1810 fix: fix request freed issue 2022-06-29 17:00:48 +08:00
Xiaoyu Wang ae076af4f1 feat: sql system info function 'database()', 'client_version()', 'server_version()', 'server_status()', 'current_user()' and 'user()' 2022-06-29 11:41:32 +08:00
dapan1121 6d8fd7e506 feat: query redirect 2022-06-29 10:51:22 +08:00
yihaoDeng 32c00b3801 modify case 2022-06-29 10:04:02 +08:00
yihaoDeng 3625a93df1 fix: fix rpc quit problem 2022-06-28 20:32:06 +08:00
yihaoDeng 1fc9eaadd0 fix: fix rpc quit problem 2022-06-28 20:30:17 +08:00
Liu Jicong 58803fafcf fix(query): check datablock should check output flag 2022-06-28 16:05:00 +08:00
yihaoDeng 3bb68c78ae fix: fix rpc quit problem 2022-06-28 11:52:43 +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
dapan1121 c9d9c3ffd0 enh: stop query 2022-06-28 09:28:50 +08:00
yihaoDeng 14209eeec6 feat: add no retry to query 2022-06-27 19:34:50 +08:00
dapan1121 d402716465 enh: stop query 2022-06-27 18:29:28 +08:00
Shuduo Sang fb50977b44
fix: add taos_set_config() back (#14277)
[TD-16828]
2022-06-27 14:07:42 +08:00
dapan1121 de06f055c2 enh: stop query 2022-06-27 13:33:29 +08:00
dapan1121 73dfd1173a enh: stop query 2022-06-27 09:50:42 +08:00
dapan1121 c364f98978 enh: stop query process 2022-06-26 19:34:50 +08:00
dapan1121 e851977da0 Merge branch '3.0' into enh/stopquery 2022-06-26 15:19:35 +08:00
dapan1121 b6c38a4f1b enh: stop query process 2022-06-26 15:13:22 +08:00
Liu Jicong 0c1a51bad6 enh(stream): refine tqRetrieveDataBlock api 2022-06-25 20:03:29 +08:00
yihaoDeng 25a12d96b0 handle rpc retry 2022-06-25 14:06:33 +08:00
yihaoDeng 7c57b03de7 handle rpc retry 2022-06-25 12:19:52 +08:00
yihaoDeng 1b339c9ccd Merge branch 'DN' into ndev 2022-06-25 11:04:39 +08:00
Xiaoyu Wang 0701da48f4 feat: subplan adds 'user' field 2022-06-24 18:39:44 +08:00
Xiaoyu Wang c41a4bd7db feat: subplan adds 'user' field 2022-06-24 17:27:43 +08:00
yihaoDeng a2b62cba42 handle except 2022-06-24 17:07:17 +08:00
yihaoDeng 445d7f2d90 feat: refactor rpc quit 2022-06-24 16:21:01 +08:00
dapan1121 94a2b6d945 enh: refactor show variables 2022-06-24 15:18:40 +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
yihaoDeng 23d1e55718 handle except 2022-06-23 20:29:14 +08:00
yihaoDeng 0d904d5aa3 fix: handle except 2022-06-23 20:06:22 +08:00
Liu Jicong 323ee6b1b0 enh(tmq): add demo for tmq_get_raw_meta 2022-06-23 17:26:52 +08:00
Liu Jicong 71bda7e658 feat(tmq): add with meta config 2022-06-23 15:56:54 +08:00
Liu Jicong 2af4a4d250 merge from 3.0 2022-06-23 14:15:33 +08:00
Liu Jicong 4ed47a0296 feat(tmq): scan tsdb as snapshot 2022-06-23 13:35:24 +08:00
yihaoDeng 3b1664d9e4 feat: refactor rpc code 2022-06-22 18:50:39 +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
dapan1121 a23418d1fa
Merge pull request #14070 from taosdata/feature/showcreate
feat: show create table
2022-06-21 21:05:30 +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 8becbc2608 feat: support show create table 2022-06-21 17:32:31 +08:00
wangmm0220 15a6e7f22f fix:unit test error 2022-06-21 17:22:44 +08:00
dapan1121 0f148c6f47 feat: show create table 2022-06-21 16:45:59 +08:00
Liu Jicong dbb8486dde
Merge pull request #14059 from taosdata/feature/stream
fix(tmq): apis adapt to tmq table meta
2022-06-21 16:36:01 +08:00
wangmm0220 df6cbe0209 Merge branch '3.0' into feature/TD-14761 2022-06-21 16:18:14 +08:00
wangmm0220 572e106691 fix:affect row in schemaless & md5 2022-06-21 16:17:53 +08:00
Liu Jicong 17639758c2 fix(tmq): apis adapt to tmq table meta 2022-06-21 15:40:34 +08:00
Liu Jicong 1644294e25
Merge pull request #14046 from taosdata/feature/stream
feat(stream): drop stream
2022-06-21 15:18:30 +08:00
Liu Jicong 3f6ce2da73 feat(tmq): support topic with meta 2022-06-21 15:18:09 +08:00