Skip to content
Merged
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 @@ -290,7 +290,7 @@ private FileDirtyInfo selectFileBaseOnDirtyData(TsFileResource resource)
// overflow, like 100 - Long.MIN
outdatedTimeDiff = Long.MAX_VALUE;
}
long ttlThreshold = 3 * ttl > ttl ? ttl : Long.MAX_VALUE;
long ttlThreshold = ttl <= Long.MAX_VALUE / 3 ? 3 * ttl : Long.MAX_VALUE;
hasExpiredTooLong =
hasExpiredTooLong
|| outdatedTimeDiff > Math.min(config.getMaxExpiredTime(), ttlThreshold);
Expand All @@ -309,7 +309,8 @@ private FileDirtyInfo selectFileBaseOnDirtyData(TsFileResource resource)
return new FileDirtyInfo(DirtyStatus.FULLY_DIRTY, ttlTables);
}
hasExpiredTooLong = config.getMaxExpiredTime() != Long.MAX_VALUE && hasExpiredTooLong;
if (hasExpiredTooLong || deletedDeviceRatio >= config.getExpiredDataRatio()) {
if (hasExpiredTooLong
|| (deletedDeviceRatio > 0 && deletedDeviceRatio >= config.getExpiredDataRatio())) {
// evaluate dirty data size in the tsfile
return new FileDirtyInfo(
PARTIALLY_DIRTY, (long) (deletedDeviceRatio * resource.getTsFileSize()), ttlTables);
Expand Down
Loading