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 re...@apache.org on 2016/04/12 14:06:58 UTC
svn commit: r1738784 -
/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
Author: reschke
Date: Tue Apr 12 12:06:58 2016
New Revision: 1738784
URL: http://svn.apache.org/viewvc?rev=1738784&view=rev
Log:
remove trailing whitespace
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java?rev=1738784&r1=1738783&r2=1738784&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java Tue Apr 12 12:06:58 2016
@@ -71,13 +71,13 @@ import static com.google.common.base.Pre
* A MicroKernel implementation that stores the data in a {@link DocumentStore}.
*/
public class DocumentMK implements MicroKernel {
-
+
static final Logger LOG = LoggerFactory.getLogger(DocumentMK.class);
-
+
/**
* The path where the persistent cache is stored.
*/
- static final String DEFAULT_PERSISTENT_CACHE_URI =
+ static final String DEFAULT_PERSISTENT_CACHE_URI =
System.getProperty("oak.documentMK.persCache");
/**
@@ -90,7 +90,7 @@ public class DocumentMK implements Micro
* Enable or disable the LIRS cache (null to use the default setting for this configuration).
*/
static final Boolean LIRS_CACHE;
-
+
static {
String s = System.getProperty("oak.documentMK.lirsCache");
LIRS_CACHE = s == null ? null : Boolean.parseBoolean(s);
@@ -715,12 +715,12 @@ public class DocumentMK implements Micro
this.clusterId = clusterId;
return this;
}
-
+
public Builder setCacheSegmentCount(int cacheSegmentCount) {
this.cacheSegmentCount = cacheSegmentCount;
return this;
}
-
+
public Builder setCacheStackMoveDistance(int cacheSegmentCount) {
this.cacheStackMoveDistance = cacheSegmentCount;
return this;
@@ -759,7 +759,7 @@ public class DocumentMK implements Micro
this.memoryCacheSize = memoryCacheSize;
return this;
}
-
+
public Builder memoryCacheDistribution(int nodeCachePercentage,
int childrenCachePercentage,
int docChildrenCachePercentage,
@@ -768,7 +768,7 @@ public class DocumentMK implements Micro
checkArgument(childrenCachePercentage>= 0);
checkArgument(docChildrenCachePercentage >= 0);
checkArgument(diffCachePercentage >= 0);
- checkArgument(nodeCachePercentage + childrenCachePercentage +
+ checkArgument(nodeCachePercentage + childrenCachePercentage +
docChildrenCachePercentage + diffCachePercentage < 100);
this.nodeCachePercentage = nodeCachePercentage;
this.childrenCachePercentage = childrenCachePercentage;
@@ -786,7 +786,7 @@ public class DocumentMK implements Micro
}
public long getDocumentCacheSize() {
- return memoryCacheSize - getNodeCacheSize() - getChildrenCacheSize()
+ return memoryCacheSize - getNodeCacheSize() - getChildrenCacheSize()
- getDiffCacheSize() - getDocChildrenCacheSize();
}
@@ -882,19 +882,19 @@ public class DocumentMK implements Micro
public DocumentMK open() {
return new DocumentMK(this);
}
-
+
public Cache<PathRev, DocumentNodeState> buildNodeCache(DocumentNodeStore store) {
return buildCache(CacheType.NODE, getNodeCacheSize(), store, null);
}
-
+
public Cache<PathRev, DocumentNodeState.Children> buildChildrenCache() {
- return buildCache(CacheType.CHILDREN, getChildrenCacheSize(), null, null);
+ return buildCache(CacheType.CHILDREN, getChildrenCacheSize(), null, null);
}
-
+
public Cache<StringValue, NodeDocument.Children> buildDocChildrenCache() {
return buildCache(CacheType.DOC_CHILDREN, getDocChildrenCacheSize(), null, null);
}
-
+
public Cache<PathRev, StringValue> buildMemoryDiffCache() {
return buildCache(CacheType.DIFF, getMemoryDiffCacheSize(), null, null);
}
@@ -929,7 +929,7 @@ public class DocumentMK implements Micro
}
return cache;
}
-
+
private PersistentCache getPersistentCache() {
if (persistentCacheURI == null) {
return null;
@@ -944,7 +944,7 @@ public class DocumentMK implements Micro
}
return persistentCache;
}
-
+
private <K extends CacheValue, V extends CacheValue> Cache<K, V> buildCache(
long maxWeight) {
// by default, use the LIRS cache when using the persistent cache,
@@ -973,5 +973,5 @@ public class DocumentMK implements Micro
}
}
-
+
}