Author: amitj
Date: Thu Sep 7 10:05:28 2017
New Revision: 1807580
URL: http://svn.apache.org/viewvc?rev=1807580&view=rev
Log:
OAK-6630: Remove older cached FileDataStore relying on JR caching
- Remove older code relying on CachingFDS from JR2
Removed:
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakCachingFDS.java
jackrabbit/oak/trunk/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakCachingFDSTest.java
Modified:
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/AbstractDataStoreService.java
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FileDataStoreService.java
jackrabbit/oak/trunk/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreServiceTest.java
Modified:
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/AbstractDataStoreService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/AbstractDataStoreService.java?rev=1807580&r1=1807579&r2=1807580&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/AbstractDataStoreService.java
(original)
+++
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/AbstractDataStoreService.java
Thu Sep 7 10:05:28 2017
@@ -53,9 +53,6 @@ import static org.apache.jackrabbit.oak.
@Component(componentAbstract = true)
public abstract class AbstractDataStoreService {
- public static final String JR2_CACHING_PROP = "oak.datastore.jr2caching";
- protected final boolean JR2_CACHING = Boolean.getBoolean(JR2_CACHING_PROP);
-
private static final String PROP_HOME = "repository.home";
public static final String PROP_ENCODE_LENGTH = "encodeLengthInId";
Modified:
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FileDataStoreService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FileDataStoreService.java?rev=1807580&r1=1807579&r2=1807580&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FileDataStoreService.java
(original)
+++
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FileDataStoreService.java
Thu Sep 7 10:05:28 2017
@@ -74,16 +74,6 @@ public class FileDataStoreService extend
properties.putAll(config);
log.info("Initializing with properties " + properties);
- if (JR2_CACHING) {
- OakCachingFDS dataStore = new OakCachingFDS();
- dataStore.setFsBackendPath(fsBackendPath);
-
- // Disabling asyncUpload by default
- dataStore.setAsyncUploadLimit(
- PropertiesUtil.toInteger(config.get("asyncUploadLimit"),
0));
- dataStore.setProperties(properties);
- return dataStore;
- }
return getCachingDataStore(properties, context);
} else {
log.info("OakFileDataStore initialized");
Modified:
jackrabbit/oak/trunk/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreServiceTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreServiceTest.java?rev=1807580&r1=1807579&r2=1807580&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreServiceTest.java
(original)
+++
jackrabbit/oak/trunk/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreServiceTest.java
Thu Sep 7 10:05:28 2017
@@ -19,8 +19,6 @@
package org.apache.jackrabbit.oak.plugins.blob.datastore;
-import static
org.apache.jackrabbit.oak.plugins.blob.datastore.AbstractDataStoreService
- .JR2_CACHING_PROP;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -36,10 +34,7 @@ import javax.jcr.RepositoryException;
import com.google.common.collect.ImmutableMap;
import org.apache.commons.io.FileUtils;
-import org.apache.jackrabbit.core.data.Backend;
-import org.apache.jackrabbit.core.data.CachingFDS;
import org.apache.jackrabbit.core.data.DataStore;
-import org.apache.jackrabbit.core.data.FSBackend;
import org.apache.jackrabbit.core.data.FileDataStore;
import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean;
import org.apache.jackrabbit.oak.commons.PropertiesUtil;
@@ -74,39 +69,6 @@ public class DataStoreServiceTest {
}
/**
- *
- * Test @CachingFDS is returned when cacheSize > 0
- */
- @Test
- public void configCachingFDS() throws Exception {
- System.setProperty(JR2_CACHING_PROP, "true");
- try {
- String nasPath = folder.getRoot().getAbsolutePath() + "/NASPath";
- String cachePath = folder.getRoot().getAbsolutePath() +
"/cachePath";
- long cacheSize = 100L;
- Map<String, Object> config = new HashMap<String, Object>();
- config.put("repository.home", folder.getRoot().getAbsolutePath());
- config.put(FileDataStoreService.CACHE_SIZE, cacheSize);
- config.put(FileDataStoreService.PATH, nasPath);
- config.put(FileDataStoreService.CACHE_PATH, cachePath);
- FileDataStoreService fdsSvc = new FileDataStoreService();
-
- DataStore ds = fdsSvc.createDataStore(context.componentContext(),
config);
- PropertiesUtil.populate(ds, config, false);
- ds.init(folder.getRoot().getAbsolutePath());
- assertTrue("not instance of CachingFDS", ds instanceof CachingFDS);
- CachingFDS cds = (CachingFDS) ds;
- assertEquals("cachesize not equal", cacheSize, cds.getCacheSize());
- assertEquals("cachepath not equal", cachePath, cds.getPath());
- Backend backend = cds.getBackend();
- Properties props = (Properties) getField(backend);
- assertEquals("path not equal", nasPath,
props.getProperty(FSBackend.FS_BACKEND_PATH));
- } finally {
- System.clearProperty(JR2_CACHING_PROP);
- }
- }
-
- /**
*
* Test {@link CachingFileDataStore} is returned when cacheSize > 0 by
default.
*/
