Author: amitj
Date: Thu Sep 7 10:04:59 2017
New Revision: 1807578
URL: http://svn.apache.org/viewvc?rev=1807578&view=rev
Log:
OAK-6603: [oak-blob-cloud] Remove the older S3 connector relying on JR caching
- Removing unused code and removing references from tests/utils/services etc
Removed:
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3DataStore.java
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3DataStoreStats.java
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/SharedS3Backend.java
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/SharedS3DataStore.java
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3DataStoreStatsTest.java
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3DSAsyncTouch.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentS3DataStoreStatsTest.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentS3DataStoreStatsTest.java
Modified:
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/AbstractS3DataStoreService.java
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreServiceTest.java
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreUtils.java
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3DataStore.java
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3Ds.java
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/DataStoreUtils.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreFixtureProvider.java
Modified:
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/AbstractS3DataStoreService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/AbstractS3DataStoreService.java?rev=1807578&r1=1807577&r2=1807578&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/AbstractS3DataStoreService.java
(original)
+++
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/AbstractS3DataStoreService.java
Thu Sep 7 10:04:59 2017
@@ -27,7 +27,6 @@ import java.util.Properties;
import org.apache.felix.scr.annotations.Component;
import org.apache.jackrabbit.core.data.DataStore;
import org.apache.jackrabbit.core.data.DataStoreException;
-import org.apache.jackrabbit.oak.blob.cloud.aws.s3.SharedS3DataStore;
import org.apache.jackrabbit.oak.plugins.blob.AbstractSharedCachingDataStore;
import
org.apache.jackrabbit.oak.plugins.blob.datastore.AbstractDataStoreService;
import org.osgi.framework.Constants;
@@ -45,35 +44,20 @@ public abstract class AbstractS3DataStor
Properties properties = new Properties();
properties.putAll(config);
- if (JR2_CACHING) {
- SharedS3DataStore dataStore = new SharedS3DataStore();
- dataStore.setProperties(properties);
-
- Dictionary<String, Object> props = new Hashtable<String, Object>();
- props.put(Constants.SERVICE_PID, dataStore.getClass().getName());
- props.put(DESCRIPTION, getDescription());
-
- delegateReg = context.getBundleContext().registerService(new
String[] {
- SharedS3DataStore.class.getName(),
- SharedS3DataStore.class.getName()
- }, dataStore , props);
- return dataStore;
- } else {
- S3DataStore dataStore = new S3DataStore();
- dataStore.setStatisticsProvider(getStatisticsProvider());
- dataStore.setProperties(properties);
-
- Dictionary<String, Object> props = new Hashtable<String, Object>();
- props.put(Constants.SERVICE_PID, dataStore.getClass().getName());
- props.put(DESCRIPTION, getDescription());
-
- delegateReg = context.getBundleContext().registerService(new
String[] {
- AbstractSharedCachingDataStore.class.getName(),
- AbstractSharedCachingDataStore.class.getName()
- }, dataStore , props);
+ S3DataStore dataStore = new S3DataStore();
+ dataStore.setStatisticsProvider(getStatisticsProvider());
+ dataStore.setProperties(properties);
+
+ Dictionary<String, Object> props = new Hashtable<String, Object>();
+ props.put(Constants.SERVICE_PID, dataStore.getClass().getName());
+ props.put(DESCRIPTION, getDescription());
+
+ delegateReg = context.getBundleContext().registerService(new String[] {
+ AbstractSharedCachingDataStore.class.getName(),
+ AbstractSharedCachingDataStore.class.getName()
+ }, dataStore , props);
- return dataStore;
- }
+ return dataStore;
}
protected void deactivate() throws DataStoreException {
Modified:
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreServiceTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreServiceTest.java?rev=1807578&r1=1807577&r2=1807578&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreServiceTest.java
(original)
+++
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreServiceTest.java
Thu Sep 7 10:04:59 2017
@@ -23,11 +23,9 @@ import java.io.IOException;
import java.util.Map;
import com.google.common.collect.Maps;
-import org.apache.jackrabbit.oak.blob.cloud.aws.s3.SharedS3DataStore;
import org.apache.jackrabbit.oak.plugins.blob.AbstractSharedCachingDataStore;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
import org.apache.sling.testing.mock.osgi.junit.OsgiContext;
-import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Rule;
@@ -37,9 +35,9 @@ import org.junit.rules.TemporaryFolder;
import static com.google.common.collect.Maps.newHashMap;
import static
org.apache.jackrabbit.oak.blob.cloud.s3.S3DataStoreUtils.isS3Configured;
-import static
org.apache.jackrabbit.oak.plugins.blob.datastore.AbstractDataStoreService
- .JR2_CACHING_PROP;
+import static org.apache.sling.testing.mock.osgi.MockOsgi.activate;
import static org.apache.sling.testing.mock.osgi.MockOsgi.deactivate;
+import static org.apache.sling.testing.mock.osgi.MockOsgi.injectServices;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assume.assumeTrue;
@@ -67,10 +65,6 @@ public class S3DataStoreServiceTest {
context.registerService(StatisticsProvider.class,
StatisticsProvider.NOOP);
}
- @After
- public void tear() {
- System.clearProperty(JR2_CACHING_PROP);
- }
@Test
public void testDefaultS3Implementation() throws IOException {
@@ -80,23 +74,15 @@ public class S3DataStoreServiceTest {
unregisterBlobStore();
}
- @Test
- public void testJR2Caching() throws IOException {
- System.setProperty(JR2_CACHING_PROP, "true");
- registerBlobStore();
- assertNotNull(context.getService(SharedS3DataStore.class));
-
- unregisterBlobStore();
- }
-
private S3DataStoreService service;
private void registerBlobStore() throws IOException {
Map<String, Object> properties = newHashMap();
properties.putAll(Maps.fromProperties(S3DataStoreUtils.getS3Config()));
properties.put("repository.home",
folder.newFolder().getAbsolutePath());
- service = context
- .registerInjectActivateService(new S3DataStoreService(),
properties);
+ service = new S3DataStoreService();
+ injectServices(service, context.bundleContext());
+ activate(service, context.bundleContext(), properties);
}
private void unregisterBlobStore() {
Modified:
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreUtils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreUtils.java?rev=1807578&r1=1807577&r2=1807578&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreUtils.java
(original)
+++
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreUtils.java
Thu Sep 7 10:04:59 2017
@@ -38,7 +38,6 @@ import com.google.common.collect.Immutab
import com.google.common.collect.Maps;
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.core.data.DataStore;
-import org.apache.jackrabbit.oak.blob.cloud.aws.s3.SharedS3DataStore;
import org.apache.jackrabbit.oak.commons.PropertiesUtil;
import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreUtils;
import org.slf4j.Logger;
@@ -52,19 +51,17 @@ public class S3DataStoreUtils extends Da
private static final String DEFAULT_CONFIG_PATH =
"./src/test/resources/aws.properties";
- protected static Class JR2_S3 = SharedS3DataStore.class;
protected static Class S3 = S3DataStore.class;
public static List<String> getFixtures() {
return ImmutableList.of(
- S3.getName(),
- JR2_S3.getName());
+ S3.getName());
}
public static boolean isS3DataStore() {
String dsName = System.getProperty(DS_CLASS_NAME);
boolean s3Class =
- (dsName != null) && (dsName.equals(S3.getName()) ||
dsName.equals(JR2_S3.getName()));
+ (dsName != null) && (dsName.equals(S3.getName()));
if (!isS3Configured()) {
return false;
}
@@ -126,8 +123,6 @@ public class S3DataStoreUtils extends Da
// Set the props object
if (S3.getName().equals(className)) {
((S3DataStore) ds).setProperties(props);
- } else if (JR2_S3.getName().equals(className)) {
- ((org.apache.jackrabbit.oak.blob.cloud.aws.s3.SharedS3DataStore)
ds).setProperties(props);
}
ds.init(homeDir);
Modified:
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3DataStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3DataStore.java?rev=1807578&r1=1807577&r2=1807578&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3DataStore.java
(original)
+++
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3DataStore.java
Thu Sep 7 10:04:59 2017
@@ -94,21 +94,6 @@ public class TestS3DataStore {
}
@Test
- public void testNoSecretDefined() throws Exception {
- assumeTrue(isS3Configured());
- assumeTrue(s3Class.equals(S3DataStoreUtils.JR2_S3.getName()));
-
- Random randomGen = new Random();
- props = S3DataStoreUtils.getS3Config();
- ds = getS3DataStore(s3Class, props, dataStoreDir.getAbsolutePath());
- byte[] data = new byte[4096];
- randomGen.nextBytes(data);
- DataRecord rec = ds.addRecord(new ByteArrayInputStream(data));
- assertEquals(data.length, rec.getLength());
- assertNull(rec.getReference());
- }
-
- @Test
public void testNoSecretDefinedUseDefault() throws Exception {
assumeTrue(isS3Configured());
assumeTrue(s3Class.equals(S3DataStoreUtils.S3.getName()));
Modified:
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3Ds.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3Ds.java?rev=1807578&r1=1807577&r2=1807578&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3Ds.java
(original)
+++
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3Ds.java
Thu Sep 7 10:04:59 2017
@@ -23,7 +23,6 @@ import java.util.Properties;
import javax.jcr.RepositoryException;
import org.apache.jackrabbit.core.data.DataStore;
-import org.apache.jackrabbit.oak.blob.cloud.aws.s3.S3DataStore;
import org.apache.jackrabbit.oak.plugins.blob.datastore.AbstractDataStoreTest;
import org.junit.After;
import org.junit.Assume;
@@ -107,16 +106,12 @@ public class TestS3Ds extends AbstractDa
return s3ds;
}
- /**----------Only run with
org.apache.jackrabbit.oak.blob.cloud.aws.s3.S3DataStore-----------**/
+ /**----------Not supported-----------**/
@Override
public void testUpdateLastModifiedOnAccess() {
- Assume.assumeThat(s3Class, new Equals(fixtures().get(1)));
- super.testUpdateLastModifiedOnAccess();
}
@Override
public void testDeleteAllOlderThan() {
- Assume.assumeThat(s3Class, new Equals(fixtures().get(1)));
- super.testDeleteAllOlderThan();
}
}
Modified:
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/DataStoreUtils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/DataStoreUtils.java?rev=1807578&r1=1807577&r2=1807578&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/DataStoreUtils.java
(original)
+++
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/DataStoreUtils.java
Thu Sep 7 10:04:59 2017
@@ -35,7 +35,6 @@ import com.microsoft.azure.storage.blob.
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.core.data.DataStore;
-import org.apache.jackrabbit.oak.blob.cloud.aws.s3.SharedS3DataStore;
import org.apache.jackrabbit.oak.blob.cloud.azure.blobstorage.AzureConstants;
import org.apache.jackrabbit.oak.blob.cloud.azure.blobstorage.AzureDataStore;
import org.apache.jackrabbit.oak.blob.cloud.s3.S3Constants;
@@ -51,12 +50,11 @@ import org.slf4j.LoggerFactory;
public class DataStoreUtils {
private static final Logger log =
LoggerFactory.getLogger(DataStoreUtils.class);
- private static Class JR2_S3 = SharedS3DataStore.class;
private static Class S3 = S3DataStore.class;
private static Class AZURE = AzureDataStore.class;
public static boolean isS3DataStore(String dsName) {
- return (dsName != null) && (dsName.equals(S3.getName()) ||
dsName.equals(JR2_S3.getName()));
+ return (dsName != null) && (dsName.equals(S3.getName()));
}
public static boolean isAzureDataStore(String dsName) {
@@ -80,8 +78,6 @@ public class DataStoreUtils {
if (S3.getName().equals(className)) {
((S3DataStore) ds).setProperties(props);
((S3DataStore) ds).setStatisticsProvider(statisticsProvider);
- } else if (JR2_S3.getName().equals(className)) {
-
((org.apache.jackrabbit.oak.blob.cloud.aws.s3.SharedS3DataStore)
ds).setProperties(props);
}
} else if (isAzureDataStore(className)) {
props.setProperty(AzureConstants.AZURE_BLOB_CONTAINER_NAME,
bucket);
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java?rev=1807578&r1=1807577&r2=1807578&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java
Thu Sep 7 10:04:59 2017
@@ -42,7 +42,7 @@ import org.apache.felix.cm.file.Configur
import org.apache.jackrabbit.core.data.DataStore;
import org.apache.jackrabbit.core.data.DataStoreException;
import org.apache.jackrabbit.oak.blob.cloud.azure.blobstorage.AzureDataStore;
-import org.apache.jackrabbit.oak.blob.cloud.aws.s3.SharedS3DataStore;
+import org.apache.jackrabbit.oak.blob.cloud.s3.S3DataStore;
import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore;
import org.apache.jackrabbit.oak.plugins.blob.datastore.OakFileDataStore;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
@@ -230,7 +230,7 @@ class Utils {
DataStore delegate;
if (options.has(s3dsConfig)) {
- SharedS3DataStore s3ds = new SharedS3DataStore();
+ S3DataStore s3ds = new S3DataStore();
String cfgPath = s3dsConfig.value(options);
Properties props = loadAndTransformProps(cfgPath);
s3ds.setProperties(props);
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreFixtureProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreFixtureProvider.java?rev=1807578&r1=1807577&r2=1807578&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreFixtureProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreFixtureProvider.java
Thu Sep 7 10:04:59 2017
@@ -41,8 +41,8 @@ import org.apache.felix.cm.file.Configur
import org.apache.jackrabbit.core.data.DataStore;
import org.apache.jackrabbit.core.data.DataStoreException;
import org.apache.jackrabbit.core.data.FileDataStore;
-import org.apache.jackrabbit.oak.blob.cloud.aws.s3.SharedS3DataStore;
import org.apache.jackrabbit.oak.blob.cloud.azure.blobstorage.AzureDataStore;
+import org.apache.jackrabbit.oak.blob.cloud.s3.S3DataStore;
import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore;
import org.apache.jackrabbit.oak.plugins.blob.datastore.OakFileDataStore;
import org.apache.jackrabbit.oak.run.cli.BlobStoreOptions.Type;
@@ -68,7 +68,7 @@ public class BlobStoreFixtureProvider {
Closer closer = Closer.create();
DataStore delegate;
if (bsType == Type.S3){
- SharedS3DataStore s3ds = new SharedS3DataStore();
+ S3DataStore s3ds = new S3DataStore();
Properties props = loadConfig(bsopts.getS3ConfigPath());
s3ds.setProperties(props);
File homeDir = Files.createTempDir();
