This is an automated email from the ASF dual-hosted git repository.
fortino pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new d7816c62b9 OAK-10491 - Indexing: pass a MongoDatabase instance instead
of MongoConnection to indexing logic (#1151)
d7816c62b9 is described below
commit d7816c62b95a6625c2d3b5ed55f97a699cb2b2a7
Author: Nuno Santos <[email protected]>
AuthorDate: Tue Oct 17 09:42:41 2023 +0200
OAK-10491 - Indexing: pass a MongoDatabase instance instead of
MongoConnection to indexing logic (#1151)
* Refactor Indexing logic to take only a MongoDatabase instance instead of
a MongoConnection, which is a more complex object with more fields other than
the MongoDatabase.
* Remove unused getter.
* Retrigger CI.
* Retrigger CI.
* Retrigger CI.
* Retrigger CI
* Retrigger CI
* Fix test.
---
.../indexer/document/DocumentStoreIndexerBase.java | 11 ++++++-----
.../document/flatfile/FlatFileNodeStoreBuilder.java | 10 +++++-----
.../pipelined/PipelinedMongoDownloadTask.java | 6 +++---
.../flatfile/pipelined/PipelinedStrategy.java | 16 ++++++++--------
.../oak/run/cli/DocumentFixtureProvider.java | 2 ++
.../document/flatfile/pipelined/PipelinedIT.java | 20 ++++++++++----------
.../pipelined/PipelinedMongoDownloadTaskTest.java | 5 +----
.../incrementalstore/IncrementalStoreIT.java | 11 ++++++-----
.../jackrabbit/oak/index/DocumentStoreIndexerIT.java | 5 +++--
9 files changed, 44 insertions(+), 42 deletions(-)
diff --git
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java
index 483653671c..7864fba920 100644
---
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java
+++
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java
@@ -20,6 +20,7 @@
package org.apache.jackrabbit.oak.index.indexer.document;
import com.codahale.metrics.MetricRegistry;
+import com.mongodb.client.MongoDatabase;
import org.apache.jackrabbit.guava.common.base.Stopwatch;
import org.apache.jackrabbit.guava.common.io.Closer;
import org.apache.jackrabbit.oak.api.CommitFailedException;
@@ -170,7 +171,7 @@ public abstract class DocumentStoreIndexerBase implements
Closeable {
.withRootRevision(rootDocumentState.getRootRevision())
.withNodeStore(nodeStore)
.withMongoDocumentStore(getMongoDocumentStore())
- .withMongoConnection(getMongoConnection())
+ .withMongoDatabase(getMongoDatabase())
.withNodeStateEntryTraverserFactory(new
MongoNodeStateEntryTraverserFactory(rootDocumentState.getRootRevision(),
nodeStore, getMongoDocumentStore(),
traversalLog))
.withCheckpoint(indexerSupport.getCheckpoint());
@@ -343,14 +344,14 @@ public abstract class DocumentStoreIndexerBase implements
Closeable {
}
}
- private MongoConnection getMongoConnection() {
- return checkNotNull(indexHelper.getService(MongoConnection.class));
- }
-
private MongoDocumentStore getMongoDocumentStore() {
return checkNotNull(indexHelper.getService(MongoDocumentStore.class));
}
+ private MongoDatabase getMongoDatabase() {
+ return checkNotNull(indexHelper.getService(MongoDatabase.class));
+ }
+
private void configureEstimators(IndexingProgressReporter
progressReporter) {
StatisticsProvider statsProvider = indexHelper.getStatisticsProvider();
if (statsProvider instanceof MetricStatisticsProvider) {
diff --git
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileNodeStoreBuilder.java
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileNodeStoreBuilder.java
index 9135094c32..b6355eddde 100644
---
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileNodeStoreBuilder.java
+++
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileNodeStoreBuilder.java
@@ -19,6 +19,7 @@
package org.apache.jackrabbit.oak.index.indexer.document.flatfile;
+import com.mongodb.client.MongoDatabase;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.jackrabbit.guava.common.collect.Iterables;
@@ -33,7 +34,6 @@ import
org.apache.jackrabbit.oak.index.indexer.document.indexstore.IndexStoreUti
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
import org.apache.jackrabbit.oak.plugins.document.RevisionVector;
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore;
-import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
import org.apache.jackrabbit.oak.query.NodeStateNodeTypeInfoProvider;
@@ -138,7 +138,7 @@ public class FlatFileNodeStoreBuilder {
private RevisionVector rootRevision = null;
private DocumentNodeStore nodeStore = null;
private MongoDocumentStore mongoDocumentStore = null;
- private MongoConnection mongoConnection = null;
+ private MongoDatabase mongoDatabase = null;
private Set<IndexDefinition> indexDefinitions = null;
private String checkpoint;
@@ -235,8 +235,8 @@ public class FlatFileNodeStoreBuilder {
return this;
}
- public FlatFileNodeStoreBuilder withMongoConnection(MongoConnection
mongoConnection) {
- this.mongoConnection = mongoConnection;
+ public FlatFileNodeStoreBuilder withMongoDatabase(MongoDatabase
mongoDatabase) {
+ this.mongoDatabase = mongoDatabase;
return this;
}
@@ -370,7 +370,7 @@ public class FlatFileNodeStoreBuilder {
case PIPELINED:
log.info("Using PipelinedStrategy");
List<PathFilter> pathFilters =
indexDefinitions.stream().map(IndexDefinition::getPathFilter).collect(Collectors.toList());
- return new PipelinedStrategy(mongoDocumentStore,
mongoConnection, nodeStore, rootRevision,
+ return new PipelinedStrategy(mongoDocumentStore,
mongoDatabase, nodeStore, rootRevision,
preferredPathElements, blobStore, dir, algorithm,
pathPredicate, pathFilters, checkpoint);
}
diff --git
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoDownloadTask.java
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoDownloadTask.java
index 2ef0de6c0a..6a2a7ade6a 100644
---
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoDownloadTask.java
+++
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoDownloadTask.java
@@ -26,6 +26,7 @@ import com.mongodb.ReadPreference;
import com.mongodb.client.FindIterable;
import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoCursor;
+import com.mongodb.client.MongoDatabase;
import com.mongodb.client.model.Filters;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.guava.common.base.Preconditions;
@@ -34,7 +35,6 @@ import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.plugins.document.Collection;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore;
-import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.apache.jackrabbit.oak.plugins.index.FormattingUtils;
import org.apache.jackrabbit.oak.plugins.index.MetricsFormatter;
@@ -136,7 +136,7 @@ public class PipelinedMongoDownloadTask implements
Callable<PipelinedMongoDownlo
private String lastIdDownloaded = null;
- public PipelinedMongoDownloadTask(MongoConnection mongoConnection,
+ public PipelinedMongoDownloadTask(MongoDatabase mongoDatabase,
MongoDocumentStore mongoDocStore,
int maxBatchSizeBytes,
int maxBatchNumberOfDocuments,
@@ -147,7 +147,7 @@ public class PipelinedMongoDownloadTask implements
Callable<PipelinedMongoDownlo
CodecRegistries.fromProviders(nodeDocumentCodecProvider),
MongoClientSettings.getDefaultCodecRegistry()
);
- this.dbCollection = mongoConnection.getDatabase()
+ this.dbCollection = mongoDatabase
.withCodecRegistry(nodeDocumentCodecRegistry)
.getCollection(Collection.NODES.toString(),
NodeDocument.class);
this.maxBatchSizeBytes = maxBatchSizeBytes;
diff --git
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedStrategy.java
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedStrategy.java
index 35f518d50d..41a2d33a95 100644
---
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedStrategy.java
+++
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedStrategy.java
@@ -18,6 +18,7 @@
*/
package org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined;
+import com.mongodb.client.MongoDatabase;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.guava.common.base.Preconditions;
import org.apache.jackrabbit.guava.common.base.Stopwatch;
@@ -29,7 +30,6 @@ import
org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
import org.apache.jackrabbit.oak.plugins.document.RevisionVector;
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore;
-import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
import org.apache.jackrabbit.oak.plugins.index.FormattingUtils;
import org.apache.jackrabbit.oak.plugins.index.MetricsFormatter;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
@@ -199,7 +199,7 @@ public class PipelinedStrategy extends
IndexStoreSortStrategyBase {
}
private final MongoDocumentStore docStore;
- private final MongoConnection mongoConnection;
+ private final MongoDatabase mongoDatabase;
private final DocumentNodeStore documentNodeStore;
private final RevisionVector rootRevision;
private final BlobStore blobStore;
@@ -220,11 +220,11 @@ public class PipelinedStrategy extends
IndexStoreSortStrategyBase {
* @param pathPredicate Used by the transform stage to test if a node
should be kept or discarded.
* @param pathFilters If non-empty, the download stage will use these
filters to try to create a query that downloads
* only the matching MongoDB documents.
- * @deprecated use {@link
PipelinedStrategy#PipelinedStrategy(MongoDocumentStore, MongoConnection,
DocumentNodeStore, RevisionVector, Set, BlobStore, File, Compression,
Predicate, List, String)} instead
+ * @deprecated use {@link
PipelinedStrategy#PipelinedStrategy(MongoDocumentStore, MongoDatabase,
DocumentNodeStore, RevisionVector, Set, BlobStore, File, Compression,
Predicate, List, String)} instead
*/
@Deprecated
public PipelinedStrategy(MongoDocumentStore documentStore,
- MongoConnection mongoConnection,
+ MongoDatabase mongoDatabase,
DocumentNodeStore documentNodeStore,
RevisionVector rootRevision,
Set<String> preferredPathElements,
@@ -233,12 +233,12 @@ public class PipelinedStrategy extends
IndexStoreSortStrategyBase {
Compression algorithm,
Predicate<String> pathPredicate,
List<PathFilter> pathFilters) {
- this(documentStore, mongoConnection, documentNodeStore, rootRevision,
preferredPathElements, blobStore, storeDir,
+ this(documentStore, mongoDatabase, documentNodeStore, rootRevision,
preferredPathElements, blobStore, storeDir,
algorithm, pathPredicate, pathFilters, null);
}
public PipelinedStrategy(MongoDocumentStore documentStore,
- MongoConnection mongoConnection,
+ MongoDatabase mongoDatabase,
DocumentNodeStore documentNodeStore,
RevisionVector rootRevision,
Set<String> preferredPathElements,
@@ -250,7 +250,7 @@ public class PipelinedStrategy extends
IndexStoreSortStrategyBase {
String checkpoint) {
super(storeDir, algorithm, pathPredicate, preferredPathElements,
checkpoint);
this.docStore = documentStore;
- this.mongoConnection = mongoConnection;
+ this.mongoDatabase = mongoDatabase;
this.documentNodeStore = documentNodeStore;
this.rootRevision = rootRevision;
this.blobStore = blobStore;
@@ -400,7 +400,7 @@ public class PipelinedStrategy extends
IndexStoreSortStrategyBase {
LOG.info("[TASK:PIPELINED-DUMP:START] Starting to build FFS");
Stopwatch start = Stopwatch.createStarted();
PipelinedMongoDownloadTask downloadTask = new
PipelinedMongoDownloadTask(
- mongoConnection,
+ mongoDatabase,
docStore,
(int) (mongoDocBatchMaxSizeMB * FileUtils.ONE_MB),
mongoDocBatchMaxNumberOfDocuments,
diff --git
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureProvider.java
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureProvider.java
index e043b08361..13942dcca2 100644
---
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureProvider.java
+++
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureProvider.java
@@ -23,6 +23,7 @@ import java.io.IOException;
import javax.sql.DataSource;
+import com.mongodb.client.MongoDatabase;
import org.apache.jackrabbit.guava.common.io.Closer;
import com.mongodb.MongoClientURI;
import org.apache.commons.io.FileUtils;
@@ -109,6 +110,7 @@ class DocumentFixtureProvider {
}
MongoConnection mongo = new MongoConnection(uri.getURI());
wb.register(MongoConnection.class, mongo, emptyMap());
+ wb.register(MongoDatabase.class, mongo.getDatabase(), emptyMap());
closer.register(mongo::close);
((MongoDocumentNodeStoreBuilder)
builder).setMongoDB(mongo.getMongoClient(), mongo.getDBName());
dns = builder.build();
diff --git
a/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedIT.java
b/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedIT.java
index 9081a602d7..0705bf7959 100644
---
a/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedIT.java
+++
b/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedIT.java
@@ -18,6 +18,7 @@
*/
package org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined;
+import com.mongodb.client.MongoDatabase;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.jackrabbit.oak.api.CommitFailedException;
@@ -64,6 +65,10 @@ import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
public class PipelinedIT {
+ private static final PathFilter contentDamPathFilter = new
PathFilter(List.of("/content/dam"), List.of());
+ private static final int LONG_PATH_TEST_LEVELS = 30;
+ private static final String LONG_PATH_LEVEL_STRING =
"Z12345678901234567890-Level_";
+
@Rule
public final MongoConnectionFactory connectionFactory = new
MongoConnectionFactory();
@Rule
@@ -73,11 +78,6 @@ public class PipelinedIT {
@Rule
public final TemporaryFolder sortFolder = new TemporaryFolder();
- private static final PathFilter contentDamPathFilter = new
PathFilter(List.of("/content/dam"), List.of());
-
- private static final int LONG_PATH_TEST_LEVELS = 30;
- private static final String LONG_PATH_LEVEL_STRING =
"Z12345678901234567890-Level_";
-
@BeforeClass
public static void setup() throws IOException {
Assume.assumeTrue(MongoUtils.isAvailable());
@@ -306,7 +306,7 @@ public class PipelinedIT {
RevisionVector rootRevision =
backend.documentNodeStore.getRoot().getRootRevision();
return new PipelinedStrategy(
backend.mongoDocumentStore,
- backend.mongoConnection,
+ backend.mongoDatabase,
backend.documentNodeStore,
rootRevision,
preferredPathElements,
@@ -369,18 +369,18 @@ public class PipelinedIT {
}
builder.setAsyncDelay(1);
DocumentNodeStore documentNodeStore = builder.getNodeStore();
- return new Backend((MongoDocumentStore) builder.getDocumentStore(),
documentNodeStore, c);
+ return new Backend((MongoDocumentStore) builder.getDocumentStore(),
documentNodeStore, c.getDatabase());
}
static class Backend {
final MongoDocumentStore mongoDocumentStore;
final DocumentNodeStore documentNodeStore;
- final MongoConnection mongoConnection;
+ final MongoDatabase mongoDatabase;
- public Backend(MongoDocumentStore mongoDocumentStore,
DocumentNodeStore documentNodeStore, MongoConnection mongoConnection) {
+ public Backend(MongoDocumentStore mongoDocumentStore,
DocumentNodeStore documentNodeStore, MongoDatabase mongoDatabase) {
this.mongoDocumentStore = mongoDocumentStore;
this.documentNodeStore = documentNodeStore;
- this.mongoConnection = mongoConnection;
+ this.mongoDatabase = mongoDatabase;
}
}
}
diff --git
a/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoDownloadTaskTest.java
b/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoDownloadTaskTest.java
index b5f069793c..f1d082ba02 100644
---
a/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoDownloadTaskTest.java
+++
b/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoDownloadTaskTest.java
@@ -28,7 +28,6 @@ import org.apache.jackrabbit.oak.plugins.document.Collection;
import org.apache.jackrabbit.oak.plugins.document.DocumentStore;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore;
-import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
import org.apache.jackrabbit.oak.spi.filter.PathFilter;
import org.bson.BsonDocument;
import org.bson.conversions.Bson;
@@ -64,10 +63,8 @@ public class PipelinedMongoDownloadTaskTest {
@SuppressWarnings("unchecked")
MongoCollection<NodeDocument> dbCollection =
mock(MongoCollection.class);
- MongoConnection mongoConnection = mock(MongoConnection.class);
MongoDatabase mongoDatabase = mock(MongoDatabase.class);
when(mongoDatabase.withCodecRegistry(any())).thenReturn(mongoDatabase);
- when(mongoConnection.getDatabase()).thenReturn(mongoDatabase);
when(mongoDatabase.getCollection(eq(Collection.NODES.toString()),
eq(NodeDocument.class))).thenReturn(dbCollection);
DocumentStore docStore = mock(DocumentStore.class);
@@ -103,7 +100,7 @@ public class PipelinedMongoDownloadTaskTest {
BlockingQueue<NodeDocument[]> queue = new ArrayBlockingQueue<>(100);
MongoDocumentStore mongoDocumentStore = mock(MongoDocumentStore.class);
- PipelinedMongoDownloadTask task = new
PipelinedMongoDownloadTask(mongoConnection, mongoDocumentStore,
batchMaxMemorySize, batchMaxElements, queue, null);
+ PipelinedMongoDownloadTask task = new
PipelinedMongoDownloadTask(mongoDatabase, mongoDocumentStore,
batchMaxMemorySize, batchMaxElements, queue, null);
// Execute
PipelinedMongoDownloadTask.Result result = task.call();
diff --git
a/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalStoreIT.java
b/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalStoreIT.java
index 4cea68aa54..a6902e576a 100644
---
a/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalStoreIT.java
+++
b/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalStoreIT.java
@@ -20,6 +20,7 @@ package
org.apache.jackrabbit.oak.index.indexer.document.incrementalstore;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.mongodb.client.MongoDatabase;
import org.apache.commons.collections4.set.ListOrderedSet;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.commons.Compression;
@@ -299,7 +300,7 @@ public class IncrementalStoreIT {
RevisionVector rootRevision =
backend.documentNodeStore.getRoot().getRootRevision();
return new PipelinedStrategy(
backend.mongoDocumentStore,
- backend.mongoConnection,
+ backend.mongoDatabase,
backend.documentNodeStore,
rootRevision,
preferredPathElements,
@@ -477,19 +478,19 @@ public class IncrementalStoreIT {
}
builder.setAsyncDelay(1);
DocumentNodeStore documentNodeStore = builder.getNodeStore();
- return new Backend((MongoDocumentStore) builder.getDocumentStore(),
documentNodeStore, c);
+ return new Backend((MongoDocumentStore) builder.getDocumentStore(),
documentNodeStore, c.getDatabase());
}
static class Backend {
final MongoDocumentStore mongoDocumentStore;
final DocumentNodeStore documentNodeStore;
- final MongoConnection mongoConnection;
+ final MongoDatabase mongoDatabase;
- public Backend(MongoDocumentStore mongoDocumentStore,
DocumentNodeStore documentNodeStore, MongoConnection mongoConnection) {
+ public Backend(MongoDocumentStore mongoDocumentStore,
DocumentNodeStore documentNodeStore, MongoDatabase mongoDatabase) {
this.mongoDocumentStore = mongoDocumentStore;
this.documentNodeStore = documentNodeStore;
- this.mongoConnection = mongoConnection;
+ this.mongoDatabase = mongoDatabase;
}
}
diff --git
a/oak-run/src/test/java/org/apache/jackrabbit/oak/index/DocumentStoreIndexerIT.java
b/oak-run/src/test/java/org/apache/jackrabbit/oak/index/DocumentStoreIndexerIT.java
index d0dd56bc44..cb41b1093d 100644
---
a/oak-run/src/test/java/org/apache/jackrabbit/oak/index/DocumentStoreIndexerIT.java
+++
b/oak-run/src/test/java/org/apache/jackrabbit/oak/index/DocumentStoreIndexerIT.java
@@ -19,6 +19,7 @@
package org.apache.jackrabbit.oak.index;
+import com.mongodb.client.MongoDatabase;
import org.apache.jackrabbit.guava.common.collect.Iterators;
import org.apache.jackrabbit.oak.InitialContent;
import org.apache.jackrabbit.oak.api.CommitFailedException;
@@ -306,7 +307,7 @@ public class DocumentStoreIndexerIT extends
LuceneAbstractIndexCommandTest {
MongoDocumentStore ds = (MongoDocumentStore)
docBuilder.getDocumentStore();
Registration r1 = wb.register(MongoDocumentStore.class, ds,
emptyMap());
wb.register(StatisticsProvider.class, StatisticsProvider.NOOP,
emptyMap());
- Registration c1Registration = wb.register(MongoConnection.class, c1,
emptyMap());
+ Registration c1Registration = wb.register(MongoDatabase.class,
c1.getDatabase(), emptyMap());
configureIndex(store);
configureBundling(store);
@@ -342,7 +343,7 @@ public class DocumentStoreIndexerIT extends
LuceneAbstractIndexCommandTest {
ds = (MongoDocumentStore) docBuilderRO.getDocumentStore();
store = docBuilderRO.build();
wb.register(MongoDocumentStore.class, ds, emptyMap());
- wb.register(MongoConnection.class, c2, emptyMap());
+ wb.register(MongoDatabase.class, c2.getDatabase(), emptyMap());
ExtendedIndexHelper helper = new ExtendedIndexHelper(store,
store.getBlobStore(), wb, temporaryFolder.newFolder(),
temporaryFolder.newFolder(), List.of(TEST_INDEX_PATH));
