You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2015/11/23 13:32:02 UTC

svn commit: r1715786 - in /sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs: JobManagerImpl.java config/JobManagerConfiguration.java queues/QueueJobCache.java

Author: cziegeler
Date: Mon Nov 23 12:32:02 2015
New Revision: 1715786

URL: http://svn.apache.org/viewvc?rev=1715786&view=rev
Log:
SLING-5320 : Optimize query for jobs by using configured path

Modified:
    sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java
    sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/config/JobManagerConfiguration.java
    sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/QueueJobCache.java

Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java?rev=1715786&r1=1715785&r2=1715786&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java Mon Nov 23 12:32:02 2015
@@ -277,7 +277,9 @@ public class JobManagerImpl
         final StringBuilder buf = new StringBuilder(64);
         try {
 
-            buf.append("//element(*,");
+            buf.append("/jcr:root");
+            buf.append(this.configuration.getJobsBasePathWithSlash());
+            buf.append("/element(*,");
             buf.append(ResourceHelper.RESOURCE_TYPE_JOB);
             buf.append(")[@");
             buf.append(ResourceHelper.PROPERTY_JOB_ID);
@@ -366,7 +368,9 @@ public class JobManagerImpl
         final StringBuilder buf = new StringBuilder(64);
         try {
 
-            buf.append("//element(*,");
+            buf.append("/jcr:root");
+            buf.append(this.configuration.getJobsBasePathWithSlash());
+            buf.append("/element(*,");
             buf.append(ResourceHelper.RESOURCE_TYPE_JOB);
             buf.append(")[@");
             buf.append(ISO9075.encode(ResourceHelper.PROPERTY_JOB_TOPIC));

Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/config/JobManagerConfiguration.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/config/JobManagerConfiguration.java?rev=1715786&r1=1715785&r2=1715786&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/config/JobManagerConfiguration.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/config/JobManagerConfiguration.java Mon Nov 23 12:32:02 2015
@@ -385,6 +385,10 @@ public class JobManagerConfiguration imp
         return jobPath.startsWith(this.jobsBasePathWithSlash);
     }
 
+    public String getJobsBasePathWithSlash() {
+        return this.jobsBasePathWithSlash;
+    }
+
     public boolean isLock(final String lockPath) {
         return lockPath.startsWith(this.locksPathWithSlash);
     }

Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/QueueJobCache.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/QueueJobCache.java?rev=1715786&r1=1715785&r2=1715786&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/QueueJobCache.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/QueueJobCache.java Mon Nov 23 12:32:02 2015
@@ -276,11 +276,12 @@ public class QueueJobCache {
                     if ( list.size() == maxPreloadLimit ) {
                         scanTopic.set(true);
                     }
+                } else if ( job.getProcessingStarted() != null ) {
+                    logger.debug("Ignoring job {} - processing already started.", job);
                 } else {
-                    if ( job.hasReadErrors() ) {
-                        scanTopic.set(true);
-                    }
-                    logger.debug("Ignoring job because {} or {}", job.getProcessingStarted(), job.hasReadErrors());
+                    // error reading job
+                    scanTopic.set(true);
+                    logger.debug("Ignoring job {} due to read errors.", job);
                 }
                 return list.size() < maxPreloadLimit;
             }