svn commit: r1825655 - in /jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document: Configuration.java DocumentNodeStoreService.java

[reschke]

Author: reschke
Date: Thu Mar  1 15:33:33 2018
New Revision: 1825655

URL: http://svn.apache.org/viewvc?rev=1825655&view=rev
Log:
OAK-7282: RDB: enable default continuous revision GC

Modified:
    
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Configuration.java
    
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java

Modified: 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Configuration.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Configuration.java?rev=1825655&r1=1825654&r2=1825655&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Configuration.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Configuration.java
 Thu Mar  1 15:33:33 2018
@@ -168,12 +168,10 @@ import static org.apache.jackrabbit.oak.
     @AttributeDefinition(
             name = "Version GC scheduler expression",
             description = "A cron expression that defines when the Version GC 
is scheduled. " +
-                    "If this configuration entry is left empty, the default 
behaviour depends on " +
-                    "the 'documentStoreType'. For 'MONGO' the default is to 
schedule a " +
-                    "run every five seconds (also known as Continuous Revision 
Garbage " +
-                    "Collection). For 'RDB' the default is no scheduled GC. It 
must be " +
-                    "enabled explicitly with a cron expression. E.g. the 
following " +
-                    "expression triggers a GC run every night at 2 AM: '" +
+                    "If this configuration entry is left empty, the default 
behaviour is to " +
+                    "schedule a run every five seconds (also known as 
Continuous Revision Garbage " +
+                    "Collection). Otherwise, the schedule can be configured 
with a cron " +
+                    "expression. E.g. the following expression triggers a GC 
run every night at 2 AM: '" +
                     DocumentNodeStoreService.CLASSIC_RGC_EXPR + "'."
     )
     String versionGCExpression() default 
DocumentNodeStoreService.DEFAULT_VER_GC_EXPRESSION;

Modified: 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java?rev=1825655&r1=1825654&r2=1825655&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
 Thu Mar  1 15:33:33 2018
@@ -513,12 +513,7 @@ public class DocumentNodeStoreService {
     }
 
     private String getVersionGCExpression() {
-        String defaultExpr;
-        if (DocumentStoreType.fromString(config.documentStoreType()) == 
DocumentStoreType.MONGO) {
-            defaultExpr = CONTINUOUS_RGC_EXPR;
-        } else {
-            defaultExpr = "";
-        }
+        String defaultExpr = CONTINUOUS_RGC_EXPR;
         String expr = config.versionGCExpression();
         if (Strings.isNullOrEmpty(expr)) {
             expr = defaultExpr;