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/03/03 06:11:57 UTC
svn commit: r1663528 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins:
blob/datastore/ segment/
Author: chetanm
Date: Tue Mar 3 05:11:57 2015
New Revision: 1663528
URL: http://svn.apache.org/r1663528
Log:
OAK-2499 - Expose mongo and db versions for reporting purposes
Expose description for FileDataStore , SegmentNodeStore and S3DataStore
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/AbstractDataStoreService.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FileDataStoreService.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/S3DataStoreService.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/AbstractDataStoreService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/AbstractDataStoreService.java?rev=1663528&r1=1663527&r2=1663528&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/AbstractDataStoreService.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/AbstractDataStoreService.java Tue Mar 3 05:11:57 2015
@@ -41,6 +41,7 @@ public abstract class AbstractDataStoreS
public static final String PROP_ENCODE_LENGTH = "encodeLengthInId";
public static final String PROP_CACHE_SIZE = "cacheSizeInMB";
+ private static final String DESCRIPTION = "oak.blobstore.description";
private ServiceRegistration reg;
@@ -63,6 +64,7 @@ public abstract class AbstractDataStoreS
Dictionary<String, String> props = new Hashtable<String, String>();
props.put(Constants.SERVICE_PID, ds.getClass().getName());
+ props.put(DESCRIPTION, getDescription());
reg = context.getBundleContext().registerService(new String[]{
BlobStore.class.getName(),
@@ -80,6 +82,10 @@ public abstract class AbstractDataStoreS
protected abstract DataStore createDataStore(ComponentContext context, Map<String, Object> config);
+ protected String getDescription(){
+ return "{\"type\":\"unknown\"}";
+ }
+
protected static String lookup(ComponentContext context, String property) {
//Prefer property from BundleContext first
if (context.getBundleContext().getProperty(property) != null) {
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FileDataStoreService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FileDataStoreService.java?rev=1663528&r1=1663527&r2=1663528&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FileDataStoreService.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FileDataStoreService.java Tue Mar 3 05:11:57 2015
@@ -34,4 +34,9 @@ public class FileDataStoreService extend
protected DataStore createDataStore(ComponentContext context, Map<String, Object> config) {
return new OakFileDataStore();
}
+
+ @Override
+ protected String getDescription() {
+ return "{\"type\":\"filesystem\"}";
+ }
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/S3DataStoreService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/S3DataStoreService.java?rev=1663528&r1=1663527&r2=1663528&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/S3DataStoreService.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/S3DataStoreService.java Tue Mar 3 05:11:57 2015
@@ -42,4 +42,9 @@ public class S3DataStoreService extends
dataStore.setProperties(properties);
return dataStore;
}
+
+ @Override
+ protected String getDescription() {
+ return "{\"type\":\"S3\"}";
+ }
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java?rev=1663528&r1=1663527&r2=1663528&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java Tue Mar 3 05:11:57 2015
@@ -81,6 +81,7 @@ import org.slf4j.LoggerFactory;
* An OSGi wrapper for the segment node store.
*/
@Component(policy = ConfigurationPolicy.REQUIRE)
+@Property(name = "oak.nodestore.description", value = "{\"type\":\"segment\"}", propertyPrivate = true)
public class SegmentNodeStoreService extends ProxyNodeStore
implements Observable, SegmentStoreProvider {