bbotella commented on code in PR #3993:
URL: https://github.com/apache/cassandra/pull/3993#discussion_r2003416535
##########
src/java/org/apache/cassandra/tools/SSTableExpiredBlockers.java:
##########
@@ -122,12 +135,37 @@ public static Multimap<SSTableReader, SSTableReader>
checkForExpiredSSTableBlock
return blockers;
}
- private static String formatForExpiryTracing(Iterable<SSTableReader>
sstables)
+ @VisibleForTesting
+ public static String formatForExpiryTracing(boolean humanReadable,
Iterable<SSTableReader> sstables)
{
StringBuilder sb = new StringBuilder();
for (SSTableReader sstable : sstables)
- sb.append(String.format("[%s (minTS = %d, maxTS = %d, maxLDT =
%d)]", sstable, sstable.getMinTimestamp(), sstable.getMaxTimestamp(),
sstable.getMaxLocalDeletionTime())).append(", ");
+ {
+ long minTimestamp = sstable.getMinTimestamp();
+ long maxTimestamp = sstable.getMaxTimestamp();
+ long maxLocalDeletionTime = sstable.getMaxLocalDeletionTime();
+ if (humanReadable)
+ {
+ sb.append(format("[%s (minTS = %s, maxTS = %s, maxLDT = %s,
diskSize = %s)]",
Review Comment:
Nit: I think extracting this string for the format will help with
maintenance in the future, having to change it only once instead of here and on
line 160.
##########
src/java/org/apache/cassandra/tools/SSTableExpiredBlockers.java:
##########
@@ -122,12 +135,37 @@ public static Multimap<SSTableReader, SSTableReader>
checkForExpiredSSTableBlock
return blockers;
}
- private static String formatForExpiryTracing(Iterable<SSTableReader>
sstables)
+ @VisibleForTesting
+ public static String formatForExpiryTracing(boolean humanReadable,
Iterable<SSTableReader> sstables)
{
StringBuilder sb = new StringBuilder();
for (SSTableReader sstable : sstables)
- sb.append(String.format("[%s (minTS = %d, maxTS = %d, maxLDT =
%d)]", sstable, sstable.getMinTimestamp(), sstable.getMaxTimestamp(),
sstable.getMaxLocalDeletionTime())).append(", ");
+ {
+ long minTimestamp = sstable.getMinTimestamp();
+ long maxTimestamp = sstable.getMaxTimestamp();
+ long maxLocalDeletionTime = sstable.getMaxLocalDeletionTime();
+ if (humanReadable)
+ {
+ sb.append(format("[%s (minTS = %s, maxTS = %s, maxLDT = %s,
diskSize = %s)]",
+ sstable,
+ minTimestamp != Long.MIN_VALUE &&
minTimestamp != Long.MAX_VALUE ? Instant.ofEpochMilli(minTimestamp) :
minTimestamp,
+ maxTimestamp != Long.MIN_VALUE &&
minTimestamp != Long.MAX_VALUE ? Instant.ofEpochMilli(maxTimestamp) :
maxTimestamp,
+ maxLocalDeletionTime != Long.MAX_VALUE ?
Instant.ofEpochSecond(maxLocalDeletionTime) : maxLocalDeletionTime,
+
FileUtils.stringifyFileSize(sstable.onDiskLength())))
+ .append(", ");
Review Comment:
The `append(", ")` can be out of the ifelse to avoid repetition.
--
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.
To unsubscribe, e-mail: pr-unsubscr...@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscr...@cassandra.apache.org
For additional commands, e-mail: pr-h...@cassandra.apache.org
