Author: mduerig
Date: Mon Apr 25 10:44:53 2016
New Revision: 1740801
URL: http://svn.apache.org/viewvc?rev=1740801&view=rev
Log:
OAK-2833: Refactor TarMK
Remove unused field and methods. Rename method still referring to an old
segment format
Modified:
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBlob.java
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentId.java
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java
Modified:
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java?rev=1740801&r1=1740800&r2=1740801&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java
Mon Apr 25 10:44:53 2016
@@ -173,8 +173,6 @@ public class Segment {
private static final boolean DISABLE_TEMPLATE_CACHE =
getBoolean("oak.segment.disableTemplateCache");
- private volatile long accessed;
-
/**
* Decode a 4 byte aligned segment offset.
* @param offset 4 byte aligned segment offset
@@ -610,23 +608,11 @@ public class Segment {
}
PropertyTemplate[] properties;
- properties = readPropsV11(propertyCount, offset);
+ properties = readProps(propertyCount, offset);
return new Template(primaryType, mixinTypes, properties, childName);
}
- private PropertyTemplate[] readPropsV10(int propertyCount, int offset) {
- PropertyTemplate[] properties = new PropertyTemplate[propertyCount];
- for (int i = 0; i < propertyCount; i++) {
- RecordId propertyNameId = readRecordId(offset);
- offset += RECORD_ID_BYTES;
- byte type = readByte(offset++);
- properties[i] = new PropertyTemplate(i, readString(propertyNameId),
- Type.fromTag(Math.abs(type), type < 0));
- }
- return properties;
- }
-
- private PropertyTemplate[] readPropsV11(int propertyCount, int offset) {
+ private PropertyTemplate[] readProps(int propertyCount, int offset) {
PropertyTemplate[] properties = new PropertyTemplate[propertyCount];
if (propertyCount > 0) {
RecordId id = readRecordId(offset);
Modified:
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBlob.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBlob.java?rev=1740801&r1=1740800&r2=1740801&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBlob.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBlob.java
Mon Apr 25 10:44:53 2016
@@ -190,10 +190,6 @@ public class SegmentBlob extends Record
&& AbstractBlob.equal(this, (Blob) object);
}
- private static boolean isLongBlob(byte head) {
- return (head & 0xe0) == 0xc0;
- }
-
@Override
public int hashCode() {
return 0;
Modified:
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentId.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentId.java?rev=1740801&r1=1740800&r2=1740801&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentId.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentId.java
Mon Apr 25 10:44:53 2016
@@ -102,10 +102,6 @@ public class SegmentId implements Compar
return (lsb >>> 60) == 0xBL;
}
- public boolean equals(long msb, long lsb) {
- return this.msb == msb && this.lsb == lsb;
- }
-
public long getMostSignificantBits() {
return msb;
}
@@ -162,13 +158,6 @@ public class SegmentId implements Compar
}
/**
- * Pins this segment so it won't be cleaned by the {@code CLEAN_OLD}
strategy.
- */
- void pin() {
- creationTime = Long.MAX_VALUE;
- }
-
- /**
* @return this segment id as UUID
*/
public UUID asUUID() {
Modified:
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java?rev=1740801&r1=1740800&r2=1740801&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java
Mon Apr 25 10:44:53 2016
@@ -777,14 +777,6 @@ public class SegmentWriter {
return tid;
}
- private RecordId toCache(NodeState state, int depth, RecordId
recordId) {
- if (state instanceof SegmentNodeState) {
- SegmentNodeState sns = (SegmentNodeState) state;
- nodeCache.generation(generation()).put(sns.getId(), recordId,
depth);
- }
- return recordId;
- }
-
private RecordId writeNode(NodeState state, int depth) throws
IOException {
if (state instanceof SegmentNodeState) {
SegmentNodeState sns = ((SegmentNodeState) state);
