Skip to content

Commit 2d68952

Browse files
committedFeb 24, 2025
added suggested changes
1 parent d7b0954 commit 2d68952

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed
 

‎core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadata.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -565,31 +565,31 @@ public static void validate(TabletMetadata tm) {
565565
throw new IllegalStateException("TabletMetadata cannot be null");
566566
}
567567

568+
Collection<StoredTabletFile> files = tm.getFiles();
569+
if (files == null || files.isEmpty()) {
570+
return;
571+
}
572+
568573
Text prevEndRowText = tm.getPrevEndRow();
569574
Text endRowText = tm.getEndRow();
570575

571576
// Allow validation even if prevEndRow is missing, as long as endRowText exists
572577
Key prevEndRowKey = (prevEndRowText != null) ? new Key(prevEndRowText) : null;
573578
Key endRowKey = (endRowText != null) ? new Key(endRowText) : null;
574579

575-
Collection<StoredTabletFile> files = tm.getFiles();
576-
if (files == null || files.isEmpty()) {
577-
return;
578-
}
579-
580580
for (StoredTabletFile file : files) {
581581
if (!isFileRangeValid(file, prevEndRowKey, endRowKey)) {
582582
throw new IllegalStateException("File range " + file.getRange()
583-
+ " is inconsistent with tablet range [" + prevEndRowText + ", " + endRowText + "]");
583+
+ " does not overlap with tablet range [" + prevEndRowText + ", " + endRowText + "]");
584584
}
585585
}
586586
}
587587

588588
private static boolean isFileRangeValid(StoredTabletFile file, Key prevEndRowKey, Key endRowKey) {
589589
Range fileRange = file.getRange();
590590

591-
if (fileRange == null) {
592-
return false;
591+
if (file.hasRange()) {
592+
return true;
593593
}
594594

595595
Key fileStartKey = fileRange.getStartKey();

0 commit comments

Comments
 (0)