Commit Graph

883 Commits

Author SHA1 Message Date
Zhiqiang Wang 51065fcbd5
Merge pull request #11500 from taosdata/fix/ZhiqiangWang/TD-13254-fix-enterprise-test
fix(test): enterprise test.
2022-04-14 18:02:38 +08:00
afwerar 09be9e4d9d fix(test): enterprise test. 2022-04-14 17:49:48 +08:00
Shengliang Guan 9a004f6827 enh<cluster>: adjust show message handle 2022-04-14 16:48:39 +08:00
dapan1121 c04bc1820c Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-04-14 16:04:42 +08:00
Shengliang Guan aa73603030 Merge remote-tracking branch 'origin/3.0' into feature/node 2022-04-14 15:47:58 +08:00
Liu Jicong 1e265d7617
Merge pull request #11485 from taosdata/feature/tq
enh(tmq): add connection type for tmq
2022-04-14 15:43:34 +08:00
dapan1121 7d92aaaad3 feature/qnode 2022-04-14 15:28:43 +08:00
afwerar 67b0fc4e6c ix(grant): show grants. 2022-04-14 15:11:13 +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
Shengliang Guan 6abed1ad5a Merge remote-tracking branch 'origin/3.0' into feature/node 2022-04-14 14:32:23 +08:00
dapan1121 955695ebe5
Merge branch '3.0' into feature/qnode 2022-04-14 14:10:19 +08:00
Shengliang Guan 6958f3abfc refact(cluster): node mgmt 2022-04-14 13:44:40 +08:00
Shengliang Guan 3a26ec4e60 Merge remote-tracking branch 'origin/3.0' into feature/node 2022-04-14 13:39:55 +08:00
Haojun Liao 3457a5e5af other: merge 3.0 2022-04-14 13:23:09 +08:00
afwerar 332b5504a2 fix(grant): change the way taosd calls grant. 2022-04-14 11:53:02 +08:00
Haojun Liao e0654bac73 Merge remote-tracking branch 'origin/3.0' into feature/3.0_liaohj 2022-04-14 11:43:36 +08:00
Haojun Liao 9c9e980ec0 test(query): update tsim test scripts. 2022-04-14 11:36:06 +08:00
Liu Jicong 932493f490 Merge branch '3.0' into feature/tq 2022-04-13 20:46:07 +08:00
Liu Jicong 0fe0d6fc77 fix: fix tmq result parse 2022-04-13 20:37:51 +08:00
Haojun Liao 7cc56c8f1c fix(query): revise system table schema. 2022-04-13 20:00:59 +08:00
Haojun Liao b62d0dd521 fix(query): fix an index overflow. 2022-04-13 19:48:15 +08:00
Haojun Liao 5a0a036770 other: merge 3.0 2022-04-13 19:32:49 +08:00
Haojun Liao bcbc8618d2 ehn(query): refactor show module in mnode. 2022-04-13 19:27:47 +08:00
afwerar 5034cf4e3f fix(grant): taosd -k. 2022-04-13 16:48:29 +08:00
Shengliang Guan 3663c6441d refact(cluster): node mgmt 2022-04-13 15:52:14 +08:00
Shengliang Guan e558d519be refact(cluster): node mgmt 2022-04-13 14:48:39 +08:00
dapan1121 d04c0bc436 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-04-13 10:48:56 +08:00
dapan1121 94b5031554 feature/qnode 2022-04-13 10:48:26 +08:00
dapan1121 4766deb299 feature/qnode 2022-04-13 10:48:09 +08:00
afwerar 2b1a544280 fix: grant feature. 2022-04-13 00:42:21 +08:00
Haojun Liao 60c1ce2d08 ehn(query): refactor show module in mnd. 2022-04-12 20:05:13 +08:00
dapan1121 b8391fad62 fix heartbeat msg 2022-04-12 19:10:52 +08:00
Haojun Liao 69c2cf11d3 ehn(query): return the performance_schema db when "show databases" sql statement issued. 2022-04-12 18:38:13 +08:00
Shengliang Guan 4fedc23b26 refact(cluster): node mgmt 2022-04-12 17:25:58 +08:00
Shengliang Guan 34286624f3 fix(cluster): delete redundant logs 2022-04-11 19:47:24 +08:00
Shengliang Guan 7f3b15020c fix(cluster): get monitor info in multi-process mode 2022-04-11 18:13:55 +08:00
Shengliang Guan 48ec0aa781
Merge pull request #11351 from taosdata/feature/node
feat[cluster]: create and drop mnode
2022-04-10 13:04:04 +08:00
Shengliang Guan c1b3afa92d feat[cluster]: create and drop mnode 2022-04-09 19:38:20 +08:00
Haojun Liao c5dadcdb99 <fix>[query]:fix an error reported by compiler. 2022-04-09 18:39:25 +08:00
Haojun Liao d6338ca773
Merge branch '3.0' into feature/3.0_liaohj 2022-04-09 18:30:05 +08:00
Shengliang Guan 2a88060067 feat[cluster]: create and drop snode bnode 2022-04-09 17:52:29 +08:00
Shengliang Guan 6810e82fb5 feat[cluster]: create and drop snode 2022-04-09 17:23:05 +08:00
Shengliang Guan a1c218d381 feat[cluster]: create and drop bnode 2022-04-09 16:59:03 +08:00
Shengliang Guan 39dde85ecc feat<cluster>: create and delete qnode 2022-04-09 16:32:19 +08:00
Haojun Liao 6a245710c9 other: merge 3.0 branch. 2022-04-09 16:24:44 +08:00
Haojun Liao 208f639806 feature[query]:refactor show query processing in mnode. 2022-04-09 16:19:08 +08:00
Shengliang Guan 66ef1daeb9 refactor[cluster]: adjust the error codes 2022-04-09 16:05:20 +08:00
Shengliang Guan 4460463317 feat<cluster>: create and delete qnode 2022-04-09 15:31:50 +08:00
dapan1121 cd8a0e89ce
Merge pull request #11330 from taosdata/feature/qnode
Feature/qnode
2022-04-09 13:20:10 +08:00
WANG MINGMING 6fbe057a0b
Merge pull request #11311 from taosdata/feature/TD-14422
Feature/td 14422
2022-04-09 11:32:48 +08:00
Shengliang Guan b1a8ed96f6 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-04-09 10:40:02 +08:00
Shengliang Guan ffaef98b75 feat[cluster]: send monitor information in multi-process mode 2022-04-09 10:39:47 +08:00
WANG MINGMING 41392e9e4a
Merge branch '3.0' into feature/TD-14422 2022-04-09 10:18:52 +08:00
dapan1121 a8f740bcbb Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-04-09 09:41:18 +08:00
dapan1121 e9f7bf866a feature/qnode 2022-04-09 09:39:01 +08:00
dapan1121 abf827ed63 feature/qnode 2022-04-08 18:37:42 +08:00
dapan1121 99d6fda66a feature/qnode 2022-04-08 18:34:11 +08:00
Liu Jicong deab8952e5
Merge pull request #11319 from taosdata/feature/tq
Feature/tq
2022-04-08 18:25:25 +08:00
WANG MINGMING bcbba6d0ae
Merge branch '3.0' into feature/TD-14422 2022-04-08 17:28:03 +08:00
dapan1121 519b6ca0f3
Merge pull request #11305 from taosdata/feature/qnode
Feature/qnode
2022-04-08 17:21:33 +08:00
Liu Jicong 0480cb68e2 merge from 3.0 2022-04-08 17:14:34 +08:00
dapan1121 9f4744c6f3 feature/qnode 2022-04-08 16:05:30 +08:00
Liu Jicong 6df2fae1a2 fix compile 2022-04-08 15:26:02 +08:00
wangmm0220 8df8c60f60 merge from 3.0 2022-04-08 10:58:39 +08:00
Cary Xu 451a65f53f add dstVgId 2022-04-07 20:49:18 +08:00
Liu Jicong 74eee69a65 fix 2022-04-07 19:57:49 +08:00
Liu Jicong d5fb11d239 add unsubscribe 2022-04-07 18:20:54 +08:00
Liu Jicong 10d291feab
Merge pull request #11282 from taosdata/feature/tq
add more log
2022-04-07 14:29:53 +08:00
Liu Jicong a60185adc8 add more log 2022-04-07 14:11:16 +08:00
wangmm0220 83eacf8d07 merge from 3.0 2022-04-06 18:38:19 +08:00
Cary Xu ca3206d45e Merge branch '3.0' into feature/TD-11463-3.0 2022-04-03 17:51:28 +08:00
Liu Jicong 47a094a24f merge from 3.0 2022-04-02 23:05:16 +08:00
Liu Jicong 798c3a9f82 add more log 2022-04-02 23:03:12 +08:00
Liu Jicong 8e2d121b3a temp 2022-04-02 19:59:25 +08:00
Shengliang Guan 7e361ebcd0 refact dm 2022-04-02 19:52:04 +08:00
wangmm0220 5aa3467e2b merge from 3.0 2022-04-02 19:02:45 +08:00
Cary Xu 1165368642 retentions param bug fix and deliver to vnode 2022-04-02 15:39:20 +08:00
wangmm0220 12c3a10a9b fix error in order by logic & fix no return error 2022-04-02 14:29:43 +08:00
Shengliang Guan dc7147760b Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-04-02 11:02:10 +08:00
Cary Xu 37245334d5 rollup sma grammar integrate 2022-04-02 10:37:17 +08:00
Liu Jicong eabc8e6337
Merge pull request #11195 from taosdata/feature/tq
add log
2022-04-01 22:43:36 +08:00
Liu Jicong adf8bd5e82 add log 2022-04-01 21:30:06 +08:00
Shengliang Guan 44311425db multi process 2022-04-01 19:52:14 +08:00
Shengliang Guan becac9fd27 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-04-01 19:07:19 +08:00
Liu Jicong 18cd6c4055
Merge pull request #11190 from taosdata/feature/tq
Feature/tq
2022-04-01 18:28:53 +08:00
Liu Jicong 61d8ef3857 merge from 3.0 2022-04-01 18:15:18 +08:00
Liu Jicong 9ebdee326f fix txn 2022-04-01 18:13:46 +08:00
Cary Xu ad68236481 remove the assert to pass CI 2022-04-01 17:58:09 +08:00
Cary Xu cf68440a59 bSma grammar integrate 2022-04-01 17:43:50 +08:00
Shengliang Guan 1649d0ddda shm 2022-04-01 16:36:36 +08:00
Xiaoyu Wang 613963a128
Merge pull request #11167 from taosdata/feature/3.0_wxy
TD-14409 TD-14436 bugfix
2022-04-01 12:57:35 +08:00
Liu Jicong e916f83fd7 temp 2022-04-01 09:57:55 +08:00
Xiaoyu Wang 689fb26708 db or table option keep implement 2022-03-31 07:38:17 -04:00
Haojun Liao 8ab075c342 [td-14373]fix bug. 2022-03-31 16:24:59 +08:00
Haojun Liao 8fe7c183cc Merge remote-tracking branch 'origin/3.0' into feature/3.0_liaohj 2022-03-30 18:11:33 +08:00
Haojun Liao c39595639c [td-14392] fix show bug. 2022-03-30 17:09:06 +08:00
Liu Jicong 9364c8063c revert topic phyplan 2022-03-30 14:25:44 +08:00
Liu Jicong 459ec6ed71 tmq optimize offset handling 2022-03-30 14:06:02 +08:00
Liu Jicong c2971618a1
Merge branch '3.0' into feature/shm 2022-03-29 17:29:20 +08:00