Repository: usergrid Updated Branches: refs/heads/master fbd73cd91 -> 9ee4288ce
Optimization: donât check that queue exists on every call Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/9ee4288c Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/9ee4288c Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/9ee4288c Branch: refs/heads/master Commit: 9ee4288ce7d218c35e41ae9a4d061c50eaa15edb Parents: fbd73cd Author: Dave Johnson <[email protected]> Authored: Mon Nov 14 13:57:06 2016 -0800 Committer: Dave Johnson <[email protected]> Committed: Mon Nov 14 13:57:06 2016 -0800 ---------------------------------------------------------------------- .../persistence/queue/impl/QakkaQueueManager.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/9ee4288c/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/QakkaQueueManager.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/QakkaQueueManager.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/QakkaQueueManager.java index 6900a46..bdcd452 100644 --- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/QakkaQueueManager.java +++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/QakkaQueueManager.java @@ -20,8 +20,10 @@ package org.apache.usergrid.persistence.queue.impl; import com.datastax.driver.core.DataType; import com.datastax.driver.core.ProtocolVersion; import com.google.inject.Inject; +import com.google.inject.Singleton; import com.google.inject.assistedinject.Assisted; import org.apache.usergrid.persistence.qakka.core.*; +import org.apache.usergrid.persistence.qakka.core.Queue; import org.apache.usergrid.persistence.qakka.exceptions.QakkaRuntimeException; import org.apache.usergrid.persistence.qakka.serialization.queuemessages.DatabaseQueueMessage; import org.apache.usergrid.persistence.queue.LegacyQueueManager; @@ -32,9 +34,7 @@ import org.slf4j.LoggerFactory; import java.io.*; import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; +import java.util.*; public class QakkaQueueManager implements LegacyQueueManager { @@ -44,6 +44,7 @@ public class QakkaQueueManager implements LegacyQueueManager { private final QueueManager queueManager; private final QueueMessageManager queueMessageManager; private final Regions regions; + private final Set<String> queueNames; @Inject @@ -53,17 +54,17 @@ public class QakkaQueueManager implements LegacyQueueManager { QueueMessageManager queueMessageManager, Regions regions ) { - this.scope = scope; this.queueManager = queueManager; this.queueMessageManager = queueMessageManager; this.regions = regions; + this.queueNames = new HashSet<>(); } private synchronized void createQueueIfNecessary() { - if ( queueManager.getQueueConfig(scope.getName()) == null ) { + if ( !queueNames.contains( scope.getName() ) && queueManager.getQueueConfig(scope.getName()) == null ) { // TODO: read defaults from config //queueManager.createQueue( new Queue( queueName, "test-type", region, region, 0L, 5, 10, null )); @@ -71,6 +72,8 @@ public class QakkaQueueManager implements LegacyQueueManager { Queue queue = new Queue( scope.getName() ); queueManager.createQueue( queue ); } + + queueNames.add( scope.getName() ); }
