This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch new_series_reader
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from c923877 Fix IoTDBAggregationSmallDataIT
add cf9c736 refactor abstract reader
add d73bb01 resolve conflicts
No new revisions were added by this update.
Summary of changes:
.../org/apache/iotdb/db/engine/StorageEngine.java | 22 +-
.../db/engine/memtable/MemSeriesLazyMerger.java | 2 +-
.../engine/memtable/TimeValuePairInMemTable.java | 2 +-
.../db/engine/memtable/TimeValuePairSorter.java | 2 +-
.../iotdb/db/engine/memtable/WritableMemChunk.java | 2 +-
.../db/engine/merge/manage/MergeResource.java | 2 +-
.../db/engine/merge/task/MergeMultiChunkTask.java | 16 +-
.../db/engine/querycontext/ReadOnlyMemChunk.java | 2 +-
.../engine/storagegroup/StorageGroupProcessor.java | 53 +--
.../db/query/control/QueryResourceManager.java | 18 +-
.../groupby/GroupByWithoutValueFilterDataSet.java | 8 +-
.../db/query/executor/AggregateEngineExecutor.java | 17 +-
.../db/query/executor/FillEngineExecutor.java | 12 +-
.../db/query/externalsort/ExternalSortJob.java | 2 +-
.../query/externalsort/ExternalSortJobEngine.java | 2 +-
.../db/query/externalsort/ExternalSortJobPart.java | 2 +-
.../iotdb/db/query/externalsort/LineMerger.java | 6 +-
.../MultiSourceExternalSortJobPart.java | 2 +-
.../externalsort/SimpleExternalSortEngine.java | 2 +-
.../SingleSourceExternalSortJobPart.java | 2 +-
.../adapter/ByTimestampReaderAdapter.java | 10 +-
.../serialize/IExternalSortFileDeserializer.java | 6 +-
.../serialize/IExternalSortFileSerializer.java | 2 +-
.../FixLengthIExternalSortFileDeserializer.java | 6 +-
.../impl/FixLengthTimeValuePairSerializer.java | 2 +-
.../java/org/apache/iotdb/db/query/fill/IFill.java | 10 +-
.../org/apache/iotdb/db/query/fill/LinearFill.java | 4 +-
.../apache/iotdb/db/query/fill/PreviousFill.java | 4 +-
.../iotdb/db/query/reader/ManagedSeriesReader.java | 5 +-
.../reader/chunkRelated/CachedDiskChunkReader.java | 14 +-
.../reader/chunkRelated/ChunkDataIterator.java | 13 +-
.../query/reader/chunkRelated/ChunkReaderWrap.java | 2 +-
.../query/reader/chunkRelated/MemChunkReader.java | 27 +-
.../chunkRelated/MemChunkReaderByTimestamp.java | 2 +-
.../reader/seriesRelated/AbstractDataReader.java | 519 +++++++++------------
.../reader/seriesRelated/IAggregateReader.java | 15 +-
.../RawDataReaderWithoutValueFilter.java | 40 +-
.../SeriesDataReaderWithValueFilter.java | 5 +-
.../SeriesDataReaderWithoutValueFilter.java | 36 +-
.../seriesRelated/SeriesReaderByTimestamp.java | 5 +-
.../universal/CachedPriorityMergeReader.java | 8 +-
.../reader/universal/PriorityMergeReader.java | 35 +-
.../java/org/apache/iotdb/db/utils/MergeUtils.java | 1 +
.../apache/iotdb/db/utils/TimeValuePairUtils.java | 1 +
.../db/engine/cache/DeviceMetaDataCacheTest.java | 4 +-
.../db/engine/memtable/PrimitiveMemTableTest.java | 2 +-
.../engine/modification/DeletionFileNodeTest.java | 27 +-
.../storagegroup/StorageGroupProcessorTest.java | 27 +-
.../iotdb/db/engine/storagegroup/TTLTest.java | 27 +-
.../engine/storagegroup/TsFileProcessorTest.java | 2 +-
.../query/externalsort/ExternalSortEngineTest.java | 22 +-
.../db/query/externalsort/FakeChunkReaderWrap.java | 2 +-
...ExternalSortFileSerializerDeserializerTest.java | 6 +-
.../reader/seriesRelated/FakedIBatchPoint.java | 2 +-
.../reader/seriesRelated/FakedIPointReader.java | 10 +-
.../query/reader/universal/FakedSeriesReader.java | 10 +-
.../universal/FakedSeriesReaderByTimestamp.java | 2 +-
.../PriorityMergeReaderByTimestampTest.java | 14 +-
.../reader/universal/PriorityMergeReaderTest.java | 6 +-
.../reader/universal/PriorityMergeReaderTest2.java | 6 +-
.../db/utils/datastructure/LongTVListTest.java | 2 +-
.../iotdb/db/writelog/recover/LogReplayerTest.java | 2 +-
.../writelog/recover/UnseqTsFileRecoverTest.java | 6 +-
.../iotdb/tsfile/read/BatchDataIterator.java | 36 ++
.../apache/iotdb/tsfile/read}/IPointReader.java | 10 +-
.../apache/iotdb/tsfile/read}/TimeValuePair.java | 2 +-
.../apache/iotdb/tsfile/read/common/BatchData.java | 7 +
.../iotdb/tsfile/read/reader/IChunkReader.java | 12 +-
.../tsfile/read/reader/chunk/ChunkReader.java | 66 ++-
.../iotdb/tsfile/read/reader/page/PageReader.java | 13 +
70 files changed, 641 insertions(+), 632 deletions(-)
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/BatchDataIterator.java
rename {server/src/main/java/org/apache/iotdb/db/query/reader =>
tsfile/src/main/java/org/apache/iotdb/tsfile/read}/IPointReader.java (77%)
rename {server/src/main/java/org/apache/iotdb/db/utils =>
tsfile/src/main/java/org/apache/iotdb/tsfile/read}/TimeValuePair.java (98%)
