You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2021/06/16 08:03:39 UTC

[iotdb] branch new_compaction updated (d2283b2 -> 3d8dedb)

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

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


    from d2283b2  [To new_compaction] modify configuration and add resource list (#3413)
     new a839369  Modify Configuration
     new a6775ce  TsFileResourceList
     new ba79839  format
     new 8d04b88  conflict fixed
     new eb21167  add header
     new a5bba4d  add header
     new 3d8dedb  Merge pull request #3416 from THUMarkLau/master

The 4988 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 19 ++++-----
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  | 47 +++++++++-------------
 .../db/engine/compaction/CompactionPriority.java   | 23 ++++++++++-
 .../compaction/CompactionScheduler.java}           | 32 +++++++--------
 .../engine/compaction/CompactionTaskManager.java   | 10 ++++-
 .../engine/compaction/TsFileResourceManager.java   | 10 ++---
 .../level/LevelCompactionTsFileManagement.java     |  1 -
 .../compaction/task/AbstractCompactionTask.java}   | 31 +++++++-------
 .../engine/flush/pool/FlushSubTaskPoolManager.java |  1 +
 .../db/engine/flush/pool/FlushTaskPoolManager.java |  1 +
 .../engine/storagegroup/StorageGroupProcessor.java |  1 -
 .../db/engine/storagegroup/TsFileResource.java     |  2 +-
 .../db/engine/storagegroup/TsFileResourceList.java | 23 +++++++++--
 .../virtualSg/StorageGroupManager.java             |  1 +
 14 files changed, 117 insertions(+), 85 deletions(-)
 copy server/src/main/java/org/apache/iotdb/db/{qp/logical/crud/FunctionOperator.java => engine/compaction/CompactionScheduler.java} (52%)
 copy cluster/src/main/java/org/apache/iotdb/cluster/log/snapshot/SnapshotFactory.java => server/src/main/java/org/apache/iotdb/db/engine/compaction/TsFileResourceManager.java (77%)
 copy server/src/main/java/org/apache/iotdb/db/{concurrent/WrappedRunnable.java => engine/compaction/task/AbstractCompactionTask.java} (59%)