You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2015/05/20 09:13:31 UTC
svn commit: r1680463 - in /jackrabbit/oak/branches/1.2: ./
oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStore.java
oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStoreTest.java
Author: chetanm
Date: Wed May 20 07:13:30 2015
New Revision: 1680463
URL: http://svn.apache.org/r1680463
Log:
OAK-2882 - Support migration without access to DataStore
Merging 1680461
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStore.java
jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStoreTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 20 07:13:30 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414,1673436,1673644,1673662-1673664,1673669,1673695,1674046,1674065,1674075,1674107,1674228,1674880,1675055,1675332,1675354,1675357,1675382,1675555,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676725,1677579,1677581,1677609,1677611,1677939,1677991,1678173,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679235,1680182,1680222,1680232,1680236
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414,1673436,1673644,1673662-1673664,1673669,1673695,1674046,1674065,1674075,1674107,1674228,1674880,1675055,1675332,1675354,1675357,1675382,1675555,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676725,1677579,1677581,1677609,1677611,1677939,1677991,1678173,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679235,1680182,1680222,1680232,1680236,1680461
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStore.java?rev=1680463&r1=1680462&r2=1680463&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStore.java (original)
+++ jackrabbit/oak/branches/1.2/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStore.java Wed May 20 07:13:30 2015
@@ -118,6 +118,19 @@ public class LengthCachingDataStore exte
}
@Override
+ public DataRecord getRecordFromReference(String reference) throws DataStoreException {
+ //Override the getRecordFromReference so that reference handling does not
+ //trigger a call to FS
+ if (reference != null) {
+ int colon = reference.indexOf(':');
+ if (colon != -1) {
+ return getRecordIfStored(new DataIdentifier(reference.substring(0, colon)));
+ }
+ }
+ return null;
+ }
+
+ @Override
public DataRecord addRecord(InputStream inputStream) throws DataStoreException {
checkIfReadOnly();
DataRecord result = getDelegate().addRecord(inputStream);
Modified: jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStoreTest.java?rev=1680463&r1=1680462&r2=1680463&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStoreTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStoreTest.java Wed May 20 07:13:30 2015
@@ -158,6 +158,19 @@ public class LengthCachingDataStoreTest
}
+ @Test
+ public void referenceHandling() throws Exception{
+ int minSize = new FileDataStore().getMinRecordLength();
+ LengthCachingDataStore fds = new LengthCachingDataStore();
+ fds.setDelegateClass(FileDataStore.class.getName());
+ fds.init(tempFolder.newFolder().getAbsolutePath());
+ fds.setReadOnly(false);
+
+ DataRecord dr1 = fds.addRecord(byteStream(minSize + 10));
+ assertNotNull(fds.getRecordFromReference(dr1.getReference()));
+ assertEquals(dr1.getIdentifier(), fds.getRecordFromReference(dr1.getReference()).getIdentifier());
+ }
+
private InputStream byteStream(int size) {
return new ByteArrayInputStream(bytes(size));
}