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 md...@apache.org on 2015/07/07 15:26:26 UTC
svn commit: r1689665 -
/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionIT.java
Author: mduerig
Date: Tue Jul 7 13:26:26 2015
New Revision: 1689665
URL: http://svn.apache.org/r1689665
Log:
OAK-2849: Improve revision gc on SegmentMK
SegmentCompactionIT improvement: make the ratio of the individual operations configurable
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionIT.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=1689665&r1=1689664&r2=1689665&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 13:26:26 2015
@@ -399,21 +399,20 @@ public class SegmentCompactionIT {
private void modify(NodeStore nodeStore, NodeBuilder nodeBuilder) throws IOException {
int p0 = nodeRemoveRatio;
- int p1 = propertyRemoveRatio;
- int p2 = nodeAddRatio;
- int p3 = addStringRatio;
- int p4 = addBinaryRatio;
- double p = p0 + p1 + p2 + p3 + p4;
+ int p1 = p0 + propertyRemoveRatio;
+ int p2 = p1 + nodeAddRatio;
+ int p3 = p2 + addStringRatio;
+ double p = p3 + addBinaryRatio;
boolean deleteOnly = fileStoreSize > maxStoreSize;
double k = rnd.nextDouble();
if (k < p0/p) {
chooseRandomNode(nodeBuilder).remove();
- } else if (k < (p0 + p1)/p) {
+ } else if (k < p1/p) {
removeRandomProperty(chooseRandomNode(nodeBuilder));
- } else if (k < (p0 + p1 + p2)/p && !deleteOnly) {
+ } else if (k < p2/p && !deleteOnly) {
addRandomNode(nodeBuilder);
- } else if (k < (p0 + p1 + p2 + p3)/p && !deleteOnly) {
+ } else if (k < p3/p && !deleteOnly) {
addRandomValue(nodeBuilder);
} else if (!deleteOnly) {
addRandomBlob(nodeStore, nodeBuilder);