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 al...@apache.org on 2017/03/24 09:12:59 UTC
svn commit: r1788384 -
/jackrabbit/oak/branches/1.4/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/segment/FileStoreHelper.java
Author: alexparvulescu
Date: Fri Mar 24 09:12:59 2017
New Revision: 1788384
URL: http://svn.apache.org/viewvc?rev=1788384&view=rev
Log:
OAK-5982 SegmentMk version check with disabled mmaping
Modified:
jackrabbit/oak/branches/1.4/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/segment/FileStoreHelper.java
Modified: jackrabbit/oak/branches/1.4/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/segment/FileStoreHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/segment/FileStoreHelper.java?rev=1788384&r1=1788383&r2=1788384&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/segment/FileStoreHelper.java (original)
+++ jackrabbit/oak/branches/1.4/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/segment/FileStoreHelper.java Fri Mar 24 09:12:59 2017
@@ -181,7 +181,7 @@ public final class FileStoreHelper {
if (!directory.exists()) {
return directory;
}
- FileStore store = openReadOnlyFileStore(directory);
+ FileStore store = openReadOnlyFileStore(directory, false);
try {
SegmentVersion segmentVersion = getSegmentVersion(store);
if (segmentVersion != LATEST_VERSION) {
@@ -223,8 +223,13 @@ public final class FileStoreHelper {
public static ReadOnlyStore openReadOnlyFileStore(File directory)
throws IOException {
+ return openReadOnlyFileStore(directory, TAR_STORAGE_MEMORY_MAPPED);
+ }
+
+ public static ReadOnlyStore openReadOnlyFileStore(File directory, boolean memoryMapped)
+ throws IOException {
return new ReadOnlyStore(isValidFileStoreOrFail(directory),
- TAR_SEGMENT_CACHE_SIZE, TAR_STORAGE_MEMORY_MAPPED);
+ TAR_SEGMENT_CACHE_SIZE, memoryMapped);
}
public static ReadOnlyStore openReadOnlyFileStore(File directory,