Author: reschke
Date: Mon May 8 17:21:45 2017
New Revision: 1794417
URL: http://svn.apache.org/viewvc?rev=1794417&view=rev
Log:
OAK-6140: Create RDB-specific BlobReferenceIterator
Added:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobReferenceIterator.java
(with props)
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java?rev=1794417&r1=1794416&r2=1794417&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
Mon May 8 17:21:45 2017
@@ -77,6 +77,7 @@ import org.apache.jackrabbit.oak.plugins
import
org.apache.jackrabbit.oak.plugins.document.persistentCache.EvictionListener;
import
org.apache.jackrabbit.oak.plugins.document.persistentCache.PersistentCache;
import
org.apache.jackrabbit.oak.plugins.document.persistentCache.PersistentCacheStats;
+import org.apache.jackrabbit.oak.plugins.document.rdb.RDBBlobReferenceIterator;
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBBlobStore;
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBOptions;
@@ -1150,10 +1151,13 @@ public class DocumentMK {
return new Iterable<ReferencedBlob>() {
@Override
public Iterator<ReferencedBlob> iterator() {
- if(store instanceof MongoDocumentStore){
+ if (store instanceof MongoDocumentStore) {
return new MongoBlobReferenceIterator(ns,
(MongoDocumentStore) store);
+ } else if (store instanceof RDBDocumentStore) {
+ return new RDBBlobReferenceIterator(ns,
(RDBDocumentStore) store);
+ } else {
+ return new BlobReferenceIterator(ns);
}
- return new BlobReferenceIterator(ns);
}
};
}
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=1794417&r1=1794416&r2=1794417&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
Mon May 8 17:21:45 2017
@@ -3211,9 +3211,8 @@ public final class DocumentNodeStore
* Returns an iterator for all the blob present in the store.
*
* <p>In some cases the iterator might implement {@link
java.io.Closeable}. So
- * callers should check for such iterator and close them</p>
+ * callers should check for such iterator and close them.
*
- * @see
org.apache.jackrabbit.oak.plugins.document.mongo.MongoBlobReferenceIterator
* @return an iterator for all the blobs
*/
public Iterator<ReferencedBlob> getReferencedBlobsIterator() {
Added:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobReferenceIterator.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobReferenceIterator.java?rev=1794417&view=auto
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobReferenceIterator.java
(added)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobReferenceIterator.java
Mon May 8 17:21:45 2017
@@ -0,0 +1,50 @@
+/*
+ * 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.rdb;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+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.rdb.RDBDocumentStore.QueryCondition;
+
+public class RDBBlobReferenceIterator extends BlobReferenceIterator {
+
+ private final RDBDocumentStore documentStore;
+
+ public RDBBlobReferenceIterator(DocumentNodeStore nodeStore,
RDBDocumentStore documentStore) {
+ super(nodeStore);
+ this.documentStore = documentStore;
+ }
+
+ private final static List<QueryCondition> WITH_BINARIES = Collections
+ .singletonList(new QueryCondition(NodeDocument.HAS_BINARY_FLAG,
"=", NodeDocument.HAS_BINARY_VAL));
+
+ @Override
+ public Iterator<NodeDocument> getIteratorOverDocsWithBinaries() {
+ return this.documentStore
+ .queryAsIterable(Collection.NODES, null, null,
Collections.emptyList(), WITH_BINARIES, Integer.MAX_VALUE, null)
+ .iterator();
+ }
+}
Propchange:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobReferenceIterator.java
------------------------------------------------------------------------------
svn:eol-style = native
