Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public CheckpointManager(String identifier, String logDirectory) throws IOExcept
logHeader();
}

public List<MemTableInfo> activeOrPinnedMemTables() {
public List<MemTableInfo> activeMemTables() {
infoLock.lock();
try {
return new ArrayList<>(memTableId2Info.values());
Expand Down Expand Up @@ -126,7 +126,7 @@ private void logHeader() {
*/
private void makeGlobalInfoCP() {
long start = System.nanoTime();
List<MemTableInfo> memTableInfos = activeOrPinnedMemTables();
List<MemTableInfo> memTableInfos = activeMemTables();
memTableInfos.removeIf(MemTableInfo::isFlushed);
Checkpoint checkpoint = new Checkpoint(CheckpointType.GLOBAL_MEMORY_TABLE_INFO, memTableInfos);
logByCachedByteBuffer(checkpoint);
Expand Down Expand Up @@ -267,7 +267,7 @@ private boolean tryRollingLogWriter() throws IOException {

public MemTableInfo getOldestMemTableInfo() {
// find oldest memTable
return activeOrPinnedMemTables().stream()
return activeMemTables().stream()
.min(Comparator.comparingLong(MemTableInfo::getMemTableId))
.orElse(null);
}
Expand All @@ -278,7 +278,7 @@ public MemTableInfo getOldestMemTableInfo() {
* @return Return {@link Long#MIN_VALUE} if no file is valid
*/
public long getFirstValidWALVersionId() {
List<MemTableInfo> memTableInfos = activeOrPinnedMemTables();
List<MemTableInfo> memTableInfos = activeMemTables();
long firstValidVersionId = memTableInfos.isEmpty() ? Long.MIN_VALUE : Long.MAX_VALUE;
for (MemTableInfo memTableInfo : memTableInfos) {
firstValidVersionId = Math.min(firstValidVersionId, memTableInfo.getFirstFileVersionId());
Expand All @@ -301,7 +301,7 @@ public void updateCostOfActiveMemTables(

/** Get total cost of active memTables. */
public long getTotalCostOfActiveMemTables() {
List<MemTableInfo> memTableInfos = activeOrPinnedMemTables();
List<MemTableInfo> memTableInfos = activeMemTables();
long totalCost = 0;
for (MemTableInfo memTableInfo : memTableInfos) {
// flushed memTables are not active
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ public void deleteOutdatedFiles() {
private class DeleteOutdatedFileTask implements Runnable {
private File[] sortedWalFilesExcludingLast;

private List<MemTableInfo> activeOrPinnedMemTables;
private List<MemTableInfo> activeMemTables;
private long cachedSafelyDeletedSearchIndex;
private int fileIndexAfterFilterSafelyDeleteIndex;

Expand Down Expand Up @@ -396,7 +396,7 @@ private boolean initAndCheckIfNeedContinue() {
}
this.sortedWalFilesExcludingLast =
Arrays.copyOfRange(allWalFilesOfOneNode, 0, allWalFilesOfOneNode.length - 1);
this.activeOrPinnedMemTables = checkpointManager.activeOrPinnedMemTables();
this.activeMemTables = checkpointManager.activeMemTables();
updateFileIndexAfterFilterSafelyDeleteIndex();
this.successfullyDeleted = new ArrayList<>();
this.deleteFileSize = 0;
Expand Down Expand Up @@ -450,15 +450,15 @@ public void run() {
private void updateEffectiveInfoRationAndUpdateMetric() {
// calculate effective information ratio
long costOfActiveMemTables = checkpointManager.getTotalCostOfActiveMemTables();
MemTableInfo oldestUnpinnedMemTableInfo = checkpointManager.getOldestMemTableInfo();
MemTableInfo oldestMemTableInfo = checkpointManager.getOldestMemTableInfo();
long avgFileSize =
getFileNum() != 0
? getDiskUsage() / getFileNum()
: config.getWalFileSizeThresholdInByte();
long totalCost =
oldestUnpinnedMemTableInfo == null
oldestMemTableInfo == null
? costOfActiveMemTables
: (getCurrentWALFileVersion() - oldestUnpinnedMemTableInfo.getFirstFileVersionId())
: (getCurrentWALFileVersion() - oldestMemTableInfo.getFirstFileVersionId())
* avgFileSize;
if (costOfActiveMemTables == 0 || totalCost == 0) {
effectiveInfoRatio = 1.0d;
Expand Down Expand Up @@ -676,17 +676,15 @@ private void snapshotMemTable(DataRegion dataRegion, File tsFile, MemTableInfo m
}
}

public boolean isContainsActiveOrPinnedMemTable(Long versionId) {
public boolean isContainsActiveMemTable(Long versionId) {
Set<Long> memTableIdsOfCurrentWal = buffer.getMemTableIds(versionId);
// A null result means that the WAL is still being written or its metadata could not be read.
// Keep the file in either case because its memTable ids are unknown.
if (memTableIdsOfCurrentWal == null) {
return true;
}
return !Collections.disjoint(
activeOrPinnedMemTables.stream()
.map(MemTableInfo::getMemTableId)
.collect(Collectors.toSet()),
activeMemTables.stream().map(MemTableInfo::getMemTableId).collect(Collectors.toSet()),
memTableIdsOfCurrentWal);
}

Expand All @@ -698,7 +696,7 @@ private boolean canDeleteFile(long fileArrIdx, WALFileStatus walFileStatus, long
return (fileArrIdx < fileIndexAfterFilterSafelyDeleteIndex
|| walFileStatus == WALFileStatus.CONTAINS_NONE_SEARCH_INDEX)
&& versionId < subscriptionRetainedMinVersionId
&& !isContainsActiveOrPinnedMemTable(versionId);
&& !isContainsActiveMemTable(versionId);
}
}

Expand Down
Loading