Commit Graph

1401 Commits

Author SHA1 Message Date
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