Commit graph

426 commits

Author SHA1 Message Date
Shengliang Guan
97b802ad77 fix: compile error 2022-09-04 09:01:26 +08:00
Shengliang Guan
0528fff7e0 Merge branch '3.0' into refact/tsdb_optimize 2022-09-04 08:56:58 +08:00
Haojun Liao
280bb37270 fix(query): reset fileIter when reset tsdb reader. 2022-09-03 23:06:39 +08:00
Haojun Liao
04c360dfcf fix(query): check the ts before merge file block. 2022-09-03 20:30:53 +08:00
Haojun Liao
86348e7439 fix(query): initialize the last block reader successfully. 2022-09-02 17:27:47 +08:00
Haojun Liao
a170796f66 fix(query): fix invalid read/write. 2022-09-02 14:34:30 +08:00
Haojun Liao
cac1fd36b7 Merge remote-tracking branch 'origin/refact/tsdb_optimize' into refact/tsdb_optimize
# Conflicts:
#	source/dnode/vnode/src/inc/tsdb.h
#	source/dnode/vnode/src/tsdb/tsdbMergeTree.c
#	source/dnode/vnode/src/tsdb/tsdbRead.c
2022-09-02 11:23:01 +08:00
Haojun Liao
720f3b2482 refactor: do some internal refactor. 2022-09-02 11:20:12 +08:00
Hongze Cheng
0eb29455ae refact code 2022-09-02 11:19:34 +08:00
Hongze Cheng
aec4297eb4 refact code 2022-09-02 11:16:23 +08:00
Hongze Cheng
ff4fda8442 refact code 2022-09-02 10:43:49 +08:00
Hongze Cheng
1132a7f719 refact code 2022-09-02 10:17:40 +08:00
Haojun Liao
52c5992c87 other:merge 3.0 2022-09-02 09:58:16 +08:00
Haojun Liao
d1b7d07790 refactor:do some internal refactor. 2022-09-02 09:54:22 +08:00
Haojun Liao
fed9efa840 fix(query): check memory malloc failure. 2022-09-01 18:46:50 +08:00
Haojun Liao
b2cf2818eb refactor(query): do some internal refactor. 2022-09-01 18:23:44 +08:00
Haojun Liao
a3011a0194 refactor(query): do some internal refactor. 2022-09-01 17:51:26 +08:00
Haojun Liao
72e0f09dd2 refactor(query): do some internal refactor. 2022-09-01 15:50:41 +08:00
Haojun Liao
e65927bc5b fix(query): fix bug in merge multiple last files. 2022-09-01 15:11:40 +08:00
Haojun Liao
1cfd3e74f9 enh(query): support merge multiple last files. 2022-09-01 11:56:56 +08:00
Haojun Liao
fdea9db9d3 fix(query): fix macro definition error. 2022-08-30 09:58:30 +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
Haojun Liao
655dbb47c1 refactor(query): do some internal refactor. 2022-08-26 19:19:48 +08:00
Haojun Liao
60d9acb7b4 feature(query): support last function cache and retrieve data. 2022-08-26 15:27:19 +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
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
Haojun Liao
5ea4c0a7c8 fix(query): update the uid list when tablemap is changed. 2022-08-25 23:04:07 +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
wangmm0220
6b61d3c23b fix:conflicts from 3.0 2022-08-25 16:57:19 +08:00
Haojun Liao
0ec1c52a19 fix(query): set ascending order of check last block. 2022-08-25 16:34:00 +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
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
Haojun Liao
a23f5f59ea refactor(query): do some internal refactor. 2022-08-24 17:09:33 +08:00
wangmm0220
2afc23a120 fix:conflicts from 3.0 2022-08-24 13:59:51 +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
Haojun Liao
370b5136c2 fix(query): fix the last block check condition. 2022-08-24 10:38:26 +08:00
Haojun Liao
20b06a7ec7 refactor(query): do some internal refactor. 2022-08-23 19:44:59 +08:00
Haojun Liao
2889b8d913 refactor(query): do some internal refactor. 2022-08-23 17:28:08 +08:00
Hongze Cheng
478d5ebb64 more code 2022-08-23 13:49:10 +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
Haojun Liao
821a12a048 fix(query): add check before retrieve data. 2022-08-22 18:17:47 +08:00
Haojun Liao
9cdf2bb3a5 fix(query): init the blockdata before load data. 2022-08-22 17:43:55 +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
Haojun Liao
4322f59a22 fix(query): fix bug in descending order scan in lastblock. 2022-08-22 14:28:13 +08:00