Commit Graph

771 Commits

Author SHA1 Message Date
dapan1121 ad051d4e65 fix: fix stop query issue 2022-07-13 20:25:16 +08:00
yihaoDeng 88ed8d4cf5 refactor code 2022-07-13 14:04:18 +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
yihaoDeng 42d6ab3b00 refactor client queue 2022-07-12 20:00:26 +08:00
dapan1121 f54a4322c2 fix: fix load table info issue 2022-07-12 16:04:18 +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
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
dapan1121 24042ffffa Merge branch '3.0' into enh/stopquery_a 2022-07-11 16:33:51 +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
Haojun Liao 7dc7f478de refactor: do some internal refactor and fix some memory leak. 2022-07-10 17:34:21 +08:00
dapan1121 e733f8067d enh: enhance query redirect 2022-07-10 11:21:13 +08:00
yihaoDeng 1e5ddcb92f merge 3.0 2022-07-06 18:29:11 +08:00
dapan1121 8b896332d6
Merge pull request #14558 from taosdata/feature/insertselect
enh: refactor scheduler code
2022-07-06 09:44:38 +08:00
yihaoDeng b6fce4b84f refactor epset update 2022-07-05 21:36:42 +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
yihaoDeng 47ec187231 merge int kill 2022-07-04 16:10:59 +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
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 068924cc62
Merge pull request #14385 from taosdata/feature/queryredirect
feat: support query redirect
2022-06-30 18:03:17 +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
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
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
dapan1121 4a55ed07b3 feature: query redirect 2022-06-28 10:34:51 +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 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
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 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 8becbc2608 feat: support show create table 2022-06-21 17:32:31 +08:00
dapan1121 b084be71f6 feat: show create table 2022-06-21 09:18:53 +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
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 d862f2b49c fix TAOS ref issue 2022-06-18 09:53:18 +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
wangmm0220 f5e0c91614 fix:judge json data for convertUCS4 logic 2022-06-17 15:29:09 +08:00
dapan1121 d320326371 reset query cache 2022-06-17 14:41:17 +08:00
dapan1121 d12614aac8 kill query 2022-06-17 09:22:03 +08:00
dapan1121 b3f9f81b61 support show apps 2022-06-16 21:06:04 +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
Liu Jicong 18c0e0ac74 fix(query): cast 2022-06-14 15:31:47 +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
Xiaoyu Wang 1863bbee9a merge 3.0 2022-06-13 15:01:29 +08:00
Xiaoyu Wang 380a071551 fix: handle the memory leak of parser 2022-06-13 14:54:38 +08:00
dapan1121 d3a56d87ca
Merge branch '3.0' into feature/qnode 2022-06-11 16:34:21 +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
dapan1121 38e6bf3b6e fix tmq crash issue 2022-06-10 19:56:11 +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
Haojun Liao 5f0f6f7c63 refactor: add log. 2022-06-10 14:50:51 +08:00
Haojun Liao 840074dfa3 refactor: do some internal refactor, and add a new api 2022-06-09 11:40:49 +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
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
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 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
dapan1121 33a7a83d65 feature delete data 2022-06-06 20:59:36 +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 90cb7966bc refactor: do some internal refactor. 2022-06-06 10:35:19 +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
Haojun Liao 4b9ea626ae Merge branch '3.0' into feature/3_liaohj 2022-06-03 00:18:54 +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
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
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
Haojun Liao 84158d861d enh(query): query APIs are built on top of async APIs. 2022-06-02 16:54:35 +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
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 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 19b0932781 feat:merge from 3.0 2022-05-31 23:46:04 +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 79394deb60 update epset 2022-05-27 17:35:48 +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
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 22470344e0 scheduler async api test 2022-05-26 14:23:07 +08:00
dapan1121 49510f6330
Merge branch '3.0' into feature/async.scheduler 2022-05-25 09:46:15 +08:00
dapan1121 efa071c9f6 scheduler async api 2022-05-24 17:49:22 +08:00
wangmm0220 125c0fa575 fix:add json test case 2022-05-23 18:12:05 +08:00
WANG MINGMING a3898d3ad5
Merge pull request #12855 from taosdata/3.0
3.0
2022-05-23 14:43:01 +08:00
wangmm0220 e51105cb86 fea:add test case for json tag 2022-05-21 22:21:49 +08:00
dapan1121 867a0914e8
Merge pull request #12800 from taosdata/feature/qnode
feat: drop table meta cache after table dropped
2022-05-21 22:17:51 +08:00
dapan1121 9364218963 fix mem leak 2022-05-21 21:59:04 +08:00
Liu Jicong 8e3701df01 fix(tmq): memory leak 2022-05-21 21:36:26 +08:00
dapan1121 733d221699 fix stmt bug 2022-05-21 16:04:25 +08:00
dapan1121 d0aa9436e4 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-05-20 21:05:21 +08:00
Xiaoyu Wang 7feeea974c feat: add scenarios that trigger metadata refresh 2022-05-20 18:22:40 +08:00
dapan1121 a353b1a1fb refresh meta 2022-05-20 18:00:05 +08:00
dapan1121 40a3f02463 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-05-20 15:38:45 +08:00
WANG MINGMING c715ee5993
Merge pull request #12719 from taosdata/feature/TD-13041
fea: add select json from table
2022-05-20 13:15:49 +08:00
wangmm0220 ac6069f343 fix:compile error in windows 2022-05-20 12:45:03 +08:00
dapan1121 54a1ecf932 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-05-20 09:05:08 +08:00
dapan1121 d472c28142 update table meta based on query sversion 2022-05-19 22:08:06 +08:00
yihaoDeng 76b9a5acee fix: avoid invalid read/write 2022-05-19 21:56:39 +08:00
wangmm0220 6c26b6230f fea:add select json logic 2022-05-19 17:57:14 +08:00
wangmm0220 91dc9e9089 fea:add select json logic 2022-05-19 17:46:28 +08:00
dapan1121 fb944e85bc fix explain res issue 2022-05-19 09:39:28 +08:00
wangmm0220 e818e27902 fea:add select json logic 2022-05-18 22:13:38 +08:00
dapan1121 97a20ee86b update meta based on sversion 2022-05-18 20:31:30 +08:00
dapan1121 c85232e14c update table meta based on sversion 2022-05-18 16:37:09 +08:00
Shengliang Guan 0623514ed1 Merge remote-tracking branch 'origin/3.0' into fix/mnode 2022-05-17 16:12:53 +08:00
Xiaoyu Wang fb901d95e4 fix: some problems of parser for stmt mode 2022-05-17 11:11:40 +08:00
Shengliang Guan 81e89ec7b6 Merge remote-tracking branch 'origin/3.0' into fix/mnode 2022-05-16 20:13:02 +08:00
Shengliang Guan fc94b71c80 refactor: adjust SRpcMsg 2022-05-16 15:17:11 +08:00
Haojun Liao 8bad3305d2 fix(query): return error code when connecting to database failed. 2022-05-16 14:52:39 +08:00
Xiaoyu Wang 4d07077be3
Merge pull request #12477 from taosdata/feature/3.0_wxy
fix: some problems of parser and planner
2022-05-14 20:53:22 +08:00
Xiaoyu Wang 24aba24791 fix: some problems of parser and planner 2022-05-14 20:20:13 +08:00
Haojun Liao 8242cac94a fix(query): fill the pseudo column before applying filter in table scanner. 2022-05-14 19:21:12 +08:00
Xiaoyu Wang b57f62f139 feat: adjust query stmt APIs 2022-05-12 20:33:52 +08:00
dapan 68f1ede8eb Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-05-11 11:45:53 +08:00
dapan 66bcbbba47 stmt auto create table 2022-05-11 11:44:09 +08:00
Haojun Liao 6c30d170ea refactor: do some internal refactor. 2022-05-10 17:46:45 +08:00
Xiaoyu Wang 7ab633048a feat: sql command 'grant', 'revoke', 'kill transaction' and 'show transactions' 2022-05-07 19:15:47 +08:00
Xiaoyu Wang 6e50691b29 feat: sql command 'grant', 'revoke', 'kill transaction' and 'show transactions' 2022-05-07 17:37:17 +08:00
Cary Xu e6a83367c8 merge 3.0 2022-04-28 09:47:49 +08:00
dapan1121 1aa22beb60 stmt query 2022-04-27 20:03:13 +08:00
Haojun Liao b159b0ff12
Merge pull request #11957 from taosdata/feature/3.0_liaohj
fix(query): enable the limitation on the number of query results
2022-04-27 19:24:27 +08:00
Zhiqiang Wang cf8154551e
Merge pull request #11955 from taosdata/fix/ZhiqiangWang/fix-14989-fix-new-compilation-errors
fix(os): fix new compilation errors.
2022-04-27 19:11:08 +08:00
Shengliang Guan ff6ddd1be1
Merge pull request #11953 from taosdata/feature/dnode
test: add unitest for sdb
2022-04-27 18:13:56 +08:00
Haojun Liao 1c08688da2 fix(query): return object instead of free it when error happens. 2022-04-27 18:12:26 +08:00
Haojun Liao 7c6bc10760 fix(query): enable the limitation on the number of query results within each group. 2022-04-27 17:52:39 +08:00
afwerar bf9ab440a7 fix(os): fix new compilation errors. 2022-04-27 17:39:54 +08:00
Shengliang Guan 4bdd90880c test: add unitest for sdb 2022-04-27 17:25:06 +08:00
Liu Jicong 19ec7bcafc enh: more info in perf schema 2022-04-27 15:16:57 +08:00
Liu Jicong 7b892a0f28 fix: client memory leak 2022-04-26 21:50:36 +08:00
dapan1121 ab459546ba Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-04-26 08:40:07 +08:00
dapan1121 15d7abf46f stmt query 2022-04-25 20:03:28 +08:00
Liu Jicong 609b21647b fix: msg with schema 2022-04-25 15:40:25 +08:00
Haojun Liao 5eed1159b1 other: merge 3.0 2022-04-25 09:16:37 +08:00
Haojun Liao 1d681a9e4b enh(query): Add the group id in the serialized block format to support the multi-table(super table) interval query. 2022-04-24 20:48:42 +08:00
Xiaoyu Wang 74fb0f4b55 enh: order by primary key optimize 2022-04-24 20:11:06 +08:00
Haojun Liao 4b36763429 refactor(query): do some internal refactor. 2022-04-22 22:43:07 +08:00
Haojun Liao d83ce4044a
Merge pull request #11754 from taosdata/feature/3.0_liaohj
fix(driver): the user specified port that is in taos_connect API isn't active.
2022-04-22 19:33:23 +08:00
Xiaoyu Wang 20879d0ef7 fix: some syntax parsing problems 2022-04-22 18:23:37 +08:00
Haojun Liao 7cd259592f fix(driver): the user specified port that is in taos_connect API is active. 2022-04-22 15:57:49 +08:00
Haojun Liao d28afa2bd9 refactor: do some internal refactor. 2022-04-22 15:26:02 +08:00
yihaoDeng 8d03ff6f9b enh(rpc): update auth way 2022-04-21 14:29:22 +08:00
dapan1121 3f880627fd
Merge pull request #11700 from taosdata/feature/qnode5
Feature/qnode5
2022-04-21 10:34:38 +08:00
dapan1121 3ae9769887 stmt 2022-04-21 10:16:43 +08:00
dapan1121 c83bae339e Merge remote-tracking branch 'origin/3.0' into feature/qnode5 2022-04-20 18:27:28 +08:00
wangmm0220 0fb41733ea refactor: merge from 3.0 2022-04-20 17:08:52 +08:00
Shengliang Guan b66718a4d8 feat: report service status 2022-04-19 21:39:42 +08:00
Shengliang Guan cf433ec94c feat: check server status 2022-04-19 16:27:20 +08:00
Shengliang Guan 9e130aef6d feat: check server status 2022-04-19 15:29:28 +08:00
wangmm0220 134a161c72 refactor: modify json compare in where condition 2022-04-18 21:05:34 +08:00
wangmm0220 ad29963423 refactor: modify json compare in where condition 2022-04-18 21:00:35 +08:00
dapan1121 49e0ecdb9b Merge remote-tracking branch 'origin/3.0' into feature/qnode4 2022-04-18 13:34:04 +08:00
dapan1121 9547c0a09b stmt 2022-04-16 15:59:19 +08:00
dapan1121 e3ea173046 stmt 2022-04-15 20:10:51 +08:00
Haojun Liao 7873c74e5f other: merge 3.0 branch and resolve the conflict. 2022-04-15 13:45:13 +08:00
Haojun Liao eaa6cd56a6 enh(query): add an new internal api to extract query result timestamp precision before the query response received from dnode. 2022-04-15 13:42:03 +08:00
Haojun Liao 367064591a refactor(driver): refactor c driver and remove redundant codes. 2022-04-15 13:40:50 +08:00
Haojun Liao d2761b4114 ehn(query): refactor c driver codes. 2022-04-15 12:09:27 +08:00
dapan1121 0e9ecc628e Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-04-15 08:33:53 +08:00
dapan1121 69f09fd0e3 stmt 2022-04-14 20:14:52 +08:00
Haojun Liao 79596698ab other: resolve conflict with 3.0 branch. 2022-04-14 16:51:46 +08:00
dapan1121 c04bc1820c Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-04-14 16:04:42 +08:00
Liu Jicong 3e38017693 merge from 3.0 2022-04-14 14:46:16 +08:00
Liu Jicong 7adb395b85 enh: add connection type for tmq 2022-04-14 14:42:51 +08:00
dapan1121 955695ebe5
Merge branch '3.0' into feature/qnode 2022-04-14 14:10:19 +08:00
Haojun Liao 1704147a8e fix(query): disable the auto conversion of ucs4 string in the implementation of API of taos_fetch_raw_block. 2022-04-14 13:50:37 +08:00
dapan1121 3bc9550233 feature/qnode 2022-04-13 19:33:07 +08:00
dapan1121 c9b43b2924 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-04-12 19:13:40 +08:00
dapan1121 b8391fad62 fix heartbeat msg 2022-04-12 19:10:52 +08:00
Haojun Liao 7c61aa17d4 ehn(query): remove redundant code. 2022-04-12 18:57:57 +08:00
Haojun Liao ec0637df8d
Merge pull request #11412 from taosdata/feature/3.0_liaohj
fix(query): load the null data in nchar/binary columns.
2022-04-12 14:26:01 +08:00
Haojun Liao 9899a5e6b0 fix(query): load the null data in nchar/binary columns. 2022-04-12 13:16:36 +08:00
Liu Jicong ad9731bd6f merge from 3.0 2022-04-12 11:00:09 +08:00
Liu Jicong db796f9e7f merge from 3.0 2022-04-12 10:59:13 +08:00
Liu Jicong bc6a466b36 refactor TAOS_RES process 2022-04-12 10:45:34 +08:00
Haojun Liao a3be085135
Merge pull request #11392 from taosdata/feature/3.0_liaohj
Feature/3.0 liaohj
2022-04-11 19:32:12 +08:00
Haojun Liao 8c27b944ba fix[query]: disable the auto convert of ucs4 for taos_fetch_raw_block api. 2022-04-11 18:54:31 +08:00
dapan1121 6f12bc1093 feature/qnode 2022-04-11 14:15:09 +08:00
Xiaoyu Wang a80610560d constant condition optimize 2022-04-09 10:09:17 +08:00
Haojun Liao af32cfcaef
Merge pull request #11262 from taosdata/feature/3.0_liaohj
[td-14493] support having in group by
2022-04-06 18:25:52 +08:00
Haojun Liao 33bcee62c9 [td-14393] refactor. 2022-04-06 15:09:29 +08:00
dapan1121 21542194c6 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-04-06 11:32:46 +08:00
Haojun Liao 05038ded8c [td-14393] fix bug. 2022-04-02 11:48:55 +08:00
dapan1121 7602f91612 feature/qnode 2022-04-01 19:45:45 +08:00
Haojun Liao 803e1ab162 [td-14393] fix bug. 2022-04-01 19:31:24 +08:00
Haojun Liao fb36f5e24e [td-14428] return correct length for both nchar and varchar type. 2022-04-01 19:10:53 +08:00
Xiaoyu Wang 59862e454d TD-14429 bugfix 2022-03-31 04:01:07 -04:00
Xiaoyu Wang ba80c7478f TD-14405 TD-14404 desc and reset query cache statement implement 2022-03-31 02:19:11 -04:00
Haojun Liao bee71f5f42 [td-13039] support nchar in taos_fetch_block. 2022-03-28 15:38:58 +08:00
Haojun Liao 2a6262f9ad [td-13039] support taos_fetch_block 2022-03-28 10:37:18 +08:00
dapan1121 96eee80063 feature/qnode 2022-03-26 15:03:22 +08:00
dapan1121 58e16e5fdc Merge remote-tracking branch 'origin/3.0' into feature/scheduler 2022-03-26 09:11:06 +08:00
afwerar 222db126bc [TD-13758]<fix>: redefine memory api. 2022-03-26 00:29:53 +08:00
dapan1121 3a41a00a63 Merge remote-tracking branch 'origin/3.0' into feature/scheduler 2022-03-24 18:32:39 +08:00
Haojun Liao 45fec96567 [td-13039] support nchar data type. 2022-03-24 17:26:04 +08:00
dapan1121 85a1bd1cc9 Merge remote-tracking branch 'origin/3.0' into feature/scheduler 2022-03-24 14:42:02 +08:00
dapan1121 ed5b283291 feature/scheduler 2022-03-23 17:19:04 +08:00
Haojun Liao d82e66b7c2 [td-13039] merge 3.0 and fix bug. 2022-03-22 23:29:38 +08:00
Xiaoyu Wang dce38817be merge 3.0 2022-03-21 05:39:28 -04:00
Xiaoyu Wang 9ca80596e4 merge 3.0 2022-03-21 02:00:30 -04:00
afwerar 79057240bd [TD-13759]<fix>: redefine thread api. 2022-03-20 00:47:45 +08:00
Xiaoyu Wang e4dd627b20 stream plan implement 2022-03-19 03:02:31 -04:00
Xiaoyu Wang c2b4ec91ff tmq plan implement 2022-03-18 05:44:08 -04:00
Haojun Liao 2144b9f283 [td-13039] add null support. 2022-03-17 13:25:29 +08:00
Haojun Liao ddaae71391 [td-13039] support write in and retrieve from vnode. 2022-03-17 13:11:06 +08:00
dapan1121 cb0d52d13c feature/scheduler 2022-03-15 19:47:08 +08:00
Xiaoyu Wang c2aebb25bf TD-13675 create sma index parser implement 2022-03-15 06:44:38 -04:00
dapan1121 43d7912987 feature/scheduler 2022-03-15 15:34:17 +08:00
dapan1121 8f1cc6ee91 Merge remote-tracking branch 'origin/3.0_query_integrate' into feature/scheduler 2022-03-14 18:17:02 +08:00
dapan1121 d9cde31b6f feature/scheduler 2022-03-14 17:31:08 +08:00
dapan1121 9b0f5df93a Merge remote-tracking branch 'origin/3.0' into feature/scheduler 2022-03-14 09:26:15 +08:00
dapan1121 43989454b6 feature/scheduler 2022-03-14 09:23:45 +08:00
Xiaoyu Wang 8a883ea00c TD-13990 interval plan implement 2022-03-13 15:28:50 -04:00
dapan dad8b812a7 feature/scheduler 2022-03-12 17:19:50 +08:00
Xiaoyu Wang 718f1e526c Merge remote-tracking branch 'origin/feature/scheduler' into feature/3.0_query_integrate_wxy 2022-03-11 05:23:51 -05:00
dapan1121 a510b9ea7f feature/scheduler 2022-03-11 18:21:28 +08:00
Xiaoyu Wang d7406cabeb Merge remote-tracking branch 'origin/feature/scheduler' into feature/3.0_query_integrate_wxy 2022-03-11 03:00:33 -05:00
Xiaoyu Wang 028e6d1620 TD-13981 show databases rewrite 2022-03-11 02:58:29 -05:00
dapan1121 9cbe40aef7 feature/scheduler 2022-03-11 13:20:26 +08:00
Yihao Deng d07b1d9b2c
Merge branch '3.0' into feature/index_oper 2022-03-11 11:48:29 +08:00
dapan1121 f17d4fb94e Merge remote-tracking branch 'origin/3.0_query_integrate' into feature/scheduler 2022-03-10 19:36:58 +08:00
Xiaoyu Wang 84f60fcc0a TD-13747 deal memory leaks 2022-03-10 06:32:39 -05:00
dapan1121 9f140ceca4 Merge remote-tracking branch 'origin/3.0_query_integrate' into feature/scheduler 2022-03-10 19:11:14 +08:00
dapan1121 763eccf8aa feature/scheduler 2022-03-10 19:05:58 +08:00
Xiaoyu Wang da0fa26717 TD-13747 src file name organize 2022-03-10 02:36:06 -05:00
yihaoDeng fdb64e7c5d test 2022-03-10 13:50:40 +08:00
Xiaoyu Wang 066c39d571 TD-13747 merge 3.0 2022-03-09 21:35:24 -05:00
Liu Jicong 255d795442 add tq push 2022-03-08 17:22:21 +08:00
Xiaoyu Wang b3d0283048 TD-13747 merge 3.0 2022-03-06 22:31:34 -05:00
Xiaoyu Wang 92cd252b70 TD-13706 integration create table stmt and insert stmt 2022-03-04 05:43:23 -05:00
Haojun Liao 92da01a8ba [td-13039] refactor. 2022-03-04 13:25:39 +08:00
xiao-yu-wang 3119efc7bd
Merge pull request #10533 from taosdata/feature/3.0_query_integrate_wxy
TD-13706 client modify vnode process integration
2022-03-03 20:26:19 +08:00
Xiaoyu Wang 441db317fd TD-13706 client modify vnode process integration 2022-03-03 07:25:16 -05:00
dapan1121 fa9d652e0e Merge remote-tracking branch 'origin/3.0' into 3.0_query_integrate 2022-03-03 15:40:57 +08:00
dapan1121 c572b9cad2 feature/qnode 2022-03-03 15:07:33 +08:00
Xiaoyu Wang db8669a3ce TD-13037 merge 3.0 2022-02-28 21:40:50 -05:00
dapan1121 43f836ee15 feature/qnode 2022-03-01 10:26:56 +08:00
Xiaoyu Wang 195ff4f52f TD-13705 parser integrate and CREATE DATABASE implement 2022-02-28 21:13:22 -05:00
Xiaoyu Wang cd7a0e559b TD-13747 New SQL model integration 2022-02-28 04:56:38 -05:00
Xiaoyu Wang 768e05939c TD-13747 New SQL model integration 2022-02-28 04:02:43 -05:00
Shengliang Guan da1351e317 client config 2022-02-24 18:35:25 +08:00
Shengliang Guan b17f826756 Merge remote-tracking branch 'origin/3.0' into feature/config 2022-02-24 10:07:04 +08:00
Yihao Deng 59c4c444e7
Merge branch '3.0' into feature/3.0Trans 2022-02-23 23:14:31 +08:00
yihaoDeng 2271dee643 refactor trans code 2022-02-23 23:10:56 +08:00
Shengliang Guan 9d091e90fd remove tnote 2022-02-23 21:22:43 +08:00
Shengliang Guan 42c100df2d sim config 2022-02-23 15:02:17 +08:00
Shengliang Guan cefb07bc99 config for client 2022-02-23 11:54:29 +08:00
Yihao Deng 07d5c9232d
Merge branch '3.0' into feature/trans_impl 2022-02-17 20:32:43 +08:00
yihaoDeng 878401c19a fix query crash on super table 2022-02-17 19:38:37 +08:00
Shengliang Guan 88b569e658
Merge pull request #10276 from taosdata/feature/privilege
serialize drop topic req
2022-02-16 13:36:20 +08:00
Shengliang Guan c8cc7ed3a6 serialize connect msg 2022-02-16 11:45:44 +08:00
Haojun Liao 3be59e4e24 [td-11818] merge 3.0 2022-02-11 15:50:20 +08:00
Haojun Liao 0296c3415e [td-11818] refactor code. 2022-02-10 13:55:53 +08:00
Liu Jicong f300c38e30
Merge pull request #10130 from taosdata/feature/tq
remove tmqTest out of clientTest
2022-02-08 10:31:22 +08:00
Liu Jicong 8b7ca94295 remove tmqTest out of clientTest 2022-02-08 10:20:41 +08:00
dapan de439d4787 feature/qnode 2022-02-06 15:37:16 +08:00
Liu Jicong d17dd9050c
Merge pull request #10084 from taosdata/feature/tq
refactor: move tmq out of clientImpl
2022-01-28 15:35:28 +08:00
Liu Jicong 5bb010ef4a refactor: move tmq out of clientImpl 2022-01-28 15:24:09 +08:00
dapan1121 f06a6c9af1
Merge pull request #10080 from taosdata/hotfix/showvgroup
Hotfix/showvgroup
2022-01-28 15:09:36 +08:00
Liu Jicong 610c812ed7 mq support stable subscribe 2022-01-28 14:33:17 +08:00
dapan1121 17792e0270 fix show vgroups issue 2022-01-28 13:46:01 +08:00
Liu Jicong 660a600dd6 refactor 2022-01-28 13:15:41 +08:00
Liu Jicong fd44bdbf57 implement get vg info 2022-01-28 10:36:31 +08:00
Liu Jicong add5ff5bdf Merge branch 'feature/3.0_liaohj' into feature/tq 2022-01-27 18:42:50 +08:00
Liu Jicong 8d71080146 disable hb 2022-01-27 18:40:36 +08:00
Haojun Liao cfc83751bb [td-11818] fix compiler error. 2022-01-27 18:38:56 +08:00
Liu Jicong 169fed61bd merge from 3.0 2022-01-27 18:15:09 +08:00
Liu Jicong 963fb9b9f6 fix mq rebalance 2022-01-27 18:05:23 +08:00
Haojun Liao c14cb95201
Merge pull request #10067 from taosdata/feature/3.0_liaohj
[td-11818] update log, add sql in the log file.
2022-01-27 17:54:54 +08:00
Liu Jicong 0712f87de0 fix query crash 2022-01-27 16:35:15 +08:00
Haojun Liao 6da9c663ff [td-11818] update log, add sql in the log file. Remove a global configure parameter. 2022-01-27 15:54:49 +08:00
dapan1121 5daa79afef Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-01-27 10:58:02 +08:00
dapan1121 3fdbfae4c1 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-01-27 10:28:17 +08:00
Shengliang Guan 5fcfebe806
Merge pull request #10050 from taosdata/feature/3.0_liaohj
[td-11818] Add the implementation of api in taos.h
2022-01-27 09:32:48 +08:00
Haojun Liao d6d8651483 [td-11818] refactor ssdatablock, add plan in log. 2022-01-26 23:09:03 +08:00
Liu Jicong 782fb854bc
Merge pull request #10044 from taosdata/feature/tq
fix query crash
2022-01-26 17:12:10 +08:00
Liu Jicong 5ea4eba3f1 fix query crash 2022-01-26 17:03:29 +08:00
Haojun Liao ac567bac9b [td-11818] Refactor. 2022-01-26 14:51:57 +08:00
Haojun Liao 2d0b84c8d1 [td-11818] merge 3.0 2022-01-26 14:04:12 +08:00
Haojun Liao 859c74a4e5 [td-11818] refactor sepset struct. 2022-01-26 14:00:15 +08:00
Liu Jicong c62304531a fix query error 2022-01-26 09:56:32 +08:00
dapan1121 3aa92dec71 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-01-26 08:51:09 +08:00
dapan1121 09b86cbf76 fix bugs 2022-01-26 08:50:32 +08:00
Liu Jicong 3036d4eac0 fix invalid wirte 2022-01-25 21:21:29 +08:00
Liu Jicong 5a760a83c4 fix invalid wirte 2022-01-25 21:06:35 +08:00
Liu Jicong 3aca885123 fix invalid wirte 2022-01-25 20:50:55 +08:00
dapan1121 03a366fa40 hb process 2022-01-25 18:29:26 +08:00
Liu Jicong 5f7ae72271 fix query crash 2022-01-25 18:08:38 +08:00
Liu Jicong 0ff19d6d5b fix query crash 2022-01-25 16:33:21 +08:00
Liu Jicong ca84e47a97 fix query crash 2022-01-25 15:17:02 +08:00
Liu Jicong f3aa81399c merge from 3.0 2022-01-24 21:46:37 +08:00
Liu Jicong b152a2467b merge from 3.0 2022-01-24 21:42:50 +08:00
Liu Jicong d410ef1ca2 fix plan convert error 2022-01-24 18:21:25 +08:00
Haojun Liao bf26efb518 [td-11818] Fix memory leak in query. 2022-01-24 17:44:44 +08:00
Haojun Liao 02a3655780 [td-11818] merge 3.0 2022-01-24 13:46:55 +08:00
Haojun Liao c87fbd87df [td-11818] merge 3.0 2022-01-24 13:44:20 +08:00
dapan1121 357783eb19
Merge pull request #9988 from taosdata/bugfix/3.0_memleak
Bugfix/3.0 memleak
2022-01-24 13:35:42 +08:00
Haojun Liao b3fadd5c93 [td-11818]Fix memory leak in creating table. 2022-01-24 13:24:27 +08:00
Yihao Deng 13d2c8ffea
Merge pull request #9987 from taosdata/feature/rename_macro
rename MAX/MIN/POW2/SWAP name
2022-01-24 13:23:27 +08:00