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 2015/07/29 10:45:37 UTC
svn commit: r1693212 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment:
./ file/
Author: mduerig
Date: Wed Jul 29 08:45:37 2015
New Revision: 1693212
URL: http://svn.apache.org/r1693212
Log:
OAK-2833: Refactor TarMK
Minor cleanup: remove redundant throws, make methods static, use Collection.isEmpty, use @code, add missing @Override
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/MapRecord.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeBuilder.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeState.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentPropertyState.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentWriter.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/ReversedLinesFileReader.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarReader.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarWriter.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/MapRecord.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/MapRecord.java?rev=1693212&r1=1693211&r2=1693212&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/MapRecord.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/MapRecord.java Wed Jul 29 08:45:37 2015
@@ -157,7 +157,7 @@ class MapRecord extends Record {
if (isDiff(head)) {
if (hash == segment.readInt(getOffset(4))) {
RecordId key = segment.readRecordId(getOffset(8));
- if (name.equals(segment.readString(key))) {
+ if (name.equals(Segment.readString(key))) {
RecordId value = segment.readRecordId(getOffset(8, 1));
return new MapEntry(name, key, value);
}
@@ -212,7 +212,7 @@ class MapRecord extends Record {
getOffset(4 + size * 4, i * 2));
RecordId valueId = segment.readRecordId(
getOffset(4 + size * 4, i * 2 + 1));
- diff = segment.readString(keyId).compareTo(name);
+ diff = Segment.readString(keyId).compareTo(name);
if (diff == 0) {
return new MapEntry(name, keyId, valueId);
}
@@ -316,7 +316,7 @@ class MapRecord extends Record {
String[] keys = new String[size];
for (int i = 0; i < size; i++) {
- keys[i] = segment.readString(ids[i]);
+ keys[i] = Segment.readString(ids[i]);
}
return Arrays.asList(keys);
}
@@ -371,7 +371,7 @@ class MapRecord extends Record {
MapEntry[] entries = new MapEntry[size];
for (int i = 0; i < size; i++) {
- String name = segment.readString(keys[i]);
+ String name = Segment.readString(keys[i]);
entries[i] = new MapEntry(name, keys[i], values[i]);
}
return Arrays.asList(entries);
@@ -387,7 +387,7 @@ class MapRecord extends Record {
if (isDiff(head)) {
int hash = segment.readInt(getOffset(4));
RecordId keyId = segment.readRecordId(getOffset(8));
- final String key = segment.readString(keyId);
+ final String key = Segment.readString(keyId);
final RecordId value = segment.readRecordId(getOffset(8, 1));
MapRecord base = new MapRecord(segment.readRecordId(getOffset(8, 2)));
@@ -429,7 +429,7 @@ class MapRecord extends Record {
if (isDiff(beforeHead)) {
int hash = beforeSegment.readInt(before.getOffset(4));
RecordId keyId = beforeSegment.readRecordId(before.getOffset(8));
- final String key = beforeSegment.readString(keyId);
+ final String key = Segment.readString(keyId);
final RecordId value = beforeSegment.readRecordId(before.getOffset(8, 1));
MapRecord base = new MapRecord(beforeSegment.readRecordId(before.getOffset(8, 2)));
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeBuilder.java?rev=1693212&r1=1693211&r2=1693212&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeBuilder.java Wed Jul 29 08:45:37 2015
@@ -47,9 +47,9 @@ public class SegmentNodeBuilder extends
*
* The value encodes both the counter and the type of the node builder:
* <ul>
- * <li>value >= <code>0</code> represents a root builder (builder keeps
+ * <li>value >= {@code 0} represents a root builder (builder keeps
* counter updates)</li>
- * <li>value = <code>-1</code> represents a child builder (value doesn't
+ * <li>value = {@code -1} represents a child builder (value doesn't
* change, builder doesn't keep an updated counter)</li>
* </ul>
*
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeState.java?rev=1693212&r1=1693211&r2=1693212&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeState.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeState.java Wed Jul 29 08:45:37 2015
@@ -290,7 +290,7 @@ public class SegmentNodeState extends Re
} else {
id = getRecordIdV10(segment, template, propertyTemplate);
}
- return segment.readString(id);
+ return Segment.readString(id);
}
/**
@@ -341,13 +341,13 @@ public class SegmentNodeState extends Re
id = segment.readRecordId(id.getOffset() + 4);
if (size == 1) {
- return singletonList(segment.readString(id));
+ return singletonList(Segment.readString(id));
}
List<String> values = newArrayListWithCapacity(size);
ListRecord list = new ListRecord(id, size);
for (RecordId value : list.getEntries()) {
- values.add(segment.readString(value));
+ values.add(Segment.readString(value));
}
return values;
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentPropertyState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentPropertyState.java?rev=1693212&r1=1693211&r2=1693212&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentPropertyState.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentPropertyState.java Wed Jul 29 08:45:37 2015
@@ -16,17 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.segment;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Nonnull;
-import javax.jcr.PropertyType;
-
-import org.apache.jackrabbit.oak.api.PropertyState;
-import org.apache.jackrabbit.oak.api.Type;
-import org.apache.jackrabbit.oak.plugins.memory.AbstractPropertyState;
-import org.apache.jackrabbit.oak.plugins.value.Conversions;
-import org.apache.jackrabbit.oak.plugins.value.Conversions.Converter;
-
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkElementIndex;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -49,6 +38,18 @@ import static org.apache.jackrabbit.oak.
import static org.apache.jackrabbit.oak.api.Type.URI;
import static org.apache.jackrabbit.oak.api.Type.WEAKREFERENCE;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Nonnull;
+import javax.jcr.PropertyType;
+
+import org.apache.jackrabbit.oak.api.PropertyState;
+import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.plugins.memory.AbstractPropertyState;
+import org.apache.jackrabbit.oak.plugins.value.Conversions;
+import org.apache.jackrabbit.oak.plugins.value.Conversions.Converter;
+
/**
* A property, which can read a value or list record from a segment. It
* currently doesn't cache data.
@@ -88,7 +89,7 @@ public class SegmentPropertyState extend
ListRecord values = getValueList(segment);
for (int i = 0; i < values.size(); i++) {
RecordId valueId = values.getEntry(i);
- String value = segment.readString(valueId);
+ String value = Segment.readString(valueId);
map.put(value, valueId);
}
@@ -171,7 +172,7 @@ public class SegmentPropertyState extend
return (T) new SegmentBlob(id); // load binaries lazily
}
- String value = segment.readString(id);
+ String value = Segment.readString(id);
if (type == STRING || type == URI || type == DATE
|| type == NAME || type == PATH
|| type == REFERENCE || type == WEAKREFERENCE) {
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentWriter.java?rev=1693212&r1=1693211&r2=1693212&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentWriter.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentWriter.java Wed Jul 29 08:45:37 2015
@@ -687,7 +687,7 @@ public class SegmentWriter {
*/
public RecordId writeList(List<RecordId> list) {
checkNotNull(list);
- checkArgument(list.size() > 0);
+ checkArgument(!list.isEmpty());
List<RecordId> thisLevel = list;
while (thisLevel.size() > 1) {
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/ReversedLinesFileReader.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/ReversedLinesFileReader.java?rev=1693212&r1=1693211&r2=1693212&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/ReversedLinesFileReader.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/ReversedLinesFileReader.java Wed Jul 29 08:45:37 2015
@@ -183,6 +183,7 @@ class ReversedLinesFileReader implements
*
* @throws IOException if an I/O error occurs
*/
+ @Override
public void close() throws IOException {
randomAccessFile.close();
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarReader.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarReader.java?rev=1693212&r1=1693211&r2=1693212&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarReader.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarReader.java Wed Jul 29 08:45:37 2015
@@ -182,8 +182,7 @@ class TarReader {
}
}
- private static TarReader openFirstFileWithValidIndex(
- List<File> files, boolean memoryMapping) throws IOException {
+ private static TarReader openFirstFileWithValidIndex(List<File> files, boolean memoryMapping) {
for (File file : files) {
String name = file.getName();
try {
@@ -369,7 +368,6 @@ class TarReader {
if (checkbytes[i] != header[148 + i]) {
log.warn("Invalid entry checksum at offset {} in tar file {}, skipping...",
access.getFilePointer() - BLOCK_SIZE, file);
- continue;
}
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarWriter.java?rev=1693212&r1=1693211&r2=1693212&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarWriter.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarWriter.java Wed Jul 29 08:45:37 2015
@@ -396,7 +396,7 @@ class TarWriter {
access.write(buffer.array());
}
- private byte[] newEntryHeader(String name, int size) throws IOException {
+ private static byte[] newEntryHeader(String name, int size) {
byte[] header = new byte[BLOCK_SIZE];
// File name
@@ -460,7 +460,7 @@ class TarWriter {
* @param referencedIds
* @throws IOException
*/
- synchronized void collectReferences(Set<UUID> referencedIds) throws IOException {
+ synchronized void collectReferences(Set<UUID> referencedIds) {
for (UUID uuid : reverse(newArrayList(index.keySet()))) {
if (referencedIds.remove(uuid)) {
List<UUID> refs = graph.get(uuid);