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/23 11:55:09 UTC
svn commit: r1745161 - in
/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment:
RecordId.java SegmentWriter.java
Author: mduerig
Date: Mon May 23 11:55:09 2016
New Revision: 1745161
URL: http://svn.apache.org/viewvc?rev=1745161&view=rev
Log:
OAK-2833: Refactor TarMK
Rename toArray method to getBytes
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordId.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordId.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordId.java?rev=1745161&r1=1745160&r2=1745161&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordId.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordId.java Mon May 23 11:55:09 2016
@@ -28,6 +28,8 @@ import java.util.UUID;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import javax.annotation.Nonnull;
+
/**
* The record id. This includes the segment id and the offset within the
* segment.
@@ -102,7 +104,12 @@ public final class RecordId implements C
buffer[pos + 1] = (byte) value;
}
- byte[] toArray() {
+ /**
+ * Serialise this record id into an array of bytes: {@code (msb, lsb, offset >> 2)}
+ * @return this record id as byte array
+ */
+ @Nonnull
+ byte[] getBytes() {
byte[] buffer = new byte[18];
writeLong(buffer, 0, segmentId.getMostSignificantBits());
writeLong(buffer, 8, segmentId.getLeastSignificantBits());
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java?rev=1745161&r1=1745160&r2=1745161&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java Mon May 23 11:55:09 2016
@@ -919,7 +919,7 @@ public class SegmentWriter {
if (state instanceof SegmentNodeState) {
// FIXME OAK-4279: Rework offline compaction
// Offline compaction could remove the stable ids again
- byte[] id = ((Record) state).getRecordId().toArray();
+ byte[] id = ((Record) state).getRecordId().getBytes();
stableId = writeBlock(id, 0, id.length);
}
return newNodeStateWriter(stableId, ids).write(writer);