You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2016/11/09 22:45:54 UTC
svn commit: r1769024 - in /qpid/java/branches/remove-queue-runner:
broker-core/src/main/java/org/apache/qpid/server/consumer/
broker-core/src/main/java/org/apache/qpid/server/queue/
broker-core/src/main/java/org/apache/qpid/server/virtualhost/ broker-p...
Author: rgodfrey
Date: Wed Nov 9 22:45:53 2016
New Revision: 1769024
URL: http://svn.apache.org/viewvc?rev=1769024&view=rev
Log:
Remove dead methods, minimize the use of notifyAllConsumers
Modified:
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/consumer/ConsumerImpl.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractSystemMessageSource.java
qpid/java/branches/remove-queue-runner/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeConsumer.java
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/consumer/ConsumerImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/consumer/ConsumerImpl.java?rev=1769024&r1=1769023&r2=1769024&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/consumer/ConsumerImpl.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/consumer/ConsumerImpl.java Wed Nov 9 22:45:53 2016
@@ -34,8 +34,6 @@ public interface ConsumerImpl
ConsumerTarget getTarget();
- boolean hasAvailableMessages();
-
AbstractQueue.MessageContainer pullMessage();
enum Option
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java?rev=1769024&r1=1769023&r2=1769024&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java Wed Nov 9 22:45:53 2016
@@ -1064,7 +1064,6 @@ public abstract class AbstractQueue<X ex
updateSubRequeueEntry(sub, entry);
}
}
- notifyAllConsumers();
}
public void addBinding(final Binding<?> binding)
@@ -1335,6 +1334,7 @@ public abstract class AbstractQueue<X ex
{
if(QueueContext._releasedUpdater.compareAndSet(subContext, oldEntry, entry))
{
+ sub.notifyWork();
break;
}
}
@@ -1355,8 +1355,6 @@ public abstract class AbstractQueue<X ex
updateSubRequeueEntry(sub, entry);
}
}
- notifyAllConsumers();
-
}
@Override
@@ -2070,7 +2068,8 @@ public abstract class AbstractQueue<X ex
return true;
}
- protected void advanceAllConsumers()
+
+ private void advanceAllConsumers()
{
ConsumerNodeIterator consumerNodeIterator = _consumerList.iterator();
while (consumerNodeIterator.advance())
@@ -2145,16 +2144,6 @@ public abstract class AbstractQueue<X ex
}
- boolean hasAvailableMessages(final QueueConsumer queueConsumer)
- {
- boolean hasAvailableMessages = getNextAvailableEntry(queueConsumer) != null;
- if (!hasAvailableMessages)
- {
- queueConsumer.queueEmpty();
- }
- return hasAvailableMessages;
- }
-
public void checkMessageStatus()
{
QueueEntryIterator queueListIterator = getEntries().iterator();
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java?rev=1769024&r1=1769023&r2=1769024&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java Wed Nov 9 22:45:53 2016
@@ -267,12 +267,6 @@ class QueueConsumerImpl
}
@Override
- public boolean hasAvailableMessages()
- {
- return !_queue.isEmpty() && _queue.hasAvailableMessages(this);
- }
-
- @Override
public long getUnacknowledgedBytes()
{
return _target.getUnacknowledgedBytes();
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractSystemMessageSource.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractSystemMessageSource.java?rev=1769024&r1=1769023&r2=1769024&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractSystemMessageSource.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractSystemMessageSource.java Wed Nov 9 22:45:53 2016
@@ -156,12 +156,6 @@ public abstract class AbstractSystemMess
}
@Override
- public boolean hasAvailableMessages()
- {
- return !_queue.isEmpty();
- }
-
- @Override
public AbstractQueue.MessageContainer pullMessage()
{
if (!_queue.isEmpty())
Modified: qpid/java/branches/remove-queue-runner/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeConsumer.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeConsumer.java?rev=1769024&r1=1769023&r2=1769024&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeConsumer.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeConsumer.java Wed Nov 9 22:45:53 2016
@@ -68,12 +68,6 @@ class ManagementNodeConsumer implements
}
@Override
- public boolean hasAvailableMessages()
- {
- return !_queue.isEmpty();
- }
-
- @Override
public AbstractQueue.MessageContainer pullMessage()
{
if (!_queue.isEmpty())
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org