svn commit: r1689612 - in /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment: SegmentCompactionIT.java SegmentCompactionMBean.java

[mduerig]

Author: mduerig
Date: Tue Jul  7 09:05:35 2015
New Revision: 1689612

URL: http://svn.apache.org/r1689612
Log:
OAK-2849: Improve revision gc on SegmentMK
SegmentCompactionIT improvement: configurable size of string properties

Modified:
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionIT.java
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionMBean.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionIT.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionIT.java?rev=1689612&r1=1689611&r2=1689612&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionIT.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionIT.java
 Tue Jul  7 09:05:35 2015
@@ -137,6 +137,7 @@ public class SegmentCompactionIT {
     private volatile int maxWriters = 10;
     private volatile long maxStoreSize = 200000000000L;
     private volatile int maxBlobSize = 1000000;
+    private volatile int maxStringSize = 10000;
     private volatile int maxReferences = 10;
     private volatile int compactionInterval = 1;
     private volatile boolean stopping;
@@ -428,7 +429,7 @@ public class SegmentCompactionIT {
         private void addRandomValue(NodeBuilder nodeBuilder) {
             if (nodeBuilder.getPropertyCount() < 1000) {
                 chooseRandomNode(nodeBuilder).setProperty('P' + itemPrefix + 
rnd.nextInt(1000),
-                        randomAlphabetic(rnd.nextInt(10000)));
+                        randomAlphabetic(rnd.nextInt(maxStringSize)));
             }
         }
 
@@ -692,6 +693,16 @@ public class SegmentCompactionIT {
         }
 
         @Override
+        public void setMaxStringSize(int size) {
+            maxStringSize = size;
+        }
+
+        @Override
+        public int getMaxStringSize() {
+            return maxStringSize;
+        }
+
+        @Override
         public void setMaxBlobSize(int size) {
             maxBlobSize = size;
         }

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionMBean.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionMBean.java?rev=1689612&r1=1689611&r2=1689612&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionMBean.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionMBean.java
 Tue Jul  7 09:05:35 2015
@@ -107,6 +107,17 @@ public interface SegmentCompactionMBean
     long getMaxStoreSize();
 
     /**
+     * Set the maximal size of string properties
+     * @param size  size in bytes
+     */
+    void setMaxStringSize(int size);
+
+    /**
+     * @return  maximal size of string properties in bytes
+     */
+    int getMaxStringSize();
+
+    /**
      * Set the maximal size of binary properties
      * @param size  size in bytes
      */