svn commit: r1644863 - in /jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability: OrderByDate.java ScalabilityRunner.java

[da...@apache.org]

Author: davide
Date: Fri Dec 12 11:53:13 2014
New Revision: 1644863

URL: http://svn.apache.org/r1644863
Log:
OAK-2056: Optimize orderings by date fields

Adding scalabitily benchmark for measuring any potential code change

Added:
    jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/OrderByDate.java
Modified:
    jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityRunner.java

Added: 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/OrderByDate.java?rev=1644863&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/OrderByDate.java (added)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/OrderByDate.java Fri Dec 12 11:53:13 2014
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.oak.scalability;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.query.Query;
+import javax.jcr.query.QueryManager;
+
+import org.apache.jackrabbit.oak.scalability.ScalabilityAbstractSuite.ExecutionContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class OrderByDate extends SearchScalabilityBenchmark {
+    private static final Logger LOG = LoggerFactory.getLogger(OrderByDate.class);
+    
+    @Override
+    protected Query getQuery(final QueryManager qm, final ExecutionContext context) throws RepositoryException {
+        final String path = (String) context.getMap().get(
+            ScalabilityBlobSearchSuite.CTX_ROOT_NODE_NAME_PROP);
+        final String statement = String.format(
+            "SELECT * FROM [%s] WHERE ISDESCENDANTNODE('/%s') ORDER BY [jcr:content/jcr:lastModified]",
+            context.getMap().get(ScalabilityBlobSearchSuite.CTX_FILE_NODE_TYPE_PROP),
+            path);
+        
+        LOG.debug("statement: {}", statement);
+        
+        return qm.createQuery(statement, Query.JCR_SQL2);
+    }
+}

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=1644863&r1=1644862&r2=1644863&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 Fri Dec 12 11:53:13 2014
@@ -126,7 +126,8 @@ public class ScalabilityRunner {
                                         new LastModifiedSearcher(Date.LAST_24_HRS),
                                         new LastModifiedSearcher(Date.LAST_7_DAYS),
                                         new LastModifiedSearcher(Date.LAST_MONTH),
-                                        new LastModifiedSearcher(Date.LAST_YEAR)),
+                                        new LastModifiedSearcher(Date.LAST_YEAR),
+                                        new OrderByDate()),
                         new ScalabilityNodeSuite(withStorage.value(options))
                                 .addBenchmarks(new OrderBySearcher(),
                                         new SplitOrderBySearcher(),