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 fr...@apache.org on 2017/07/03 13:09:28 UTC
svn commit: r1800678 - in
/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar:
TarFiles.java TarReader.java
Author: frm
Date: Mon Jul 3 13:09:28 2017
New Revision: 1800678
URL: http://svn.apache.org/viewvc?rev=1800678&view=rev
Log:
OAK-6405 - Remove unused parameter
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarReader.java
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java?rev=1800678&r1=1800677&r2=1800678&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java Mon Jul 3 13:09:28 2017
@@ -293,7 +293,7 @@ public class TarFiles implements Closeab
for (Integer index : indices) {
TarReader r;
if (builder.readOnly) {
- r = TarReader.openRO(map.get(index), memoryMapping, true, builder.tarRecovery, ioMonitor);
+ r = TarReader.openRO(map.get(index), memoryMapping, builder.tarRecovery, ioMonitor);
} else {
r = TarReader.open(map.get(index), memoryMapping, builder.tarRecovery, ioMonitor);
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarReader.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarReader.java?rev=1800678&r1=1800677&r2=1800678&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarReader.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarReader.java Mon Jul 3 13:09:28 2017
@@ -138,31 +138,25 @@ class TarReader implements Closeable {
}
}
- static TarReader openRO(Map<Character, File> files, boolean memoryMapping, boolean recover, TarRecovery recovery, IOMonitor ioMonitor) throws IOException {
+ static TarReader openRO(Map<Character, File> files, boolean memoryMapping, TarRecovery recovery, IOMonitor ioMonitor) throws IOException {
// for readonly store only try the latest generation of a given
// tar file to prevent any rollback or rewrite
File file = files.get(Collections.max(files.keySet()));
-
TarReader reader = openFirstFileWithValidIndex(singletonList(file), memoryMapping, ioMonitor);
if (reader != null) {
return reader;
}
- if (recover) {
- log.warn(
- "Could not find a valid tar index in {}, recovering read-only",
- file);
- // collecting the entries (without touching the original file) and
- // writing them into an artificial tar file '.ro.bak'
- LinkedHashMap<UUID, byte[]> entries = newLinkedHashMap();
- collectFileEntries(file, entries, false);
- file = findAvailGen(file, ".ro.bak");
- generateTarFile(entries, file, recovery, ioMonitor);
- reader = openFirstFileWithValidIndex(singletonList(file), memoryMapping, ioMonitor);
- if (reader != null) {
- return reader;
- }
+ log.warn("Could not find a valid tar index in {}, recovering read-only", file);
+ // collecting the entries (without touching the original file) and
+ // writing them into an artificial tar file '.ro.bak'
+ LinkedHashMap<UUID, byte[]> entries = newLinkedHashMap();
+ collectFileEntries(file, entries, false);
+ file = findAvailGen(file, ".ro.bak");
+ generateTarFile(entries, file, recovery, ioMonitor);
+ reader = openFirstFileWithValidIndex(singletonList(file), memoryMapping, ioMonitor);
+ if (reader != null) {
+ return reader;
}
-
throw new IOException("Failed to open tar file " + file);
}