Author: mduerig
Date: Thu Jun 29 11:13:25 2017
New Revision: 1800265
URL: http://svn.apache.org/viewvc?rev=1800265&view=rev
Log:
OAK-6406: Cleanup constants in Segment class
Remove SEGMENT_REFERENCE_LIMIT and adjust dependencies and comments referring
to it
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ListRecord.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/SegmentBufferWriter.java
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ListRecord.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ListRecord.java?rev=1800265&r1=1800264&r2=1800265&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ListRecord.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ListRecord.java
Thu Jun 29 11:13:25 2017
@@ -32,7 +32,7 @@ import java.util.List;
*/
class ListRecord extends Record {
- static final int LEVEL_SIZE = Segment.SEGMENT_REFERENCE_LIMIT;
+ static final int LEVEL_SIZE = 255;
private final int size;
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=1800265&r1=1800264&r2=1800265&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
Thu Jun 29 11:13:25 2017
@@ -86,26 +86,15 @@ public class Segment {
static final int RECORD_ID_BYTES = 2 + 4;
/**
- * The limit on segment references within one segment. Since record
- * identifiers use one byte to indicate the referenced segment, a single
- * segment can hold references to up to 255 segments plus itself.
- */
- static final int SEGMENT_REFERENCE_LIMIT = (1 << 8) - 1; // 255
-
- /**
* The number of bytes (or bits of address space) to use for the
* alignment boundary of segment records.
*/
static final int RECORD_ALIGN_BITS = 2; // align at the four-byte boundary
/**
- * Maximum segment size. Record identifiers are stored as three-byte
- * sequences with the first byte indicating the segment and the next
- * two the offset within that segment. Since all records are aligned
- * at four-byte boundaries, the two bytes can address up to 256kB of
- * record data.
+ * Maximum segment size
*/
- static final int MAX_SEGMENT_SIZE = 1 << (16 + RECORD_ALIGN_BITS); // 256kB
+ static final int MAX_SEGMENT_SIZE = 1 << 18; // 256kB
/**
* The size limit for small values. The variable length of small values
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=1800265&r1=1800264&r2=1800265&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
Thu Jun 29 11:13:25 2017
@@ -186,7 +186,7 @@ public class SegmentBufferWriter impleme
buffer[2] = 'K';
buffer[3] = SegmentVersion.asByte(LATEST_VERSION);
buffer[4] = 0; // reserved
- buffer[5] = 0; // refcount
+ buffer[5] = 0; // reserved
buffer[GC_GENERATION_OFFSET] = (byte) (generation >> 24);
buffer[GC_GENERATION_OFFSET + 1] = (byte) (generation >> 16);
