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

1116 Commits

Author SHA1 Message Date
Haojun Liao 79596698ab other: resolve conflict with 3.0 branch. 2022-04-14 16:51:46 +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
Xiaoyu Wang 7efb34fdfa enh(query): increase the validity check of function parameters 2022-04-14 15:53:41 +08:00
Xiaoyu Wang 8118a20649 enh(query): increase the validity check of function parameters 2022-04-14 15:49:57 +08:00
Shengliang Guan aa73603030 Merge remote-tracking branch 'origin/3.0' into feature/node 2022-04-14 15:47:58 +08:00
Haojun Liao 928a977354 ehn(query): enhance the api of ssdatablock to support copy data while clone a new ssdatablock. 2022-04-14 15:33:37 +08:00
Liu Jicong 90b1527e5f merge from 3.0 2022-04-14 15:25:43 +08:00
Ganlin Zhao 4eb20bda19
Merge pull request #11478 from taosdata/feature/TD-14243 
feat(query): add today()/today() + duration in insert clause
 2022-04-14 15:01:26 +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 3a26ec4e60 Merge remote-tracking branch 'origin/3.0' into feature/node 2022-04-14 13:39:55 +08:00
Ganlin Zhao b355e2b3c8 feat(query): add today()/today() + duration in insert clause 
TD-14243
 2022-04-14 12:53:59 +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
Ganlin Zhao 50fa78b0bb
Merge pull request #11469 from taosdata/feature/TD-14243 
refactor(query): add TK_TODAY in keyword hashtable
 2022-04-14 10:01:31 +08:00
Ganlin Zhao 8572bd2afa feat(query): add TK_TODAY in keyword hashtable 
TD-14243
 2022-04-13 21:22:57 +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 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
Zhiqiang Wang a114724120
Merge pull request #11455 from taosdata/fix/ZhiqiangWang/TD-13254-fix-taosd-k 
fix(grant): taosd -k.
 2022-04-13 18:16:29 +08:00
afwerar 5034cf4e3f fix(grant): taosd -k. 2022-04-13 16:48:29 +08:00
afwerar 222987c002 Revert "fix(grant): taosd -k." 
This reverts commit 11e772d4d4.
 2022-04-13 16:39:36 +08:00
Liu Jicong 9f1c7968e4
Merge pull request #11452 from taosdata/feature/tq 
feat: support tmq msg parse
 2022-04-13 16:35:24 +08:00
afwerar 11e772d4d4 fix(grant): taosd -k. 2022-04-13 16:21:54 +08:00
Liu Jicong 1a13affb13 Merge branch '3.0' into feature/tq 2022-04-13 16:05:02 +08:00
Liu Jicong 03d7201d47 feat: support tmq msg parse 2022-04-13 16:00:30 +08:00
Shengliang Guan e558d519be refact(cluster): node mgmt 2022-04-13 14:48:39 +08:00
Shengliang Guan 318d774ba9 refact(cluster): node mgmt 2022-04-13 14:00:56 +08:00
Ganlin Zhao a497670f29
Merge pull request #11440 from taosdata/feature/TD-14243 
feat(query): add to_unixtimestamp function
 2022-04-13 12:38:57 +08:00
Ganlin Zhao c0b3607756 feat(query): add to_unixtimestamp function 
TD-14243
 2022-04-13 11:41:02 +08:00
dapan1121 d04c0bc436 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-04-13 10:48:56 +08:00
Yihao Deng 27c05997b6
Merge pull request #11431 from taosdata/feature/filter_tag 
fix compile error
 2022-04-12 22:43:52 +08:00
yihaoDeng b3c03c14a6 fix compile error 2022-04-12 22:01:05 +08:00
Xiaoyu Wang baa0696625
Merge pull request #11428 from taosdata/feature/3.0_wxy 
feat(query): child table or normal table support JOIN-clause
 2022-04-12 20:25:17 +08:00
Haojun Liao 60c1ce2d08 ehn(query): refactor show module in mnd. 2022-04-12 20:05:13 +08:00
Xiaoyu Wang d8762d401f feat(query): child table or normal table support JOIN-clause 2022-04-12 20:02:16 +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 684a1f23ad
Merge pull request #11424 from taosdata/feature/3.0_liaohj 
fix(query): handle crash of taosd caused by a complex expression in GROUP BY clauses.
 2022-04-12 18:20:28 +08:00
Haojun Liao e10794169e Merge remote-tracking branch 'origin/3.0' into feature/3.0_liaohj 2022-04-12 18:19:40 +08:00
Yihao Deng c2d1c480d0
Merge pull request #11403 from taosdata/feature/filter_tag 
enh: add tag filter
 2022-04-12 17:57:48 +08:00
Haojun Liao b9bf2515f5 fix(query): handle crash of taosd caused by a complex expression in GROUP BY clauses. 2022-04-12 17:55:17 +08:00
Shengliang Guan 4fedc23b26 refact(cluster): node mgmt 2022-04-12 17:25:58 +08:00
yihaoDeng b6b4c57a72 fix compile error 2022-04-12 16:18:17 +08:00
Shuduo Sang b0792743fc
feat(tools): taos shell refactor (#11416) 
* [TD-13558]<feature>: taos shell refactor

add taosTools as submodule

* add tools/taos-tools

* add more client interface for taosTools compile

* update taos-tools

* update taos-tools

* refactor shell

* [TD-13558]<feature>: taos shell test speed

* [TD-13558]<feature>: taos -n startup works

* taos -n rpc works

* taos -n server works

* cleanup code since no endPort in 3.0

* update taos-tools

* [TD-13558]<feature>: taos -C works

* improve taos shell -c WIP

* update taos-tools
 2022-04-12 15:58:41 +08:00
Ganlin Zhao ff70238e38
Merge pull request #11413 from taosdata/feature/TD-14242 
feat(query): add cast function
 2022-04-12 14:34:33 +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
Ganlin Zhao a59b558331 feat(query): add cast function 
TD-14242
 2022-04-11 20:22:53 +08:00
Cary Xu 72e39b2bf5 adaption for update function 2022-04-11 17:05:24 +08:00
afwerar 2662a3b69d [TD-13254]<fix>: make 3.0 grant. 2022-04-10 19:08:16 +08:00
yihaoDeng 3d6030a4e7 handle conflict 2022-04-10 10:13:22 +08:00
Haojun Liao 9d7d12b397
Merge pull request #11322 from taosdata/feature/3.0_liaohj 
<fix>[query]: fix filter caused taosd crash.td-14566.
 2022-04-09 22:52:32 +08:00
Haojun Liao d6338ca773
Merge branch '3.0' into feature/3.0_liaohj 2022-04-09 18:30:05 +08:00
Cary Xu 7254263a29 use 1 bit in bitmap for super block 2022-04-09 18:21:03 +08:00
Shengliang Guan f18cdd5f87 Merge remote-tracking branch 'origin/3.0' into feature/node 2022-04-09 17:38:26 +08:00
Xiaoyu Wang 990fe3fab2
Merge pull request #11339 from taosdata/feature/3.0_wxy 
create/drop/show bnode/snode/mnode frontend implement
 2022-04-09 17:34:56 +08:00
Liu Jicong 59945477ab merge from 3.0 2022-04-09 16:47:10 +08:00
Liu Jicong 5189643909 extract compressed col data format 2022-04-09 16:44:31 +08:00
Haojun Liao 6a245710c9 other: merge 3.0 branch. 2022-04-09 16:24:44 +08:00
Shengliang Guan 4460463317 feat<cluster>: create and delete qnode 2022-04-09 15:31:50 +08:00
Xiaoyu Wang a6b5dd8ef0 create/drop/show bnode/snode/mnode frontend implement 2022-04-09 14:57:28 +08:00
dapan1121 cd8a0e89ce
Merge pull request #11330 from taosdata/feature/qnode 
Feature/qnode
 2022-04-09 13:20:10 +08:00
Haojun Liao 6af7e1810f Merge remote-tracking branch 'origin/3.0' into feature/3.0_liaohj 2022-04-09 11:56:45 +08:00
Haojun Liao 2523445452 <fix>[query]: refactor. 2022-04-09 11:55:59 +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
WANG MINGMING 41392e9e4a
Merge branch '3.0' into feature/TD-14422 2022-04-09 10:18:52 +08:00
Haojun Liao 94e19cc32a <fix>[query]: fix scalar function calculate bug in scalar module. td-14576 2022-04-09 10:10:56 +08:00
dapan1121 a8f740bcbb Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-04-09 09:41:18 +08:00
Haojun Liao fce5d48835 <fix>[query]: reset the null value bitmap before fetch next data block from tsdb. TD-14581. 2022-04-08 20:04:17 +08:00
Shengliang Guan 4105842574 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-04-08 19:43:06 +08:00
Haojun Liao 126658bf80
Merge pull request #11313 from taosdata/feature/3.0_liaohj 
Feature/3.0 liaohj
 2022-04-08 19:33:58 +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
Yihao Deng 70f5abeb6a
Merge branch '3.0' into feature/create_index 2022-04-08 18:11:17 +08:00
Haojun Liao cf9e0be1c9 [td-14493] support slimit/soffset 2022-04-08 17:37:57 +08:00
WANG MINGMING bcbba6d0ae
Merge branch '3.0' into feature/TD-14422 2022-04-08 17:28:03 +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
Shengliang Guan f492ae743a feat: send monitor information in multi-process mode 2022-04-08 16:05:28 +08:00
Liu Jicong ca7eee7451 add log 2022-04-08 14:42:30 +08:00
wangmm0220 1f8d2ea446 <fix>: fix index map error from table scan to sort output 2022-04-08 14:17:32 +08:00
Haojun Liao 28456a034c Merge remote-tracking branch 'origin/3.0' into feature/3.0_liaohj 2022-04-08 13:13:38 +08:00
wangmm0220 8df8c60f60 merge from 3.0 2022-04-08 10:58:39 +08:00
Haojun Liao b984e12e4c [td-14493] support partition by 2022-04-08 10:24:35 +08:00
yihaoDeng acc9d3d9a7 add create index msg 2022-04-07 22:04:38 +08:00
yihaoDeng c40ab3679a add create index msg 2022-04-07 21:40:21 +08:00
yihaoDeng e23ead7da8 add create index msg 2022-04-07 21:32:30 +08:00
Liu Jicong 4d26b416a5
Merge pull request #11294 from taosdata/feature/tq 
add unsubscribe
 2022-04-07 20:19:54 +08:00
Xiaoyu Wang 9ef7db3964
Merge pull request #11296 from taosdata/feature/3.0_wxy 
sort plan bugfix
 2022-04-07 20:03:36 +08:00
Xiaoyu Wang 07892f0f62 sort plan bugfix 2022-04-07 19:28:00 +08:00
Xiaoyu Wang 05d6ccf43e
Merge pull request #11293 from taosdata/feature/3.0_wxy 
db/table options adjust
 2022-04-07 18:43:28 +08:00
Liu Jicong d5fb11d239 add unsubscribe 2022-04-07 18:20:54 +08:00
Xiaoyu Wang a7aa815215 db/table options adjust 2022-04-07 18:19:20 +08:00
yihaoDeng 36670708b2 add create index msg 2022-04-07 17:41:16 +08:00
Shengliang Guan 7aea48a2a5
Merge pull request #11289 from taosdata/feature/shm 
config thread nums
 2022-04-07 16:43:58 +08:00
Shengliang Guan 1844645403 config thread num in snode 2022-04-07 15:54:05 +08:00
Shengliang Guan 6dd6a00728 config thread num of qnode 2022-04-07 15:51:24 +08:00
Shengliang Guan 0a5cfe754b adjust vnode threads 2022-04-07 15:43:47 +08:00
Shengliang Guan e4652d5a7c adjust thread nums 2022-04-07 14:48:13 +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 225cf61845 merge from 3.0 2022-04-07 11:31:50 +08:00
Shengliang Guan 5d835bc5b1 cfg for multi process 2022-04-06 21:16:31 +08:00
wangmm0220 83eacf8d07 merge from 3.0 2022-04-06 18:38:19 +08:00
dapan1121 398a41d09b feature/qnode 2022-04-06 15:20:38 +08:00
dapan1121 21542194c6 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-04-06 11:32:46 +08:00
dapan1121 2c6dec89d2 feature/qnode 2022-04-06 11:32:21 +08:00
Cary Xu b3bb652708 data and bitmap compress/store/decompress separatedly 2022-04-03 18:02:30 +08:00
dapan1121 27a3a1d782 feature/qnode 2022-04-02 19:31:52 +08:00
wangmm0220 5aa3467e2b merge from 3.0 2022-04-02 19:02:45 +08:00
Haojun Liao 1cbdec1aba [td-14393] fix bug, update sim script. 2022-04-02 18:25:57 +08:00
Haojun Liao c7e749d040 Merge remote-tracking branch 'origin/3.0' into feature/3.0_liaohj 2022-04-02 15:12:40 +08:00
Haojun Liao cf25aca809 [td-13039] refactor. 2022-04-02 15:08:48 +08:00
wangmm0220 12c3a10a9b fix error in order by logic & fix no return error 2022-04-02 14:29:43 +08:00
Xiaoyu Wang a5fbcb36b6
Merge pull request #11202 from taosdata/feature/3.0_wxy 
condition bugfix
 2022-04-02 13:56:13 +08:00
Xiaoyu Wang 9e9805f7b7 condition bugfix 2022-04-02 01:13:20 -04:00
Shengliang Guan 060149fa9d
Merge pull request #11192 from taosdata/feature/shm 
add multiprocess mode to CI
 2022-04-02 11:36:08 +08:00
Haojun Liao 27817adbdc
Merge pull request #11199 from taosdata/feature/3.0_liaohj 
[td-14393] refactor and support filter condition in where clause.
 2022-04-02 11:18:58 +08:00
Shengliang Guan dc7147760b Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-04-02 11:02:10 +08:00
Haojun Liao 55f93d2179 [td-14393] refactor and support filter condition in where clause. 2022-04-02 10:43:28 +08:00
Cary Xu 37245334d5 rollup sma grammar integrate 2022-04-02 10:37:17 +08:00
Shengliang Guan 44311425db multi process 2022-04-01 19:52:14 +08:00
dapan1121 7602f91612 feature/qnode 2022-04-01 19:45:45 +08:00
Haojun Liao 632f3b1cbf
Merge pull request #11188 from taosdata/feature/3.0_liaohj 
[td-13039] support limit/offset
 2022-04-01 19:07:22 +08:00
Cary Xu e2e1d4c899 Merge branch '3.0' into feature/TD-11463-3.0 2022-04-01 17:44:21 +08:00
Cary Xu cf68440a59 bSma grammar integrate 2022-04-01 17:43:50 +08:00
Haojun Liao 7b0dfc6c4e [td-13039] support limit/offset 2022-04-01 17:21:24 +08:00
Xiaoyu Wang 4ff2ad2c39 all ddl statement syntax define, and ORDER BY clause bugfix 2022-04-01 04:31:24 -04: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
dapan1121 a60ce69b02 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-04-01 11:21:40 +08:00
Xiaoyu Wang db08d3ca9b TD-14392 bugfix 2022-03-31 22:38:48 -04:00
Haojun Liao 3f6e96c66d
Merge pull request #11166 from taosdata/feature/3.0_liaohj 
[td-14373]fix bug.
 2022-04-01 10:37:39 +08:00
dapan1121 36dc9da4a5 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-04-01 10:30:20 +08:00
dapan1121 0608824186 feature/qnode 2022-03-31 18:02:58 +08:00
Xiaoyu Wang 4afa7acf53 Merge remote-tracking branch 'origin/3.0' into feature/3.0_wxy 2022-03-31 05:44:34 -04:00
Haojun Liao 02e097dc5c [td-14426] fix bug. 2022-03-31 17:36:51 +08:00
Xiaoyu Wang baa238eead TD-14409 TD-14436 bugfix 2022-03-31 05:20:26 -04:00
dapan1121 369d08c557 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-03-31 16:06:57 +08:00
dapan1121 236b8adad3 feature/qnode 2022-03-31 16:00:47 +08:00
Liu Jicong e163197573 merge from 3.0 2022-03-31 15:55:34 +08:00
Liu Jicong 3e5da8bedb fix 2022-03-31 15:52:54 +08:00
Xiaoyu Wang 98648acd73
Merge pull request #11157 from taosdata/feature/3.0_wxy 
TD-14405 TD-14404 desc and reset query cache statement implement
 2022-03-31 14:36:05 +08:00
Xiaoyu Wang ba80c7478f TD-14405 TD-14404 desc and reset query cache statement implement 2022-03-31 02:19:11 -04:00
Cary Xu fd4455aa23 colIdx bugfix 2022-03-30 19:13:24 +08:00