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 2015/08/12 16:04:26 UTC
svn commit: r1695520 - in /jackrabbit/oak/trunk/oak-core/src:
main/java/org/apache/jackrabbit/oak/plugins/document/
main/java/org/apache/jackrabbit/oak/plugins/document/memory/
main/java/org/apache/jackrabbit/oak/plugins/document/mongo/
main/java/org/a...
Author: reschke
Date: Wed Aug 12 14:04:26 2015
New Revision: 1695520
URL: http://svn.apache.org/r1695520
Log:
OAK-2682: make test run for all DS implementations, code reformat
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1695520&r1=1695519&r2=1695520&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java Wed Aug 12 14:04:26 2015
@@ -2516,10 +2516,10 @@ public final class DocumentNodeStore
}
return sdf.format(r.getTimestamp());
}
-
+
@Override
public long determineServerTimeDifferenceMillis() {
- return store.determineServerTimeDifferenceMillis();
+ return store.determineServerTimeDifferenceMillis();
}
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java?rev=1695520&r1=1695519&r2=1695520&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java Wed Aug 12 14:04:26 2015
@@ -447,18 +447,20 @@ public class DocumentNodeStoreService {
observerTracker.start(context.getBundleContext());
DocumentStore ds = mk.getDocumentStore();
-
- // OAK-2682: time difference detection applied at startup with a default max time diff of 2000 millis (2sec)
+
+ // OAK-2682: time difference detection applied at startup with a default
+ // max time diff of 2000 millis (2sec)
final long maxDiff = Long.parseLong(System.getProperty("oak.documentMK.maxServerTimeDiffMillis", "2000"));
- try{
- final long timeDiff = ds.determineServerTimeDifferenceMillis();
- log.info("registerNodeStore: server time difference: {}ms (max allowed: {}ms)", timeDiff, maxDiff);
- if (Math.abs(timeDiff)>Math.abs(maxDiff)) {
- throw new IllegalStateException("Server clock seems off ("+timeDiff+"ms) by more than configured amount ("+maxDiff+"ms)");
- }
- } catch(RuntimeException e) { // no checked exception
- // in case of a RuntimeException, just log but continue
- log.warn("registerNodeStore: got RuntimeException while trying to determine time difference to server: "+e, e);
+ try {
+ final long timeDiff = ds.determineServerTimeDifferenceMillis();
+ log.info("registerNodeStore: server time difference: {}ms (max allowed: {}ms)", timeDiff, maxDiff);
+ if (Math.abs(timeDiff) > Math.abs(maxDiff)) {
+ throw new IllegalStateException("Server clock seems off (" + timeDiff + "ms) by more than configured amount ("
+ + maxDiff + "ms)");
+ }
+ } catch (RuntimeException e) { // no checked exception
+ // in case of a RuntimeException, just log but continue
+ log.warn("registerNodeStore: got RuntimeException while trying to determine time difference to server: " + e, e);
}
Dictionary<String, Object> props = new Hashtable<String, Object>();
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java?rev=1695520&r1=1695519&r2=1695520&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java Wed Aug 12 14:04:26 2015
@@ -308,7 +308,7 @@ public interface DocumentStore {
* @return description of the underlying storage.
*/
Map<String, String> getMetadata();
-
+
/**
* @return the estimated time difference in milliseconds between
* the local instance and the (typically common, shared) document server system.
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java?rev=1695520&r1=1695519&r2=1695520&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java Wed Aug 12 14:04:26 2015
@@ -401,11 +401,10 @@ public class MemoryDocumentStore impleme
public Map<String, String> getMetadata() {
return metadata;
}
-
+
@Override
public long determineServerTimeDifferenceMillis() {
- // the MemoryDocumentStore has no delays, thus return 0
- return 0;
+ // the MemoryDocumentStore has no delays, thus return 0
+ return 0;
}
-
}
\ No newline at end of file
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java?rev=1695520&r1=1695519&r2=1695520&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java Wed Aug 12 14:04:26 2015
@@ -123,9 +123,9 @@ public class MongoDocumentStore implemen
private final DBCollection settings;
private final DBCollection journal;
- private final DB db;
+ private final DB db;
- private final Cache<CacheValue, NodeDocument> nodesCache;
+ private final Cache<CacheValue, NodeDocument> nodesCache;
private final CacheStats cacheStats;
/**
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java?rev=1695520&r1=1695519&r2=1695520&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java Wed Aug 12 14:04:26 2015
@@ -333,13 +333,13 @@ public class LoggingDocumentStoreWrapper
public Map<String, String> getMetadata() {
return store.getMetadata();
}
-
+
@Override
public long determineServerTimeDifferenceMillis() {
- logMethod("determineServerTimeDifferenceMillis", "start");
- long result = store.determineServerTimeDifferenceMillis();
- logMethod("determineServerTimeDifferenceMillis", "end", result);
- return result;
+ logMethod("determineServerTimeDifferenceMillis", "start");
+ long result = store.determineServerTimeDifferenceMillis();
+ logMethod("determineServerTimeDifferenceMillis", "end", result);
+ return result;
}
private void logMethod(String methodName, Object... args) {
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java?rev=1695520&r1=1695519&r2=1695520&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java Wed Aug 12 14:04:26 2015
@@ -135,10 +135,10 @@ public class SynchronizingDocumentStoreW
public synchronized CacheStats getCacheStats() {
return store.getCacheStats();
}
-
+
@Override
public synchronized long determineServerTimeDifferenceMillis() {
- return store.determineServerTimeDifferenceMillis();
+ return store.determineServerTimeDifferenceMillis();
}
@Override
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java?rev=1695520&r1=1695519&r2=1695520&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java Wed Aug 12 14:04:26 2015
@@ -357,7 +357,7 @@ public class TimingDocumentStoreWrapper
public Map<String, String> getMetadata() {
return base.getMetadata();
}
-
+
@Override
public long determineServerTimeDifferenceMillis() {
try {
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java?rev=1695520&r1=1695519&r2=1695520&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java Wed Aug 12 14:04:26 2015
@@ -34,7 +34,6 @@ import java.util.UUID;
import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Condition;
import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Key;
-import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.junit.Test;
import org.slf4j.Logger;
@@ -589,14 +588,12 @@ public class BasicDocumentStoreTest exte
@Test
public void testServerTimeDiff() throws Exception {
- if (super.ds instanceof RDBDocumentStore) {
- UpdateOp up = new UpdateOp("0:/", true);
- up.set("_id", "0:/");
- super.ds.create(Collection.NODES, Collections.singletonList(up));
- removeMe.add("0:/");
- long td = ((RDBDocumentStore)super.ds).determineServerTimeDifferenceMillis();
- LOG.info("Server time difference on " + super.dsname + ": " + td + "ms");
- }
+ UpdateOp up = new UpdateOp("0:/", true);
+ up.set("_id", "0:/");
+ super.ds.create(Collection.NODES, Collections.singletonList(up));
+ removeMe.add("0:/");
+ long td = super.ds.determineServerTimeDifferenceMillis();
+ LOG.info("Server time difference on " + super.dsname + ": " + td + "ms");
}
@Test
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java?rev=1695520&r1=1695519&r2=1695520&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java Wed Aug 12 14:04:26 2015
@@ -221,6 +221,6 @@ public class CountingDocumentStore imple
@Override
public long determineServerTimeDifferenceMillis() {
- return delegate.determineServerTimeDifferenceMillis();
+ return delegate.determineServerTimeDifferenceMillis();
}
}