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:32 UTC
svn commit: r1745165 - in
/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment:
Segment.java SegmentBufferWriter.java SegmentId.java SegmentTracker.java
Author: mduerig
Date: Mon May 23 11:55:32 2016
New Revision: 1745165
URL: http://svn.apache.org/viewvc?rev=1745165&view=rev
Log:
@Trivial: make field final, rename constant, re-align code
Modified:
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/SegmentBufferWriter.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentId.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentTracker.java
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=1745165&r1=1745164&r2=1745165&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:32 2016
@@ -125,7 +125,7 @@ public class Segment {
static final int BLOBREF_COUNT_OFFSET = 8;
- public static final int GC_GEN_OFFSET = 10;
+ public static final int GC_GENERATION_OFFSET = 10;
private final SegmentTracker tracker;
@@ -300,7 +300,7 @@ public class Segment {
*/
public static int getGcGeneration(ByteBuffer data, UUID segmentId) {
return isDataSegmentId(segmentId.getLeastSignificantBits())
- ? data.getInt(GC_GEN_OFFSET)
+ ? data.getInt(GC_GENERATION_OFFSET)
: 0;
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriter.java?rev=1745165&r1=1745164&r2=1745165&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriter.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriter.java Mon May 23 11:55:32 2016
@@ -29,7 +29,7 @@ import static com.google.common.collect.
import static java.lang.System.arraycopy;
import static java.lang.System.currentTimeMillis;
import static java.lang.System.identityHashCode;
-import static org.apache.jackrabbit.oak.segment.Segment.GC_GEN_OFFSET;
+import static org.apache.jackrabbit.oak.segment.Segment.GC_GENERATION_OFFSET;
import static org.apache.jackrabbit.oak.segment.Segment.MAX_SEGMENT_SIZE;
import static org.apache.jackrabbit.oak.segment.Segment.RECORD_ID_BYTES;
import static org.apache.jackrabbit.oak.segment.Segment.SEGMENT_REFERENCE_LIMIT;
@@ -158,10 +158,10 @@ public class SegmentBufferWriter impleme
buffer[4] = 0; // reserved
buffer[5] = 0; // refcount
- buffer[GC_GEN_OFFSET] = (byte) (generation >> 24);
- buffer[GC_GEN_OFFSET + 1] = (byte) (generation >> 16);
- buffer[GC_GEN_OFFSET + 2] = (byte) (generation >> 8);
- buffer[GC_GEN_OFFSET + 3] = (byte) generation;
+ buffer[GC_GENERATION_OFFSET] = (byte) (generation >> 24);
+ buffer[GC_GENERATION_OFFSET + 1] = (byte) (generation >> 16);
+ buffer[GC_GENERATION_OFFSET + 2] = (byte) (generation >> 8);
+ buffer[GC_GENERATION_OFFSET + 3] = (byte) generation;
length = 0;
position = buffer.length;
roots.clear();
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentId.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentId.java?rev=1745165&r1=1745164&r2=1745165&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentId.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentId.java Mon May 23 11:55:32 2016
@@ -66,7 +66,7 @@ public class SegmentId implements Compar
private final long lsb;
- private long creationTime;
+ private final long creationTime;
/**
* A reference to the segment object, if it is available in memory. It is
@@ -168,9 +168,9 @@ public class SegmentId implements Compar
@Override
public int compareTo(SegmentId that) {
- int d = Long.valueOf(this.msb).compareTo(Long.valueOf(that.msb));
+ int d = Long.valueOf(this.msb).compareTo(that.msb);
if (d == 0) {
- d = Long.valueOf(this.lsb).compareTo(Long.valueOf(that.lsb));
+ d = Long.valueOf(this.lsb).compareTo(that.lsb);
}
return d;
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentTracker.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentTracker.java?rev=1745165&r1=1745164&r2=1745165&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentTracker.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentTracker.java Mon May 23 11:55:32 2016
@@ -123,8 +123,7 @@ public class SegmentTracker {
segmentId.setSegment(null);
}
}
- })
- .build();
+ }).build();
}
public SegmentTracker(SegmentStore store, SegmentVersion version) {