Commit Graph

2354 Commits

Author SHA1 Message Date
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
Shengliang Guan d812206eda refact(cluster): node mgmt 2022-04-14 11:33:31 +08:00
Hongze Cheng f80768efb3 refact vnode 2022-04-14 02:53:10 +00:00
Hongze Cheng bb6806b59e refact vnode 2022-04-14 02:25:49 +00:00
Hongze Cheng 10b8756c6b refact vnode 2022-04-14 02:13:47 +00:00
Hongze Cheng 272d0ec74a refact vnode 2022-04-14 02:10:56 +00:00
Hongze Cheng b932b5bca6 refact header file 2022-04-14 02:01:04 +00:00
Cary Xu 4473d23633
Merge pull request #11465 from taosdata/feature/TD-11463-3.0
feat: add version for tsma expired window updating
2022-04-14 09:01:43 +08:00
Shengliang Guan 3b54d90350 refact(cluster): node mgmt 2022-04-13 21:36:36 +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
Shengliang Guan 1dd4984eeb refact(cluster): node mgmt 2022-04-13 20:08:39 +08:00
Cary Xu 744a198906 add version for tsma expired window updating 2022-04-13 20:02:11 +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
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
Cary Xu 05d6c3096a
Merge pull request #11453 from taosdata/feature/TD-11463-3.0
feat: store time-range-wise sma data by tdb
2022-04-13 16:34:04 +08:00
Shengliang Guan e770a6e974 refact(cluster): node mgmt 2022-04-13 16:23:03 +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
Cary Xu f9d162bae2 tsma use TDB 2022-04-13 16:02:55 +08:00
Liu Jicong 03d7201d47 feat: support tmq msg parse 2022-04-13 16:00:30 +08:00
Shengliang Guan 3663c6441d refact(cluster): node mgmt 2022-04-13 15:52:14 +08:00
Shengliang Guan 25e5f02653 refact(cluster): node mgmt 2022-04-13 15:06:36 +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
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
Shengliang Guan 271264f626 refact(cluster): node mgmt 2022-04-13 10:00:50 +08:00
Shengliang Guan 3de4b0ad05 refact(cluster): node mgmt 2022-04-13 09:59:33 +08:00
afwerar 2b1a544280 fix: grant feature. 2022-04-13 00:42:21 +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
Shengliang Guan a8b890bcae refact(cluster): node mgmt 2022-04-12 20:33:13 +08:00
Haojun Liao 60c1ce2d08 ehn(query): refactor show module in mnd. 2022-04-12 20:05:13 +08:00
Shengliang Guan 4df0c48fc0 refact(cluster): node mgmt 2022-04-12 19:43:42 +08:00
dapan1121 c9b43b2924 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-04-12 19:13:40 +08:00
dapan1121 39fb565119 Merge branch 'feature/qnode' of github.com:taosdata/TDengine into feature/qnode 2022-04-12 19:11:44 +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 69c2cf11d3 ehn(query): return the performance_schema db when "show databases" sql statement issued. 2022-04-12 18:38:13 +08:00
Shengliang Guan 35e29f0bf6 refact(cluster): node mgmt 2022-04-12 18:11:59 +08:00
Shengliang Guan f7cf8229c8 refact(cluster): node mgmt 2022-04-12 18:05: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
Shengliang Guan a86b9faa9f refact(cluster): node mgmt 2022-04-12 17:57:24 +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
Shengliang Guan b9f5237d8d
Merge pull request #11418 from taosdata/feature/node
fix(cluster): get monitor info in multi-process mode
2022-04-12 16:11:36 +08:00
Shengliang Guan 0094f30140 refact(cluster): modify node management code 2022-04-12 15:27:17 +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
Shengliang Guan c55a3c2f9e Merge remote-tracking branch 'origin/3.0' into feature/node 2022-04-12 13:20:49 +08:00
Haojun Liao 9899a5e6b0 fix(query): load the null data in nchar/binary columns. 2022-04-12 13:16:36 +08:00
yihaoDeng 4c54e3b303 add tag filter 2022-04-11 22:10:58 +08:00
Shengliang Guan 34286624f3 fix(cluster): delete redundant logs 2022-04-11 19:47:24 +08:00
afwerar c11946fd75 [TD-13756]<fix>: Fix macro name error. 2022-04-11 18:55:43 +08:00
Shengliang Guan e61a8b6a14 Merge remote-tracking branch 'origin/3.0' into feature/node 2022-04-11 18:14:06 +08:00
Shengliang Guan 7f3b15020c fix(cluster): get monitor info in multi-process mode 2022-04-11 18:13:55 +08:00
Cary Xu 91f9661550 bug fix for bitmap compress 2022-04-11 17:29:14 +08:00
Cary Xu 6a9834f541 Merge branch '3.0' into feature/TD-11463-3.0 2022-04-11 17:05:51 +08:00
Cary Xu 72e39b2bf5 adaption for update function 2022-04-11 17:05:24 +08:00
Shengliang Guan e846ac560f Merge remote-tracking branch 'origin/3.0' into feature/node 2022-04-10 22:34:31 +08:00
Shengliang Guan c4ee7142b9 fix[cluster]: manage mnode in multi-process mode 2022-04-10 22:34:18 +08:00
afwerar 2662a3b69d [TD-13254]<fix>: make 3.0 grant. 2022-04-10 19:08:16 +08:00
Shengliang Guan 14ec5b672a fix[cluster]: redirect msg when mnode not deployed 2022-04-10 18:24:16 +08:00
Shengliang Guan a3ac72079e fix[cluster]: redirect msg when node not deployed 2022-04-10 14:04:44 +08:00
Shengliang Guan b8bdbed3db fix[cluster]: redirect meg when node not deployed 2022-04-10 13:47:28 +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
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 d63bff3ffc test[cluster]:disable mnode unit test temporarily. 2022-04-09 22:29:05 +08:00
Shengliang Guan b4496f5349 Merge remote-tracking branch 'origin/3.0' into feature/node 2022-04-09 19:38:58 +08:00
Shengliang Guan c1b3afa92d feat[cluster]: create and drop mnode 2022-04-09 19:38:20 +08:00
Haojun Liao 4c182340d0 fix[query]:disable the assignment of table uid to ssdatablock. 2022-04-09 19:32:50 +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
Cary Xu 7254263a29 use 1 bit in bitmap for super block 2022-04-09 18:21:03 +08:00
Shengliang Guan 2a88060067 feat[cluster]: create and drop snode bnode 2022-04-09 17:52:29 +08:00
Shengliang Guan f18cdd5f87 Merge remote-tracking branch 'origin/3.0' into feature/node 2022-04-09 17:38:26 +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
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
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
Haojun Liao 6af7e1810f Merge remote-tracking branch 'origin/3.0' into feature/3.0_liaohj 2022-04-09 11:56:45 +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 284f84ac93
Merge pull request #11334 from taosdata/feature/shm
feat[cluster]: send monitor information in multi-process mode
2022-04-09 11:22:16 +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
Liu Jicong 8641cfe22b change test 2022-04-09 10:29:07 +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
dapan1121 e9f7bf866a feature/qnode 2022-04-09 09:39:01 +08:00
Haojun Liao cd71bf4816 <fix>[query]: move the reset columnInfoData to the right place. 2022-04-08 23:48:01 +08:00
Shengliang Guan 951ee6136c feat[cluster]: send monitor information in multi-process mode 2022-04-08 21:25:46 +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 b34ea72a04 feat[cluster]: send monitor information in multi-process mode 2022-04-08 19:59:10 +08:00
Shengliang Guan 4105842574 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-04-08 19:43:06 +08:00
Shengliang Guan f98ceb04be feat: send monitor information in multi-process mode 2022-04-08 19:29:17 +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
Liu Jicong dff0640967 Merge branch '3.0' into feature/tq 2022-04-08 18:06:33 +08:00
Liu Jicong 32cc09ae8c remove bdb 2022-04-08 17:52:24 +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
wangmm0220 bd3a7838c0 Merge branch '3.0' into feature/TD-14422 2022-04-08 16:53:56 +08:00
Liu Jicong 471522d9b9 add log 2022-04-08 16:43:01 +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 6df2fae1a2 fix compile 2022-04-08 15:26:02 +08:00
Hongze Cheng 742b2918ff refact more 2022-04-08 06:49:07 +00:00
Hongze Cheng 94bcbf6bac refact more 2022-04-08 06:41:42 +00:00
Hongze Cheng 0e1a27c750 more refact 2022-04-08 06:19:58 +00:00
wangmm0220 1f8d2ea446 <fix>: fix index map error from table scan to sort output 2022-04-08 14:17:32 +08:00
Hongze Cheng 6faaafb7a2 remove tsdb.h and meta.h 2022-04-08 06:09:15 +00:00
Hongze Cheng 544f012066 rename file 2022-04-08 06:01:01 +00:00
Hongze Cheng e41abf9916 refact vnode code 2022-04-08 03:56:30 +00:00
Hongze Cheng afea903a98 refact vnode 2022-04-08 03:30:11 +00:00
wangmm0220 8df8c60f60 merge from 3.0 2022-04-08 10:58:39 +08:00
Hongze Cheng 41fc6be1a8 Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/vnode 2022-04-08 02:56:47 +00:00
Hongze Cheng 2a499ddf20 Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/vnode 2022-04-07 14:23:27 +00:00
Cary Xu 451a65f53f add dstVgId 2022-04-07 20:49:18 +08:00
Cary Xu f266d593ef restore current add .smad/.smal 2022-04-07 20:34:12 +08:00
Liu Jicong 4d26b416a5
Merge pull request #11294 from taosdata/feature/tq
add unsubscribe
2022-04-07 20:19:54 +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
Hongze Cheng cc2726debe start vnode refact 2022-04-07 09:35:00 +00:00
Cary Xu c219d09bac comment to pass CI 2022-04-07 17:34:46 +08:00
Cary Xu c3b5f435b0 tsma integration with stream computing 2022-04-07 17:13:55 +08:00
Liu Jicong d4d9ce20cf
Merge pull request #11291 from taosdata/feature/tq
add multi topic test
2022-04-07 16:53:56 +08:00
Shengliang Guan 7aea48a2a5
Merge pull request #11289 from taosdata/feature/shm
config thread nums
2022-04-07 16:43:58 +08:00
Liu Jicong 0cbfc79b90 add multi topic test 2022-04-07 16:27:35 +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 1d437eaa64
Merge pull request #11266 from taosdata/feature/shm
shm
2022-04-07 10:40:36 +08:00
Shengliang Guan 8202301992 fix dead lock in shm 2022-04-06 21:53:58 +08:00
Shengliang Guan 79963b9c34 rename node type 2022-04-06 20:53:12 +08:00
Shengliang Guan c53489204c minor changes 2022-04-06 20:27:59 +08:00
Hongze Cheng f739e7c32a
Merge pull request #11258 from taosdata/feature/meta
Feature/meta
2022-04-06 20:02:48 +08:00
Shengliang Guan aee4c7a25e Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-04-06 19:41:55 +08:00
Shengliang Guan 563d2ec613 proc test 2022-04-06 19:41:41 +08:00
Hongze Cheng 70810ddb39 fix a small bug 2022-04-06 11:37:34 +00:00
Hongze Cheng eafc0f88bc remove tid from tsdb 2022-04-06 11:00:52 +00:00
wangmm0220 83eacf8d07 merge from 3.0 2022-04-06 18:38:19 +08:00
Haojun Liao 6863999ec5 [td-14493] support having in group by 2022-04-06 17:59:08 +08:00
Hongze Cheng e707047d6c fix a small bug 2022-04-06 09:39:05 +00:00
Hongze Cheng e40dc9b929 commit meta when close vnode 2022-04-06 08:06:28 +00:00
Hongze Cheng 61d0180b85 more TDB integration 2022-04-06 06:37:37 +00:00
Shengliang Guan 5382648ba6 proc test 2022-04-06 11:01:16 +08:00
Hongze Cheng 317d4ff2eb make tdb work with meta 2022-04-06 02:06:59 +00:00
Hongze Cheng 906b615c9a make TDB compile 2022-04-06 01:55:37 +00:00
Hongze Cheng 4540f53b32 make feature/meta compile 2022-04-06 01:45:22 +00:00
Shengliang Guan 13770e971e Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-04-05 15:38:01 +08:00
Shengliang Guan 69aa4546f5 send response on child queue killed 2022-04-05 15:37:37 +08:00
Shengliang Guan ca3a0b3e02
Merge pull request #11243 from taosdata/feature/shm
she
2022-04-05 15:26:07 +08:00
Cary Xu 670554dcdd bug fix 2022-04-03 18:56:44 +08:00
Cary Xu b3bb652708 data and bitmap compress/store/decompress separatedly 2022-04-03 18:02:30 +08:00
Cary Xu ca3206d45e Merge branch '3.0' into feature/TD-11463-3.0 2022-04-03 17:51:28 +08:00
Shengliang Guan 43e84cbd38 rename files 2022-04-02 23:45:28 +08:00
Shengliang Guan ddd462c471 rename files 2022-04-02 23:38:55 +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
Shengliang Guan bdf5dbd5a7 refact monitor 2022-04-02 22:10:56 +08:00
Shengliang Guan ef5ca96d34
Merge pull request #11224 from taosdata/feature/shm
refact files
2022-04-02 22:06:08 +08:00
Shengliang Guan 1839793b14 rename files 2022-04-02 20:31:11 +08:00
Shengliang Guan e00f74ccbc refact dm 2022-04-02 20:05:42 +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
Shengliang Guan a554bd7fe7 rename file 2022-04-02 19:24:20 +08:00
Shengliang Guan b2bf853952 rename file 2022-04-02 19:22:59 +08:00
Shengliang Guan 6abfd9fed3 refact transport 2022-04-02 19:21:20 +08:00
wangmm0220 5aa3467e2b merge from 3.0 2022-04-02 19:02:45 +08:00
Shengliang Guan 745fa09bbb refact transport 2022-04-02 18:58:28 +08:00
Shengliang Guan 2eb30ee0f0 refact transport 2022-04-02 18:08:38 +08:00
Cary Xu 192060ebb8 Merge branch '3.0' into feature/TD-11463-3.0 2022-04-02 17:44:50 +08:00
Haojun Liao 6561851bc1
Merge pull request #11216 from taosdata/feature/3.0_liaohj
[td-13039] support stddev.
2022-04-02 17:33:06 +08:00
Shengliang Guan 20f1e3f5e5 refact dnode 2022-04-02 17:22:19 +08:00
Haojun Liao 29fd5ec11e [td-14393] fix bug. 2022-04-02 15:42:45 +08:00
Cary Xu 1165368642 retentions param bug fix and deliver to vnode 2022-04-02 15:39:20 +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
Shengliang Guan a8a914d47d minor changes 2022-04-02 13:51:05 +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 5015a6a78b shm 2022-04-01 21:27:47 +08:00
Shengliang Guan 44311425db multi process 2022-04-01 19:52:14 +08:00
Shengliang Guan 8176ff04d1 minor changes 2022-04-01 19:43:29 +08:00
Shengliang Guan e238dd22d5 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-04-01 19:31:49 +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
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
Shengliang Guan e1660a1276 shm 2022-04-01 17:56:57 +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
Shengliang Guan c3917c2544 shm 2022-04-01 16:46:31 +08:00
Shengliang Guan 1649d0ddda shm 2022-04-01 16:36:36 +08:00
Haojun Liao 3846250454 [td-13039] fix query crash. 2022-04-01 16:09:00 +08:00
Shengliang Guan 13e6efe3fc shm 2022-04-01 15:42:27 +08:00
Shengliang Guan 6129f132ac
Merge pull request #11179 from taosdata/feature/shm
shm
2022-04-01 13:53:58 +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
Shengliang Guan 8eb99ef6d1 shm 2022-04-01 11:57:35 +08:00
Xiaoyu Wang 7060fb793a modify unit test since the unit of db/table option DAYS/KEEP changes 2022-03-31 23:27:19 -04:00
Shengliang Guan ea8a336269 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-04-01 10:42:07 +08:00
Shengliang Guan 8fcaee6d97 minor changes 2022-04-01 10:39:59 +08: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
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
Liu Jicong b06db715bc
Merge pull request #11163 from taosdata/feature/tq
fix
2022-03-31 19:04:47 +08:00
Liu Jicong e21ba1637e revert uid 2022-03-31 18:39:11 +08:00
Shengliang Guan d89ab51375 minor changes 2022-03-31 17:38:47 +08:00
Liu Jicong b56ea026cb fix 2022-03-31 17:36:21 +08:00
Shengliang Guan 651fb09407 handle sigchild 2022-03-31 17:27:04 +08:00
Liu Jicong d02850382c fix serialize 2022-03-31 16:45:16 +08:00
Shengliang Guan 781d31d39f adjust log 2022-03-31 16:41:27 +08:00
Haojun Liao 8ab075c342 [td-14373]fix bug. 2022-03-31 16:24:59 +08:00
Shengliang Guan bee82c6ff9 rename files 2022-03-31 16:19:47 +08:00
Shengliang Guan 68f2911ce2 rename files 2022-03-31 16:19:26 +08:00
Liu Jicong b45f7cef2e fix 2022-03-31 16:04:23 +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
Shengliang Guan 873c2373f3 adjust logs 2022-03-31 15:48:53 +08:00
Shengliang Guan a041c07c2f Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-31 15:29:21 +08:00
Shengliang Guan 1a8b1753fb shm 2022-03-31 15:27:21 +08:00
Haojun Liao 1e5bdbfa60
Merge pull request #11134 from taosdata/feature/3.0_liaohj
[td-14392] fix show bug.
2022-03-31 14:40:13 +08:00
Shengliang Guan 4c2ce0b407 shm 2022-03-31 11:59:34 +08:00
Shengliang Guan 4d6c844438 shm 2022-03-30 21:09:45 +08:00
Shengliang Guan 68da160004 shm 2022-03-30 20:51:34 +08:00
Shengliang Guan afad08d106 shm 2022-03-30 20:45:30 +08:00
Shengliang Guan b168766ff2 shm 2022-03-30 20:32:01 +08:00
Shengliang Guan d90ebef80b Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-30 20:15:22 +08:00
Shengliang Guan 79936567c5 shm 2022-03-30 20:11:09 +08:00
Haojun Liao 387cfe8d45 [td-13039] fix bug in stream interval query. 2022-03-30 19:38:30 +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
Cary Xu 7a8642ff53 memory clear 2022-03-30 17:54:29 +08:00
Haojun Liao c39595639c [td-14392] fix show bug. 2022-03-30 17:09:06 +08:00
Shengliang Guan ae182cd75a shm 2022-03-30 16:52:14 +08:00
Shengliang Guan 6ece0d9ac1 shm 2022-03-30 16:03:21 +08:00
Shengliang Guan 5bd37b75dc shm 2022-03-30 15:57:12 +08:00
Cary Xu cf06c16379 Merge branch '3.0' into feature/TD-11463-3.0 2022-03-30 15:49:53 +08:00
Cary Xu 8627b593d5 insert tSma by SSDataBlock 2022-03-30 15:48:51 +08:00
Liu Jicong f65908a095
Merge pull request #11118 from taosdata/feature/tq
Feature/tq
2022-03-30 14:38:16 +08:00
Liu Jicong 9364c8063c revert topic phyplan 2022-03-30 14:25:44 +08:00
Shengliang Guan f16e9970fd Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-30 14:06:46 +08:00
Shengliang Guan a341c476c0 shm 2022-03-30 14:06:36 +08:00
Liu Jicong 459ec6ed71 tmq optimize offset handling 2022-03-30 14:06:02 +08:00
Hongze Cheng abfb80acac still use BDB 2022-03-30 03:21:57 +00:00
Shengliang Guan 6ed3c2490b minor changes 2022-03-30 10:43:45 +08:00
Hongze Cheng f8947c1790 Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/meta 2022-03-30 01:48:57 +00:00
Shengliang Guan 4dc47f7b8e set signal 2022-03-29 21:35:27 +08:00
Shengliang Guan dd94e2da5a shm 2022-03-29 21:13:09 +08:00
Liu Jicong 8b00e0ed06 Merge branch '3.0' into feature/tq 2022-03-29 20:31:05 +08:00
Shengliang Guan b2405a0098 minor changes 2022-03-29 20:04:03 +08:00
Shengliang Guan 72c4f0956e rename files 2022-03-29 19:53:10 +08:00
Shengliang Guan f7a40fe99e rename files 2022-03-29 19:20:41 +08:00
Shengliang Guan b4d011a0c6 rename files 2022-03-29 19:17:26 +08:00
Shengliang Guan 8469098bc9 rename files 2022-03-29 19:09:38 +08:00
Liu Jicong a9ad7ebd10 merge from 3.0 2022-03-29 18:58:15 +08:00
Shengliang Guan 9f8fba1b5d Merge branch 'feature/shm' of https://github.com/taosdata/TDengine into feature/shm 2022-03-29 18:08:06 +08:00
Shengliang Guan 457f5450e6 minor changes 2022-03-29 17:46:03 +08:00
Liu Jicong c2971618a1
Merge branch '3.0' into feature/shm 2022-03-29 17:29:20 +08:00
Shengliang Guan d76a0c9b6d shm 2022-03-29 17:15:48 +08:00
Liu Jicong 09bef18578 add case 2022-03-29 17:13:10 +08:00
Hongze Cheng f0e6b6ede6 fix a stupic bug 2022-03-29 08:38:42 +00:00
Liu Jicong a77e4f28b8 fix 2022-03-29 16:30:09 +08:00
Hongze Cheng 22d43247a9 fix another bug 2022-03-29 08:10:02 +00:00
Hongze Cheng 4552f9ba2f fix a problem 2022-03-29 07:57:38 +00:00
Liu Jicong e48206f9a0 add topic info schema 2022-03-29 15:48:02 +08:00
Liu Jicong 4fd6f59092 stream set multi input 2022-03-29 15:24:25 +08:00
Hongze Cheng e9585e74f7 more TDB 2022-03-29 07:15:07 +00:00
Hongze Cheng 5d1d22552a more meta 2022-03-29 07:04:17 +00:00
Hongze Cheng 8a0d117acf more meta 2022-03-29 06:38:22 +00:00
Hongze Cheng 015e4fc394 more TDB 2022-03-29 05:57:39 +00:00
Shengliang Guan 43d8df0781
Merge pull request #11077 from taosdata/feature/shm
shm
2022-03-29 13:39:59 +08:00
Shengliang Guan ac6b121348 shm 2022-03-29 13:39:55 +08:00
Hongze Cheng 9b3d8b0e85 more meta 2022-03-29 05:34:30 +00:00