[incubator-iotdb] branch new_series_reader updated (0b636dc -> 1222a15)

[ja...@apache.org]

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 0b636dc  fixed new_series_reader problem reported in sonar (#768)
     add 255d9ce  some file package changes
     add 1222a15  resolve conflicts

No new revisions were added by this update.

Summary of changes:
 .../db/engine/merge/manage/MergeResource.java      |  4 ++--
 .../db/engine/merge/task/MergeMultiChunkTask.java  |  2 +-
 .../db/engine/querycontext/ReadOnlyMemChunk.java   |  2 +-
 .../db/query/dataset/NonAlignEngineDataSet.java    |  2 +-
 .../dataset/RawQueryDataSetWithoutValueFilter.java |  2 +-
 .../db/query/executor/RawDataQueryExecutor.java    | 11 +++++----
 .../db/query/externalsort/ExternalSortJob.java     |  2 +-
 .../query/externalsort/ExternalSortJobEngine.java  |  7 +++---
 .../db/query/externalsort/ExternalSortJobPart.java |  2 +-
 .../iotdb/db/query/externalsort/LineMerger.java    |  2 +-
 .../MultiSourceExternalSortJobPart.java            |  2 +-
 .../externalsort/SimpleExternalSortEngine.java     | 13 +++++-----
 .../SingleSourceExternalSortJobPart.java           | 28 +++++++++++-----------
 .../adapter/ByTimestampReaderAdapter.java          |  2 +-
 .../serialize/IExternalSortFileDeserializer.java   |  2 +-
 .../java/org/apache/iotdb/db/query/fill/IFill.java |  2 +-
 .../org/apache/iotdb/db/query/fill/LinearFill.java |  4 ++++
 .../apache/iotdb/db/query/fill/PreviousFill.java   |  4 ++++
 .../iotdb/db/query/reader/MemChunkLoader.java      |  3 ++-
 .../{chunkrelated => chunk}/ChunkDataIterator.java |  4 ++--
 .../{chunkrelated => chunk}/ChunkReaderWrap.java   |  7 +++---
 .../DiskChunkReaderByTimestamp.java                |  5 ++--
 .../{chunkrelated => chunk}/MemChunkReader.java    |  6 ++---
 .../{chunkrelated => chunk}/MemPageReader.java     |  2 +-
 .../CachedUnseqResourceMergeReader.java            |  9 +++----
 .../IAggregateReader.java                          |  2 +-
 .../reader/{ => series}/ManagedSeriesReader.java   |  2 +-
 .../SeriesAggregateReader.java                     |  5 ++--
 .../SeriesRawDataBatchReader.java                  |  3 +--
 .../SeriesRawDataPointReader.java                  | 10 ++++----
 .../{seriesrelated => series}/SeriesReader.java    |  2 +-
 .../SeriesReaderByTimestamp.java                   |  5 ++--
 .../reader/universal/PriorityMergeReader.java      |  2 +-
 .../db/query/timegenerator/EngineLeafNode.java     |  2 +-
 .../iotdb/db/utils/datastructure/TVList.java       |  2 +-
 .../db/engine/memtable/PrimitiveMemTableTest.java  |  2 +-
 .../engine/modification/DeletionFileNodeTest.java  |  2 +-
 .../storagegroup/StorageGroupProcessorTest.java    |  2 +-
 .../engine/storagegroup/TsFileProcessorTest.java   |  2 +-
 .../query/externalsort/ExternalSortEngineTest.java | 16 ++++++-------
 .../db/query/externalsort/FakeChunkReaderWrap.java |  4 ++--
 .../SeriesReaderTest.java                          |  2 +-
 .../query/reader/universal/FakedSeriesReader.java  |  2 +-
 .../PriorityMergeReaderByTimestampTest.java        |  2 +-
 .../iotdb/db/writelog/recover/LogReplayerTest.java |  2 +-
 .../apache/iotdb/tsfile/read/common/BatchData.java |  2 +-
 .../read/{ => reader}/BatchDataIterator.java       |  3 ++-
 .../tsfile/read/{ => reader}/IPointReader.java     |  4 +++-
 48 files changed, 114 insertions(+), 95 deletions(-)
 rename server/src/main/java/org/apache/iotdb/db/query/reader/{chunkrelated => chunk}/ChunkDataIterator.java (95%)
 rename server/src/main/java/org/apache/iotdb/db/query/reader/{chunkrelated => chunk}/ChunkReaderWrap.java (96%)
 rename server/src/main/java/org/apache/iotdb/db/query/reader/{chunkrelated => chunk}/DiskChunkReaderByTimestamp.java (97%)
 rename server/src/main/java/org/apache/iotdb/db/query/reader/{chunkrelated => chunk}/MemChunkReader.java (94%)
 rename server/src/main/java/org/apache/iotdb/db/query/reader/{chunkrelated => chunk}/MemPageReader.java (96%)
 rename server/src/main/java/org/apache/iotdb/db/query/reader/{resourcerelated => resource}/CachedUnseqResourceMergeReader.java (92%)
 rename server/src/main/java/org/apache/iotdb/db/query/reader/{seriesrelated => series}/IAggregateReader.java (96%)
 rename server/src/main/java/org/apache/iotdb/db/query/reader/{ => series}/ManagedSeriesReader.java (96%)
 rename server/src/main/java/org/apache/iotdb/db/query/reader/{seriesrelated => series}/SeriesAggregateReader.java (98%)
 rename server/src/main/java/org/apache/iotdb/db/query/reader/{seriesrelated => series}/SeriesRawDataBatchReader.java (97%)
 rename server/src/main/java/org/apache/iotdb/db/query/reader/{seriesrelated => series}/SeriesRawDataPointReader.java (87%)
 rename server/src/main/java/org/apache/iotdb/db/query/reader/{seriesrelated => series}/SeriesReader.java (99%)
 rename server/src/main/java/org/apache/iotdb/db/query/reader/{seriesrelated => series}/SeriesReaderByTimestamp.java (98%)
 rename server/src/test/java/org/apache/iotdb/db/query/reader/{seriesrelated => series}/SeriesReaderTest.java (99%)
 rename tsfile/src/main/java/org/apache/iotdb/tsfile/read/{ => reader}/BatchDataIterator.java (94%)
 rename tsfile/src/main/java/org/apache/iotdb/tsfile/read/{ => reader}/IPointReader.java (91%)