[incubator-iotdb] branch dev_merge updated (7a23ef2 -> 8014e8c)

[qi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a change to branch dev_merge
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from 7a23ef2  fix by review comment
     add d3758b0  change merge chunk logic and add some comments
     add 0f2e52d  Merge branch 'dev_merge' of github.com:apache/incubator-iotdb into dev_merge
     add 8014e8c  fix by review comment

No new revisions were added by this update.

Summary of changes:
 .../resources/conf/iotdb-engine.properties         |   2 +-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |   2 +-
 .../iotdb/db/engine/merge/manage/MergeManager.java |   4 +-
 .../db/engine/merge/manage/MergeResource.java      |  12 +-
 .../iotdb/db/engine/merge/recover/LogAnalyzer.java |  16 +++
 .../iotdb/db/engine/merge/recover/MergeLogger.java |   2 +-
 ...surement.java => IFileQueryMemMeasurement.java} |   2 +-
 ...geFileSelector.java => IMergeFileSelector.java} |   4 +-
 ...gePathSelector.java => IMergePathSelector.java} |   4 +-
 .../merge/selector/MaxFileMergeFileSelector.java   |  12 +-
 .../merge/selector/MaxSeriesMergeFileSelector.java |   2 +-
 .../engine/merge/selector/NaivePathSelector.java   |   2 +-
 .../iotdb/db/engine/merge/task/MergeFileTask.java  |   2 +-
 .../db/engine/merge/task/MergeMultiChunkTask.java  | 138 +++++++++++----------
 .../iotdb/db/engine/merge/task/MergeTask.java      |  16 +--
 .../db/engine/merge/task/RecoverMergeTask.java     |  12 +-
 .../engine/storagegroup/StorageGroupProcessor.java |  25 ++--
 .../iotdb/db/query/control/JobFileManager.java     |   6 +-
 .../db/query/control/QueryResourceManager.java     |   5 -
 .../fileRelated/UnSealedTsFileIterateReader.java   |   4 +-
 .../UnSealedTsFileReaderByTimestamp.java           |   4 +-
 .../resourceRelated/SeqResourceIterateReader.java  |   4 +-
 .../SeqResourceReaderByTimestamp.java              |   4 +-
 .../resourceRelated/UnseqResourceMergeReader.java  |  11 --
 .../java/org/apache/iotdb/db/utils/MergeUtils.java |   6 +-
 .../org/apache/iotdb/db/utils/TsPrimitiveType.java |  12 +-
 .../engine/merge/MaxFileMergeFileSelectorTest.java |   8 +-
 .../apache/iotdb/db/engine/merge/MergeLogTest.java |   3 +-
 .../writelog/recover/UnseqTsFileRecoverTest.java   |   8 +-
 .../apache/iotdb/tsfile/read/ReadOnlyTsFile.java   |   8 +-
 .../iotdb/tsfile/read/TsFileSequenceReader.java    |   2 +-
 .../org/apache/iotdb/tsfile/read/common/Chunk.java |   3 +
 .../tsfile/read/controller/ChunkLoaderImpl.java    |   2 +-
 .../{ChunkLoader.java => IChunkLoader.java}        |   2 +-
 ...{MetadataQuerier.java => IMetadataQuerier.java} |   2 +-
 .../read/controller/MetadataQuerierByFileImpl.java |   5 +-
 .../query/executor/ExecutorWithTimeGenerator.java  |  10 +-
 .../tsfile/read/query/executor/TsFileExecutor.java |  10 +-
 .../query/timegenerator/TimeGeneratorImpl.java     |  12 +-
 .../read/reader/series/FileSeriesReader.java       |   6 +-
 .../reader/series/FileSeriesReaderByTimestamp.java |   6 +-
 .../reader/series/FileSeriesReaderWithFilter.java  |   4 +-
 .../series/FileSeriesReaderWithoutFilter.java      |   4 +-
 .../write/writer/ForceAppendTsFileWriter.java      |   5 +-
 .../iotdb/tsfile/read/ReadInPartitionTest.java     |   2 +-
 ...st.java => IMetadataQuerierByFileImplTest.java} |   2 +-
 .../read/query/executor/QueryExecutorTest.java     |   4 +-
 .../query/timegenerator/TimeGeneratorTest.java     |   4 +-
 48 files changed, 215 insertions(+), 210 deletions(-)
 rename server/src/main/java/org/apache/iotdb/db/engine/merge/selector/{FileQueryMemMeasurement.java => IFileQueryMemMeasurement.java} (96%)
 rename server/src/main/java/org/apache/iotdb/db/engine/merge/selector/{MergeFileSelector.java => IMergeFileSelector.java} (89%)
 rename server/src/main/java/org/apache/iotdb/db/engine/merge/selector/{MergePathSelector.java => IMergePathSelector.java} (86%)
 rename tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/{ChunkLoader.java => IChunkLoader.java} (97%)
 rename tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/{MetadataQuerier.java => IMetadataQuerier.java} (98%)
 rename tsfile/src/test/java/org/apache/iotdb/tsfile/read/controller/{MetadataQuerierByFileImplTest.java => IMetadataQuerierByFileImplTest.java} (99%)