xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
44,184 Commits 3 Branches 0 Tags 479 MiB
Commit Graph

1782 Commits

Author SHA1 Message Date
dapan1121 c5f900f620 Merge branch '3.0' into fix/TD-15197 2022-07-19 09:16:33 +08:00
dapan1121 8d5bd9a83a fix: fix crash issue 2022-07-19 09:05:17 +08:00
dapan1121 1444054437 fix: fix stmt memory leak 2022-07-18 18:57:47 +08:00
Liu Jicong 7542fa0b62 fix(tmq): topic name should be lower unless quoted 2022-07-18 16:42:54 +08:00
wangmm0220 00bb6ed309 fix:conflicts from 3.0 2022-07-18 15:41:35 +08:00
wangmm0220 34c87dc428 fix:<TD-17324> ts already exist when insert with schemaless & modify the interface of tmq meta 2022-07-18 15:33:42 +08:00
dapan1121 03e9b15237 fix: fix taosc memory leak 2022-07-18 13:32:17 +08:00
WANG MINGMING 05e5beb8f3
Merge pull request #14970 from taosdata/feature/TD-14761 
fix:raw block datalen if json data
 2022-07-18 13:31:28 +08:00
Liu Jicong 6fb3072b43 Merge branch '3.0' into feature/stream 2022-07-18 11:46:59 +08:00
Liu Jicong 500553d581 refactor: add debug log 2022-07-18 11:41:56 +08:00
dapan1121 4097b5ae56
Merge pull request #14986 from taosdata/fix/fixmsgorder 
fix: fix msg disorder and other issues
 2022-07-16 18:42:41 +08:00
Liu Jicong 01a345a7c1 merge 3.0 2022-07-16 16:47:35 +08:00
Liu Jicong bb58ec1e02 feat(tmq): support background heartbeat 2022-07-16 16:44:07 +08:00
wangmm0220 22903b3dff fix:nchar is too long 2022-07-16 16:34:56 +08:00
Yihao Deng fe31b4b4fb
Merge pull request #14984 from taosdata/refactor/changeRetError 
enh: change redirect to network_unavail
 2022-07-16 16:25:47 +08:00
wangmm0220 3a8a1021ed Merge branch '3.0' into feature/TD-14761 2022-07-16 16:11:53 +08:00
wangmm0220 887cca3aa8 fix:error in schemaless 2022-07-16 16:11:16 +08:00
dapan1121 320ca85a8f Merge branch '3.0' into fix/fixmsgorder 2022-07-16 15:40:50 +08:00
yihaoDeng 92ec6ccea0 enh: change redirect to network_unavail 2022-07-16 15:37:48 +08:00
yihaoDeng 9ea66e08af enh: change redirect to network_unavail 2022-07-16 14:58:55 +08:00
huolibo af24f2f85d fix(driver): tmq jdbc get meta 2022-07-16 09:32:31 +08:00
wangmm0220 3417cf469c fix:raw block datalen if json data 2022-07-15 20:00:00 +08:00
WANG MINGMING 67b1c680b3
Merge pull request #14958 from taosdata/feature/TD-14761 
fix:error in schemaless
 2022-07-15 18:51:35 +08:00
dapan1121 e55f01df23 Merge branch 'fix/fixmsgorder' of github.com:taosdata/TDengine into fix/fixmsgorder 2022-07-15 18:11:32 +08:00
dapan1121 0048bd8cb6 fix: fix redirect issue 2022-07-15 18:09:27 +08:00
yihaoDeng f91d6dca9e add more debug 2022-07-15 18:07:45 +08:00
wangmm0220 1517b69cef fix:error in schemaless 2022-07-15 17:36:33 +08:00
yihaoDeng f32d2bde1f feat: add time unsynced check 2022-07-15 16:07:54 +08:00
yihaoDeng baa21c8398 Merge branch '3.0' of https://github.com/taosdata/TDengine into dev 2022-07-15 14:58:00 +08:00
yihaoDeng 8006ee1d8e feat: add time unsynced check 2022-07-15 14:56:23 +08:00
yihaoDeng 35e8ad2811 feat: add time unsynced check 2022-07-15 14:51:20 +08:00
dapan1121 5ed51e0010 Merge branch '3.0' into fix/fixmsgorder 2022-07-15 14:19:37 +08:00
dapan1121 c67fa0c1ce enh: add taosd query exit processing 2022-07-15 14:17:00 +08:00
dapan1121 c7aa4a108b
Merge branch '3.0' into enh/schPolicy 2022-07-15 13:24:30 +08:00
Yihao Deng a6e71424b4
Merge branch '3.0' into enh/addLRUToIdx 2022-07-15 09:47:35 +08:00
Xiaoyu Wang 9522288f6b Merge remote-tracking branch 'origin/3.0' into feature/3.0_debug_wxy 2022-07-15 08:44:23 +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
Xiaoyu Wang ef4f6964d1 Merge remote-tracking branch 'origin/3.0' into feature/3.0_debug_wxy 2022-07-14 20:17:28 +08:00
Xiaoyu Wang d894e959ee fix: client module memory leak problem 2022-07-14 20:16:39 +08:00
Haojun Liao 5ca810a985 fix(query): fix memory leak. 2022-07-14 19:09:40 +08:00
dapan1121 ae132e6626 Merge branch '3.0' into enh/schPolicy 2022-07-14 18:44:21 +08:00
dapan1121 12b961c7f5 enh: add schedule policy 2022-07-14 18:42:26 +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
dapan1121 a0f7cc6790 enh: add schedule policy 2022-07-14 14:03:27 +08:00
wangmm0220 3b4c2826b4 Merge branch '3.0' into feature/TD-13041 2022-07-14 10:22:15 +08:00
wangmm0220 56ec0a3920 fix: json null 2022-07-13 20:42:49 +08:00
dapan1121 ad051d4e65 fix: fix stop query issue 2022-07-13 20:25:16 +08:00
wangmm0220 cd051d40c3 fix:confilct from 3.0 2022-07-13 16:03:39 +08:00
wangmm0220 531dfd4452 fix:error in tmq meta 2022-07-13 16:00:06 +08:00
wangmm0220 0237ccbbb6 fix:error in tmq meta 2022-07-13 15:33:31 +08:00
yihaoDeng 88ed8d4cf5 refactor code 2022-07-13 14:04:18 +08:00
wangmm0220 037ea1519c fix:core dump if consumer multi vgroup message with sequence:create/alter/delete/create or create/delete/create 2022-07-13 13:42:55 +08:00
wangmm0220 0857ab3531 fix:core dump if consumer multi vgroup message with sequence:create/alter/delete/create or create/delete/create 2022-07-13 11:39:32 +08:00
dapan1121 346c86408f Merge branch '3.0' into enh/stopquery_a 2022-07-13 11:33:23 +08:00
dapan1121 7891ff0f03 fix: fix stop query issue 2022-07-13 11:31:28 +08:00
Yihao Deng aadd4192dd
Merge pull request #14832 from taosdata/feat/refactorClientQ 
enh: refactor client queue
 2022-07-13 09:25:29 +08:00
dapan1121 80c1055b5b
Merge pull request #14835 from taosdata/fix/TD-15890 
fix: fix client memory leak
 2022-07-13 08:33:16 +08:00
dapan1121 a5c83c7e8d fix: fix client memory leak 2022-07-12 20:53:42 +08:00
yihaoDeng 42d6ab3b00 refactor client queue 2022-07-12 20:00:26 +08:00
wangmm0220 2b442621e8 feat:get child table name in tmq meta 2022-07-12 18:58:33 +08:00
Liu Jicong a34d344225
Merge pull request #14808 from taosdata/feature/stream 
refactor(tmq): prepare only needed
 2022-07-12 18:09:31 +08:00
dapan1121 55b94558b6
Merge pull request #14824 from taosdata/fix/TD-17268 
fix: fix load table info issue
 2022-07-12 16:47:06 +08:00
Haojun Liao 3ffc4e0dfd
Merge pull request #14820 from taosdata/feature/3_liaohj 
fix(query): set correct number of result rows for taos_fetch_raw_block_a
 2022-07-12 16:23:31 +08:00
dapan1121 f54a4322c2 fix: fix load table info issue 2022-07-12 16:04:18 +08:00
wangmm0220 824d3db96b fix:conflict from 3.0 2022-07-12 16:01:55 +08:00
Haojun Liao 6cef3baa95 fix(query): set correct number of result rows for taos_fetch_raw_block_a 2022-07-12 15:17:39 +08:00
Liu Jicong ac57956a56 Merge branch '3.0' into feature/stream 2022-07-12 14:12:18 +08:00
Liu Jicong d637ffe22c refactor(tmq): prepare only needed 2022-07-12 14:10:22 +08:00
dapan1121 8957a91ab3 fix: add more columns in show stable res 2022-07-12 13:56:15 +08:00
dapan1121 177814f6eb
Merge pull request #14781 from taosdata/fix/stmt_rerun 
fix: fix stmt rerun incorrect uid issue
 2022-07-11 21:15:02 +08:00
wangmm0220 5d3e07c022 fix:conflict from 3.0 2022-07-11 19:10:41 +08:00
wangmm0220 f9d5c809c9 fix:conflict from 3.0 2022-07-11 19:06:36 +08:00
Yihao Deng b6bd0b5198
Merge pull request #14771 from taosdata/enh/rpcSvrRefactor 
enh: rpc svr refactor
 2022-07-11 19:05:30 +08:00
wangmm0220 a196298640 fix:disable colName in tag 2022-07-11 18:07:46 +08:00
dapan1121 f3d298c81f fix: fix stmt rerun issue 2022-07-11 17:51:03 +08:00
Haojun Liao 0b45f95211
Merge pull request #14762 from taosdata/feature/3_liaohj 
fix(query): add more check for fetch rsp, and set the correct start time window for fill.
 2022-07-11 17:49:04 +08:00
wangmm0220 c54bc76925 feat:get meta ok 2022-07-11 17:36:07 +08:00
dapan1121 24042ffffa Merge branch '3.0' into enh/stopquery_a 2022-07-11 16:33:51 +08:00
dapan1121 c8e1e2a09e fix: fix stmt rerun 2022-07-11 16:28:55 +08:00
dapan1121 1eba184907 fix: fix stmt rerun issue 2022-07-11 15:58:21 +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
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
Haojun Liao e5d25f4634 fix(query): set correct ts column index in interp executor. 2022-06-21 09:41:35 +08:00
dapan1121 b084be71f6 feat: show create table 2022-06-21 09:18:53 +08:00
Haojun Liao 1bf7fbbc0b feature(query): support interp function, and do some internal refactor. 2022-06-20 23:22:28 +08:00
dapan1121 be2935cba6 feat: show create table 2022-06-20 20:58:36 +08:00
dapan1121 a8694bd863
Merge pull request #13977 from taosdata/enh/taos.ref 
feat: support all queries on Qnode
 2022-06-20 09:26:33 +08:00
WANG MINGMING e50b10dbef
Merge pull request #13987 from taosdata/fix/TD-16591 
fix:raw data error in json type
 2022-06-18 20:34:47 +08:00
dapan1121 cd5578918a Merge branch '3.0' into enh/taos.ref 2022-06-18 19:49:08 +08:00
wangmm0220 e6e44a6fe0 fix:raw data for json 2022-06-18 18:36:46 +08:00
wangmm0220 d5afeae611 fix:raw data for json 2022-06-18 17:04:32 +08:00
dapan1121 5f4614d61a qnode for policy 2/3 2022-06-18 16:30:46 +08:00
dapan1121 6f610bd363
Merge pull request #13952 from taosdata/enh/taos.ref 
fix: fix insert affected rows issue
 2022-06-18 11:12:50 +08:00
dapan1121 d862f2b49c fix TAOS ref issue 2022-06-18 09:53:18 +08:00
dapan1121 38a481afce add close null pointer validate 2022-06-18 08:21:31 +08:00
dapan1121 744bc92f68 modify TAOS as id addr 2022-06-17 20:21:41 +08:00
dapan1121 c2a96b2cc1 fix insert affected rows issue 2022-06-17 20:12:18 +08:00
dapan1121 211adf20af
Merge pull request #13875 from taosdata/feature/showapps 
feat: support show apps command
 2022-06-17 18:20:05 +08:00
Liu Jicong e92aa57e93 feat(tmq): support commit one msg 2022-06-17 16:38:06 +08:00
wangmm0220 f5e0c91614 fix:judge json data for convertUCS4 logic 2022-06-17 15:29:09 +08:00
Liu Jicong d7660484cc fix(tmq): performance issue 2022-06-17 15:10:00 +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
Liu Jicong 18993d50e5 refactor(tmq): offset storage 2022-06-17 13:16:46 +08:00
dapan1121 d12614aac8 kill query 2022-06-17 09:22:03 +08:00
Liu Jicong aef7c7ebe1 Merge branch '3.0' into feature/stream 2022-06-16 22:01:31 +08:00
Liu Jicong 79494364ae refactor(tmq): offset storage 2022-06-16 22:00:33 +08:00
dapan1121 b3f9f81b61 support show apps 2022-06-16 21:06:04 +08:00
Zhiqiang Wang 304d20f024
Merge pull request #13895 from taosdata/fix/ZhiqiangWang/TD-16357-add-dll-check 
os: add dll check
 2022-06-16 18:26:24 +08: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
afwerar 528d7d7248 os: add dll check 2022-06-16 15:46:51 +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
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
Haojun Liao 6b2d4a6aca other: merge 3.0 2022-06-15 23:05:55 +08:00
dapan1121 4973739794 show apps 2022-06-15 20:59:33 +08:00
dapan1121 b56f1dc03d fix schemaless taos issue 2022-06-15 20:58:18 +08:00
Liu Jicong fd9bb8db73
Merge pull request #13860 from taosdata/feature/stream 
feat(stream): trigger mode add max delay
 2022-06-15 17:11:18 +08:00
Liu Jicong 8eb08fa0d4 feat(stream): trigger mode add max delay 2022-06-15 16:11:20 +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
WANG MINGMING d6012f22dc
Merge branch '3.0' into feature/TD-14761 2022-06-14 18:23:37 +08:00
Xiaoyu Wang 18ced3eb97
Merge pull request #13810 from taosdata/feature/3.0_wxy 
fix: some problems of parser
 2022-06-14 18:06:29 +08:00
wangmm0220 f4eb95a02b fix: error in schemaless parameters 2022-06-14 17:45:54 +08:00
Liu Jicong 04593fa44e fix(stream): build table name 2022-06-14 16:38:33 +08:00
Xiaoyu Wang 1676bfe5cf fix: some problems of parser 2022-06-14 15:43:56 +08:00
Liu Jicong 18c0e0ac74 fix(query): cast 2022-06-14 15:31:47 +08:00
Liu Jicong acda336f4e Merge branch '3.0' into feature/stream 2022-06-14 15:14:47 +08:00
dapan1121 2861534ada
Merge pull request #13781 from taosdata/feature/cacheIndex 
feat: cache table index
 2022-06-14 14:29:13 +08:00
Liu Jicong ae8d2fd36d merge from 3.0 2022-06-14 14:10:37 +08:00
Liu Jicong 601e454a24 enh(tmq): put offset store into vnode 2022-06-14 13:58:40 +08:00
dapan1121 545345de7b remove debug flag 2022-06-14 13:23:47 +08:00
WANG MINGMING 64dca74a54
Merge branch '3.0' into feature/TD-14761 2022-06-14 11:34:18 +08:00
wangmm0220 5ffb01b2e6 fix: error in schemaless with same timestamp 2022-06-14 11:24:45 +08:00
wangmm0220 4481bb4e5c fix: error in schemaless with same timestamp 2022-06-13 21:29:00 +08:00
dapan1121 8d86b877e7 Merge branch '3.0' into feature/cacheIndex 2022-06-13 18:49:08 +08:00
dapan1121 bb89ceb6bd change stb hash value to stbName 2022-06-13 18:46:02 +08:00
Xiaoyu Wang a5ce5192f2 merge 3.0 2022-06-13 18:37:25 +08:00
Haojun Liao 0166d40c68
Merge pull request #13759 from taosdata/feature/3_liaohj 
fix(query): add check for data completed.
 2022-06-13 15:10:46 +08:00
Xiaoyu Wang 3eda47e159 merge 3.0 2022-06-13 15:02:42 +08:00
Xiaoyu Wang 1863bbee9a merge 3.0 2022-06-13 15:01:29 +08:00
WANG MINGMING e3b9f58ebd
Merge pull request #13762 from taosdata/feature/TD-14761 
fix:to make time sort stable if timestamp is same in schemalsee
 2022-06-13 15:00:17 +08:00
Xiaoyu Wang 380a071551 fix: handle the memory leak of parser 2022-06-13 14:54:38 +08:00
wangmm0220 c54fc87afe Merge branch 'feature/TD-14761' of github.com:taosdata/TDengine into feature/TD-14761 2022-06-13 14:13:05 +08:00
wangmm0220 78dd9a035e fix:to make time sort stable if timestamp is same in schemalsee 2022-06-13 14:12:36 +08:00
dapan1121 eff9f9be4d add sma update 2022-06-13 14:06:11 +08:00
dapan1121 2eed1d4f2f
Merge pull request #13690 from taosdata/feature/qnode 
feat: support mnode/vnode epset update
 2022-06-13 14:02:06 +08:00
Haojun Liao 0a414b4934 fix(query): add check for data completed. 2022-06-13 13:32:02 +08:00
dapan1121 17f6275015 add sma cache 2022-06-13 10:38:45 +08:00
Liu Jicong 32151de1f0
Merge pull request #13745 from taosdata/feature/stream 
enh(tmq): avoid uninitialized memory
 2022-06-12 08:56:08 +08:00
WANG MINGMING 0f417eb584
Merge pull request #13743 from taosdata/feature/TD-14761 
fix:disable schemaless database parameters & fix insert error in multi thread in schemaless
 2022-06-11 23:38:06 +08:00
wangmm0220 6e45140db4 fix:disable schemaless database parameters 2022-06-11 21:40:57 +08:00
Liu Jicong 0ef33c05bc enh(tmq): avoid uninitialized memory 2022-06-11 21:36:15 +08:00
Xiaoyu Wang d1e0327d19 fix: handle the memory leak of parser 2022-06-11 21:32:29 +08:00
wangmm0220 324e8607cc fix:disable schemaless database parameters 2022-06-11 20:26:11 +08:00
wangmm0220 d0fa1f568d fix:error in multi thread in schemaless 2022-06-11 19:59:18 +08:00
wangmm0220 9bccbbf865 fix:error in multi thread in schemaless 2022-06-11 19:40:56 +08:00
dapan1121 0046593d4f
Merge branch '3.0' into feature/qnode 2022-06-11 17:58:53 +08:00
WANG MINGMING ed43a4da73
Merge pull request #13728 from taosdata/feature/TD-14761 
fix:error in schemaless
 2022-06-11 17:51:57 +08:00
wangmm0220 40b841f704 fix:error in schemaless 2022-06-11 17:15:38 +08:00
dapan1121 d3a56d87ca
Merge branch '3.0' into feature/qnode 2022-06-11 16:34:21 +08:00
Haojun Liao a91053300c other: merge 3.0 2022-06-11 14:54:31 +08:00
Haojun Liao 0fbf30ce6d refactor: do some internal refactor, and add some check before create exchange operator. 2022-06-11 14:51:54 +08:00
wangmm0220 e45a990344 feat: sort data by time before build submit block in schemaless 2022-06-11 11:58:28 +08:00
wangmm0220 341fe3700b feat: sort data by time before build submit block in schemaless 2022-06-11 11:33:46 +08:00
wangmm0220 7b1c07cf90 feat: sort data by time before build submit block in schemaless 2022-06-11 11:27:37 +08:00
dapan1121 16254ae28b fix windows compile issue 2022-06-11 10:54:47 +08:00
wangmm0220 2cb998a566 feat: add async logic for schemaless 2022-06-11 10:54:40 +08:00
dapan1121 9642096d24 fix windows compile issue 2022-06-11 10:51:37 +08:00
dapan1121 3d598366bc fix windows compile 2022-06-11 10:33:13 +08:00
dapan1121 ffa069e4ed fix compile issue 2022-06-10 20:11:58 +08:00
dapan1121 7923d51f62 Merge branch '3.0' into feature/qnode 2022-06-10 20:04:19 +08:00
dapan1121 6b3495af06 fix tmq crash issue 2022-06-10 20:02:32 +08:00
dapan1121 38e6bf3b6e fix tmq crash issue 2022-06-10 19:56:11 +08:00
wangmm0220 9333120d42 feat: add async logic for schemaless 2022-06-10 17:53:13 +08:00
WANG MINGMING b352f0d1e4
Merge pull request #13658 from taosdata/feature/TD-14761 
fix:error in schemaless
 2022-06-10 17:45:36 +08:00
dapan1121 294b54004f fix compile issue 2022-06-10 17:33:01 +08:00
dapan1121 0e9203ebf6 Merge branch '3.0' into feature/qnode 2022-06-10 17:09:11 +08:00
dapan1121 1b196df8ed update epset 2022-06-10 17:07:24 +08:00
wangmm0220 f364ad7bed fix:error in windows 2022-06-10 16:13:41 +08:00
Liu Jicong 1cc2cd0747 merge from 3.0 2022-06-10 16:12:56 +08:00
Liu Jicong 3fb0c24af3 refactor(tmq): timeout -1 means always waiting 2022-06-10 16:10:57 +08:00
Haojun Liao 5f0f6f7c63 refactor: add log. 2022-06-10 14:50:51 +08:00
wangmm0220 a4fba1c70b feat:add async logic for schemaless 2022-06-10 13:54:44 +08:00
Haojun Liao 24cca6cbcd Merge branch '3.0' into feature/3_liaohj 2022-06-10 11:28:10 +08:00
Haojun Liao 5bb16c3073 enh(query): add new api in taos.h 2022-06-10 09:48:56 +08:00
wangmm0220 1d14725880 feat:add async logic for schemaless 2022-06-09 21:38:57 +08:00
wangmm0220 3451ba0c82 fix:error in schemaless 2022-06-09 18:54:22 +08:00
WANG MINGMING a80a3f4617
Merge pull request #13647 from taosdata/feature/TD-14761 
fix:error in schemaless
 2022-06-09 16:43:26 +08:00
wangmm0220 fb26a97fae fix:error in schemaless 2022-06-09 15:45:31 +08:00
wangmm0220 04f1f71095 fix:error in schemaless 2022-06-09 14:27:02 +08:00
Liu Jicong 88313b9068
Merge pull request #13619 from taosdata/feature/stream 
fix(query): decode
 2022-06-09 13:03:35 +08:00
Haojun Liao 840074dfa3 refactor: do some internal refactor, and add a new api 2022-06-09 11:40:49 +08:00
Liu Jicong 83f5e5eedc fix(stream): fix no executor stream task 2022-06-09 09:56:45 +08:00
dapan1121 ed3289e0fa
Merge branch '3.0' into feature/3_liaohj 2022-06-08 21:50:54 +08:00
Liu Jicong 6733636a1a
Merge pull request #13601 from taosdata/feature/retrievemsg 
refactor: do some internal refactor.
 2022-06-08 21:27:16 +08:00
wangmm0220 0147e49848 fix:add test case 2022-06-08 21:01:01 +08:00
Haojun Liao 90024cb130 refactor: do some internal refactor. 2022-06-08 20:56:38 +08:00
dapan1121 deaa295fb5
Merge branch '3.0' into feature/3_liaohj 2022-06-08 20:44:01 +08:00
dapan1121 594c370543 fix error handle issue 2022-06-08 20:39:46 +08:00
dapan1121 9e9381a6c5 fix bug 2022-06-08 20:28:24 +08:00
Liu Jicong 552c6607bb Merge branch '3.0' into feature/stream 2022-06-08 19:31:40 +08:00
Liu Jicong b1226e5d06 feat(tmq): support err2str 2022-06-08 19:07:07 +08:00
Haojun Liao 716dd2c5e4 refactor: do some internal refactor, add the column info in STableRetrieveRsp. 2022-06-08 18:41:05 +08:00
wangmm0220 48b487dd9d fix: error in schemaless_insert if insert with multi threads 2022-06-08 17:01:20 +08:00
wangmm0220 f31ec1d1b5 Merge branch 'feature/TD-14761' of github.com:taosdata/TDengine into feature/TD-14761 2022-06-08 16:51:10 +08:00
wangmm0220 f1ea9905aa fix: error in schemaless_insert if insert with multi threads 2022-06-08 16:50:02 +08:00
yihaoDeng 6b39c690d2 json idx 2022-06-08 16:13:52 +08:00
Haojun Liao 9bee5e2cee refactor: do some internal refactor. 2022-06-08 16:08:26 +08:00
dapan1121 cd56e3b11f collect db table list 2022-06-08 15:30:57 +08:00
wangmm0220 9221513d97 fix:memory leak & memory problem & sml params 2022-06-07 18:37:35 +08:00
Haojun Liao d98a4b467d fix(query): set the schemaless flag. 2022-06-07 15:52:46 +08:00
Liu Jicong 65900c32c3 enh(stream): use same name rule with schemaless 2022-06-07 15:40:11 +08:00
Haojun Liao 8a00b3ab86 test: update test cases. 2022-06-07 11:43:25 +08:00
Haojun Liao fb07e8b73e refactor:do some internal refactor and add some logs. 2022-06-07 11:15:33 +08:00
dapan1121 16b84f575f Merge branch '3.0' into featuer/delete 2022-06-07 09:13:47 +08:00
Haojun Liao 9740ccf9fa test:update test case. 2022-06-07 09:08:44 +08:00
Haojun Liao 3e6bb05581 refactor: do some internal refactor. 2022-06-06 23:39:54 +08:00
Haojun Liao aba3ea28b5 refactor: do some internal refactor. 2022-06-06 23:35:25 +08:00
dapan1121 33a7a83d65 feature delete data 2022-06-06 20:59:36 +08:00
Haojun Liao b650daa334 refactor: do some internal refactor. 2022-06-06 20:00:11 +08:00
Haojun Liao 2bd16c4978 refactor: update output of log. 2022-06-06 19:58:14 +08:00
Haojun Liao aa143beda4 fix(query): fix invalid free. 2022-06-06 19:27:51 +08:00
Haojun Liao 475a399c31 refactor: do some internal refactor. 2022-06-06 17:29:43 +08:00
Haojun Liao 79d8361a08 refactor: do some internal refactor. 2022-06-06 10:36:48 +08:00
Haojun Liao 570d464129 refactor: do some internal refactor. 2022-06-06 10:36:32 +08:00
Haojun Liao 90cb7966bc refactor: do some internal refactor. 2022-06-06 10:35:19 +08:00
dapan1121 b375531ade
Merge branch '3.0' into feature/qnode 2022-06-05 17:49:12 +08:00
Haojun Liao 52ae8f0efa other: merge 3.0 2022-06-05 15:45:01 +08:00
dapan1121 e6c15da7ea Merge branch '3.0' into feature/qnode 2022-06-05 10:24:58 +08:00
dapan1121 31f10572c4 remove rpc close 2022-06-05 10:18:03 +08:00
WANG MINGMING 8566917971
Merge pull request #13433 from taosdata/feature/TD-13041 
feat:add json test case
 2022-06-04 23:18:09 +08:00
dapan1121 9bd195d94d reschedule timeout task 2022-06-04 22:33:30 +08:00
Haojun Liao ad6a648d2b refactor: do some internal refactor. 2022-06-04 17:08:46 +08:00
dapan1121 c2c2defc7c Merge branch '3.0' into feature/qnode 2022-06-04 16:02:07 +08:00
dapan1121 8f16b9b8c1 catalog force update 2022-06-04 15:59:41 +08:00
dapan1121 53ae7b794b
Merge pull request #13442 from taosdata/feature/qnode 
feat: rescheduler timeout task
 2022-06-04 12:35:27 +08:00
wangmm0220 14f5019c6e fix:fix conflict merge from 3.0 2022-06-04 12:10:25 +08:00
Haojun Liao 0c94c65acb fix(query): add ref for job 2022-06-03 23:13:21 +08:00
dapan1121 bcec782dd2 Merge branch '3.0' into feature/qnode 2022-06-03 20:47:46 +08:00
dapan1121 b6e60082ae rescheduler timeout task 2022-06-03 20:44:32 +08:00
Haojun Liao 4b9ea626ae Merge branch '3.0' into feature/3_liaohj 2022-06-03 00:18:54 +08:00
Haojun Liao 3ff81a90e6 refactor: do some internal refactor. 2022-06-03 00:04:07 +08:00
Haojun Liao ad5be523e6 refactor: do some internal refactor. 2022-06-02 23:33:38 +08:00
Haojun Liao 6b49352a81 refactor: do some internal refactor. 2022-06-02 22:52:01 +08:00
wangmm0220 c937313e3f feat:add json test case 2022-06-02 22:31:12 +08:00
Haojun Liao 4fd2fb06bc refactor: do some internal refactor. 2022-06-02 21:20:15 +08:00
dapan1121 f6c6083aad reschedule timeout task 2022-06-02 21:02:02 +08:00
Ganlin Zhao 077724b892
Merge pull request #13423 from taosdata/fix/TD-16232 
fix(query): concat/concat_ws function output incorrect when all params are constant and include NULL value.
 2022-06-02 18:49:35 +08:00
Ganlin Zhao de167cd46d fix(query): concat/concat_ws function output incorrect when 
all param are constant and include NULL value.

TD-16232
TD-16233
 2022-06-02 10:17:07 +00:00
Haojun Liao ef6b0f942f fix(query): prepare test env 2022-06-02 17:52:51 +08:00
WANG MINGMING 57ad40e32f
Merge pull request #13419 from taosdata/feature/TD-14761 
feat: give tips if col_set is empty in schemaless
 2022-06-02 17:35:52 +08:00
Haojun Liao 343f912ddd Merge remote-tracking branch 'origin/feature/3_liaohj' into feature/3_liaohj 
# Conflicts:
#	source/client/inc/clientInt.h
#	source/client/src/clientImpl.c
#	source/client/src/clientMsgHandler.c
 2022-06-02 17:27:51 +08:00
wangmm0220 f0531a2a3d Merge branch 'feature/TD-14761' of github.com:taosdata/TDengine into feature/TD-14761 2022-06-02 17:13:45 +08:00
wangmm0220 01cc322fc9 fix:add test case for schemaless 2022-06-02 17:09:12 +08:00
Haojun Liao 84158d861d enh(query): query APIs are built on top of async APIs. 2022-06-02 16:54:35 +08:00
wangmm0220 70d3a47edd fix:fix error in schemaless if col_set is empty 2022-06-02 15:59:02 +08:00
Liu Jicong c28af7001f
Merge pull request #13256 from taosdata/feature/3_liaohj 
enh(query): enable twa function in select clause.
 2022-06-02 15:39:18 +08:00
WANG MINGMING 0ac78291ae
Merge pull request #13384 from taosdata/feature/TD-14761 
feat:add schemaless param from db
 2022-06-02 15:18:29 +08:00
Liu Jicong 77fe6a4ef7
Merge branch '3.0' into feature/3_liaohj 2022-06-02 15:05:49 +08:00
wangmm0220 90cdc36018 fix:fix error in get db name for schemaless parameters 2022-06-02 12:55:51 +08:00
dapan1121 7251634534 Merge branch '3.0' into feature/qnode 2022-06-02 12:39:14 +08:00
dapan1121 a10643a074 update table meta after alter table 2022-06-02 12:34:35 +08:00
Liu Jicong e1fd4a6640 feat(tmq): get_db api 2022-06-02 10:18:11 +08:00
Liu Jicong 946acdcd9c fix(query): double free 2022-06-01 21:00:49 +08:00
dapan1121 d8093c91c2 alter table return meta 2022-06-01 20:28:29 +08:00
WANG MINGMING 9cb385f0b8
Merge pull request #13388 from taosdata/3.0 
3.0
 2022-06-01 20:07:09 +08:00
wangmm0220 0ecd49205f feat:merge from 3.0 2022-06-01 18:59:01 +08:00
wangmm0220 6418caa430 feat:add schemaless param from db 2022-06-01 18:53:23 +08:00
wangmm0220 7ad1e97987 fix:fix compile error in windows 2022-06-01 13:55:56 +08:00
wangmm0220 588c4f5abf Merge branch '3.0' into feat/tag_refact 2022-06-01 13:25:41 +08:00
dapan1121 f5ce8c9df8 Merge branch '3.0' into feature/qnode 2022-06-01 13:15:33 +08:00
Liu Jicong 2aacbfee10
Merge pull request #13341 from taosdata/feature/tq 
fix(tmq): auto unsubscribe when consumer close
 2022-06-01 10:42:14 +08:00
Liu Jicong 66899bd8d0 fix(tmq): auto unsubscribe when consumer close 2022-06-01 10:27:41 +08:00
wangmm0220 19b0932781 feat:merge from 3.0 2022-05-31 23:46:04 +08:00
dapan1121 719cebdd87 stmt new api 2022-05-31 21:03:47 +08:00
wangmm0220 816cea07f9 feat:add new logic for new tag format 2022-05-31 17:49:33 +08:00
dapan1121 496ae4ca89 schedule based on qnode's load 2022-05-31 14:03:47 +08:00
wangmm0220 f7c21c4502 feat:add schemaless db paras 2022-05-30 18:00:03 +08:00
dapan1121 5ce7dd2a4d qnode load 2022-05-28 22:13:26 +08:00
Cary Xu 9b4c9e4802 enh: tag refactor for normal tags 2022-05-28 17:16:04 +08:00
dapan1121 320f874982 Merge branch '3.0' into feature/qnode 2022-05-28 09:16:07 +08:00
Xiaoyu Wang d25a902893
Merge pull request #13093 from taosdata/feature/3.0_async 
feat: parser adapts asynchronous interface
 2022-05-27 18:09:02 +08:00
dapan1121 e7b8a7d567 Merge branch '3.0' into feature/qnode 2022-05-27 17:36:44 +08:00
dapan1121 79394deb60 update epset 2022-05-27 17:35:48 +08:00
dapan1121 6b0c9694a3
Merge pull request #13088 from taosdata/feature/qnode 
enh: optimize query msg
 2022-05-27 17:34:47 +08:00
Xiaoyu Wang 1005fb8850 feat: parser adapts asynchronous interface 2022-05-27 17:02:40 +08:00
Xiaoyu Wang d0c11c5bba feat: parser adapts asynchronous interface 2022-05-27 17:00:37 +08:00
dapan1121 6e465ebd8e optimize query msg 2022-05-27 16:01:40 +08:00
Yihao Deng a939bc8777
Merge pull request #12967 from taosdata/enh/defaultEpSet 
enh: default ep set
 2022-05-27 13:33:57 +08:00
dapan1121 782ad93dc9 fix update mgmt epset issue 2022-05-26 21:16:06 +08:00
dapan1121 7c46aea979 add tversion 2022-05-26 20:37:55 +08:00
dapan1121 47ea043d5f
Merge pull request #13017 from taosdata/feature/qnode 
feat: scheduler async api
 2022-05-26 18:00:21 +08:00
dapan1121 22470344e0 scheduler async api test 2022-05-26 14:23:07 +08:00
Xiaoyu Wang 7989190b5e fix: some problems of rollup sma 2022-05-26 14:16:36 +08:00
yihaoDeng 6e6dadf5d7 eerge branch 'ne' into update 2022-05-26 11:53:31 +08:00
yihaoDeng 511a4c3a4f update default epset 2022-05-26 11:29:31 +08:00
dapan1121 e27f8e8a23
Merge pull request #12926 from taosdata/feature/async.scheduler 
feat: scheduler async api
 2022-05-26 09:15:55 +08:00
afwerar f6fb34269f fix(os): run case on win 2022-05-25 19:29:34 +08:00
afwerar 3a0efe7255 fix(os): run case on win 2022-05-25 16:30:26 +08:00
dapan1121 c1a774c64f enh/defaultEpSet 2022-05-25 14:46:34 +08:00