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 am...@apache.org on 2016/10/24 04:51:55 UTC

svn commit: r1766340 - /jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/DataStoreUtils.java

Author: amitj
Date: Mon Oct 24 04:51:55 2016
New Revision: 1766340

URL: http://svn.apache.org/viewvc?rev=1766340&view=rev
Log:
OAK-4869: Enable benchmarks for DataStore

- Support for new S3DataStore implementation

Modified:
    jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/DataStoreUtils.java

Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/DataStoreUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/DataStoreUtils.java?rev=1766340&r1=1766339&r2=1766340&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/DataStoreUtils.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/DataStoreUtils.java Mon Oct 24 04:51:55 2016
@@ -35,6 +35,7 @@ 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.s3.S3Constants;
+import org.apache.jackrabbit.oak.blob.cloud.s3.S3DataStore;
 import org.apache.jackrabbit.oak.blob.cloud.s3.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -46,9 +47,10 @@ 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;
 
     public static boolean isS3DataStore(String dsName) {
-        return (dsName != null) && (dsName.equals(JR2_S3.getName()));
+        return (dsName != null) && (dsName.equals(S3.getName()) || dsName.equals(JR2_S3.getName()));
     }
 
     public static DataStore configureIfS3DataStore(String className, DataStore ds,
@@ -59,6 +61,9 @@ public class DataStoreUtils {
         props.setProperty(S3Constants.S3_BUCKET, bucket);
 
         // 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);
         }