Commit graph

3572 commits

Author SHA1 Message Date
Cary Xu
2a45862946 other: code format 2022-08-30 09:55:47 +08:00
Cary Xu
9600840aad fix: race condition between fetch all and commit 2022-08-30 08:14:32 +08:00
Cary Xu
c8d6960291 other: adjust sma log level 2022-08-29 17:53:02 +08:00
wangmm0220
bf3231ab9f fix: cols num error in tmq for query 2022-08-29 17:30:50 +08:00
Cary Xu
8f6e87594f enh: not fetch all during commit 2022-08-29 16:33:08 +08:00
Cary Xu
12a01a88dd fix: race condition between fetch all and optr serialize 2022-08-29 16:15:12 +08:00
Hongze Cheng
90d7ba0f4f Merge branch '3.0' of https://github.com/taosdata/TDengine into refact/tsdb_optimize 2022-08-29 11:02:53 +08:00
wade zhang
2ad31384f6
Merge pull request #15818 from taosdata/feature/TD-14761
feat: get meta and data from tmq using snapshot
2022-08-29 09:49:35 +08:00
Shengliang Guan
c581212712
Merge pull request #16439 from taosdata/feature/3_liaohj
feature(query): support last function cache and retrieve data.
2022-08-28 21:27:13 +08:00
Hongze Cheng
1852c21b40 refact code 2022-08-28 16:30:37 +08:00
Hongze Cheng
2d3762a546 more code 2022-08-28 01:00:23 +08:00
Hongze Cheng
6a5423d08d more 2022-08-28 00:25:44 +08:00
Hongze Cheng
0e50a96668 refact code 2022-08-28 00:24:11 +08:00
Hongze Cheng
de8944b62c more code 2022-08-28 00:19:24 +08:00
Hongze Cheng
92ca817b99 more code 2022-08-28 00:00:48 +08:00
Hongze Cheng
d31459dc08 more code 2022-08-27 17:11:00 +08:00
Hongze Cheng
f310c2cfcc more code 2022-08-27 15:34:01 +08:00
Hongze Cheng
8b58508e2e more code 2022-08-26 22:23:03 +08:00
Hongze Cheng
8ed246bdd3 more code 2022-08-26 21:57:02 +08:00
Haojun Liao
655dbb47c1 refactor(query): do some internal refactor. 2022-08-26 19:19:48 +08:00
Hongze Cheng
7de0fc7dae more code 2022-08-26 19:07:51 +08:00
Hongze Cheng
efbbaa4120 more code 2022-08-26 18:25:02 +08:00
Hongze Cheng
a224abef7e more code 2022-08-26 18:06:27 +08:00
Hongze Cheng
71e1049377 Merge branch '3.0' of https://github.com/taosdata/TDengine into refact/tsdb_optimize 2022-08-26 17:53:06 +08:00
Hongze Cheng
712bc9a0ba more code 2022-08-26 17:47:37 +08:00
Hongze Cheng
daf5d42394 more code 2022-08-26 17:05:17 +08:00
Hongze Cheng
3b9e03ba17 more code 2022-08-26 16:56:42 +08:00
wangmm0220
6dfbe30d6b fix:test case if drop table in snapshot for create topic as database 2022-08-26 15:52:12 +08:00
Hongze Cheng
90b32809c5 more code 2022-08-26 15:48:44 +08:00
Minglei Jin
083ce4e67d fix: use sizeof(SBlockL) from aBlockL array's element size 2022-08-26 15:43:20 +08:00
Hongze Cheng
393ab4de7c more code 2022-08-26 15:35:43 +08:00
Haojun Liao
60d9acb7b4 feature(query): support last function cache and retrieve data. 2022-08-26 15:27:19 +08:00
Hongze Cheng
01fe1fc80c more code 2022-08-26 13:36:42 +08:00
Hongze Cheng
341ff02624 more code 2022-08-26 13:33:16 +08:00
Hongze Cheng
c677d5494b make it compile 2022-08-26 13:03:12 +08:00
Hongze Cheng
b833c3ef89 Merge branch '3.0' of https://github.com/taosdata/TDengine into refact/tsdb_optimize 2022-08-26 13:01:15 +08:00
Hongze Cheng
61cfacd8c2 more code 2022-08-26 12:58:13 +08:00
Hongze Cheng
e3701fdcb1
Merge pull request #16427 from taosdata/fix/TD-18643
fix: return -1 if child table's uid not exist
2022-08-26 12:37:14 +08:00
Hongze Cheng
2acfc81c8b more code 2022-08-26 11:08:21 +08:00
Haojun Liao
13563f1733
Merge pull request #16412 from taosdata/feature/3_liaohj
refactor(query): check table in uid order when handling the last block, and some internal refactor.
2022-08-26 10:44:27 +08:00
Hongze Cheng
039e4a0505 more code 2022-08-26 10:44:02 +08:00
Minglei Jin
2eacdf51fa fix: return -1 if child table's uid not exist 2022-08-26 10:30:07 +08:00
Hongze Cheng
4a1447b666 make it compile 2022-08-26 10:12:36 +08:00
Hongze Cheng
5bbfc54504 Merge branch '3.0' of https://github.com/taosdata/TDengine into refact/tsdb_optimize 2022-08-26 10:08:12 +08:00
Hongze Cheng
34abb83796 more code 2022-08-25 23:07:59 +08:00
Haojun Liao
5ea4c0a7c8 fix(query): update the uid list when tablemap is changed. 2022-08-25 23:04:07 +08:00
Hongze Cheng
2876f597f0 more code 2022-08-25 19:00:44 +08:00
Hongze Cheng
eb2fb724b1 more code 2022-08-25 18:15:20 +08:00
Haojun Liao
755176d28f fix(query): add the null ptr check. 2022-08-25 17:32:27 +08:00
Hongze Cheng
f0be446e03
Merge pull request #16413 from taosdata/fix/TD-18112-2
fix: stats normal tables' timeseries
2022-08-25 17:13:47 +08:00
Hongze Cheng
cfa666f247 more code 2022-08-25 17:04:42 +08:00
wangmm0220
6b61d3c23b fix:conflicts from 3.0 2022-08-25 16:57:19 +08:00
wangmm0220
4cc2d361e1 fix:error in getting snapshot for taosX 2022-08-25 16:55:12 +08:00
Shengliang Guan
6dc8d005fe
Merge pull request #16406 from taosdata/enh/updateTbMeta
enh: update table meta after auto creating table
2022-08-25 16:39:32 +08:00
Haojun Liao
0ec1c52a19 fix(query): set ascending order of check last block. 2022-08-25 16:34:00 +08:00
Minglei Jin
85da71460e fix: stats normal tables' timeseries 2022-08-25 16:22:55 +08:00
Haojun Liao
739457ad28 refactor: do some internal refactor. 2022-08-25 16:22:22 +08:00
Haojun Liao
0d14fa9aad fix(query): reset the table accesss index. 2022-08-25 16:06:54 +08:00
Hongze Cheng
c1462d726a more code 2022-08-25 15:35:55 +08:00
Haojun Liao
b09ee742d5 refactor(query): check table in uid order when handling the last block, and some internal refactor. 2022-08-25 15:31:48 +08:00
dapan1121
a0ae0c78d9 enh: update table meta after auto creating table 2022-08-25 15:16:14 +08:00
Hongze Cheng
c3304c48bf more code 2022-08-25 14:43:54 +08:00
Shengliang Guan
4c280dc236
Merge pull request #16386 from taosdata/enh/updateTbMeta
enh: update table meta cache after creating table
2022-08-25 14:32:43 +08:00
Shengliang Guan
2b3a760ae1
Merge pull request #16372 from taosdata/main
release: merge from main to 3.0
2022-08-25 13:33:24 +08:00
dapan1121
4ab25b856f Merge remote-tracking branch 'origin/3.0' into enh/updateTbMeta 2022-08-25 13:23:16 +08:00
Hongze Cheng
beab5f1fe3 more code 2022-08-25 11:55:43 +08:00
Haojun Liao
1c06206000 other:merge 3.0 2022-08-25 11:01:36 +08:00
Hongze Cheng
b8a70bc5b0 Merge branch '3.0' of https://github.com/taosdata/TDengine into refact/tsdb_optimize 2022-08-25 10:05:50 +08:00
Cary Xu
23098a08cf other: revert to 3.0 2022-08-24 18:18:53 +08:00
Cary Xu
39cd95d825 fix: while condition 2022-08-24 18:15:37 +08:00
Cary Xu
0e094b3811 other: merge 3.0 2022-08-24 18:12:21 +08:00
wangmm0220
c7bf08d5af feat: get snapshot data for taosX 2022-08-24 17:42:33 +08:00
Cary Xu
a6fa87fb6a enh: add specific threads for rsma task 2022-08-24 17:36:22 +08:00
Hongze Cheng
6003158b22 Merge branch '3.0' of https://github.com/taosdata/TDengine into refact/tsdb_optimize 2022-08-24 17:29:39 +08:00
Hongze Cheng
f95c0013ef more code 2022-08-24 17:29:28 +08:00
Haojun Liao
a23f5f59ea refactor(query): do some internal refactor. 2022-08-24 17:09:33 +08:00
Hongze Cheng
66177fb9f1 more code 2022-08-24 16:41:09 +08:00
Shengliang Guan
e0ac102795
Merge pull request #16376 from taosdata/feature/stream
refactor(stream): refine stream backend interface
2022-08-24 16:40:20 +08:00
Hongze Cheng
602a48abf2 more code 2022-08-24 16:21:16 +08:00
Hongze Cheng
9f72a715bf fix: typo coredump 2022-08-24 16:00:15 +08:00
Liu Jicong
24261cc90b refactor(stream): refine stream backend interface 2022-08-24 15:53:29 +08:00
Hongze Cheng
5bce5c6935 more code 2022-08-24 14:59:55 +08:00
Hongze Cheng
e39a08f763 fix some bug 2022-08-24 14:26:53 +08:00
Hongze Cheng
aa08b76479 more work 2022-08-24 14:05:20 +08:00
wangmm0220
2afc23a120 fix:conflicts from 3.0 2022-08-24 13:59:51 +08:00
wangmm0220
632c8b4a1a fix:error in snapshot for taosX 2022-08-24 13:58:18 +08:00
Hongze Cheng
cab6bb1be2 Merge branch '3.0' of https://github.com/taosdata/TDengine into refact/tsdb_optimize 2022-08-24 13:35:58 +08:00
Shengliang Guan
4c287f602d
Merge pull request #16352 from taosdata/feature/stream
feat(stream): support tdb state backend
2022-08-24 13:24:09 +08:00
dapan1121
2ea802a23e Merge remote-tracking branch 'origin/3.0' into enh/updateTbMeta 2022-08-24 13:20:43 +08:00
dapan1121
150956ffd3 enh: update tbMeta after creating table 2022-08-24 13:19:52 +08:00
Hongze Cheng
fd2fccd7d7 fix: data loss 2022-08-24 13:12:13 +08:00
Hongze Cheng
ee36ea82ee Merge branch 'main' of https://github.com/taosdata/TDengine into fix/td_18604 2022-08-24 13:10:35 +08:00
Hongze Cheng
a4d4b10404 make it compile 2022-08-24 11:58:10 +08:00
Hongze Cheng
0920cb911a Merge branch '3.0' of https://github.com/taosdata/TDengine into refact/tsdb_optimize 2022-08-24 11:52:40 +08:00
Hongze Cheng
1c182684c4 more code 2022-08-24 11:51:34 +08:00
Shengliang Guan
a56699386f
Merge pull request #16365 from taosdata/feature/3_liaohj
fix(query): fix the last block check condition.
2022-08-24 11:48:49 +08:00
Hongze Cheng
16dd4a9899 fix: commit coredump 2022-08-24 11:13:11 +08:00
Cary Xu
3f96e41691 Merge branch '3.0' into feature/3.0_interval_hash_optimize 2022-08-24 10:57:30 +08:00
Cary Xu
bd02bfe58d enh: assign specific threads for rsma 2022-08-24 10:57:06 +08:00
Haojun Liao
01eac71b65 fix(query): fix the invalid last block check condition. 2022-08-24 10:42:37 +08:00
Liu Jicong
d7b804e02e fix stream load task 2022-08-24 10:42:34 +08:00
Haojun Liao
370b5136c2 fix(query): fix the last block check condition. 2022-08-24 10:38:26 +08:00
Haojun Liao
b62e0c0235
Merge pull request #16354 from taosdata/feature/3_liaohj
refactor(query): do some internal refactor.
2022-08-24 10:25:27 +08:00
wangmm0220
f477e94dda fix:error in snapshot from taosx 2022-08-24 10:24:19 +08:00
Haojun Liao
20b06a7ec7 refactor(query): do some internal refactor. 2022-08-23 19:44:59 +08:00
Liu Jicong
de041f45b5 Merge branch '3.0' into feature/stream 2022-08-23 19:41:16 +08:00
Liu Jicong
2d628491b2 feat(stream): support tdb state backend 2022-08-23 19:30:04 +08:00
Haojun Liao
36eb46fa4d
Merge pull request #16342 from taosdata/feature/3_liaohj
refactor(query): do some internal refactor.
2022-08-23 19:28:50 +08:00
dapan1121
0ebd3281c5 enh: update table meta after creating table 2022-08-23 18:26:27 +08:00
Hongze Cheng
f696ef0a6a more code 2022-08-23 18:12:18 +08:00
Hongze Cheng
b977626a78 more code 2022-08-23 17:42:10 +08:00
wangmm0220
514711e54c feat:get data from snapshot for taosx 2022-08-23 17:28:49 +08:00
Haojun Liao
2889b8d913 refactor(query): do some internal refactor. 2022-08-23 17:28:08 +08:00
Hongze Cheng
f43bae0df0 more code 2022-08-23 17:11:17 +08:00
Hongze Cheng
23e82ff68b more code 2022-08-23 16:32:44 +08:00
Hongze Cheng
fa257f50ce more code 2022-08-23 15:47:42 +08:00
Hongze Cheng
478d5ebb64 more code 2022-08-23 13:49:10 +08:00
Hongze Cheng
d65956d1a3 more code 2022-08-23 10:59:30 +08:00
wangmm0220
1134319570 Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/TD-14761 2022-08-23 10:45:51 +08:00
Hongze Cheng
1a265d8eca Merge branch '3.0' of https://github.com/taosdata/TDengine into refact/tsdb_optimize 2022-08-23 09:29:56 +08:00
Hongze Cheng
2fff10278f more code 2022-08-23 09:28:01 +08:00
Shengliang Guan
5a358cd057
Merge pull request #16304 from taosdata/fix/TD-18541
fix: create block data for last files
2022-08-22 20:19:53 +08:00
Haojun Liao
ca539ea5e2
Merge pull request #16300 from taosdata/feature/3_liaohj
fix(query): init the blockdata before load data.
2022-08-22 19:15:34 +08:00
Minglei Jin
ab94107310 fix: create block data for last files 2022-08-22 19:10:55 +08:00
Haojun Liao
821a12a048 fix(query): add check before retrieve data. 2022-08-22 18:17:47 +08:00
Hongze Cheng
3f90f99d8f first step optimization 2022-08-22 18:12:40 +08:00
Haojun Liao
940896f2ce
Merge pull request #16296 from taosdata/fix/TD-18539
fix: use new API tBlockDataInit to init pBlockData
2022-08-22 17:51:51 +08:00
Haojun Liao
9cdf2bb3a5 fix(query): init the blockdata before load data. 2022-08-22 17:43:55 +08:00
Hongze Cheng
726006d18a more code 2022-08-22 17:37:51 +08:00
Minglei Jin
2ed38aad93 fix: use new API tBlockDataInit to init pBlockData 2022-08-22 17:08:19 +08:00
wangmm0220
43862ccd74 Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/TD-14761 2022-08-22 16:53:53 +08:00
Shengliang Guan
f8310d4203
Merge pull request #16286 from taosdata/feature/3_liaohj
fix(query): fix bug in descending order scan in lastblock.
2022-08-22 15:09:21 +08:00
Haojun Liao
4322f59a22 fix(query): fix bug in descending order scan in lastblock. 2022-08-22 14:28:13 +08:00
Haojun Liao
e61ee31de6 refactor(query): do some internal refactor. 2022-08-22 13:26:09 +08:00
Shengliang Guan
e16a2a5027
Merge pull request #16278 from taosdata/feature/3_liaohj
fix(query): add one more condition check when merge file block and last block.
2022-08-22 12:58:38 +08:00
Haojun Liao
530c775d97 refactor(query): do some internal refactor. 2022-08-22 11:57:10 +08:00
Haojun Liao
e4881423b8 fix(query): add one more condition check when merge file block and last block. 2022-08-22 11:09:12 +08:00
Shengliang Guan
4bc8e086a8
Merge pull request #16262 from taosdata/feature/3.0_interval_hash_optimize
enh: rsma batch process and code optimization
2022-08-21 23:57:58 +08:00
Haojun Liao
f029df4876 fix(query): reset index when moving to next file. 2022-08-21 22:17:12 +08:00
Haojun Liao
a7ba94939a fix(query): set init value for current last block index. 2022-08-21 22:02:01 +08:00
Haojun Liao
4879ae3d68 refactor(query): optimize load last block. 2022-08-21 21:36:15 +08:00
Haojun Liao
29a1245be4 fix(query): use the separate last block delete index. 2022-08-21 20:15:53 +08:00
Haojun Liao
7904686915 fix(query): support delete in last 2022-08-21 18:59:21 +08:00
Haojun Liao
2087375967 Merge branch 'refact/tsdb_last' of github.com:taosdata/tdengine into refact/tsdb_last 2022-08-21 15:59:08 +08:00
Haojun Liao
d305e975c4 fix(query): remove printf. 2022-08-21 15:56:46 +08:00
Haojun Liao
fe918b3f69 fix(query): set correct column data. 2022-08-21 15:56:06 +08:00
Hongze Cheng
470c774f54 fix: alter table schema 2022-08-21 15:05:56 +08:00
Cary Xu
e0317964f0 fix: adjust max executor for rsma 2022-08-21 14:56:20 +08:00
Hongze Cheng
5324889c52 fix: sma file corrupt 2022-08-21 11:26:20 +08:00
Cary Xu
65e1cce6df enh: rsma code optimization 2022-08-21 01:22:56 +08:00
Cary Xu
4b3d989168 other: naming optimization 2022-08-21 01:19:32 +08:00
Cary Xu
77bfd400cb enh: code optimization 2022-08-21 01:10:18 +08:00
Cary Xu
8b3b6a8962 enh: code optimization and memory leak 2022-08-21 01:07:21 +08:00
Haojun Liao
38b30d071e fix(query): fix errors. 2022-08-21 00:02:43 +08:00
Cary Xu
0de7f3e3a7 enh: rsma code optimization 2022-08-20 23:46:12 +08:00
Cary Xu
f9e0aad827 enh: rsma batch process 2022-08-20 23:28:48 +08:00
Haojun Liao
aca09788ea Merge branch 'refact/tsdb_last' of github.com:taosdata/tdengine into refact/tsdb_last 2022-08-20 23:27:42 +08:00
Haojun Liao
5a1ba3d016 fix(query): increase the output buffer size. 2022-08-20 23:26:58 +08:00
Hongze Cheng
16d28b8a39 fix: a bug 2022-08-20 22:24:07 +08:00
Hongze Cheng
c3ec89c3cb fix a coredump 2022-08-20 21:18:12 +08:00
Haojun Liao
6d8a70ebf6 fix(query): remove invalid free. 2022-08-20 20:22:39 +08:00
Haojun Liao
03879752a1 fix(query): fix syntax error on the darwin platform. 2022-08-20 19:17:17 +08:00
Haojun Liao
df0d6f1823 fix(query): fix memory leak. 2022-08-20 19:05:55 +08:00
Cary Xu
50e7e033bc enh: rsma batch process 2022-08-20 18:56:48 +08:00
Haojun Liao
0dfd032068 fix(query): reset block data when no blocks are available. 2022-08-20 16:57:44 +08:00
Haojun Liao
09ffcd2e13 fix(query): fix bug in tsdbread 2022-08-20 12:41:58 +08:00
Haojun Liao
515e8d36b0 fix(query): fix bug in merge buffer data and last block. 2022-08-20 11:14:00 +08:00
Hongze Cheng
5e4b7bf9bd more code 2022-08-19 22:29:46 +08:00
Hongze Cheng
831d7dafca more code 2022-08-19 21:56:37 +08:00
Hongze Cheng
94b97c4da4 more code 2022-08-19 21:42:14 +08:00
Hongze Cheng
de97c9253a make it compile 2022-08-19 20:53:19 +08:00
Cary Xu
a9fcc12c33 enh: rsma batch process 2022-08-19 20:08:09 +08:00
Hongze Cheng
4acc76b7c5 adjust more code 2022-08-19 18:35:09 +08:00
Hongze Cheng
875566d361 adjust more 2022-08-19 18:06:18 +08:00
Hongze Cheng
47cddbfe2b mroe code 2022-08-19 17:52:48 +08:00
Hongze Cheng
d3d03d8c4d adjust more code 2022-08-19 17:45:52 +08:00
Cary Xu
59739e0cb7 Merge branch '3.0' into feature/3.0_interval_hash_optimize 2022-08-19 17:20:08 +08:00
Cary Xu
441ce21677 enh: rsma batch process 2022-08-19 17:19:50 +08:00
Hongze Cheng
029c16e487 more code 2022-08-19 17:13:39 +08:00
wangmm0220
f2912a17ba fix:conflicts from 3.0 2022-08-19 16:38:23 +08:00
wangmm0220
03a187571c fix:error in snapshot for taosx 2022-08-19 15:12:04 +08:00
Hongze Cheng
72471af0ce adjust more code 2022-08-19 14:26:37 +08:00
Hongze Cheng
c7158f782e adjust more 2022-08-19 11:52:43 +08:00
Hongze Cheng
f59bc9c0a7 more work 2022-08-19 11:02:33 +08:00
Hongze Cheng
972ad9e70b Merge branch '3.0' of https://github.com/taosdata/TDengine into refact/tsdb_last 2022-08-19 09:53:45 +08:00
Hongze Cheng
a14aa3aac5 Merge branch 'refact/tsdb_last' of https://github.com/taosdata/TDengine into refact/tsdb_last 2022-08-19 09:51:52 +08:00
Hongze Cheng
fc0745825e more snapshot 2022-08-19 09:51:40 +08:00
Hui Li
240747abed
Merge pull request #16222 from taosdata/feature/stream
fix(query): memory leak
2022-08-19 09:31:09 +08:00
Haojun Liao
5eae03fcab fix(query): handle the reverse case. 2022-08-18 22:57:26 +08:00
Haojun Liao
04a06d4353 Merge branch 'refact/tsdb_last' of github.com:taosdata/tdengine into refact/tsdb_last 2022-08-18 22:43:23 +08:00
Haojun Liao
eaef3dffaf fix(query): fix error in query last block. 2022-08-18 22:42:16 +08:00
Hongze Cheng
538f130ac0 Merge branch '3.0' of https://github.com/taosdata/TDengine into refact/tsdb_last 2022-08-18 21:49:56 +08:00
Haojun Liao
3490fe5561
Merge pull request #16205 from taosdata/fix/TD-18482
fix(tsdb/cache): add DCLP to tsdbCache
2022-08-18 21:12:21 +08:00
Minglei Jin
65903a7c0d fix: refact mutex locking 2022-08-18 20:14:50 +08:00
Haojun Liao
e75c400045 fix(query): fix bug in query last block. 2022-08-18 18:48:50 +08:00
Liu Jicong
2b092f6551 fix(query): memory leak 2022-08-18 18:39:21 +08:00
Hongze Cheng
871b4895f9 fix bit map bug 2022-08-18 18:26:10 +08:00
Hongze Cheng
e9bb654a4a Merge branch '3.0' of https://github.com/taosdata/TDengine into refact/tsdb_last 2022-08-18 17:14:51 +08:00
Haojun Liao
0d84bd2d40 Merge branch 'refact/tsdb_last' of github.com:taosdata/tdengine into refact/tsdb_last 2022-08-18 17:11:07 +08:00
Haojun Liao
8eb86676d0 fix(query): support query last file. 2022-08-18 17:09:44 +08:00