Author: amitj
Date: Thu Jun 23 05:02:25 2016
New Revision: 1749815
URL: http://svn.apache.org/viewvc?rev=1749815&view=rev
Log:
OAK-4496: Enable DataStoreBlobStore#getAllRecords to support non-shared
DataStore
Fixed by calling getRecord() explicitly for delegate DataStore's not supporting
#getAllRecords
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/SharedDataStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/SharedDataStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/SharedDataStore.java?rev=1749815&r1=1749814&r2=1749815&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/SharedDataStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/SharedDataStore.java
Thu Jun 23 05:02:25 2016
@@ -79,7 +79,7 @@ public interface SharedDataStore {
*
* @return iterator over DataRecords
*/
- Iterator<DataRecord> getAllRecords();
+ Iterator<DataRecord> getAllRecords() throws DataStoreException;
/**
* Gets the type.
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java?rev=1749815&r1=1749814&r2=1749815&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
Thu Jun 23 05:02:25 2016
@@ -454,11 +454,23 @@ public class DataStoreBlobStore implemen
}
@Override
- public Iterator<DataRecord> getAllRecords() {
+ public Iterator<DataRecord> getAllRecords() throws DataStoreException {
if (delegate instanceof SharedDataStore) {
return ((SharedDataStore) delegate).getAllRecords();
+ } else {
+ return Iterators.transform(delegate.getAllIdentifiers(),
+ new Function<DataIdentifier, DataRecord>() {
+ @Nullable @Override
+ public DataRecord apply(@Nullable DataIdentifier input) {
+ try {
+ return delegate.getRecord(input);
+ } catch (DataStoreException e) {
+ log.warn("Error occurred while fetching DataRecord
for identifier {}", input, e);
+ }
+ return null;
+ }
+ });
}
- return Iterators.emptyIterator();
}
@Override
