Author: frm
Date: Thu Nov 29 14:10:52 2018
New Revision: 1847724
URL: http://svn.apache.org/viewvc?rev=1847724&view=rev
Log:
OAK-7866 - Fix comparison of journal entries
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/RecoverJournal.java
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/RecoverJournal.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/RecoverJournal.java?rev=1847724&r1=1847723&r2=1847724&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/RecoverJournal.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/RecoverJournal.java
Thu Nov 29 14:10:52 2018
@@ -232,14 +232,14 @@ public class RecoverJournal {
return segmentIdComparison;
}
- // Records from the same segments are sorted in decreasing order
+ // Records from the same segments are sorted in increasing order
// of their record number. This builds on the assumption that a
// record with a higher record number was added after a record
// with a lower one, and therefor is more recent.
int leftRecordNumber = left.recordId.getRecordNumber();
int rightRecordNumber = right.recordId.getRecordNumber();
- return Integer.compare(rightRecordNumber, leftRecordNumber);
+ return Integer.compare(leftRecordNumber, rightRecordNumber);
});
// Filter out the most recent entries that are not valid for