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:04 UTC
svn commit: r1745160 - in
/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment:
RecordId.java RecordIdSet.java Segment.java SegmentNodeState.java
Author: mduerig
Date: Mon May 23 11:55:03 2016
New Revision: 1745160
URL: http://svn.apache.org/viewvc?rev=1745160&view=rev
Log:
OAK-2833: Refactor TarMK
Rename methods for (un)packing segment offsets from encode/decode to unpack/pack
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/RecordIdSet.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeState.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=1745160&r1=1745159&r2=1745160&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:03 2016
@@ -22,7 +22,7 @@ import static com.google.common.base.Pre
import static com.google.common.base.Preconditions.checkNotNull;
import static java.lang.Integer.parseInt;
import static org.apache.jackrabbit.oak.segment.Segment.RECORD_ALIGN_BITS;
-import static org.apache.jackrabbit.oak.segment.Segment.encode;
+import static org.apache.jackrabbit.oak.segment.Segment.pack;
import java.util.UUID;
import java.util.regex.Matcher;
@@ -106,7 +106,7 @@ public final class RecordId implements C
byte[] buffer = new byte[18];
writeLong(buffer, 0, segmentId.getMostSignificantBits());
writeLong(buffer, 8, segmentId.getLeastSignificantBits());
- writeShort(buffer, 16, encode(offset));
+ writeShort(buffer, 16, pack(offset));
return buffer;
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordIdSet.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordIdSet.java?rev=1745160&r1=1745159&r2=1745160&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordIdSet.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordIdSet.java Mon May 23 11:55:03 2016
@@ -22,7 +22,7 @@ package org.apache.jackrabbit.oak.segmen
import static com.google.common.collect.Maps.newHashMap;
import static java.lang.System.arraycopy;
import static java.util.Arrays.binarySearch;
-import static org.apache.jackrabbit.oak.segment.Segment.RECORD_ALIGN_BITS;
+import static org.apache.jackrabbit.oak.segment.Segment.pack;
import java.util.Map;
@@ -47,7 +47,7 @@ public class RecordIdSet {
offsets = new ShortSet();
seenIds.put(segmentId, offsets);
}
- return offsets.add(crop(id.getOffset()));
+ return offsets.add(pack(id.getOffset()));
}
/**
@@ -58,11 +58,7 @@ public class RecordIdSet {
public boolean contains(RecordId id) {
String segmentId = id.getSegmentId().toString();
ShortSet offsets = seenIds.get(segmentId);
- return offsets != null && offsets.contains(crop(id.getOffset()));
- }
-
- private static short crop(int value) {
- return (short) (value >> RECORD_ALIGN_BITS);
+ return offsets != null && offsets.contains(pack(id.getOffset()));
}
static class ShortSet {
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java?rev=1745160&r1=1745159&r2=1745160&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java Mon May 23 11:55:03 2016
@@ -176,20 +176,20 @@ public class Segment {
private static final boolean DISABLE_TEMPLATE_CACHE = getBoolean("oak.segment.disableTemplateCache");
/**
- * Decode a 4 byte aligned segment offset.
+ * Unpacks a 4 byte aligned segment offset.
* @param offset 4 byte aligned segment offset
- * @return decoded segment offset
+ * @return unpacked segment offset
*/
- public static int decode(short offset) {
+ public static int unpack(short offset) {
return (offset & 0xffff) << RECORD_ALIGN_BITS;
}
/**
- * Encode a segment offset into a 4 byte aligned address packed into a {@code short}.
+ * Packs a segment offset into a 4 byte aligned address packed into a {@code short}.
* @param offset segment offset
* @return encoded segment offset packed into a {@code short}
*/
- public static short encode(int offset) {
+ public static short pack(int offset) {
return (short) (offset >> RECORD_ALIGN_BITS);
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeState.java?rev=1745160&r1=1745159&r2=1745160&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeState.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeState.java Mon May 23 11:55:03 2016
@@ -33,8 +33,8 @@ import static org.apache.jackrabbit.oak.
import static org.apache.jackrabbit.oak.api.Type.STRINGS;
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE;
-import static org.apache.jackrabbit.oak.segment.Segment.decode;
import static org.apache.jackrabbit.oak.segment.Segment.readString;
+import static org.apache.jackrabbit.oak.segment.Segment.unpack;
import static org.apache.jackrabbit.oak.spi.state.AbstractNodeState.checkValidName;
import java.util.Collections;
@@ -106,7 +106,7 @@ public class SegmentNodeState extends Re
int pos = id.getOffset();
long msb = segment.readLong(pos);
long lsb = segment.readLong(pos + 8);
- int offset = decode(segment.readShort(pos + 16));
+ int offset = unpack(segment.readShort(pos + 16));
return new UUID(msb, lsb) + ":" + offset;
}
}