Author: reschke
Date: Tue Sep 5 15:01:08 2017
New Revision: 1807360
URL: http://svn.apache.org/viewvc?rev=1807360&view=rev
Log:
OAK-6171: Refactor MongoBlobReferenceIterator (ported to 1.6)
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobReferenceIterator.java
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 5 15:01:08 2017
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787217,1787425,1788056,1788378,1788387-1788389,1788850,1789056,1789534,1790382,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1798035,1798834,1799219,1799389,1799393,1799924,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262,1802286,1802548,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1805851-1805852,1806668
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787217,1787425,1788056,1788378,1788387-1788389,1788850,1789056,1789534,1790382,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1798035,1798834,1799219,1799389,1799393,1799924,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262,1802286,1802548,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1805851-1805852,1806668
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobReferenceIterator.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobReferenceIterator.java?rev=1807360&r1=1807359&r2=1807360&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobReferenceIterator.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobReferenceIterator.java
Tue Sep 5 15:01:08 2017
@@ -19,77 +19,43 @@
package org.apache.jackrabbit.oak.plugins.document.mongo;
-import java.io.Closeable;
-import java.util.Queue;
+import static com.google.common.collect.Iterables.transform;
-import com.google.common.collect.AbstractIterator;
-import com.google.common.collect.Queues;
-import com.mongodb.DBCollection;
-import com.mongodb.DBCursor;
-import com.mongodb.DBObject;
-import com.mongodb.QueryBuilder;
-import org.apache.jackrabbit.oak.plugins.blob.ReferencedBlob;
-import org.apache.jackrabbit.oak.plugins.document.BlobCollector;
+import java.util.Iterator;
+
+import org.apache.jackrabbit.oak.plugins.document.BlobReferenceIterator;
import org.apache.jackrabbit.oak.plugins.document.Collection;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
+import org.apache.jackrabbit.oak.plugins.document.util.CloseableIterable;
-public class MongoBlobReferenceIterator extends
AbstractIterator<ReferencedBlob> implements Closeable {
- private final MongoDocumentStore documentStore;
- private final BlobCollector blobCollector;
- private final Queue<ReferencedBlob> blobs = Queues.newArrayDeque();
+import com.google.common.base.Function;
+import com.mongodb.DBCursor;
+import com.mongodb.DBObject;
+import com.mongodb.QueryBuilder;
- private DBCursor cursor;
+public class MongoBlobReferenceIterator extends BlobReferenceIterator {
+
+ private final MongoDocumentStore documentStore;
- public MongoBlobReferenceIterator(DocumentNodeStore nodeStore,
- MongoDocumentStore documentStore) {
+ public MongoBlobReferenceIterator(DocumentNodeStore nodeStore,
MongoDocumentStore documentStore) {
+ super(nodeStore);
this.documentStore = documentStore;
- this.blobCollector = new BlobCollector(nodeStore);
}
@Override
- protected ReferencedBlob computeNext() {
- if (blobs.isEmpty()) {
- loadBatch();
- }
- if (!blobs.isEmpty()) {
- return blobs.remove();
- }
- return endOfData();
- }
-
- private void loadBatch() {
- initializeCursor();
- //Some node which have the '_bin' flag set might not have any binaries
in it
- //so move forward if blobs is still empty and cursor has more elements
- while (cursor.hasNext() && blobs.isEmpty()) {
-
collectBinaries(documentStore.convertFromDBObject(Collection.NODES,
cursor.next()));
- }
- }
-
- private void collectBinaries(NodeDocument nodeDocument) {
- blobCollector.collect(nodeDocument, blobs);
- }
+ public Iterator<NodeDocument> getIteratorOverDocsWithBinaries() {
+ DBObject query =
QueryBuilder.start(NodeDocument.HAS_BINARY_FLAG).is(NodeDocument.HAS_BINARY_VAL).get();
+ // TODO It currently prefers secondary. Would that be Ok?
+ DBCursor cursor =
documentStore.getDBCollection(Collection.NODES).find(query)
+
.setReadPreference(documentStore.getConfiguredReadPreference(Collection.NODES));
+
+ return CloseableIterable.wrap(transform(cursor, new Function<DBObject,
NodeDocument>() {
+ @Override
+ public NodeDocument apply(DBObject input) {
+ return documentStore.convertFromDBObject(Collection.NODES,
input);
+ }
+ }), cursor).iterator();
- private void initializeCursor() {
- if (cursor == null) {
- DBObject query = QueryBuilder.start(NodeDocument.HAS_BINARY_FLAG)
- .is(NodeDocument.HAS_BINARY_VAL)
- .get();
- //TODO It currently prefers secondary. Would that be Ok?
- cursor = getNodeCollection().find(query)
-
.setReadPreference(documentStore.getConfiguredReadPreference(Collection.NODES));
- }
- }
-
- private DBCollection getNodeCollection() {
- return documentStore.getDBCollection(Collection.NODES);
- }
-
- @Override
- public void close() {
- if (cursor != null) {
- cursor.close();
- }
}
}
