Author: mreutegg
Date: Mon Oct 1 10:26:08 2018
New Revision: 1842463
URL: http://svn.apache.org/viewvc?rev=1842463&view=rev
Log:
OAK-7783: Default write concern and read concern level not applied
Added:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReplicaSetDefaultWriteConcernIT.java
(with props)
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/UnlockUpgradeCommand.java
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/UnlockUpgradeCommandTest.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentNodeStoreBuilderBase.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/AcquireRecoveryLockTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDBExceptionTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreMetricsTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongodProcessFactory.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/QueryHintTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/RetryReadIT.java
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/UnlockUpgradeCommand.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/UnlockUpgradeCommand.java?rev=1842463&r1=1842462&r2=1842463&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/UnlockUpgradeCommand.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/UnlockUpgradeCommand.java
Mon Oct 1 10:26:08 2018
@@ -81,7 +81,7 @@ class UnlockUpgradeCommand implements Co
} else {
MongoConnection mongo = new
MongoConnection(clientURI.getURI());
store = new MongoDocumentStore(
- mongo.getMongoClient(), mongo.getDBName(),
+ mongo.getMongoClient(), mongo.getDatabase(),
new MongoDocumentNodeStoreBuilder());
}
} else if (uri.startsWith("jdbc")) {
Modified:
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/UnlockUpgradeCommandTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/UnlockUpgradeCommandTest.java?rev=1842463&r1=1842462&r2=1842463&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/UnlockUpgradeCommandTest.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/UnlockUpgradeCommandTest.java
Mon Oct 1 10:26:08 2018
@@ -82,7 +82,7 @@ public class UnlockUpgradeCommandTest {
private void resetFormatVersion(FormatVersion v) {
MongoConnection c = connectionFactory.getConnection();
DocumentStore s = new MongoDocumentStore(c.getMongoClient(),
- c.getDBName(), newMongoDocumentNodeStoreBuilder());
+ c.getDatabase(), newMongoDocumentNodeStoreBuilder());
s.remove(Collection.SETTINGS, "version");
assertTrue(v.writeTo(s));
s.dispose();
Modified:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentNodeStoreBuilderBase.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentNodeStoreBuilderBase.java?rev=1842463&r1=1842462&r2=1842463&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentNodeStoreBuilderBase.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentNodeStoreBuilderBase.java
Mon Oct 1 10:26:08 2018
@@ -224,7 +224,7 @@ public abstract class MongoDocumentNodeS
this.mongoStatus = status;
this.documentStoreSupplier = memoize(() -> new MongoDocumentStore(
- client, db.getName(), MongoDocumentNodeStoreBuilderBase.this));
+ client, db, MongoDocumentNodeStoreBuilderBase.this));
if (this.blobStore == null) {
GarbageCollectableBlobStore s = new MongoBlobStore(db,
blobCacheSizeMB * 1024 * 1024L);
Modified:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java?rev=1842463&r1=1842462&r2=1842463&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
Mon Oct 1 10:26:08 2018
@@ -246,12 +246,12 @@ public class MongoDocumentStore implemen
private final boolean readOnly;
- public MongoDocumentStore(MongoClient client, String dbName,
+ public MongoDocumentStore(MongoClient client, MongoDatabase db,
MongoDocumentNodeStoreBuilderBase<?> builder) {
this.readOnly = builder.getReadOnlyMode();
MongoStatus mongoStatus = builder.getMongoStatus();
if (mongoStatus == null) {
- mongoStatus = new MongoStatus(client, dbName);
+ mongoStatus = new MongoStatus(client, db.getName());
}
mongoStatus.checkVersion();
metadata = ImmutableMap.<String,String>builder()
@@ -262,7 +262,7 @@ public class MongoDocumentStore implemen
this.client = client;
this.status = mongoStatus;
this.sessionFactory = new MongoSessionFactory(client);
- this.db = client.getDatabase(dbName);
+ this.db = db;
stats = builder.getDocumentStoreStatsCollector();
nodes = db.getCollection(Collection.NODES.toString(),
BasicDBObject.class);
clusterNodes = db.getCollection(Collection.CLUSTER_NODES.toString(),
BasicDBObject.class);
Modified:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTest.java?rev=1842463&r1=1842462&r2=1842463&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTest.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTest.java
Mon Oct 1 10:26:08 2018
@@ -53,7 +53,7 @@ public class CacheConsistencyTest extend
MongoUtils.dropCollections(db);
DocumentMK.Builder builder = new DocumentMK.Builder()
.clock(getTestClock()).setAsyncDelay(0);
- store = new TestStore(mongoConnection.getMongoClient(), db.getName(),
builder);
+ store = new TestStore(mongoConnection.getMongoClient(), db, builder);
mk = builder.setDocumentStore(store).open();
}
@@ -108,8 +108,8 @@ public class CacheConsistencyTest extend
final Map<Thread, Semaphore> semaphores = Maps.newConcurrentMap();
- TestStore(MongoClient client, String dbName, DocumentMK.Builder
builder) {
- super(client, dbName, builder);
+ TestStore(MongoClient client, MongoDatabase db, DocumentMK.Builder
builder) {
+ super(client, db, builder);
}
@Override
Modified:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java?rev=1842463&r1=1842462&r2=1842463&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java
Mon Oct 1 10:26:08 2018
@@ -214,7 +214,7 @@ public abstract class DocumentStoreFixtu
MongoConnection connection = MongoUtils.getConnection();
connections.add(connection);
return new MongoDocumentStore(connection.getMongoClient(),
- connection.getDBName(), builder);
+ connection.getDatabase(), builder);
} catch (Exception e) {
throw new RuntimeException(e);
}
Modified:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreTest.java?rev=1842463&r1=1842462&r2=1842463&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreTest.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreTest.java
Mon Oct 1 10:26:08 2018
@@ -65,7 +65,7 @@ public class MongoDocumentStoreTest {
if (MONGO_DB) {
MongoConnection c = connectionFactory.getConnection();
assertNotNull(c);
- return new MongoDocumentStore(c.getMongoClient(), c.getDBName(),
new DocumentMK.Builder());
+ return new MongoDocumentStore(c.getMongoClient(), c.getDatabase(),
new DocumentMK.Builder());
}
return new MemoryDocumentStore();
}
Modified:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/AcquireRecoveryLockTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/AcquireRecoveryLockTest.java?rev=1842463&r1=1842462&r2=1842463&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/AcquireRecoveryLockTest.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/AcquireRecoveryLockTest.java
Mon Oct 1 10:26:08 2018
@@ -49,7 +49,7 @@ public class AcquireRecoveryLockTest ext
MongoConnection connection = connectionFactory.getConnection();
assumeNotNull(connection);
store = new MongoDocumentStore(
- connection.getMongoClient(), connection.getDBName(),
+ connection.getMongoClient(), connection.getDatabase(),
new DocumentMK.Builder());
}
Modified:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDBExceptionTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDBExceptionTest.java?rev=1842463&r1=1842462&r2=1842463&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDBExceptionTest.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDBExceptionTest.java
Mon Oct 1 10:26:08 2018
@@ -53,7 +53,7 @@ public class MongoDBExceptionTest {
public void before() {
MongoUtils.dropCollections(MongoUtils.DB);
client = new MongoTestClient(MongoUtils.URL);
- store = new MongoDocumentStore(client, MongoUtils.DB,
+ store = new MongoDocumentStore(client,
client.getDatabase(MongoUtils.DB),
new DocumentMK.Builder());
}
Modified:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreMetricsTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreMetricsTest.java?rev=1842463&r1=1842462&r2=1842463&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreMetricsTest.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreMetricsTest.java
Mon Oct 1 10:26:08 2018
@@ -54,7 +54,7 @@ public class MongoDocumentStoreMetricsTe
MongoConnection connection = connectionFactory.getConnection();
assumeNotNull(connection);
MongoDocumentStore store = new MongoDocumentStore(
- connection.getMongoClient(), connection.getDBName(),
+ connection.getMongoClient(), connection.getDatabase(),
newMongoDocumentNodeStoreBuilder());
try {
MongoDocumentStoreMetrics metrics = new
MongoDocumentStoreMetrics(store, statsProvider);
Modified:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreTest.java?rev=1842463&r1=1842462&r2=1842463&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreTest.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreTest.java
Mon Oct 1 10:26:08 2018
@@ -92,7 +92,7 @@ public class MongoDocumentStoreTest exte
static final class TestStore extends MongoDocumentStore {
TestStore(MongoConnection c, DocumentMK.Builder builder) {
- super(c.getMongoClient(), c.getDBName(), builder);
+ super(c.getMongoClient(), c.getDatabase(), builder);
}
}
}
Modified:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongodProcessFactory.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongodProcessFactory.java?rev=1842463&r1=1842462&r2=1842463&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongodProcessFactory.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongodProcessFactory.java
Mon Oct 1 10:26:08 2018
@@ -42,6 +42,7 @@ import de.flapdoodle.embed.mongo.config.
import de.flapdoodle.embed.process.config.IRuntimeConfig;
import de.flapdoodle.embed.process.io.directories.FixedPath;
import de.flapdoodle.embed.process.io.directories.IDirectory;
+import de.flapdoodle.embed.process.io.progress.Slf4jProgressListener;
import de.flapdoodle.embed.process.runtime.Network;
import static de.flapdoodle.embed.process.io.directories.Directories.join;
@@ -70,6 +71,7 @@ public class MongodProcessFactory extend
.defaults(Command.MongoD)
.download(new DownloadConfigBuilder()
.defaultsForCommand(Command.MongoD)
+ .progressListener(new Slf4jProgressListener(LOG))
.artifactStorePath(DOWNLOAD_DIR).build())
.extractDir(EXTRACT_DIR).build())
.daemonProcess(false)
Modified:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/QueryHintTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/QueryHintTest.java?rev=1842463&r1=1842462&r2=1842463&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/QueryHintTest.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/QueryHintTest.java
Mon Oct 1 10:26:08 2018
@@ -56,7 +56,7 @@ public class QueryHintTest extends Abstr
//If we retain this feature then need to have better config support
for it
System.setProperty("oak.mongo.maxDeltaForModTimeIdxSecs", "120");
mongoDS = new MongoDocumentStore(mongoConnection.getMongoClient(),
- mongoConnection.getDBName(), new DocumentMK.Builder());
+ mongoConnection.getDatabase(), new DocumentMK.Builder());
mongoDS.setClock(clock);
TRACE_LOGGER.addHandler(testHandler);
TRACE_LOGGER.setLevel(Level.FINEST);
Added:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReplicaSetDefaultWriteConcernIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReplicaSetDefaultWriteConcernIT.java?rev=1842463&view=auto
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReplicaSetDefaultWriteConcernIT.java
(added)
+++
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReplicaSetDefaultWriteConcernIT.java
Mon Oct 1 10:26:08 2018
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.jackrabbit.oak.plugins.document.mongo;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.mongodb.WriteConcern;
+
+import org.apache.jackrabbit.oak.plugins.document.Collection;
+import org.apache.jackrabbit.oak.plugins.document.DocumentMKBuilderProvider;
+import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
+import org.apache.jackrabbit.oak.plugins.document.DocumentStore;
+import org.apache.jackrabbit.oak.plugins.document.LeaseCheckMode;
+import org.apache.jackrabbit.oak.plugins.document.MongoUtils;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class ReplicaSetDefaultWriteConcernIT {
+
+ @Rule
+ public MongodProcessFactory mongodProcessFactory = new
MongodProcessFactory();
+
+ @Rule
+ public DocumentMKBuilderProvider builderProvider = new
DocumentMKBuilderProvider();
+
+ private Map<Integer, MongodProcess> executables = new HashMap<>();
+
+ @Before
+ public void before() throws IOException {
+ executables.putAll(mongodProcessFactory.startReplicaSet("rs", 3));
+ }
+
+ @Test
+ public void majorityWriteConcern() {
+ String uri = "mongodb://" +
MongodProcessFactory.localhost(executables.keySet());
+ DocumentNodeStore ns = builderProvider.newBuilder()
+ .setLeaseCheckMode(LeaseCheckMode.DISABLED)
+ .setMongoDB(uri, MongoUtils.DB, 0).build();
+ DocumentStore store = ns.getDocumentStore();
+ assertTrue(store instanceof MongoDocumentStore);
+ MongoDocumentStore mds = (MongoDocumentStore) store;
+ WriteConcern wc =
mds.getDBCollection(Collection.NODES).getWriteConcern();
+ assertEquals(WriteConcern.MAJORITY, wc);
+ }
+}
Propchange:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReplicaSetDefaultWriteConcernIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/RetryReadIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/RetryReadIT.java?rev=1842463&r1=1842462&r2=1842463&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/RetryReadIT.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/RetryReadIT.java
Mon Oct 1 10:26:08 2018
@@ -31,6 +31,7 @@ import org.junit.Test;
import com.mongodb.MongoClient;
import com.mongodb.MongoException;
+import com.mongodb.client.MongoDatabase;
import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES;
import static org.hamcrest.collection.IsEmptyCollection.empty;
@@ -52,7 +53,7 @@ public class RetryReadIT extends Abstrac
MongoUtils.dropCollections(mongoConnection.getDatabase());
DocumentMK.Builder builder = new DocumentMK.Builder();
builder.clock(getTestClock());
- store = new TestStore(mongoConnection.getMongoClient(),
mongoConnection.getDBName(), builder);
+ store = new TestStore(mongoConnection.getMongoClient(),
mongoConnection.getDatabase(), builder);
mk = builder.setDocumentStore(store).open();
}
@@ -102,8 +103,8 @@ public class RetryReadIT extends Abstrac
private int failRead = 0;
- public TestStore(MongoClient client, String dbName, DocumentMK.Builder
builder) {
- super(client, dbName, builder);
+ public TestStore(MongoClient client, MongoDatabase db,
DocumentMK.Builder builder) {
+ super(client, db, builder);
}
@Override
