This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch f_batch_reader
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 5b121fe fix fillBuffer bug in EngineDataSetWithoutValueFilter
add a5aa240 fix tsfile bug and PriorityMergeReader bug
No new revisions were added by this update.
Summary of changes:
.../db/engine/merge/manage/MergeResource.java | 2 +-
.../dataset/EngineDataSetWithoutValueFilter.java | 28 +++--
.../iotdb/db/query/executor/EngineExecutor.java | 6 +-
.../iotdb/db/query/externalsort/LineMerger.java | 4 +-
.../java/org/apache/iotdb/db/query/fill/IFill.java | 2 +-
.../resourceRelated/UnseqResourceMergeReader.java | 125 ++++++++++++---------
.../seriesRelated/SeriesReaderWithValueFilter.java | 7 +-
.../SeriesReaderWithoutValueFilter.java | 38 ++-----
.../universal/CachedPriorityMergeReader.java | 14 +--
.../reader/universal/PriorityMergeReader.java | 65 ++++-------
.../query/timegenerator/EngineNodeConstructor.java | 8 +-
.../apache/iotdb/db/utils/TimeValuePairUtils.java | 25 -----
.../iotdb/db/engine/merge/MergeTaskTest.java | 22 ++--
.../SeriesReaderWithValueFilterTest.java | 2 +-
.../SeriesReaderWithoutValueFilterTest.java | 5 +-
.../reader/universal/PriorityMergeReaderTest.java | 9 +-
.../reader/universal/PriorityMergeReaderTest2.java | 5 +-
.../writelog/recover/UnseqTsFileRecoverTest.java | 5 +-
.../apache/iotdb/tsfile/read/common/BatchData.java | 24 ++--
.../tsfile/read/query/executor/TsFileExecutor.java | 10 +-
20 files changed, 186 insertions(+), 220 deletions(-)
