You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@iotdb.apache.org by GitBox <gi...@apache.org> on 2021/06/01 14:18:28 UTC
[GitHub] [iotdb] zhanglingzhe0820 opened a new pull request #3305: Clear compaction code
zhanglingzhe0820 opened a new pull request #3305:
URL: https://github.com/apache/iotdb/pull/3305
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] liutaohua commented on a change in pull request #3305: Clear compaction code
Posted by GitBox <gi...@apache.org>.
liutaohua commented on a change in pull request #3305:
URL: https://github.com/apache/iotdb/pull/3305#discussion_r643682728
##########
File path: server/src/main/java/org/apache/iotdb/db/engine/compaction/TsFileManagement.java
##########
@@ -66,325 +62,464 @@
*/
public ModificationFile mergingModification;
- /** whether execute merge chunk in this task */
- protected boolean isMergeExecutedInCurrentTask = false;
+ // First map is partition list; Second list is level list; Third list is file list in level;
+ private final Map<Long, List<SortedSet<TsFileResource>>> sequenceTsFileResources =
+ new HashMap<>();
+ private final Map<Long, List<List<TsFileResource>>> unSequenceTsFileResources = new HashMap<>();
- protected boolean isForceFullMerge = IoTDBDescriptor.getInstance().getConfig().isFullMerge();
- private final int maxOpenFileNumInEachUnseqCompaction =
- IoTDBDescriptor.getInstance().getConfig().getMaxOpenFileNumInEachUnseqCompaction();
+ private final List<TsFileResource> sequenceRecoverTsFileResources = new ArrayList<>();
+ private final List<TsFileResource> unSequenceRecoverTsFileResources = new ArrayList<>();
+
+ private final int seqLevelNum =
+ Math.max(IoTDBDescriptor.getInstance().getConfig().getSeqLevelNum(), 1);
+ private final int unseqLevelNum =
+ Math.max(IoTDBDescriptor.getInstance().getConfig().getUnseqLevelNum(), 1);
public TsFileManagement(String storageGroupName, String storageGroupDir) {
this.storageGroupName = storageGroupName;
this.storageGroupDir = storageGroupDir;
}
- public void setFullMerge(boolean forceFullMerge) {
- isForceFullMerge = forceFullMerge;
+ public Pair<List<List<TsFileResource>>, List<List<TsFileResource>>> forkCurrentFileList(
Review comment:
I think we should wrap a `class` here,
```
class LevelCompactionFiles{
private List<List<TsFileResource> seqFiles;
private List<List<TsFileResource> unseqFiles;
public List<List<tsFileSource>> getSeqResource(){}
public List<List<tsFileSource>> getUnseqResource(){}
public List<TsFileResource> getSeqResource(int level){}
public. List<TsFileResource> getUnseqResource(int level){}
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] qiaojialin merged pull request #3305: Clear compaction code
Posted by GitBox <gi...@apache.org>.
qiaojialin merged pull request #3305:
URL: https://github.com/apache/iotdb/pull/3305
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] EJTTianYu commented on a change in pull request #3305: Clear compaction code
Posted by GitBox <gi...@apache.org>.
EJTTianYu commented on a change in pull request #3305:
URL: https://github.com/apache/iotdb/pull/3305#discussion_r643605813
##########
File path: server/src/main/java/org/apache/iotdb/db/engine/compaction/TsFileManagement.java
##########
@@ -66,325 +62,464 @@
*/
public ModificationFile mergingModification;
- /** whether execute merge chunk in this task */
- protected boolean isMergeExecutedInCurrentTask = false;
+ // First map is partition list; Second list is level list; Third list is file list in level;
+ private final Map<Long, List<SortedSet<TsFileResource>>> sequenceTsFileResources =
+ new HashMap<>();
+ private final Map<Long, List<List<TsFileResource>>> unSequenceTsFileResources = new HashMap<>();
- protected boolean isForceFullMerge = IoTDBDescriptor.getInstance().getConfig().isFullMerge();
- private final int maxOpenFileNumInEachUnseqCompaction =
- IoTDBDescriptor.getInstance().getConfig().getMaxOpenFileNumInEachUnseqCompaction();
+ private final List<TsFileResource> sequenceRecoverTsFileResources = new ArrayList<>();
+ private final List<TsFileResource> unSequenceRecoverTsFileResources = new ArrayList<>();
+
+ private final int seqLevelNum =
+ Math.max(IoTDBDescriptor.getInstance().getConfig().getSeqLevelNum(), 1);
+ private final int unseqLevelNum =
+ Math.max(IoTDBDescriptor.getInstance().getConfig().getUnseqLevelNum(), 1);
public TsFileManagement(String storageGroupName, String storageGroupDir) {
this.storageGroupName = storageGroupName;
this.storageGroupDir = storageGroupDir;
}
- public void setFullMerge(boolean forceFullMerge) {
- isForceFullMerge = forceFullMerge;
+ public Pair<List<List<TsFileResource>>, List<List<TsFileResource>>> forkCurrentFileList(
+ long timePartition) {
+ readLock();
+ List<List<TsFileResource>> forkedSeqTsFileResources = new ArrayList<>();
+ List<List<TsFileResource>> forkedUnseqTsFileResources = new ArrayList<>();
+ try {
+ forkTsFileList(
+ forkedSeqTsFileResources,
+ sequenceTsFileResources.computeIfAbsent(timePartition, this::newSequenceTsFileResources),
+ seqLevelNum);
+ forkTsFileList(
+ forkedUnseqTsFileResources,
+ unSequenceTsFileResources.computeIfAbsent(
+ timePartition, this::newUnSequenceTsFileResources),
+ unseqLevelNum);
+ return new Pair<>(forkedSeqTsFileResources, forkedUnseqTsFileResources);
+ } finally {
+ readUnLock();
+ }
+ }
+
+ private void forkTsFileList(
+ List<List<TsFileResource>> forkedTsFileResources, List rawTsFileResources, int currMaxLevel) {
+ for (int i = 0; i < currMaxLevel; i++) {
+ List<TsFileResource> forkedLevelTsFileResources = new ArrayList<>();
+ Collection<TsFileResource> levelRawTsFileResources =
+ (Collection<TsFileResource>) rawTsFileResources.get(i);
+ for (TsFileResource tsFileResource : levelRawTsFileResources) {
+ if (tsFileResource.isClosed()) {
+ forkedLevelTsFileResources.add(tsFileResource);
+ }
+ }
+ forkedTsFileResources.add(forkedLevelTsFileResources);
+ }
}
/**
* get the TsFile list in sequence, not recommend to use this method, use
* getTsFileListByTimePartition instead
*/
@Deprecated
- public abstract List<TsFileResource> getTsFileList(boolean sequence);
-
- /** get the TsFile list in sequence by time partition */
- public abstract List<TsFileResource> getTsFileListByTimePartition(
- boolean sequence, long timePartition);
-
- /** get the TsFile list iterator in sequence */
- public abstract Iterator<TsFileResource> getIterator(boolean sequence);
-
- /** remove one TsFile from list */
- public abstract void remove(TsFileResource tsFileResource, boolean sequence);
-
- /** remove some TsFiles from list */
- public abstract void removeAll(List<TsFileResource> tsFileResourceList, boolean sequence);
-
- /** add one TsFile to list */
- public abstract void add(TsFileResource tsFileResource, boolean sequence);
-
- /** add one TsFile to list for recover */
- public abstract void addRecover(TsFileResource tsFileResource, boolean sequence);
-
- /** add some TsFiles to list */
- public abstract void addAll(List<TsFileResource> tsFileResourceList, boolean sequence);
-
- /** is one TsFile contained in list */
- public abstract boolean contains(TsFileResource tsFileResource, boolean sequence);
-
- /** clear list */
- public abstract void clear();
-
- /** is the list empty */
- public abstract boolean isEmpty(boolean sequence);
-
- /** return TsFile list size */
- public abstract int size(boolean sequence);
-
- /** recover TsFile list */
- public abstract void recover();
-
- /** fork current TsFile list (call this before merge) */
- public abstract void forkCurrentFileList(long timePartition) throws IOException;
-
- protected void readLock() {
- compactionMergeLock.readLock().lock();
- }
-
- protected void readUnLock() {
- compactionMergeLock.readLock().unlock();
- }
-
- public void writeLock() {
- compactionMergeLock.writeLock().lock();
- }
-
- public void writeUnlock() {
- compactionMergeLock.writeLock().unlock();
+ public List<TsFileResource> getTsFileList(boolean sequence) {
+ readLock();
+ try {
+ List<TsFileResource> result = new ArrayList<>();
+ if (sequence) {
+ for (long timePartition : sequenceTsFileResources.keySet()) {
+ result.addAll(getTsFileListByTimePartition(true, timePartition));
+ }
+ } else {
+ for (long timePartition : unSequenceTsFileResources.keySet()) {
+ result.addAll(getTsFileListByTimePartition(false, timePartition));
+ }
+ }
+ return result;
+ } finally {
+ readUnLock();
+ }
}
- public boolean tryWriteLock() {
- return compactionMergeLock.writeLock().tryLock();
+ /** get the TsFile list in sequence by time partition */
+ public List<TsFileResource> getTsFileListByTimePartition(boolean sequence, long timePartition) {
+ readLock();
+ try {
+ List<TsFileResource> result = new ArrayList<>();
+ if (sequence) {
+ List<SortedSet<TsFileResource>> sequenceTsFileList =
+ sequenceTsFileResources.get(timePartition);
+ for (int i = sequenceTsFileList.size() - 1; i >= 0; i--) {
+ result.addAll(sequenceTsFileList.get(i));
+ }
+ } else {
+ List<List<TsFileResource>> unSequenceTsFileList =
+ unSequenceTsFileResources.get(timePartition);
+ for (int i = unSequenceTsFileList.size() - 1; i >= 0; i--) {
+ result.addAll(unSequenceTsFileList.get(i));
+ }
+ }
+ return result;
+ } finally {
+ readUnLock();
+ }
}
- protected abstract void merge(long timePartition);
-
- public class CompactionMergeTask implements Callable<Void> {
-
- private CloseCompactionMergeCallBack closeCompactionMergeCallBack;
- private long timePartitionId;
-
- public CompactionMergeTask(
- CloseCompactionMergeCallBack closeCompactionMergeCallBack, long timePartitionId) {
- this.closeCompactionMergeCallBack = closeCompactionMergeCallBack;
- this.timePartitionId = timePartitionId;
+ /** get the TsFile list iterator in sequence */
+ public Iterator<TsFileResource> getIterator(boolean sequence) {
+ readLock();
+ try {
+ return getTsFileList(sequence).iterator();
+ } finally {
+ readUnLock();
}
+ }
- @Override
- public Void call() {
- merge(timePartitionId);
- closeCompactionMergeCallBack.call(isMergeExecutedInCurrentTask, timePartitionId);
- return null;
+ /** remove one TsFile from list */
+ public void remove(TsFileResource tsFileResource, boolean sequence) {
+ writeLock();
+ try {
+ if (sequence) {
+ for (SortedSet<TsFileResource> sequenceTsFileResource :
+ sequenceTsFileResources.get(tsFileResource.getTimePartition())) {
+ sequenceTsFileResource.remove(tsFileResource);
+ }
+ } else {
+ for (List<TsFileResource> unSequenceTsFileResource :
+ unSequenceTsFileResources.get(tsFileResource.getTimePartition())) {
+ unSequenceTsFileResource.remove(tsFileResource);
+ }
+ }
+ } finally {
+ writeUnlock();
}
}
- public class LevelCompactionRecoverTask implements Callable<Void> {
-
- private CloseCompactionMergeCallBack closeCompactionMergeCallBack;
-
- public LevelCompactionRecoverTask(CloseCompactionMergeCallBack closeCompactionMergeCallBack) {
- this.closeCompactionMergeCallBack = closeCompactionMergeCallBack;
+ /** remove some TsFiles from list */
+ public void removeAll(List<TsFileResource> tsFileResourceList, boolean sequence) {
+ writeLock();
+ try {
+ if (sequence) {
+ for (List<SortedSet<TsFileResource>> partitionSequenceTsFileResource :
+ sequenceTsFileResources.values()) {
+ for (SortedSet<TsFileResource> levelTsFileResource : partitionSequenceTsFileResource) {
+ levelTsFileResource.removeAll(tsFileResourceList);
+ }
+ }
+ } else {
+ for (List<List<TsFileResource>> partitionUnSequenceTsFileResource :
+ unSequenceTsFileResources.values()) {
+ for (List<TsFileResource> levelTsFileResource : partitionUnSequenceTsFileResource) {
+ levelTsFileResource.removeAll(tsFileResourceList);
+ }
+ }
+ }
+ } finally {
+ writeUnlock();
}
+ }
- @Override
- public Void call() {
- recover();
- // in recover logic, we do not have to start next compaction task, and in this case the param
- // time partition is useless, we can just pass 0L
- closeCompactionMergeCallBack.call(false, 0L);
- return null;
+ /** add one TsFile to list */
+ public void add(TsFileResource tsFileResource, boolean sequence) {
+ writeLock();
+ try {
+ long timePartitionId = tsFileResource.getTimePartition();
+ int level = getMergeLevel(tsFileResource.getTsFile());
+ if (sequence) {
+ if (level <= seqLevelNum - 1) {
+ // current file has normal level
+ sequenceTsFileResources
+ .computeIfAbsent(timePartitionId, this::newSequenceTsFileResources)
+ .get(level)
+ .add(tsFileResource);
+ } else {
+ // current file has too high level
+ sequenceTsFileResources
+ .computeIfAbsent(timePartitionId, this::newSequenceTsFileResources)
+ .get(seqLevelNum - 1)
+ .add(tsFileResource);
+ }
+ } else {
+ if (level <= unseqLevelNum - 1) {
+ // current file has normal level
+ unSequenceTsFileResources
+ .computeIfAbsent(timePartitionId, this::newUnSequenceTsFileResources)
+ .get(level)
+ .add(tsFileResource);
+ } else {
+ // current file has too high level
+ unSequenceTsFileResources
+ .computeIfAbsent(timePartitionId, this::newUnSequenceTsFileResources)
+ .get(unseqLevelNum - 1)
+ .add(tsFileResource);
+ }
+ }
+ } finally {
+ writeUnlock();
}
}
- protected void doUnseqMerge(
- boolean fullMerge,
- List<TsFileResource> seqMergeList,
- List<TsFileResource> unSeqMergeList) {
-
- if (seqMergeList.isEmpty() || unSeqMergeList.isEmpty()) {
- logger.info("{} no files to be merged, seqFiles={}, unseqFiles={}",
- storageGroupName, seqMergeList.size(), unSeqMergeList.size());
- return;
+ /** add one TsFile to list for recover */
+ public void addRecover(TsFileResource tsFileResource, boolean sequence) {
+ if (sequence) {
+ sequenceRecoverTsFileResources.add(tsFileResource);
+ } else {
+ unSequenceRecoverTsFileResources.add(tsFileResource);
}
+ }
- // the number of unseq files in one merge should not exceed maxOpenFileNumInEachUnseqCompaction
- if (unSeqMergeList.size() > maxOpenFileNumInEachUnseqCompaction) {
- unSeqMergeList = unSeqMergeList.subList(0, maxOpenFileNumInEachUnseqCompaction);
+ /** add some TsFiles to list */
+ public void addAll(List<TsFileResource> tsFileResourceList, boolean sequence) {
+ writeLock();
+ try {
+ for (TsFileResource tsFileResource : tsFileResourceList) {
+ add(tsFileResource, sequence);
+ }
+ } finally {
+ writeUnlock();
}
+ }
- long timeLowerBound = System.currentTimeMillis() - IoTDBDescriptor.getInstance().getConfig().getDefaultTTL();
- MergeResource mergeResource = new MergeResource(seqMergeList, unSeqMergeList, timeLowerBound);
-
- IMergeFileSelector fileSelector = getMergeFileSelector(mergeResource);
+ /** is one TsFile contained in list */
+ public boolean contains(TsFileResource tsFileResource, boolean sequence) {
+ readLock();
try {
- List[] mergeFiles = fileSelector.select();
- if (mergeFiles.length == 0) {
- logger.info(
- "{} cannot select merge candidates under the budget {}",
- storageGroupName, IoTDBDescriptor.getInstance().getConfig().getMergeMemoryBudget());
- return;
+ if (sequence) {
+ for (SortedSet<TsFileResource> sequenceTsFileResource :
+ sequenceTsFileResources.computeIfAbsent(
+ tsFileResource.getTimePartition(), this::newSequenceTsFileResources)) {
+ if (sequenceTsFileResource.contains(tsFileResource)) {
+ return true;
+ }
+ }
+ } else {
+ for (List<TsFileResource> unSequenceTsFileResource :
+ unSequenceTsFileResources.computeIfAbsent(
+ tsFileResource.getTimePartition(), this::newUnSequenceTsFileResources)) {
+ if (unSequenceTsFileResource.contains(tsFileResource)) {
+ return true;
+ }
+ }
}
-
- mergeResource.startMerging();
-
- MergeTask mergeTask =
- new MergeTask(
- mergeResource,
- storageGroupDir,
- this::mergeEndAction,
- fullMerge,
- fileSelector.getConcurrentMergeNum(),
- storageGroupName);
-
- mergingModification =
- new ModificationFile(storageGroupDir + File.separator + MERGING_MODIFICATION_FILE_NAME);
-
- logger.info(
- "{} start merge {} seqFiles, {} unseqFiles", storageGroupName,
- mergeFiles[0].size(),
- mergeFiles[1].size());
-
- mergeTask.doMerge();
-
- } catch (Exception e) {
- logger.error("{} cannot select file for merge", storageGroupName, e);
+ return false;
+ } finally {
+ readUnLock();
}
}
- private IMergeFileSelector getMergeFileSelector(MergeResource resource) {
- long budget = IoTDBDescriptor.getInstance().getConfig().getMergeMemoryBudget();
- MergeFileStrategy strategy = IoTDBDescriptor.getInstance().getConfig().getMergeFileStrategy();
- switch (strategy) {
- case MAX_FILE_NUM:
- return new MaxFileMergeFileSelector(resource, budget);
- case MAX_SERIES_NUM:
- return new MaxSeriesMergeFileSelector(resource, budget);
- default:
- throw new UnsupportedOperationException("Unknown MergeFileStrategy " + strategy);
+ /** clear list */
+ public void clear() {
+ writeLock();
+ try {
+ sequenceTsFileResources.clear();
+ unSequenceTsFileResources.clear();
+ } finally {
+ writeUnlock();
}
}
- /** acquire the write locks of the resource , the merge lock and the compaction lock */
- private void doubleWriteLock(TsFileResource seqFile) {
- boolean fileLockGot;
- boolean compactionLockGot;
- while (true) {
- fileLockGot = seqFile.tryWriteLock();
- compactionLockGot = tryWriteLock();
-
- if (fileLockGot && compactionLockGot) {
- break;
- } else {
- // did not get all of them, release the gotten one and retry
- if (compactionLockGot) {
- writeUnlock();
+ /** is the list empty */
+ @SuppressWarnings("squid:S3776")
+ public boolean isEmpty(boolean sequence) {
+ readLock();
+ try {
+ if (sequence) {
+ for (List<SortedSet<TsFileResource>> partitionSequenceTsFileResource :
+ sequenceTsFileResources.values()) {
+ for (SortedSet<TsFileResource> sequenceTsFileResource : partitionSequenceTsFileResource) {
+ if (!sequenceTsFileResource.isEmpty()) {
+ return false;
+ }
+ }
}
- if (fileLockGot) {
- seqFile.writeUnlock();
+ } else {
+ for (List<List<TsFileResource>> partitionUnSequenceTsFileResource :
+ unSequenceTsFileResources.values()) {
+ for (List<TsFileResource> unSequenceTsFileResource : partitionUnSequenceTsFileResource) {
+ if (!unSequenceTsFileResource.isEmpty()) {
+ return false;
+ }
+ }
}
}
+ return true;
+ } finally {
+ readUnLock();
}
}
- /** release the write locks of the resource , the merge lock and the compaction lock */
- private void doubleWriteUnlock(TsFileResource seqFile) {
- writeUnlock();
- seqFile.writeUnlock();
- }
-
- private void removeUnseqFiles(List<TsFileResource> unseqFiles) {
- writeLock();
+ /** return TsFile list size */
+ public int size(boolean sequence) {
+ readLock();
try {
- removeAll(unseqFiles, false);
- // clean cache
- if (IoTDBDescriptor.getInstance().getConfig().isMetaDataCacheEnable()) {
- ChunkCache.getInstance().clear();
- TimeSeriesMetadataCache.getInstance().clear();
+ int result = 0;
+ if (sequence) {
+ for (List<SortedSet<TsFileResource>> partitionSequenceTsFileResource :
+ sequenceTsFileResources.values()) {
+ for (int i = seqLevelNum - 1; i >= 0; i--) {
+ result += partitionSequenceTsFileResource.get(i).size();
+ }
+ }
+ } else {
+ for (List<List<TsFileResource>> partitionUnSequenceTsFileResource :
+ unSequenceTsFileResources.values()) {
+ for (int i = unseqLevelNum - 1; i >= 0; i--) {
+ result += partitionUnSequenceTsFileResource.get(i).size();
+ }
+ }
}
+ return result;
} finally {
- writeUnlock();
+ readUnLock();
}
+ }
- for (TsFileResource unseqFile : unseqFiles) {
- unseqFile.writeLock();
- try {
- unseqFile.remove();
- } finally {
- unseqFile.writeUnlock();
- }
+ public void deleteLevelFilesInDisk(Collection<TsFileResource> mergeTsFiles) {
+ logger.debug("{} [compaction] merge starts to delete real file", storageGroupName);
+ for (TsFileResource mergeTsFile : mergeTsFiles) {
+ deleteLevelFile(mergeTsFile);
+ logger.info(
+ "{} [Compaction] delete TsFile {}", storageGroupName, mergeTsFile.getTsFilePath());
}
}
- @SuppressWarnings("squid:S1141")
- private void updateMergeModification(TsFileResource seqFile) {
- try {
- // remove old modifications and write modifications generated during merge
- seqFile.removeModFile();
- if (mergingModification != null) {
- for (Modification modification : mergingModification.getModifications()) {
- // we have to set modification offset to MAX_VALUE, as the offset of source chunk may
- // change after compaction
- modification.setFileOffset(Long.MAX_VALUE);
- seqFile.getModFile().write(modification);
+ public void deleteLevelFilesInList(
+ long timePartitionId, Collection<TsFileResource> mergeTsFiles, int level, boolean sequence) {
+ logger.debug("{} [compaction] merge starts to delete file list", storageGroupName);
+ if (sequence) {
+ if (sequenceTsFileResources.containsKey(timePartitionId)) {
+ if (sequenceTsFileResources.get(timePartitionId).size() > level) {
+ sequenceTsFileResources.get(timePartitionId).get(level).removeAll(mergeTsFiles);
}
- try {
- seqFile.getModFile().close();
- } catch (IOException e) {
- logger.error(
- "Cannot close the ModificationFile {}", seqFile.getModFile().getFilePath(), e);
+ }
+ } else {
+ if (unSequenceTsFileResources.containsKey(timePartitionId)) {
+ if (unSequenceTsFileResources.get(timePartitionId).size() > level) {
+ unSequenceTsFileResources.get(timePartitionId).get(level).removeAll(mergeTsFiles);
}
}
- } catch (IOException e) {
- logger.error(
- "{} cannot clean the ModificationFile of {} after merge",
- storageGroupName,
- seqFile.getTsFile(),
- e);
}
}
- private void removeMergingModification() {
+ private void deleteLevelFile(TsFileResource seqFile) {
+ seqFile.writeLock();
try {
- if (mergingModification != null) {
- mergingModification.remove();
- mergingModification = null;
- }
+ ChunkCache.getInstance().clear();
+ TimeSeriesMetadataCache.getInstance().clear();
+ FileReaderManager.getInstance().closeFileAndRemoveReader(seqFile.getTsFilePath());
+ seqFile.setDeleted(true);
+ seqFile.delete();
} catch (IOException e) {
- logger.error("{} cannot remove merging modification ", storageGroupName, e);
+ logger.error(e.getMessage(), e);
+ } finally {
+ seqFile.writeUnlock();
}
}
- public void mergeEndAction(
- List<TsFileResource> seqFiles, List<TsFileResource> unseqFiles, File mergeLog) {
- logger.info("{} a merge task is ending...", storageGroupName);
+ public static int getMergeLevel(File file) {
+ String mergeLevelStr =
+ file.getPath()
+ .substring(file.getPath().lastIndexOf(FILE_NAME_SEPARATOR) + 1)
+ .replaceAll(TSFILE_SUFFIX, "");
+ return Integer.parseInt(mergeLevelStr);
+ }
- if (Thread.currentThread().isInterrupted() || unseqFiles.isEmpty()) {
- // merge task abort, or merge runtime exception arose, just end this merge
- logger.info("{} a merge task abnormally ends", storageGroupName);
- return;
+ private List<SortedSet<TsFileResource>> newSequenceTsFileResources(Long k) {
+ List<SortedSet<TsFileResource>> newSequenceTsFileResources = new ArrayList<>();
+ for (int i = 0; i < seqLevelNum; i++) {
+ newSequenceTsFileResources.add(
+ new TreeSet<>(
+ (o1, o2) -> {
+ try {
+ int rangeCompare =
+ Long.compare(
+ Long.parseLong(o1.getTsFile().getParentFile().getName()),
Review comment:
I doubt the rangeCompare of the parentFile,as the current file dir is like sgName/timepartition/virtualSG
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] EJTTianYu commented on a change in pull request #3305: Clear compaction code
Posted by GitBox <gi...@apache.org>.
EJTTianYu commented on a change in pull request #3305:
URL: https://github.com/apache/iotdb/pull/3305#discussion_r643604634
##########
File path: server/src/main/java/org/apache/iotdb/db/engine/compaction/TsFileManagement.java
##########
@@ -66,325 +62,464 @@
*/
public ModificationFile mergingModification;
- /** whether execute merge chunk in this task */
- protected boolean isMergeExecutedInCurrentTask = false;
+ // First map is partition list; Second list is level list; Third list is file list in level;
+ private final Map<Long, List<SortedSet<TsFileResource>>> sequenceTsFileResources =
+ new HashMap<>();
+ private final Map<Long, List<List<TsFileResource>>> unSequenceTsFileResources = new HashMap<>();
- protected boolean isForceFullMerge = IoTDBDescriptor.getInstance().getConfig().isFullMerge();
- private final int maxOpenFileNumInEachUnseqCompaction =
- IoTDBDescriptor.getInstance().getConfig().getMaxOpenFileNumInEachUnseqCompaction();
+ private final List<TsFileResource> sequenceRecoverTsFileResources = new ArrayList<>();
+ private final List<TsFileResource> unSequenceRecoverTsFileResources = new ArrayList<>();
+
+ private final int seqLevelNum =
+ Math.max(IoTDBDescriptor.getInstance().getConfig().getSeqLevelNum(), 1);
+ private final int unseqLevelNum =
+ Math.max(IoTDBDescriptor.getInstance().getConfig().getUnseqLevelNum(), 1);
public TsFileManagement(String storageGroupName, String storageGroupDir) {
this.storageGroupName = storageGroupName;
this.storageGroupDir = storageGroupDir;
}
- public void setFullMerge(boolean forceFullMerge) {
- isForceFullMerge = forceFullMerge;
+ public Pair<List<List<TsFileResource>>, List<List<TsFileResource>>> forkCurrentFileList(
+ long timePartition) {
+ readLock();
+ List<List<TsFileResource>> forkedSeqTsFileResources = new ArrayList<>();
+ List<List<TsFileResource>> forkedUnseqTsFileResources = new ArrayList<>();
+ try {
+ forkTsFileList(
+ forkedSeqTsFileResources,
+ sequenceTsFileResources.computeIfAbsent(timePartition, this::newSequenceTsFileResources),
+ seqLevelNum);
+ forkTsFileList(
+ forkedUnseqTsFileResources,
+ unSequenceTsFileResources.computeIfAbsent(
+ timePartition, this::newUnSequenceTsFileResources),
+ unseqLevelNum);
+ return new Pair<>(forkedSeqTsFileResources, forkedUnseqTsFileResources);
+ } finally {
+ readUnLock();
+ }
+ }
+
+ private void forkTsFileList(
+ List<List<TsFileResource>> forkedTsFileResources, List rawTsFileResources, int currMaxLevel) {
+ for (int i = 0; i < currMaxLevel; i++) {
+ List<TsFileResource> forkedLevelTsFileResources = new ArrayList<>();
+ Collection<TsFileResource> levelRawTsFileResources =
+ (Collection<TsFileResource>) rawTsFileResources.get(i);
+ for (TsFileResource tsFileResource : levelRawTsFileResources) {
+ if (tsFileResource.isClosed()) {
+ forkedLevelTsFileResources.add(tsFileResource);
+ }
+ }
+ forkedTsFileResources.add(forkedLevelTsFileResources);
+ }
}
/**
* get the TsFile list in sequence, not recommend to use this method, use
* getTsFileListByTimePartition instead
*/
@Deprecated
- public abstract List<TsFileResource> getTsFileList(boolean sequence);
-
- /** get the TsFile list in sequence by time partition */
- public abstract List<TsFileResource> getTsFileListByTimePartition(
- boolean sequence, long timePartition);
-
- /** get the TsFile list iterator in sequence */
- public abstract Iterator<TsFileResource> getIterator(boolean sequence);
-
- /** remove one TsFile from list */
- public abstract void remove(TsFileResource tsFileResource, boolean sequence);
-
- /** remove some TsFiles from list */
- public abstract void removeAll(List<TsFileResource> tsFileResourceList, boolean sequence);
-
- /** add one TsFile to list */
- public abstract void add(TsFileResource tsFileResource, boolean sequence);
-
- /** add one TsFile to list for recover */
- public abstract void addRecover(TsFileResource tsFileResource, boolean sequence);
-
- /** add some TsFiles to list */
- public abstract void addAll(List<TsFileResource> tsFileResourceList, boolean sequence);
-
- /** is one TsFile contained in list */
- public abstract boolean contains(TsFileResource tsFileResource, boolean sequence);
-
- /** clear list */
- public abstract void clear();
-
- /** is the list empty */
- public abstract boolean isEmpty(boolean sequence);
-
- /** return TsFile list size */
- public abstract int size(boolean sequence);
-
- /** recover TsFile list */
- public abstract void recover();
-
- /** fork current TsFile list (call this before merge) */
- public abstract void forkCurrentFileList(long timePartition) throws IOException;
-
- protected void readLock() {
- compactionMergeLock.readLock().lock();
- }
-
- protected void readUnLock() {
- compactionMergeLock.readLock().unlock();
- }
-
- public void writeLock() {
- compactionMergeLock.writeLock().lock();
- }
-
- public void writeUnlock() {
- compactionMergeLock.writeLock().unlock();
+ public List<TsFileResource> getTsFileList(boolean sequence) {
+ readLock();
+ try {
+ List<TsFileResource> result = new ArrayList<>();
+ if (sequence) {
+ for (long timePartition : sequenceTsFileResources.keySet()) {
+ result.addAll(getTsFileListByTimePartition(true, timePartition));
+ }
+ } else {
+ for (long timePartition : unSequenceTsFileResources.keySet()) {
+ result.addAll(getTsFileListByTimePartition(false, timePartition));
+ }
+ }
+ return result;
+ } finally {
+ readUnLock();
+ }
}
- public boolean tryWriteLock() {
- return compactionMergeLock.writeLock().tryLock();
+ /** get the TsFile list in sequence by time partition */
+ public List<TsFileResource> getTsFileListByTimePartition(boolean sequence, long timePartition) {
+ readLock();
+ try {
+ List<TsFileResource> result = new ArrayList<>();
+ if (sequence) {
+ List<SortedSet<TsFileResource>> sequenceTsFileList =
+ sequenceTsFileResources.get(timePartition);
+ for (int i = sequenceTsFileList.size() - 1; i >= 0; i--) {
+ result.addAll(sequenceTsFileList.get(i));
+ }
+ } else {
+ List<List<TsFileResource>> unSequenceTsFileList =
+ unSequenceTsFileResources.get(timePartition);
+ for (int i = unSequenceTsFileList.size() - 1; i >= 0; i--) {
+ result.addAll(unSequenceTsFileList.get(i));
+ }
+ }
+ return result;
+ } finally {
+ readUnLock();
+ }
}
- protected abstract void merge(long timePartition);
-
- public class CompactionMergeTask implements Callable<Void> {
-
- private CloseCompactionMergeCallBack closeCompactionMergeCallBack;
- private long timePartitionId;
-
- public CompactionMergeTask(
- CloseCompactionMergeCallBack closeCompactionMergeCallBack, long timePartitionId) {
- this.closeCompactionMergeCallBack = closeCompactionMergeCallBack;
- this.timePartitionId = timePartitionId;
+ /** get the TsFile list iterator in sequence */
+ public Iterator<TsFileResource> getIterator(boolean sequence) {
+ readLock();
+ try {
+ return getTsFileList(sequence).iterator();
+ } finally {
+ readUnLock();
}
+ }
- @Override
- public Void call() {
- merge(timePartitionId);
- closeCompactionMergeCallBack.call(isMergeExecutedInCurrentTask, timePartitionId);
- return null;
+ /** remove one TsFile from list */
+ public void remove(TsFileResource tsFileResource, boolean sequence) {
+ writeLock();
+ try {
+ if (sequence) {
+ for (SortedSet<TsFileResource> sequenceTsFileResource :
+ sequenceTsFileResources.get(tsFileResource.getTimePartition())) {
+ sequenceTsFileResource.remove(tsFileResource);
+ }
+ } else {
+ for (List<TsFileResource> unSequenceTsFileResource :
+ unSequenceTsFileResources.get(tsFileResource.getTimePartition())) {
+ unSequenceTsFileResource.remove(tsFileResource);
+ }
+ }
+ } finally {
+ writeUnlock();
}
}
- public class LevelCompactionRecoverTask implements Callable<Void> {
-
- private CloseCompactionMergeCallBack closeCompactionMergeCallBack;
-
- public LevelCompactionRecoverTask(CloseCompactionMergeCallBack closeCompactionMergeCallBack) {
- this.closeCompactionMergeCallBack = closeCompactionMergeCallBack;
+ /** remove some TsFiles from list */
+ public void removeAll(List<TsFileResource> tsFileResourceList, boolean sequence) {
+ writeLock();
+ try {
+ if (sequence) {
+ for (List<SortedSet<TsFileResource>> partitionSequenceTsFileResource :
+ sequenceTsFileResources.values()) {
+ for (SortedSet<TsFileResource> levelTsFileResource : partitionSequenceTsFileResource) {
+ levelTsFileResource.removeAll(tsFileResourceList);
+ }
+ }
+ } else {
+ for (List<List<TsFileResource>> partitionUnSequenceTsFileResource :
+ unSequenceTsFileResources.values()) {
+ for (List<TsFileResource> levelTsFileResource : partitionUnSequenceTsFileResource) {
+ levelTsFileResource.removeAll(tsFileResourceList);
+ }
+ }
+ }
+ } finally {
+ writeUnlock();
}
+ }
- @Override
- public Void call() {
- recover();
- // in recover logic, we do not have to start next compaction task, and in this case the param
- // time partition is useless, we can just pass 0L
- closeCompactionMergeCallBack.call(false, 0L);
- return null;
+ /** add one TsFile to list */
+ public void add(TsFileResource tsFileResource, boolean sequence) {
+ writeLock();
+ try {
+ long timePartitionId = tsFileResource.getTimePartition();
+ int level = getMergeLevel(tsFileResource.getTsFile());
+ if (sequence) {
+ if (level <= seqLevelNum - 1) {
+ // current file has normal level
+ sequenceTsFileResources
+ .computeIfAbsent(timePartitionId, this::newSequenceTsFileResources)
+ .get(level)
+ .add(tsFileResource);
+ } else {
+ // current file has too high level
+ sequenceTsFileResources
+ .computeIfAbsent(timePartitionId, this::newSequenceTsFileResources)
+ .get(seqLevelNum - 1)
+ .add(tsFileResource);
+ }
+ } else {
+ if (level <= unseqLevelNum - 1) {
+ // current file has normal level
+ unSequenceTsFileResources
+ .computeIfAbsent(timePartitionId, this::newUnSequenceTsFileResources)
+ .get(level)
+ .add(tsFileResource);
+ } else {
+ // current file has too high level
+ unSequenceTsFileResources
+ .computeIfAbsent(timePartitionId, this::newUnSequenceTsFileResources)
+ .get(unseqLevelNum - 1)
+ .add(tsFileResource);
+ }
+ }
+ } finally {
+ writeUnlock();
}
}
- protected void doUnseqMerge(
- boolean fullMerge,
- List<TsFileResource> seqMergeList,
- List<TsFileResource> unSeqMergeList) {
-
- if (seqMergeList.isEmpty() || unSeqMergeList.isEmpty()) {
- logger.info("{} no files to be merged, seqFiles={}, unseqFiles={}",
- storageGroupName, seqMergeList.size(), unSeqMergeList.size());
- return;
+ /** add one TsFile to list for recover */
+ public void addRecover(TsFileResource tsFileResource, boolean sequence) {
+ if (sequence) {
+ sequenceRecoverTsFileResources.add(tsFileResource);
+ } else {
+ unSequenceRecoverTsFileResources.add(tsFileResource);
}
+ }
- // the number of unseq files in one merge should not exceed maxOpenFileNumInEachUnseqCompaction
- if (unSeqMergeList.size() > maxOpenFileNumInEachUnseqCompaction) {
- unSeqMergeList = unSeqMergeList.subList(0, maxOpenFileNumInEachUnseqCompaction);
+ /** add some TsFiles to list */
+ public void addAll(List<TsFileResource> tsFileResourceList, boolean sequence) {
+ writeLock();
+ try {
+ for (TsFileResource tsFileResource : tsFileResourceList) {
+ add(tsFileResource, sequence);
+ }
+ } finally {
+ writeUnlock();
}
+ }
- long timeLowerBound = System.currentTimeMillis() - IoTDBDescriptor.getInstance().getConfig().getDefaultTTL();
- MergeResource mergeResource = new MergeResource(seqMergeList, unSeqMergeList, timeLowerBound);
-
- IMergeFileSelector fileSelector = getMergeFileSelector(mergeResource);
+ /** is one TsFile contained in list */
+ public boolean contains(TsFileResource tsFileResource, boolean sequence) {
+ readLock();
try {
- List[] mergeFiles = fileSelector.select();
- if (mergeFiles.length == 0) {
- logger.info(
- "{} cannot select merge candidates under the budget {}",
- storageGroupName, IoTDBDescriptor.getInstance().getConfig().getMergeMemoryBudget());
- return;
+ if (sequence) {
+ for (SortedSet<TsFileResource> sequenceTsFileResource :
+ sequenceTsFileResources.computeIfAbsent(
+ tsFileResource.getTimePartition(), this::newSequenceTsFileResources)) {
+ if (sequenceTsFileResource.contains(tsFileResource)) {
+ return true;
+ }
+ }
+ } else {
+ for (List<TsFileResource> unSequenceTsFileResource :
+ unSequenceTsFileResources.computeIfAbsent(
+ tsFileResource.getTimePartition(), this::newUnSequenceTsFileResources)) {
+ if (unSequenceTsFileResource.contains(tsFileResource)) {
+ return true;
+ }
+ }
}
-
- mergeResource.startMerging();
-
- MergeTask mergeTask =
- new MergeTask(
- mergeResource,
- storageGroupDir,
- this::mergeEndAction,
- fullMerge,
- fileSelector.getConcurrentMergeNum(),
- storageGroupName);
-
- mergingModification =
- new ModificationFile(storageGroupDir + File.separator + MERGING_MODIFICATION_FILE_NAME);
-
- logger.info(
- "{} start merge {} seqFiles, {} unseqFiles", storageGroupName,
- mergeFiles[0].size(),
- mergeFiles[1].size());
-
- mergeTask.doMerge();
-
- } catch (Exception e) {
- logger.error("{} cannot select file for merge", storageGroupName, e);
+ return false;
+ } finally {
+ readUnLock();
}
}
- private IMergeFileSelector getMergeFileSelector(MergeResource resource) {
- long budget = IoTDBDescriptor.getInstance().getConfig().getMergeMemoryBudget();
- MergeFileStrategy strategy = IoTDBDescriptor.getInstance().getConfig().getMergeFileStrategy();
- switch (strategy) {
- case MAX_FILE_NUM:
- return new MaxFileMergeFileSelector(resource, budget);
- case MAX_SERIES_NUM:
- return new MaxSeriesMergeFileSelector(resource, budget);
- default:
- throw new UnsupportedOperationException("Unknown MergeFileStrategy " + strategy);
+ /** clear list */
+ public void clear() {
+ writeLock();
+ try {
+ sequenceTsFileResources.clear();
+ unSequenceTsFileResources.clear();
+ } finally {
+ writeUnlock();
}
}
- /** acquire the write locks of the resource , the merge lock and the compaction lock */
- private void doubleWriteLock(TsFileResource seqFile) {
- boolean fileLockGot;
- boolean compactionLockGot;
- while (true) {
- fileLockGot = seqFile.tryWriteLock();
- compactionLockGot = tryWriteLock();
-
- if (fileLockGot && compactionLockGot) {
- break;
- } else {
- // did not get all of them, release the gotten one and retry
- if (compactionLockGot) {
- writeUnlock();
+ /** is the list empty */
+ @SuppressWarnings("squid:S3776")
+ public boolean isEmpty(boolean sequence) {
+ readLock();
+ try {
+ if (sequence) {
+ for (List<SortedSet<TsFileResource>> partitionSequenceTsFileResource :
+ sequenceTsFileResources.values()) {
+ for (SortedSet<TsFileResource> sequenceTsFileResource : partitionSequenceTsFileResource) {
+ if (!sequenceTsFileResource.isEmpty()) {
+ return false;
+ }
+ }
}
- if (fileLockGot) {
- seqFile.writeUnlock();
+ } else {
+ for (List<List<TsFileResource>> partitionUnSequenceTsFileResource :
+ unSequenceTsFileResources.values()) {
+ for (List<TsFileResource> unSequenceTsFileResource : partitionUnSequenceTsFileResource) {
+ if (!unSequenceTsFileResource.isEmpty()) {
+ return false;
+ }
+ }
}
}
+ return true;
+ } finally {
+ readUnLock();
}
}
- /** release the write locks of the resource , the merge lock and the compaction lock */
- private void doubleWriteUnlock(TsFileResource seqFile) {
- writeUnlock();
- seqFile.writeUnlock();
- }
-
- private void removeUnseqFiles(List<TsFileResource> unseqFiles) {
- writeLock();
+ /** return TsFile list size */
+ public int size(boolean sequence) {
+ readLock();
try {
- removeAll(unseqFiles, false);
- // clean cache
- if (IoTDBDescriptor.getInstance().getConfig().isMetaDataCacheEnable()) {
- ChunkCache.getInstance().clear();
- TimeSeriesMetadataCache.getInstance().clear();
+ int result = 0;
+ if (sequence) {
+ for (List<SortedSet<TsFileResource>> partitionSequenceTsFileResource :
+ sequenceTsFileResources.values()) {
+ for (int i = seqLevelNum - 1; i >= 0; i--) {
+ result += partitionSequenceTsFileResource.get(i).size();
+ }
+ }
+ } else {
+ for (List<List<TsFileResource>> partitionUnSequenceTsFileResource :
+ unSequenceTsFileResources.values()) {
+ for (int i = unseqLevelNum - 1; i >= 0; i--) {
+ result += partitionUnSequenceTsFileResource.get(i).size();
+ }
+ }
}
+ return result;
} finally {
- writeUnlock();
+ readUnLock();
}
+ }
- for (TsFileResource unseqFile : unseqFiles) {
- unseqFile.writeLock();
- try {
- unseqFile.remove();
- } finally {
- unseqFile.writeUnlock();
- }
+ public void deleteLevelFilesInDisk(Collection<TsFileResource> mergeTsFiles) {
+ logger.debug("{} [compaction] merge starts to delete real file", storageGroupName);
+ for (TsFileResource mergeTsFile : mergeTsFiles) {
+ deleteLevelFile(mergeTsFile);
+ logger.info(
+ "{} [Compaction] delete TsFile {}", storageGroupName, mergeTsFile.getTsFilePath());
}
}
- @SuppressWarnings("squid:S1141")
- private void updateMergeModification(TsFileResource seqFile) {
- try {
- // remove old modifications and write modifications generated during merge
- seqFile.removeModFile();
- if (mergingModification != null) {
- for (Modification modification : mergingModification.getModifications()) {
- // we have to set modification offset to MAX_VALUE, as the offset of source chunk may
- // change after compaction
- modification.setFileOffset(Long.MAX_VALUE);
- seqFile.getModFile().write(modification);
+ public void deleteLevelFilesInList(
+ long timePartitionId, Collection<TsFileResource> mergeTsFiles, int level, boolean sequence) {
+ logger.debug("{} [compaction] merge starts to delete file list", storageGroupName);
+ if (sequence) {
+ if (sequenceTsFileResources.containsKey(timePartitionId)) {
+ if (sequenceTsFileResources.get(timePartitionId).size() > level) {
+ sequenceTsFileResources.get(timePartitionId).get(level).removeAll(mergeTsFiles);
}
- try {
- seqFile.getModFile().close();
- } catch (IOException e) {
- logger.error(
- "Cannot close the ModificationFile {}", seqFile.getModFile().getFilePath(), e);
+ }
+ } else {
+ if (unSequenceTsFileResources.containsKey(timePartitionId)) {
+ if (unSequenceTsFileResources.get(timePartitionId).size() > level) {
+ unSequenceTsFileResources.get(timePartitionId).get(level).removeAll(mergeTsFiles);
}
}
- } catch (IOException e) {
- logger.error(
- "{} cannot clean the ModificationFile of {} after merge",
- storageGroupName,
- seqFile.getTsFile(),
- e);
}
}
- private void removeMergingModification() {
+ private void deleteLevelFile(TsFileResource seqFile) {
+ seqFile.writeLock();
try {
- if (mergingModification != null) {
- mergingModification.remove();
- mergingModification = null;
- }
+ ChunkCache.getInstance().clear();
+ TimeSeriesMetadataCache.getInstance().clear();
+ FileReaderManager.getInstance().closeFileAndRemoveReader(seqFile.getTsFilePath());
+ seqFile.setDeleted(true);
+ seqFile.delete();
} catch (IOException e) {
- logger.error("{} cannot remove merging modification ", storageGroupName, e);
+ logger.error(e.getMessage(), e);
+ } finally {
+ seqFile.writeUnlock();
}
}
- public void mergeEndAction(
- List<TsFileResource> seqFiles, List<TsFileResource> unseqFiles, File mergeLog) {
- logger.info("{} a merge task is ending...", storageGroupName);
+ public static int getMergeLevel(File file) {
Review comment:
The current IoTDB data file format is as follows:timestamp-version-level-unseq merge cnt, is this the required merge level?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] EJTTianYu commented on a change in pull request #3305: Clear compaction code
Posted by GitBox <gi...@apache.org>.
EJTTianYu commented on a change in pull request #3305:
URL: https://github.com/apache/iotdb/pull/3305#discussion_r643605813
##########
File path: server/src/main/java/org/apache/iotdb/db/engine/compaction/TsFileManagement.java
##########
@@ -66,325 +62,464 @@
*/
public ModificationFile mergingModification;
- /** whether execute merge chunk in this task */
- protected boolean isMergeExecutedInCurrentTask = false;
+ // First map is partition list; Second list is level list; Third list is file list in level;
+ private final Map<Long, List<SortedSet<TsFileResource>>> sequenceTsFileResources =
+ new HashMap<>();
+ private final Map<Long, List<List<TsFileResource>>> unSequenceTsFileResources = new HashMap<>();
- protected boolean isForceFullMerge = IoTDBDescriptor.getInstance().getConfig().isFullMerge();
- private final int maxOpenFileNumInEachUnseqCompaction =
- IoTDBDescriptor.getInstance().getConfig().getMaxOpenFileNumInEachUnseqCompaction();
+ private final List<TsFileResource> sequenceRecoverTsFileResources = new ArrayList<>();
+ private final List<TsFileResource> unSequenceRecoverTsFileResources = new ArrayList<>();
+
+ private final int seqLevelNum =
+ Math.max(IoTDBDescriptor.getInstance().getConfig().getSeqLevelNum(), 1);
+ private final int unseqLevelNum =
+ Math.max(IoTDBDescriptor.getInstance().getConfig().getUnseqLevelNum(), 1);
public TsFileManagement(String storageGroupName, String storageGroupDir) {
this.storageGroupName = storageGroupName;
this.storageGroupDir = storageGroupDir;
}
- public void setFullMerge(boolean forceFullMerge) {
- isForceFullMerge = forceFullMerge;
+ public Pair<List<List<TsFileResource>>, List<List<TsFileResource>>> forkCurrentFileList(
+ long timePartition) {
+ readLock();
+ List<List<TsFileResource>> forkedSeqTsFileResources = new ArrayList<>();
+ List<List<TsFileResource>> forkedUnseqTsFileResources = new ArrayList<>();
+ try {
+ forkTsFileList(
+ forkedSeqTsFileResources,
+ sequenceTsFileResources.computeIfAbsent(timePartition, this::newSequenceTsFileResources),
+ seqLevelNum);
+ forkTsFileList(
+ forkedUnseqTsFileResources,
+ unSequenceTsFileResources.computeIfAbsent(
+ timePartition, this::newUnSequenceTsFileResources),
+ unseqLevelNum);
+ return new Pair<>(forkedSeqTsFileResources, forkedUnseqTsFileResources);
+ } finally {
+ readUnLock();
+ }
+ }
+
+ private void forkTsFileList(
+ List<List<TsFileResource>> forkedTsFileResources, List rawTsFileResources, int currMaxLevel) {
+ for (int i = 0; i < currMaxLevel; i++) {
+ List<TsFileResource> forkedLevelTsFileResources = new ArrayList<>();
+ Collection<TsFileResource> levelRawTsFileResources =
+ (Collection<TsFileResource>) rawTsFileResources.get(i);
+ for (TsFileResource tsFileResource : levelRawTsFileResources) {
+ if (tsFileResource.isClosed()) {
+ forkedLevelTsFileResources.add(tsFileResource);
+ }
+ }
+ forkedTsFileResources.add(forkedLevelTsFileResources);
+ }
}
/**
* get the TsFile list in sequence, not recommend to use this method, use
* getTsFileListByTimePartition instead
*/
@Deprecated
- public abstract List<TsFileResource> getTsFileList(boolean sequence);
-
- /** get the TsFile list in sequence by time partition */
- public abstract List<TsFileResource> getTsFileListByTimePartition(
- boolean sequence, long timePartition);
-
- /** get the TsFile list iterator in sequence */
- public abstract Iterator<TsFileResource> getIterator(boolean sequence);
-
- /** remove one TsFile from list */
- public abstract void remove(TsFileResource tsFileResource, boolean sequence);
-
- /** remove some TsFiles from list */
- public abstract void removeAll(List<TsFileResource> tsFileResourceList, boolean sequence);
-
- /** add one TsFile to list */
- public abstract void add(TsFileResource tsFileResource, boolean sequence);
-
- /** add one TsFile to list for recover */
- public abstract void addRecover(TsFileResource tsFileResource, boolean sequence);
-
- /** add some TsFiles to list */
- public abstract void addAll(List<TsFileResource> tsFileResourceList, boolean sequence);
-
- /** is one TsFile contained in list */
- public abstract boolean contains(TsFileResource tsFileResource, boolean sequence);
-
- /** clear list */
- public abstract void clear();
-
- /** is the list empty */
- public abstract boolean isEmpty(boolean sequence);
-
- /** return TsFile list size */
- public abstract int size(boolean sequence);
-
- /** recover TsFile list */
- public abstract void recover();
-
- /** fork current TsFile list (call this before merge) */
- public abstract void forkCurrentFileList(long timePartition) throws IOException;
-
- protected void readLock() {
- compactionMergeLock.readLock().lock();
- }
-
- protected void readUnLock() {
- compactionMergeLock.readLock().unlock();
- }
-
- public void writeLock() {
- compactionMergeLock.writeLock().lock();
- }
-
- public void writeUnlock() {
- compactionMergeLock.writeLock().unlock();
+ public List<TsFileResource> getTsFileList(boolean sequence) {
+ readLock();
+ try {
+ List<TsFileResource> result = new ArrayList<>();
+ if (sequence) {
+ for (long timePartition : sequenceTsFileResources.keySet()) {
+ result.addAll(getTsFileListByTimePartition(true, timePartition));
+ }
+ } else {
+ for (long timePartition : unSequenceTsFileResources.keySet()) {
+ result.addAll(getTsFileListByTimePartition(false, timePartition));
+ }
+ }
+ return result;
+ } finally {
+ readUnLock();
+ }
}
- public boolean tryWriteLock() {
- return compactionMergeLock.writeLock().tryLock();
+ /** get the TsFile list in sequence by time partition */
+ public List<TsFileResource> getTsFileListByTimePartition(boolean sequence, long timePartition) {
+ readLock();
+ try {
+ List<TsFileResource> result = new ArrayList<>();
+ if (sequence) {
+ List<SortedSet<TsFileResource>> sequenceTsFileList =
+ sequenceTsFileResources.get(timePartition);
+ for (int i = sequenceTsFileList.size() - 1; i >= 0; i--) {
+ result.addAll(sequenceTsFileList.get(i));
+ }
+ } else {
+ List<List<TsFileResource>> unSequenceTsFileList =
+ unSequenceTsFileResources.get(timePartition);
+ for (int i = unSequenceTsFileList.size() - 1; i >= 0; i--) {
+ result.addAll(unSequenceTsFileList.get(i));
+ }
+ }
+ return result;
+ } finally {
+ readUnLock();
+ }
}
- protected abstract void merge(long timePartition);
-
- public class CompactionMergeTask implements Callable<Void> {
-
- private CloseCompactionMergeCallBack closeCompactionMergeCallBack;
- private long timePartitionId;
-
- public CompactionMergeTask(
- CloseCompactionMergeCallBack closeCompactionMergeCallBack, long timePartitionId) {
- this.closeCompactionMergeCallBack = closeCompactionMergeCallBack;
- this.timePartitionId = timePartitionId;
+ /** get the TsFile list iterator in sequence */
+ public Iterator<TsFileResource> getIterator(boolean sequence) {
+ readLock();
+ try {
+ return getTsFileList(sequence).iterator();
+ } finally {
+ readUnLock();
}
+ }
- @Override
- public Void call() {
- merge(timePartitionId);
- closeCompactionMergeCallBack.call(isMergeExecutedInCurrentTask, timePartitionId);
- return null;
+ /** remove one TsFile from list */
+ public void remove(TsFileResource tsFileResource, boolean sequence) {
+ writeLock();
+ try {
+ if (sequence) {
+ for (SortedSet<TsFileResource> sequenceTsFileResource :
+ sequenceTsFileResources.get(tsFileResource.getTimePartition())) {
+ sequenceTsFileResource.remove(tsFileResource);
+ }
+ } else {
+ for (List<TsFileResource> unSequenceTsFileResource :
+ unSequenceTsFileResources.get(tsFileResource.getTimePartition())) {
+ unSequenceTsFileResource.remove(tsFileResource);
+ }
+ }
+ } finally {
+ writeUnlock();
}
}
- public class LevelCompactionRecoverTask implements Callable<Void> {
-
- private CloseCompactionMergeCallBack closeCompactionMergeCallBack;
-
- public LevelCompactionRecoverTask(CloseCompactionMergeCallBack closeCompactionMergeCallBack) {
- this.closeCompactionMergeCallBack = closeCompactionMergeCallBack;
+ /** remove some TsFiles from list */
+ public void removeAll(List<TsFileResource> tsFileResourceList, boolean sequence) {
+ writeLock();
+ try {
+ if (sequence) {
+ for (List<SortedSet<TsFileResource>> partitionSequenceTsFileResource :
+ sequenceTsFileResources.values()) {
+ for (SortedSet<TsFileResource> levelTsFileResource : partitionSequenceTsFileResource) {
+ levelTsFileResource.removeAll(tsFileResourceList);
+ }
+ }
+ } else {
+ for (List<List<TsFileResource>> partitionUnSequenceTsFileResource :
+ unSequenceTsFileResources.values()) {
+ for (List<TsFileResource> levelTsFileResource : partitionUnSequenceTsFileResource) {
+ levelTsFileResource.removeAll(tsFileResourceList);
+ }
+ }
+ }
+ } finally {
+ writeUnlock();
}
+ }
- @Override
- public Void call() {
- recover();
- // in recover logic, we do not have to start next compaction task, and in this case the param
- // time partition is useless, we can just pass 0L
- closeCompactionMergeCallBack.call(false, 0L);
- return null;
+ /** add one TsFile to list */
+ public void add(TsFileResource tsFileResource, boolean sequence) {
+ writeLock();
+ try {
+ long timePartitionId = tsFileResource.getTimePartition();
+ int level = getMergeLevel(tsFileResource.getTsFile());
+ if (sequence) {
+ if (level <= seqLevelNum - 1) {
+ // current file has normal level
+ sequenceTsFileResources
+ .computeIfAbsent(timePartitionId, this::newSequenceTsFileResources)
+ .get(level)
+ .add(tsFileResource);
+ } else {
+ // current file has too high level
+ sequenceTsFileResources
+ .computeIfAbsent(timePartitionId, this::newSequenceTsFileResources)
+ .get(seqLevelNum - 1)
+ .add(tsFileResource);
+ }
+ } else {
+ if (level <= unseqLevelNum - 1) {
+ // current file has normal level
+ unSequenceTsFileResources
+ .computeIfAbsent(timePartitionId, this::newUnSequenceTsFileResources)
+ .get(level)
+ .add(tsFileResource);
+ } else {
+ // current file has too high level
+ unSequenceTsFileResources
+ .computeIfAbsent(timePartitionId, this::newUnSequenceTsFileResources)
+ .get(unseqLevelNum - 1)
+ .add(tsFileResource);
+ }
+ }
+ } finally {
+ writeUnlock();
}
}
- protected void doUnseqMerge(
- boolean fullMerge,
- List<TsFileResource> seqMergeList,
- List<TsFileResource> unSeqMergeList) {
-
- if (seqMergeList.isEmpty() || unSeqMergeList.isEmpty()) {
- logger.info("{} no files to be merged, seqFiles={}, unseqFiles={}",
- storageGroupName, seqMergeList.size(), unSeqMergeList.size());
- return;
+ /** add one TsFile to list for recover */
+ public void addRecover(TsFileResource tsFileResource, boolean sequence) {
+ if (sequence) {
+ sequenceRecoverTsFileResources.add(tsFileResource);
+ } else {
+ unSequenceRecoverTsFileResources.add(tsFileResource);
}
+ }
- // the number of unseq files in one merge should not exceed maxOpenFileNumInEachUnseqCompaction
- if (unSeqMergeList.size() > maxOpenFileNumInEachUnseqCompaction) {
- unSeqMergeList = unSeqMergeList.subList(0, maxOpenFileNumInEachUnseqCompaction);
+ /** add some TsFiles to list */
+ public void addAll(List<TsFileResource> tsFileResourceList, boolean sequence) {
+ writeLock();
+ try {
+ for (TsFileResource tsFileResource : tsFileResourceList) {
+ add(tsFileResource, sequence);
+ }
+ } finally {
+ writeUnlock();
}
+ }
- long timeLowerBound = System.currentTimeMillis() - IoTDBDescriptor.getInstance().getConfig().getDefaultTTL();
- MergeResource mergeResource = new MergeResource(seqMergeList, unSeqMergeList, timeLowerBound);
-
- IMergeFileSelector fileSelector = getMergeFileSelector(mergeResource);
+ /** is one TsFile contained in list */
+ public boolean contains(TsFileResource tsFileResource, boolean sequence) {
+ readLock();
try {
- List[] mergeFiles = fileSelector.select();
- if (mergeFiles.length == 0) {
- logger.info(
- "{} cannot select merge candidates under the budget {}",
- storageGroupName, IoTDBDescriptor.getInstance().getConfig().getMergeMemoryBudget());
- return;
+ if (sequence) {
+ for (SortedSet<TsFileResource> sequenceTsFileResource :
+ sequenceTsFileResources.computeIfAbsent(
+ tsFileResource.getTimePartition(), this::newSequenceTsFileResources)) {
+ if (sequenceTsFileResource.contains(tsFileResource)) {
+ return true;
+ }
+ }
+ } else {
+ for (List<TsFileResource> unSequenceTsFileResource :
+ unSequenceTsFileResources.computeIfAbsent(
+ tsFileResource.getTimePartition(), this::newUnSequenceTsFileResources)) {
+ if (unSequenceTsFileResource.contains(tsFileResource)) {
+ return true;
+ }
+ }
}
-
- mergeResource.startMerging();
-
- MergeTask mergeTask =
- new MergeTask(
- mergeResource,
- storageGroupDir,
- this::mergeEndAction,
- fullMerge,
- fileSelector.getConcurrentMergeNum(),
- storageGroupName);
-
- mergingModification =
- new ModificationFile(storageGroupDir + File.separator + MERGING_MODIFICATION_FILE_NAME);
-
- logger.info(
- "{} start merge {} seqFiles, {} unseqFiles", storageGroupName,
- mergeFiles[0].size(),
- mergeFiles[1].size());
-
- mergeTask.doMerge();
-
- } catch (Exception e) {
- logger.error("{} cannot select file for merge", storageGroupName, e);
+ return false;
+ } finally {
+ readUnLock();
}
}
- private IMergeFileSelector getMergeFileSelector(MergeResource resource) {
- long budget = IoTDBDescriptor.getInstance().getConfig().getMergeMemoryBudget();
- MergeFileStrategy strategy = IoTDBDescriptor.getInstance().getConfig().getMergeFileStrategy();
- switch (strategy) {
- case MAX_FILE_NUM:
- return new MaxFileMergeFileSelector(resource, budget);
- case MAX_SERIES_NUM:
- return new MaxSeriesMergeFileSelector(resource, budget);
- default:
- throw new UnsupportedOperationException("Unknown MergeFileStrategy " + strategy);
+ /** clear list */
+ public void clear() {
+ writeLock();
+ try {
+ sequenceTsFileResources.clear();
+ unSequenceTsFileResources.clear();
+ } finally {
+ writeUnlock();
}
}
- /** acquire the write locks of the resource , the merge lock and the compaction lock */
- private void doubleWriteLock(TsFileResource seqFile) {
- boolean fileLockGot;
- boolean compactionLockGot;
- while (true) {
- fileLockGot = seqFile.tryWriteLock();
- compactionLockGot = tryWriteLock();
-
- if (fileLockGot && compactionLockGot) {
- break;
- } else {
- // did not get all of them, release the gotten one and retry
- if (compactionLockGot) {
- writeUnlock();
+ /** is the list empty */
+ @SuppressWarnings("squid:S3776")
+ public boolean isEmpty(boolean sequence) {
+ readLock();
+ try {
+ if (sequence) {
+ for (List<SortedSet<TsFileResource>> partitionSequenceTsFileResource :
+ sequenceTsFileResources.values()) {
+ for (SortedSet<TsFileResource> sequenceTsFileResource : partitionSequenceTsFileResource) {
+ if (!sequenceTsFileResource.isEmpty()) {
+ return false;
+ }
+ }
}
- if (fileLockGot) {
- seqFile.writeUnlock();
+ } else {
+ for (List<List<TsFileResource>> partitionUnSequenceTsFileResource :
+ unSequenceTsFileResources.values()) {
+ for (List<TsFileResource> unSequenceTsFileResource : partitionUnSequenceTsFileResource) {
+ if (!unSequenceTsFileResource.isEmpty()) {
+ return false;
+ }
+ }
}
}
+ return true;
+ } finally {
+ readUnLock();
}
}
- /** release the write locks of the resource , the merge lock and the compaction lock */
- private void doubleWriteUnlock(TsFileResource seqFile) {
- writeUnlock();
- seqFile.writeUnlock();
- }
-
- private void removeUnseqFiles(List<TsFileResource> unseqFiles) {
- writeLock();
+ /** return TsFile list size */
+ public int size(boolean sequence) {
+ readLock();
try {
- removeAll(unseqFiles, false);
- // clean cache
- if (IoTDBDescriptor.getInstance().getConfig().isMetaDataCacheEnable()) {
- ChunkCache.getInstance().clear();
- TimeSeriesMetadataCache.getInstance().clear();
+ int result = 0;
+ if (sequence) {
+ for (List<SortedSet<TsFileResource>> partitionSequenceTsFileResource :
+ sequenceTsFileResources.values()) {
+ for (int i = seqLevelNum - 1; i >= 0; i--) {
+ result += partitionSequenceTsFileResource.get(i).size();
+ }
+ }
+ } else {
+ for (List<List<TsFileResource>> partitionUnSequenceTsFileResource :
+ unSequenceTsFileResources.values()) {
+ for (int i = unseqLevelNum - 1; i >= 0; i--) {
+ result += partitionUnSequenceTsFileResource.get(i).size();
+ }
+ }
}
+ return result;
} finally {
- writeUnlock();
+ readUnLock();
}
+ }
- for (TsFileResource unseqFile : unseqFiles) {
- unseqFile.writeLock();
- try {
- unseqFile.remove();
- } finally {
- unseqFile.writeUnlock();
- }
+ public void deleteLevelFilesInDisk(Collection<TsFileResource> mergeTsFiles) {
+ logger.debug("{} [compaction] merge starts to delete real file", storageGroupName);
+ for (TsFileResource mergeTsFile : mergeTsFiles) {
+ deleteLevelFile(mergeTsFile);
+ logger.info(
+ "{} [Compaction] delete TsFile {}", storageGroupName, mergeTsFile.getTsFilePath());
}
}
- @SuppressWarnings("squid:S1141")
- private void updateMergeModification(TsFileResource seqFile) {
- try {
- // remove old modifications and write modifications generated during merge
- seqFile.removeModFile();
- if (mergingModification != null) {
- for (Modification modification : mergingModification.getModifications()) {
- // we have to set modification offset to MAX_VALUE, as the offset of source chunk may
- // change after compaction
- modification.setFileOffset(Long.MAX_VALUE);
- seqFile.getModFile().write(modification);
+ public void deleteLevelFilesInList(
+ long timePartitionId, Collection<TsFileResource> mergeTsFiles, int level, boolean sequence) {
+ logger.debug("{} [compaction] merge starts to delete file list", storageGroupName);
+ if (sequence) {
+ if (sequenceTsFileResources.containsKey(timePartitionId)) {
+ if (sequenceTsFileResources.get(timePartitionId).size() > level) {
+ sequenceTsFileResources.get(timePartitionId).get(level).removeAll(mergeTsFiles);
}
- try {
- seqFile.getModFile().close();
- } catch (IOException e) {
- logger.error(
- "Cannot close the ModificationFile {}", seqFile.getModFile().getFilePath(), e);
+ }
+ } else {
+ if (unSequenceTsFileResources.containsKey(timePartitionId)) {
+ if (unSequenceTsFileResources.get(timePartitionId).size() > level) {
+ unSequenceTsFileResources.get(timePartitionId).get(level).removeAll(mergeTsFiles);
}
}
- } catch (IOException e) {
- logger.error(
- "{} cannot clean the ModificationFile of {} after merge",
- storageGroupName,
- seqFile.getTsFile(),
- e);
}
}
- private void removeMergingModification() {
+ private void deleteLevelFile(TsFileResource seqFile) {
+ seqFile.writeLock();
try {
- if (mergingModification != null) {
- mergingModification.remove();
- mergingModification = null;
- }
+ ChunkCache.getInstance().clear();
+ TimeSeriesMetadataCache.getInstance().clear();
+ FileReaderManager.getInstance().closeFileAndRemoveReader(seqFile.getTsFilePath());
+ seqFile.setDeleted(true);
+ seqFile.delete();
} catch (IOException e) {
- logger.error("{} cannot remove merging modification ", storageGroupName, e);
+ logger.error(e.getMessage(), e);
+ } finally {
+ seqFile.writeUnlock();
}
}
- public void mergeEndAction(
- List<TsFileResource> seqFiles, List<TsFileResource> unseqFiles, File mergeLog) {
- logger.info("{} a merge task is ending...", storageGroupName);
+ public static int getMergeLevel(File file) {
+ String mergeLevelStr =
+ file.getPath()
+ .substring(file.getPath().lastIndexOf(FILE_NAME_SEPARATOR) + 1)
+ .replaceAll(TSFILE_SUFFIX, "");
+ return Integer.parseInt(mergeLevelStr);
+ }
- if (Thread.currentThread().isInterrupted() || unseqFiles.isEmpty()) {
- // merge task abort, or merge runtime exception arose, just end this merge
- logger.info("{} a merge task abnormally ends", storageGroupName);
- return;
+ private List<SortedSet<TsFileResource>> newSequenceTsFileResources(Long k) {
+ List<SortedSet<TsFileResource>> newSequenceTsFileResources = new ArrayList<>();
+ for (int i = 0; i < seqLevelNum; i++) {
+ newSequenceTsFileResources.add(
+ new TreeSet<>(
+ (o1, o2) -> {
+ try {
+ int rangeCompare =
+ Long.compare(
+ Long.parseLong(o1.getTsFile().getParentFile().getName()),
Review comment:
I doubt the rangeCompare of the parentFile,as the current file dir is like sgName/timepartition/virtualSG
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] liutaohua commented on a change in pull request #3305: Clear compaction code
Posted by GitBox <gi...@apache.org>.
liutaohua commented on a change in pull request #3305:
URL: https://github.com/apache/iotdb/pull/3305#discussion_r643682728
##########
File path: server/src/main/java/org/apache/iotdb/db/engine/compaction/TsFileManagement.java
##########
@@ -66,325 +62,464 @@
*/
public ModificationFile mergingModification;
- /** whether execute merge chunk in this task */
- protected boolean isMergeExecutedInCurrentTask = false;
+ // First map is partition list; Second list is level list; Third list is file list in level;
+ private final Map<Long, List<SortedSet<TsFileResource>>> sequenceTsFileResources =
+ new HashMap<>();
+ private final Map<Long, List<List<TsFileResource>>> unSequenceTsFileResources = new HashMap<>();
- protected boolean isForceFullMerge = IoTDBDescriptor.getInstance().getConfig().isFullMerge();
- private final int maxOpenFileNumInEachUnseqCompaction =
- IoTDBDescriptor.getInstance().getConfig().getMaxOpenFileNumInEachUnseqCompaction();
+ private final List<TsFileResource> sequenceRecoverTsFileResources = new ArrayList<>();
+ private final List<TsFileResource> unSequenceRecoverTsFileResources = new ArrayList<>();
+
+ private final int seqLevelNum =
+ Math.max(IoTDBDescriptor.getInstance().getConfig().getSeqLevelNum(), 1);
+ private final int unseqLevelNum =
+ Math.max(IoTDBDescriptor.getInstance().getConfig().getUnseqLevelNum(), 1);
public TsFileManagement(String storageGroupName, String storageGroupDir) {
this.storageGroupName = storageGroupName;
this.storageGroupDir = storageGroupDir;
}
- public void setFullMerge(boolean forceFullMerge) {
- isForceFullMerge = forceFullMerge;
+ public Pair<List<List<TsFileResource>>, List<List<TsFileResource>>> forkCurrentFileList(
Review comment:
I think we should wrap a `class` here,
```
class LevelCompactionFiles{
List<List<tsFileSource>> getSeqResource(),
List<List<tsFileSource>> getUnseqResource(),
List<TsFileResource> getSeqResource(int level),
List<TsFileResource> getUnseqResource(int level)
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] EJTTianYu commented on a change in pull request #3305: Clear compaction code
Posted by GitBox <gi...@apache.org>.
EJTTianYu commented on a change in pull request #3305:
URL: https://github.com/apache/iotdb/pull/3305#discussion_r643611846
##########
File path: server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
##########
@@ -533,9 +520,9 @@ private void recoverLevelCompaction() {
CompactionTaskManager.getInstance()
.submitTask(
logicalStorageGroupName,
- tsFileManagement.new LevelCompactionRecoverTask(this::closeCompactionMergeCallBack));
+ compactionScheduler.new CompactionRecoverTask(this::closeCompactionMergeCallBack));
Review comment:
as level compaction has been renamed to inner space compaction, the function name should be renamed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org