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 da...@apache.org on 2015/05/28 11:47:01 UTC
svn commit: r1682191 - in
/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability:
./ benchmarks/ suites/
Author: davide
Date: Thu May 28 09:47:00 2015
New Revision: 1682191
URL: http://svn.apache.org/r1682191
Log:
OAK-2925 - Reorganise scalability classes
- moved classes around
Added:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/AggregateNodeSearcher.java
- copied, changed from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/AggregateNodeSearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/FormatSearcher.java
- copied, changed from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/FormatSearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/FullTextSearcher.java
- copied, changed from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/FullTextSearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/LastModifiedSearcher.java
- copied, changed from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/LastModifiedSearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterOrderByKeysetPageSearcher.java
- copied, changed from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterOrderByKeysetPageSearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterOrderByOffsetPageSearcher.java
- copied, changed from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterOrderByOffsetPageSearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterOrderBySearcher.java
- copied, changed from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterOrderBySearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterSplitOrderByKeysetPageSearcher.java
- copied, changed from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterSplitOrderByKeysetPageSearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterSplitOrderByOffsetPageSearcher.java
- copied, changed from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterSplitOrderByOffsetPageSearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterSplitOrderBySearcher.java
- copied, changed from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterSplitOrderBySearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/NodeTypeSearcher.java
- copied, changed from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/NodeTypeSearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/OrderByDate.java
- copied, changed from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/OrderByDate.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/OrderByKeysetPageSearcher.java
- copied, changed from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/OrderByKeysetPageSearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/OrderByOffsetPageSearcher.java
- copied, changed from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/OrderByOffsetPageSearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/OrderBySearcher.java
- copied, changed from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/OrderBySearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/PaginationEnabledSearcher.java
- copied, changed from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/PaginationEnabledSearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/ScalabilityBenchmark.java
- copied, changed from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityBenchmark.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/SearchScalabilityBenchmark.java
- copied, changed from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/SearchScalabilityBenchmark.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/SplitOrderByKeysetPageSearcher.java
- copied, changed from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/SplitOrderByKeysetPageSearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/SplitOrderByOffsetPageSearcher.java
- copied, changed from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/SplitOrderByOffsetPageSearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/SplitOrderBySearcher.java
- copied, changed from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/SplitOrderBySearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/suites/
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityAbstractSuite.java
- copied, changed from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityAbstractSuite.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityBlobSearchSuite.java
- copied, changed from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityBlobSearchSuite.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeRelationshipSuite.java
- copied, changed from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityNodeRelationshipSuite.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeSuite.java
- copied, changed from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityNodeSuite.java
Removed:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/AggregateNodeSearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/FormatSearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/FullTextSearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/LastModifiedSearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterOrderByKeysetPageSearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterOrderByOffsetPageSearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterOrderBySearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterSplitOrderByKeysetPageSearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterSplitOrderByOffsetPageSearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterSplitOrderBySearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/NodeTypeSearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/OrderByDate.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/OrderByKeysetPageSearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/OrderByOffsetPageSearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/OrderBySearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/PaginationEnabledSearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityAbstractSuite.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityBenchmark.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityBlobSearchSuite.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityNodeRelationshipSuite.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityNodeSuite.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/SearchScalabilityBenchmark.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/SplitOrderByKeysetPageSearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/SplitOrderByOffsetPageSearcher.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/SplitOrderBySearcher.java
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityRunner.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilitySuite.java
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityRunner.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityRunner.java?rev=1682191&r1=1682190&r2=1682191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityRunner.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityRunner.java Thu May 28 09:47:00 2015
@@ -33,15 +33,38 @@ import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
+
import joptsimple.OptionParser;
import joptsimple.OptionSet;
import joptsimple.OptionSpec;
+
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.benchmark.CSVResultGenerator;
import org.apache.jackrabbit.oak.benchmark.util.Date;
import org.apache.jackrabbit.oak.fixture.JackrabbitRepositoryFixture;
import org.apache.jackrabbit.oak.fixture.OakRepositoryFixture;
import org.apache.jackrabbit.oak.fixture.RepositoryFixture;
+import org.apache.jackrabbit.oak.scalability.benchmarks.AggregateNodeSearcher;
+import org.apache.jackrabbit.oak.scalability.benchmarks.FormatSearcher;
+import org.apache.jackrabbit.oak.scalability.benchmarks.FullTextSearcher;
+import org.apache.jackrabbit.oak.scalability.benchmarks.LastModifiedSearcher;
+import org.apache.jackrabbit.oak.scalability.benchmarks.MultiFilterOrderByKeysetPageSearcher;
+import org.apache.jackrabbit.oak.scalability.benchmarks.MultiFilterOrderByOffsetPageSearcher;
+import org.apache.jackrabbit.oak.scalability.benchmarks.MultiFilterOrderBySearcher;
+import org.apache.jackrabbit.oak.scalability.benchmarks.MultiFilterSplitOrderByKeysetPageSearcher;
+import org.apache.jackrabbit.oak.scalability.benchmarks.MultiFilterSplitOrderByOffsetPageSearcher;
+import org.apache.jackrabbit.oak.scalability.benchmarks.MultiFilterSplitOrderBySearcher;
+import org.apache.jackrabbit.oak.scalability.benchmarks.NodeTypeSearcher;
+import org.apache.jackrabbit.oak.scalability.benchmarks.OrderByDate;
+import org.apache.jackrabbit.oak.scalability.benchmarks.OrderByKeysetPageSearcher;
+import org.apache.jackrabbit.oak.scalability.benchmarks.OrderByOffsetPageSearcher;
+import org.apache.jackrabbit.oak.scalability.benchmarks.OrderBySearcher;
+import org.apache.jackrabbit.oak.scalability.benchmarks.SplitOrderByKeysetPageSearcher;
+import org.apache.jackrabbit.oak.scalability.benchmarks.SplitOrderByOffsetPageSearcher;
+import org.apache.jackrabbit.oak.scalability.benchmarks.SplitOrderBySearcher;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityBlobSearchSuite;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityNodeRelationshipSuite;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityNodeSuite;
/**
* Main class for running scalability/longevity tests.
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilitySuite.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilitySuite.java?rev=1682191&r1=1682190&r2=1682191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilitySuite.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilitySuite.java Thu May 28 09:47:00 2015
@@ -21,6 +21,7 @@ package org.apache.jackrabbit.oak.scalab
import java.util.Map;
import org.apache.jackrabbit.oak.fixture.RepositoryFixture;
+import org.apache.jackrabbit.oak.scalability.benchmarks.ScalabilityBenchmark;
/**
* Interface for scalability suite for load testing.
Copied: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/AggregateNodeSearcher.java (from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/AggregateNodeSearcher.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/AggregateNodeSearcher.java?p2=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/AggregateNodeSearcher.java&p1=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/AggregateNodeSearcher.java&r1=1682178&r2=1682191&rev=1682191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/AggregateNodeSearcher.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/AggregateNodeSearcher.java Thu May 28 09:47:00 2015
@@ -17,19 +17,23 @@
* under the License.
*/
-package org.apache.jackrabbit.oak.scalability;
+package org.apache.jackrabbit.oak.scalability.benchmarks;
import com.google.common.collect.Lists;
+
import org.apache.jackrabbit.api.security.user.Authorizable;
import javax.annotation.Nonnull;
import javax.jcr.*;
import javax.jcr.query.Query;
import javax.jcr.query.QueryManager;
+
import java.util.List;
import java.util.Random;
-import org.apache.jackrabbit.oak.scalability.ScalabilityAbstractSuite.ExecutionContext;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityNodeRelationshipSuite;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite.ExecutionContext;
/**
* Retrieves search property by iterating over nodes and then executes search using the retrieved
Copied: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/FormatSearcher.java (from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/FormatSearcher.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/FormatSearcher.java?p2=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/FormatSearcher.java&p1=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/FormatSearcher.java&r1=1682178&r2=1682191&rev=1682191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/FormatSearcher.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/FormatSearcher.java Thu May 28 09:47:00 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.scalability;
+package org.apache.jackrabbit.oak.scalability.benchmarks;
import javax.jcr.RepositoryException;
import javax.jcr.query.Query;
@@ -24,7 +24,8 @@ import javax.jcr.query.QueryManager;
import org.apache.jackrabbit.oak.benchmark.util.MimeType;
import org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants;
-import org.apache.jackrabbit.oak.scalability.ScalabilityAbstractSuite.ExecutionContext;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityBlobSearchSuite;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite.ExecutionContext;
/**
* Searches on the file format/Mime type
Copied: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/FullTextSearcher.java (from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/FullTextSearcher.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/FullTextSearcher.java?p2=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/FullTextSearcher.java&p1=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/FullTextSearcher.java&r1=1682178&r2=1682191&rev=1682191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/FullTextSearcher.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/FullTextSearcher.java Thu May 28 09:47:00 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.scalability;
+package org.apache.jackrabbit.oak.scalability.benchmarks;
import java.util.List;
import java.util.Random;
@@ -26,7 +26,8 @@ import javax.jcr.RepositoryException;
import javax.jcr.query.Query;
import javax.jcr.query.QueryManager;
-import org.apache.jackrabbit.oak.scalability.ScalabilityAbstractSuite.ExecutionContext;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityBlobSearchSuite;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite.ExecutionContext;
/**
* Full text query search
Copied: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/LastModifiedSearcher.java (from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/LastModifiedSearcher.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/LastModifiedSearcher.java?p2=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/LastModifiedSearcher.java&p1=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/LastModifiedSearcher.java&r1=1682178&r2=1682191&rev=1682191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/LastModifiedSearcher.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/LastModifiedSearcher.java Thu May 28 09:47:00 2015
@@ -16,14 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.scalability;
+package org.apache.jackrabbit.oak.scalability.benchmarks;
import javax.jcr.RepositoryException;
import javax.jcr.query.Query;
import javax.jcr.query.QueryManager;
import org.apache.jackrabbit.oak.benchmark.util.Date;
-import org.apache.jackrabbit.oak.scalability.ScalabilityAbstractSuite.ExecutionContext;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityBlobSearchSuite;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite.ExecutionContext;
/**
* perform searches using the {@code jcr:lastModified} and the provided timeframe
Copied: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterOrderByKeysetPageSearcher.java (from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterOrderByKeysetPageSearcher.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterOrderByKeysetPageSearcher.java?p2=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterOrderByKeysetPageSearcher.java&p1=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterOrderByKeysetPageSearcher.java&r1=1682178&r2=1682191&rev=1682191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterOrderByKeysetPageSearcher.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterOrderByKeysetPageSearcher.java Thu May 28 09:47:00 2015
@@ -16,16 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.scalability;
+package org.apache.jackrabbit.oak.scalability.benchmarks;
import javax.jcr.RepositoryException;
import javax.jcr.query.QueryManager;
-import org.apache.jackrabbit.oak.scalability.ScalabilityAbstractSuite.ExecutionContext;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite.ExecutionContext;
/**
- * Simulates keyset pagination over the search {@link org.apache.jackrabbit.oak.scalability
- * .MultiFilterOrderBySearcher}
+ * Simulates keyset pagination over the search {@link org.apache.jackrabbit.oak.scalability.benchmarks.MultiFilterOrderBySearcher}
*/
public class MultiFilterOrderByKeysetPageSearcher extends MultiFilterOrderBySearcher {
@Override
Copied: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterOrderByOffsetPageSearcher.java (from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterOrderByOffsetPageSearcher.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterOrderByOffsetPageSearcher.java?p2=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterOrderByOffsetPageSearcher.java&p1=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterOrderByOffsetPageSearcher.java&r1=1682178&r2=1682191&rev=1682191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterOrderByOffsetPageSearcher.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterOrderByOffsetPageSearcher.java Thu May 28 09:47:00 2015
@@ -16,16 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.scalability;
+package org.apache.jackrabbit.oak.scalability.benchmarks;
import javax.jcr.RepositoryException;
import javax.jcr.query.QueryManager;
-import org.apache.jackrabbit.oak.scalability.ScalabilityAbstractSuite.ExecutionContext;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite.ExecutionContext;
/**
- * Simulates offset pagination over the search {@link org.apache.jackrabbit.oak.scalability
- * .MultiFilterOrderBySearcher}
+ * Simulates offset pagination over the search {@link org.apache.jackrabbit.oak.scalability.benchmarks.MultiFilterOrderBySearcher}
*/
public class MultiFilterOrderByOffsetPageSearcher extends MultiFilterOrderBySearcher {
@Override
Copied: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterOrderBySearcher.java (from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterOrderBySearcher.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterOrderBySearcher.java?p2=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterOrderBySearcher.java&p1=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterOrderBySearcher.java&r1=1682178&r2=1682191&rev=1682191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterOrderBySearcher.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterOrderBySearcher.java Thu May 28 09:47:00 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.scalability;
+package org.apache.jackrabbit.oak.scalability.benchmarks;
import java.util.Calendar;
@@ -26,7 +26,9 @@ import javax.jcr.query.Query;
import javax.jcr.query.QueryManager;
import org.apache.jackrabbit.oak.benchmark.util.Date;
-import org.apache.jackrabbit.oak.scalability.ScalabilityAbstractSuite.ExecutionContext;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityBlobSearchSuite;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityNodeSuite;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite.ExecutionContext;
/**
* Searches on node with a filter property and orders the results by 2 properties
Copied: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterSplitOrderByKeysetPageSearcher.java (from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterSplitOrderByKeysetPageSearcher.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterSplitOrderByKeysetPageSearcher.java?p2=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterSplitOrderByKeysetPageSearcher.java&p1=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterSplitOrderByKeysetPageSearcher.java&r1=1682178&r2=1682191&rev=1682191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterSplitOrderByKeysetPageSearcher.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterSplitOrderByKeysetPageSearcher.java Thu May 28 09:47:00 2015
@@ -16,16 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.scalability;
+package org.apache.jackrabbit.oak.scalability.benchmarks;
-import org.apache.jackrabbit.oak.scalability.ScalabilityAbstractSuite.ExecutionContext;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite.ExecutionContext;
import javax.jcr.RepositoryException;
import javax.jcr.query.QueryManager;
/**
- * Simulates keyset pagination over the search {@link org.apache.jackrabbit.oak.scalability
- * .MultiFilterSplitOrderBySearcher}
+ * Simulates keyset pagination over the search {@link org.apache.jackrabbit.oak.scalability.benchmarks.MultiFilterSplitOrderBySearcher}
*/
public class MultiFilterSplitOrderByKeysetPageSearcher extends MultiFilterSplitOrderBySearcher {
@Override
Copied: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterSplitOrderByOffsetPageSearcher.java (from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterSplitOrderByOffsetPageSearcher.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterSplitOrderByOffsetPageSearcher.java?p2=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterSplitOrderByOffsetPageSearcher.java&p1=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterSplitOrderByOffsetPageSearcher.java&r1=1682178&r2=1682191&rev=1682191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterSplitOrderByOffsetPageSearcher.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterSplitOrderByOffsetPageSearcher.java Thu May 28 09:47:00 2015
@@ -17,14 +17,15 @@
* under the License.
*/
-package org.apache.jackrabbit.oak.scalability;
+package org.apache.jackrabbit.oak.scalability.benchmarks;
import javax.jcr.RepositoryException;
import javax.jcr.query.QueryManager;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite;
+
/**
- * Simulates offset pagination over the search {@link org.apache.jackrabbit.oak.scalability
- * .MultiFilterSplitOrderBySearcher}
+ * Simulates offset pagination over the search {@link org.apache.jackrabbit.oak.scalability.benchmarks.MultiFilterSplitOrderBySearcher}
*/
public class MultiFilterSplitOrderByOffsetPageSearcher extends MultiFilterSplitOrderBySearcher {
@Override
Copied: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterSplitOrderBySearcher.java (from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterSplitOrderBySearcher.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterSplitOrderBySearcher.java?p2=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterSplitOrderBySearcher.java&p1=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterSplitOrderBySearcher.java&r1=1682178&r2=1682191&rev=1682191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/MultiFilterSplitOrderBySearcher.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/MultiFilterSplitOrderBySearcher.java Thu May 28 09:47:00 2015
@@ -17,16 +17,19 @@
* under the License.
*/
-package org.apache.jackrabbit.oak.scalability;
+package org.apache.jackrabbit.oak.scalability.benchmarks;
import javax.annotation.Nonnull;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.query.*;
-import org.apache.jackrabbit.oak.scalability.ScalabilityAbstractSuite.ExecutionContext;
+
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityBlobSearchSuite;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityNodeSuite;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite.ExecutionContext;
/**
- * Splits the query in {@link org.apache.jackrabbit.oak.scalability.MultiFilterOrderBySearcher}
+ * Splits the query in {@link org.apache.jackrabbit.oak.scalability.benchmarks.MultiFilterOrderBySearcher}
* into multiple queries and unions the results.
*/
public class MultiFilterSplitOrderBySearcher extends MultiFilterOrderBySearcher {
Copied: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/NodeTypeSearcher.java (from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/NodeTypeSearcher.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/NodeTypeSearcher.java?p2=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/NodeTypeSearcher.java&p1=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/NodeTypeSearcher.java&r1=1682178&r2=1682191&rev=1682191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/NodeTypeSearcher.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/NodeTypeSearcher.java Thu May 28 09:47:00 2015
@@ -16,14 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.scalability;
+package org.apache.jackrabbit.oak.scalability.benchmarks;
import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import javax.jcr.query.Query;
import javax.jcr.query.QueryManager;
-import org.apache.jackrabbit.oak.scalability.ScalabilityAbstractSuite.ExecutionContext;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityBlobSearchSuite;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite.ExecutionContext;
/**
* Searches on the NodeType
Copied: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/OrderByDate.java (from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/OrderByDate.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/OrderByDate.java?p2=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/OrderByDate.java&p1=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/OrderByDate.java&r1=1682178&r2=1682191&rev=1682191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/OrderByDate.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/OrderByDate.java Thu May 28 09:47:00 2015
@@ -14,13 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.scalability;
+package org.apache.jackrabbit.oak.scalability.benchmarks;
import javax.jcr.RepositoryException;
import javax.jcr.query.Query;
import javax.jcr.query.QueryManager;
-import org.apache.jackrabbit.oak.scalability.ScalabilityAbstractSuite.ExecutionContext;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityBlobSearchSuite;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite.ExecutionContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/OrderByKeysetPageSearcher.java (from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/OrderByKeysetPageSearcher.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/OrderByKeysetPageSearcher.java?p2=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/OrderByKeysetPageSearcher.java&p1=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/OrderByKeysetPageSearcher.java&r1=1682178&r2=1682191&rev=1682191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/OrderByKeysetPageSearcher.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/OrderByKeysetPageSearcher.java Thu May 28 09:47:00 2015
@@ -16,16 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.scalability;
+package org.apache.jackrabbit.oak.scalability.benchmarks;
import javax.jcr.RepositoryException;
import javax.jcr.query.QueryManager;
-import org.apache.jackrabbit.oak.scalability.ScalabilityAbstractSuite.ExecutionContext;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite.ExecutionContext;
/**
- * Simulates keyset pagination over the search {@link org.apache.jackrabbit.oak.scalability
- * .OrderBySearcher}
+ * Simulates keyset pagination over the search {@link org.apache.jackrabbit.oak.scalability.benchmarks.OrderBySearcher}
*/
public class OrderByKeysetPageSearcher extends OrderBySearcher {
@Override
Copied: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/OrderByOffsetPageSearcher.java (from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/OrderByOffsetPageSearcher.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/OrderByOffsetPageSearcher.java?p2=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/OrderByOffsetPageSearcher.java&p1=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/OrderByOffsetPageSearcher.java&r1=1682178&r2=1682191&rev=1682191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/OrderByOffsetPageSearcher.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/OrderByOffsetPageSearcher.java Thu May 28 09:47:00 2015
@@ -16,16 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.scalability;
+package org.apache.jackrabbit.oak.scalability.benchmarks;
import javax.jcr.RepositoryException;
import javax.jcr.query.QueryManager;
-import org.apache.jackrabbit.oak.scalability.ScalabilityAbstractSuite.ExecutionContext;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite.ExecutionContext;
/**
- * Simulates offset pagination over the search {@link org.apache.jackrabbit.oak.scalability
- * .OrderBySearcher}
+ * Simulates offset pagination over the search {@link org.apache.jackrabbit.oak.scalability.benchmarks.OrderBySearcher}
*/
public class OrderByOffsetPageSearcher extends OrderBySearcher {
@Override
Copied: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/OrderBySearcher.java (from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/OrderBySearcher.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/OrderBySearcher.java?p2=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/OrderBySearcher.java&p1=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/OrderBySearcher.java&r1=1682178&r2=1682191&rev=1682191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/OrderBySearcher.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/OrderBySearcher.java Thu May 28 09:47:00 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.scalability;
+package org.apache.jackrabbit.oak.scalability.benchmarks;
import java.util.Calendar;
@@ -26,7 +26,9 @@ import javax.jcr.query.Query;
import javax.jcr.query.QueryManager;
import org.apache.jackrabbit.oak.benchmark.util.Date;
-import org.apache.jackrabbit.oak.scalability.ScalabilityAbstractSuite.ExecutionContext;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityBlobSearchSuite;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityNodeSuite;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite.ExecutionContext;
/**
* Searches on path and orders the results by 2 properties
Copied: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/PaginationEnabledSearcher.java (from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/PaginationEnabledSearcher.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/PaginationEnabledSearcher.java?p2=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/PaginationEnabledSearcher.java&p1=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/PaginationEnabledSearcher.java&r1=1682178&r2=1682191&rev=1682191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/PaginationEnabledSearcher.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/PaginationEnabledSearcher.java Thu May 28 09:47:00 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.scalability;
+package org.apache.jackrabbit.oak.scalability.benchmarks;
import java.util.Calendar;
import java.util.TimeZone;
@@ -30,7 +30,8 @@ import javax.jcr.query.QueryManager;
import javax.jcr.query.QueryResult;
import javax.jcr.query.RowIterator;
-import org.apache.jackrabbit.oak.scalability.ScalabilityAbstractSuite.ExecutionContext;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityNodeSuite;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite.ExecutionContext;
/**
* Abstract class which defines utility methods for processing results like
Copied: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/ScalabilityBenchmark.java (from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityBenchmark.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/ScalabilityBenchmark.java?p2=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/ScalabilityBenchmark.java&p1=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityBenchmark.java&r1=1682178&r2=1682191&rev=1682191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityBenchmark.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/ScalabilityBenchmark.java Thu May 28 09:47:00 2015
@@ -16,12 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.scalability;
+package org.apache.jackrabbit.oak.scalability.benchmarks;
import javax.jcr.Credentials;
import javax.jcr.Repository;
-import org.apache.jackrabbit.oak.scalability.ScalabilityAbstractSuite.ExecutionContext;
+import org.apache.jackrabbit.oak.scalability.ScalabilitySuite;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite.ExecutionContext;
/**
Copied: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/SearchScalabilityBenchmark.java (from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/SearchScalabilityBenchmark.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/SearchScalabilityBenchmark.java?p2=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/SearchScalabilityBenchmark.java&p1=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/SearchScalabilityBenchmark.java&r1=1682178&r2=1682191&rev=1682191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/SearchScalabilityBenchmark.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/SearchScalabilityBenchmark.java Thu May 28 09:47:00 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.scalability;
+package org.apache.jackrabbit.oak.scalability.benchmarks;
import javax.annotation.Nonnull;
import javax.jcr.Credentials;
@@ -29,7 +29,7 @@ import javax.jcr.query.QueryManager;
import javax.jcr.query.QueryResult;
import javax.jcr.query.RowIterator;
-import org.apache.jackrabbit.oak.scalability.ScalabilityAbstractSuite.ExecutionContext;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite.ExecutionContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/SplitOrderByKeysetPageSearcher.java (from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/SplitOrderByKeysetPageSearcher.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/SplitOrderByKeysetPageSearcher.java?p2=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/SplitOrderByKeysetPageSearcher.java&p1=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/SplitOrderByKeysetPageSearcher.java&r1=1682178&r2=1682191&rev=1682191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/SplitOrderByKeysetPageSearcher.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/SplitOrderByKeysetPageSearcher.java Thu May 28 09:47:00 2015
@@ -16,16 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.scalability;
+package org.apache.jackrabbit.oak.scalability.benchmarks;
-import org.apache.jackrabbit.oak.scalability.ScalabilityAbstractSuite.ExecutionContext;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite.ExecutionContext;
import javax.jcr.RepositoryException;
import javax.jcr.query.QueryManager;
/**
- * Simulates keyset pagination over the search {@link org.apache.jackrabbit.oak.scalability
- * .SplitOrderBySearcher}
+ * Simulates keyset pagination over the search {@link org.apache.jackrabbit.oak.scalability.benchmarks.SplitOrderBySearcher}
*/
public class SplitOrderByKeysetPageSearcher extends SplitOrderBySearcher {
@Override
Copied: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/SplitOrderByOffsetPageSearcher.java (from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/SplitOrderByOffsetPageSearcher.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/SplitOrderByOffsetPageSearcher.java?p2=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/SplitOrderByOffsetPageSearcher.java&p1=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/SplitOrderByOffsetPageSearcher.java&r1=1682178&r2=1682191&rev=1682191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/SplitOrderByOffsetPageSearcher.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/SplitOrderByOffsetPageSearcher.java Thu May 28 09:47:00 2015
@@ -16,16 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.scalability;
+package org.apache.jackrabbit.oak.scalability.benchmarks;
-import org.apache.jackrabbit.oak.scalability.ScalabilityAbstractSuite.ExecutionContext;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite.ExecutionContext;
import javax.jcr.RepositoryException;
import javax.jcr.query.QueryManager;
/**
- * Simulates offset pagination over the search {@link org.apache.jackrabbit.oak.scalability
- * .SplitOrderBySearcher}
+ * Simulates offset pagination over the search {@link org.apache.jackrabbit.oak.scalability.benchmarks.SplitOrderBySearcher}
*/
public class SplitOrderByOffsetPageSearcher extends SplitOrderBySearcher {
@Override
Copied: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/SplitOrderBySearcher.java (from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/SplitOrderBySearcher.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/SplitOrderBySearcher.java?p2=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/SplitOrderBySearcher.java&p1=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/SplitOrderBySearcher.java&r1=1682178&r2=1682191&rev=1682191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/SplitOrderBySearcher.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/SplitOrderBySearcher.java Thu May 28 09:47:00 2015
@@ -16,9 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.scalability;
+package org.apache.jackrabbit.oak.scalability.benchmarks;
-import org.apache.jackrabbit.oak.scalability.ScalabilityAbstractSuite.ExecutionContext;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityBlobSearchSuite;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityNodeSuite;
+import org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite.ExecutionContext;
import javax.annotation.Nonnull;
import javax.jcr.Node;
@@ -29,7 +31,7 @@ import javax.jcr.query.QueryResult;
import javax.jcr.query.RowIterator;
/**
- * Splits the search in {@link org.apache.jackrabbit.oak.scalability.OrderBySearcher} to multiple
+ * Splits the search in {@link org.apache.jackrabbit.oak.scalability.benchmarks.OrderBySearcher} to multiple
* queries and unions the results.
*
*/
Copied: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityAbstractSuite.java (from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityAbstractSuite.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityAbstractSuite.java?p2=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityAbstractSuite.java&p1=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityAbstractSuite.java&r1=1682178&r2=1682191&rev=1682191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityAbstractSuite.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityAbstractSuite.java Thu May 28 09:47:00 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.scalability;
+package org.apache.jackrabbit.oak.scalability.suites;
import static com.google.common.collect.Lists.newArrayList;
import static com.google.common.collect.Maps.newConcurrentMap;
@@ -40,11 +40,14 @@ import javax.jcr.SimpleCredentials;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import com.google.common.base.Stopwatch;
+
import org.apache.commons.math.stat.descriptive.DescriptiveStatistics;
import org.apache.commons.math.stat.descriptive.SynchronizedDescriptiveStatistics;
import org.apache.jackrabbit.oak.benchmark.CSVResultGenerator;
import org.apache.jackrabbit.oak.benchmark.util.Profiler;
import org.apache.jackrabbit.oak.fixture.RepositoryFixture;
+import org.apache.jackrabbit.oak.scalability.ScalabilitySuite;
+import org.apache.jackrabbit.oak.scalability.benchmarks.ScalabilityBenchmark;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -491,7 +494,7 @@ public abstract class ScalabilityAbstrac
/**
* Execution context to be pass information to and from the suite to the benchmarks.
*/
- static class ExecutionContext {
+ public static class ExecutionContext {
private Profiler profiler;
private final AtomicLong iteration = new AtomicLong();
private Map<Object, Object> map = newConcurrentMap();
Copied: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityBlobSearchSuite.java (from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityBlobSearchSuite.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityBlobSearchSuite.java?p2=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityBlobSearchSuite.java&p1=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityBlobSearchSuite.java&r1=1682178&r2=1682191&rev=1682191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityBlobSearchSuite.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityBlobSearchSuite.java Thu May 28 09:47:00 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.scalability;
+package org.apache.jackrabbit.oak.scalability.suites;
import static com.google.common.collect.Lists.newArrayList;
import static com.google.common.collect.Lists.newArrayListWithCapacity;
Copied: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeRelationshipSuite.java (from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityNodeRelationshipSuite.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeRelationshipSuite.java?p2=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeRelationshipSuite.java&p1=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityNodeRelationshipSuite.java&r1=1682178&r2=1682191&rev=1682191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityNodeRelationshipSuite.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeRelationshipSuite.java Thu May 28 09:47:00 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.scalability;
+package org.apache.jackrabbit.oak.scalability.suites;
import java.util.Calendar;
import java.util.List;
Copied: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeSuite.java (from r1682178, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityNodeSuite.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeSuite.java?p2=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeSuite.java&p1=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityNodeSuite.java&r1=1682178&r2=1682191&rev=1682191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityNodeSuite.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeSuite.java Thu May 28 09:47:00 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.scalability;
+package org.apache.jackrabbit.oak.scalability.suites;
import static com.google.common.collect.Lists.newArrayList;
import static com.google.common.collect.Lists.newArrayListWithCapacity;
@@ -37,9 +37,9 @@ import javax.jcr.Session;
import com.google.common.base.Splitter;
import com.google.common.base.StandardSystemProperty;
import com.google.common.base.Stopwatch;
-
import com.google.common.base.Strings;
import com.google.common.collect.Maps;
+
import org.apache.commons.math.stat.descriptive.SynchronizedDescriptiveStatistics;
import org.apache.jackrabbit.commons.JcrUtils;
import org.apache.jackrabbit.oak.Oak;
@@ -56,6 +56,8 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneInitializerHelper;
import org.apache.jackrabbit.oak.plugins.index.property.OrderedIndex;
import org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants;
+import org.apache.jackrabbit.oak.scalability.ScalabilitySuite;
+import org.apache.jackrabbit.oak.scalability.benchmarks.ScalabilityBenchmark;
import org.apache.jackrabbit.oak.scalability.util.NodeTypeUtils;
import org.apache.jackrabbit.oak.spi.commit.Observer;
import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider;