Commit Graph

521 Commits

Author SHA1 Message Date
Haojun Liao 188c3a9881 Merge remote-tracking branch 'origin/feature/3_liaohj' into feature/3_liaohj 2022-09-15 17:44:57 +08:00
Haojun Liao 0c71d95773 fix(query):set correct block load condition. 2022-09-15 17:44:28 +08:00
Cary Xu 4be9d4c704 chore: merge 3.0 2022-09-15 16:56:46 +08:00
Haojun Liao 22afbb5035
Merge branch '3.0' into feature/3_liaohj 2022-09-15 16:56:39 +08:00
Haojun Liao 5ba41111b4 refactor: add some logs. 2022-09-15 16:17:39 +08:00
Haojun Liao dec379586b
Merge pull request #16851 from taosdata/feature/3_liaohj
refactor(query): do some internal refactor.
2022-09-15 11:43:24 +08:00
Haojun Liao 18924f9a7d refactor(query): do some internal refactor. 2022-09-15 10:26:45 +08:00
Hongze Cheng 26f740f26b fix more 2022-09-15 09:56:56 +08:00
Haojun Liao 4d44b56ec6 refactor(query):check for none table. 2022-09-14 14:53:52 +08:00
Haojun Liao dfc028a5c7 other:merge 3.0 2022-09-14 13:48:40 +08:00
Cary Xu 860a7bdcac enh: add queryRsmaTolerance conf for rsma query 2022-09-13 14:51:04 +08:00
Cary Xu 834c9edad8 chore: revert the code change 2022-09-11 19:46:30 +08:00
Cary Xu b8b91eb124 chore: revert the code change 2022-09-11 19:39:54 +08:00
Cary Xu 4cc44ee791 enh: sma optimization for query and reboot 2022-09-11 19:34:10 +08:00
Haojun Liao c328552b09
Merge pull request #16769 from taosdata/feature/3_liaohj
refactor(query): opt tsdb read perf.
2022-09-10 18:30:28 +08:00
Haojun Liao 06926edadd fix(query): handle empty time window case. 2022-09-10 15:43:46 +08:00
Haojun Liao 7b8f96851f fix(query): copy all columns to dest buffer. 2022-09-09 23:18:19 +08:00
Haojun Liao 1f645ab1d9 refactor(query): opt tsdb read perf. 2022-09-09 18:41:12 +08:00
Haojun Liao 44544ef228 fix(query): remove invalid assert 2022-09-09 16:17:51 +08:00
Haojun Liao 2c3c441b78 refactor(query): opt perf. 2022-09-09 16:13:36 +08:00
Haojun Liao e7987cd9e3 fix(query): set correct finish flag. 2022-09-09 10:21:31 +08:00
Haojun Liao 22c32f76fc refactor: opt perf in tsdbread. 2022-09-09 09:50:49 +08:00
Haojun Liao a0520d2a06 refactor: do some internal refactor. 2022-09-08 15:36:53 +08:00
Hongze Cheng bb0b1fda91 Merge branch '3.0' of https://github.com/taosdata/TDengine into refact/tsdb_new_snapshot 2022-09-08 15:16:22 +08:00
Haojun Liao 57d6c27171 refactor:do some internal refactor. 2022-09-08 14:11:34 +08:00
Haojun Liao e6ab7e5c86 refactor: do some internal refactor. 2022-09-08 14:08:07 +08:00
Haojun Liao 96dedb04f8 refactor: add some logs. 2022-09-08 10:26:30 +08:00
Haojun Liao 0b6070e518 refactor(query): add some logs. 2022-09-08 09:45:11 +08:00
Hongze Cheng 79f71be7e0 Merge branch '3.0' of https://github.com/taosdata/TDengine into refact/tsdb_new_snapshot 2022-09-07 21:37:36 +08:00
Haojun Liao 3c952a337e fix(query): fix invalid read. 2022-09-07 18:54:58 +08:00
Haojun Liao a0a6c9e9b9 fix(query): fix bug caused by refactor. 2022-09-07 17:51:04 +08:00
Hongze Cheng 0e4b0459bd more code 2022-09-07 17:06:42 +08:00
Haojun Liao e7149cce3a fix(query): opt perf in query last file blocks. 2022-09-07 13:18:34 +08:00
Haojun Liao cf46b22267 fix(query): fix error in tsdbread. 2022-09-06 19:27:49 +08:00
Haojun Liao a5933fc682 fix(query): optimize last block read performance. 2022-09-06 15:25:54 +08:00
Haojun Liao 8f92ffcd3b fix(query): set correct time window. 2022-09-06 02:36:04 +08:00
Haojun Liao a6d9c76681 fix(query): reset the time range. 2022-09-06 01:56:31 +08:00
Haojun Liao 581cb0ffe1 other:merge 3.0 2022-09-06 01:30:15 +08:00
Haojun Liao e179c10c88 fix(query): set correct last block reader range. 2022-09-06 00:26:38 +08:00
Haojun Liao 3719da865c other:merge 3.0 2022-09-05 19:02:04 +08:00
Haojun Liao a6cece10df fix(query): fix the invalid the check of last file blocks. 2022-09-05 18:57:46 +08:00
Hongze Cheng e70db79d10 refact: change sst to stt 2022-09-05 17:31:41 +08:00
Shengliang Guan 1a764d64ce
Merge pull request #16620 from taosdata/feature/TD-14761
fix:<TD-18803> taosX core dump if schema is null
2022-09-04 18:19:05 +08:00
Shengliang Guan c09e6f6236 Merge branch '3.0' into feature/TD-14761 2022-09-04 09:01:43 +08:00
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
wangmm0220 796342dabb fix:<TD-18803> taosX core dump if schema is null 2022-09-02 16:05:22 +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
Haojun Liao e61ee31de6 refactor(query): do some internal refactor. 2022-08-22 13:26:09 +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
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