You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2016/05/24 09:06:04 UTC
svn commit: r1745334 - in
/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment:
MapRecord.java SegmentParser.java
Author: mduerig
Date: Tue May 24 09:06:04 2016
New Revision: 1745334
URL: http://svn.apache.org/viewvc?rev=1745334&view=rev
Log:
OAK-4373: Refactor SegmentTracker
Consistently use the record reader for reading map records
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapRecord.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentParser.java
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapRecord.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapRecord.java?rev=1745334&r1=1745333&r2=1745334&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapRecord.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapRecord.java Tue May 24 09:06:04 2016
@@ -98,7 +98,7 @@ public class MapRecord extends Record {
*/
protected static final int MAX_SIZE = (1 << SIZE_BITS) - 1; // ~268e6
- protected MapRecord(@Nonnull SegmentStore store, @Nonnull RecordId id) {
+ MapRecord(@Nonnull SegmentStore store, @Nonnull RecordId id) {
super(id);
this.store = checkNotNull(store);
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentParser.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentParser.java?rev=1745334&r1=1745333&r2=1745334&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentParser.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentParser.java Tue May 24 09:06:04 2016
@@ -558,7 +558,7 @@ public class SegmentParser {
RecordId baseId = mapId.getSegment()
.readRecordId(mapId.getOffset() + 8 + 2 * RECORD_ID_BYTES);
- onMap(mapId, baseId, new MapRecord(store, baseId));
+ onMap(mapId, baseId, store.getReader().readMap(baseId));
return new MapInfo(mapId, size);
}