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 2007/01/08 00:11:57 UTC
svn commit: r493872 [1/4] - in /incubator/qpid/trunk/qpid/java: broker/bin/
broker/src/main/java/org/apache/qpid/server/
broker/src/main/java/org/apache/qpid/server/ack/
broker/src/main/java/org/apache/qpid/server/exchange/
broker/src/main/java/org/apa...
Author: rgreig
Date: Sun Jan 7 15:11:53 2007
New Revision: 493872
URL: http://svn.apache.org/viewvc?view=rev&rev=493872
Log:
QPID-32: new model for holding and processing message in memory to support new persistent stores
Added:
incubator/qpid/trunk/qpid/java/broker/bin/qpid-server-bdb.bat (with props)
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessageHandle.java (with props)
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/InMemoryMessageHandle.java (with props)
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/MessageHandleFactory.java (with props)
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/MessageMetaData.java (with props)
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/TransientMessageData.java (with props)
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/WeakReferenceMessageHandle.java (with props)
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/StoreContext.java (with props)
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/CleanupMessageOperation.java (with props)
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DeliverMessageOperation.java (with props)
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java (with props)
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/NonTransactionalContext.java (with props)
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/StoreMessageOperation.java (with props)
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/TransactionalContext.java (with props)
incubator/qpid/trunk/qpid/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleBodySendable.java (with props)
Modified:
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/RequiredDeliveryException.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/TxAck.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessage.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMap.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DestWildExchange.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/MessageRouter.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/Expression.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/LogicExpression.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/NoConsumerFilter.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XQueryExpression.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XalanXPathEvaluator.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxCommitHandler.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxSelectHandler.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/message/jms/JMSMessage.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentDeliveryManager.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/DeliveryManager.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ManagedQueue.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/NoConsumersException.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/Subscription.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionImpl.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionSet.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SynchronizedDeliveryManager.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/TxnBuffer.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/TxnOp.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverSupport.java
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/codec/BasicDeliverTest.java
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/framing/FieldTableTest.java
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/requestreply1/VmRequestReply.java
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/test/unit/jndi/referenceabletest/JNDIReferenceableTest.java
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/weblogic/ServiceRequestingClient.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
incubator/qpid/trunk/qpid/java/cluster/src/main/java/org/apache/qpid/server/cluster/DefaultGroupManager.java
incubator/qpid/trunk/qpid/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleSendable.java
incubator/qpid/trunk/qpid/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ReplicatingHandler.java
incubator/qpid/trunk/qpid/java/cluster/src/main/java/org/apache/qpid/server/queue/ClusteredQueue.java
incubator/qpid/trunk/qpid/java/cluster/src/main/java/org/apache/qpid/server/queue/PrivateQueue.java
incubator/qpid/trunk/qpid/java/cluster/src/main/java/org/apache/qpid/server/queue/RemoteQueueProxy.java
incubator/qpid/trunk/qpid/java/cluster/src/main/java/org/apache/qpid/server/queue/RemoteSubscriptionImpl.java
incubator/qpid/trunk/qpid/java/cluster/src/test/java/org/apache/qpid/server/cluster/BrokerTest.java
incubator/qpid/trunk/qpid/java/systests/src/old_test/java/org/apache/qpid/server/queue/SendPerfTest.java
incubator/qpid/trunk/qpid/java/systests/src/old_test/java/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/ack/TxAckTest.java
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ConcurrencyTest.java
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/DeliveryManagerTest.java
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/MessageTestHelper.java
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/store/TestReferenceCounting.java
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/txn/TxnBufferTest.java
Added: incubator/qpid/trunk/qpid/java/broker/bin/qpid-server-bdb.bat
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/bin/qpid-server-bdb.bat?view=auto&rev=493872
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/bin/qpid-server-bdb.bat (added)
+++ incubator/qpid/trunk/qpid/java/broker/bin/qpid-server-bdb.bat Sun Jan 7 15:11:53 2007
@@ -0,0 +1,3 @@
+set BDBSTORE_HOME=c:\qpid\trunk\java\bdbstore
+set QPID_MODULE_JARS=%BDBSTORE_HOME%\target\qpid-bdbstore-1.0-incubating-M2-SNAPSHOT.jar;%BDBSTORE_HOME%\lib\bdb\je-3.1.0.jar
+.\qpid-server.bat
\ No newline at end of file
Propchange: incubator/qpid/trunk/qpid/java/broker/bin/qpid-server-bdb.bat
------------------------------------------------------------------------------
svn:eol-style = CRLF
Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java?view=diff&rev=493872&r1=493871&r2=493872
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java Sun Jan 7 15:11:53 2007
@@ -22,32 +22,27 @@
import org.apache.log4j.Logger;
import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQDataBlock;
import org.apache.qpid.framing.BasicPublishBody;
import org.apache.qpid.framing.ContentBody;
import org.apache.qpid.framing.ContentHeaderBody;
import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.server.ack.TxAck;
import org.apache.qpid.server.ack.UnacknowledgedMessage;
import org.apache.qpid.server.ack.UnacknowledgedMessageMap;
import org.apache.qpid.server.ack.UnacknowledgedMessageMapImpl;
import org.apache.qpid.server.exchange.MessageRouter;
+import org.apache.qpid.server.exchange.NoRouteException;
import org.apache.qpid.server.protocol.AMQProtocolSession;
import org.apache.qpid.server.queue.AMQMessage;
import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.NoConsumersException;
+import org.apache.qpid.server.queue.MessageHandleFactory;
import org.apache.qpid.server.store.MessageStore;
+import org.apache.qpid.server.store.StoreContext;
+import org.apache.qpid.server.txn.LocalTransactionalContext;
+import org.apache.qpid.server.txn.NonTransactionalContext;
+import org.apache.qpid.server.txn.TransactionalContext;
import org.apache.qpid.server.txn.TxnBuffer;
-import org.apache.qpid.server.txn.TxnOp;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.Set;
-import java.util.HashSet;
+import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
@@ -59,7 +54,7 @@
private final int _channelId;
- private boolean _transactional;
+ //private boolean _transactional;
private long _prefetch_HighWaterMark;
@@ -97,21 +92,24 @@
private final MessageStore _messageStore;
- private final Object _unacknowledgedMessageMapLock = new Object();
-
- private Map<Long, UnacknowledgedMessage> _unacknowledgedMessageMap = new LinkedHashMap<Long, UnacknowledgedMessage>(DEFAULT_PREFETCH);
-
- private long _lastDeliveryTag;
+ private UnacknowledgedMessageMap _unacknowledgedMessageMap = new UnacknowledgedMessageMapImpl(DEFAULT_PREFETCH);
private final AtomicBoolean _suspended = new AtomicBoolean(false);
private final MessageRouter _exchanges;
- private final TxnBuffer _txnBuffer;
+ private TransactionalContext _txnContext;
- private TxAck ackOp;
+ /**
+ * A context used by the message store enabling it to track context for a given channel even across
+ * thread boundaries
+ */
+ private final StoreContext _storeContext = new StoreContext();
+
+ private final List<RequiredDeliveryException> _returnMessages = new LinkedList<RequiredDeliveryException>();
+
+ private MessageHandleFactory _messageHandleFactory = new MessageHandleFactory();
- private final List<AMQDataBlock> _returns = new LinkedList<AMQDataBlock>();
private Set<Long> _browsedAcks = new HashSet<Long>();
public AMQChannel(int channelId, MessageStore messageStore, MessageRouter exchanges)
@@ -122,22 +120,29 @@
_prefetch_LowWaterMark = _prefetch_HighWaterMark / 2;
_messageStore = messageStore;
_exchanges = exchanges;
- _txnBuffer = new TxnBuffer(_messageStore);
+ // by default the session is non-transactional
+ _txnContext = new NonTransactionalContext(_messageStore, _storeContext, this, _returnMessages, _browsedAcks);
}
- public int getChannelId()
+ /**
+ * Sets this channel to be part of a local transaction
+ */
+ public void setLocalTransactional()
{
- return _channelId;
+ _txnContext = new LocalTransactionalContext(_messageStore, _storeContext, new TxnBuffer(), _returnMessages);
}
public boolean isTransactional()
{
- return _transactional;
+ // this does not look great but there should only be one "non-transactional"
+ // transactional context, while there could be several transactional ones in
+ // theory
+ return !(_txnContext instanceof NonTransactionalContext);
}
- public void setTransactional(boolean transactional)
+ public int getChannelId()
{
- _transactional = transactional;
+ return _channelId;
}
public long getPrefetchCount()
@@ -173,7 +178,9 @@
public void setPublishFrame(BasicPublishBody publishBody, AMQProtocolSession publisher) throws AMQException
{
- _currentMessage = new AMQMessage(_messageStore, publishBody);
+ _currentMessage = new AMQMessage(_messageStore.getNewMessageId(), publishBody,
+ _txnContext);
+ // TODO: used in clustering only I think (RG)
_currentMessage.setPublisher(publisher);
}
@@ -182,92 +189,60 @@
{
if (_currentMessage == null)
{
- throw new AMQException("Received content header without previously receiving a BasicDeliver frame");
+ throw new AMQException("Received content header without previously receiving a BasicPublish frame");
}
else
{
_currentMessage.setContentHeaderBody(contentHeaderBody);
- // check and route if header says body length is zero
+ routeCurrentMessage();
+ _currentMessage.routingComplete(_messageStore, _storeContext, _messageHandleFactory);
+
+ // check and deliver if header says body length is zero
if (contentHeaderBody.bodySize == 0)
{
- routeCurrentMessage();
+ _currentMessage = null;
}
}
}
- public void publishContentBody(ContentBody contentBody)
+ public void publishContentBody(ContentBody contentBody, AMQProtocolSession protocolSession)
throws AMQException
{
if (_currentMessage == null)
{
throw new AMQException("Received content body without previously receiving a JmsPublishBody");
}
- if (_currentMessage.getContentHeaderBody() == null)
- {
- throw new AMQException("Received content body without previously receiving a content header");
- }
- _currentMessage.addContentBodyFrame(contentBody);
- if (_currentMessage.isAllContentReceived())
+ // returns true iff the message was delivered (i.e. if all data was
+ // received
+ try
+ {
+ if (_currentMessage.addContentBodyFrame(_storeContext, contentBody))
+ {
+ // callback to allow the context to do any post message processing
+ // primary use is to allow message return processing in the non-tx case
+ _txnContext.messageProcessed(protocolSession);
+ _currentMessage = null;
+ }
+ }
+ catch (AMQException e)
{
- routeCurrentMessage();
+ // we want to make sure we don't keep a reference to the message in the
+ // event of an error
+ _currentMessage = null;
+ throw e;
}
}
protected void routeCurrentMessage() throws AMQException
{
- if (_transactional)
+ try
{
- //don't create a transaction unless needed
- if (_currentMessage.isPersistent())
- {
- _txnBuffer.containsPersistentChanges();
- }
-
- //A publication will result in the enlisting of several
- //TxnOps. The first is an op that will store the message.
- //Following that (and ordering is important), an op will
- //be added for every queue onto which the message is
- //enqueued. Finally a cleanup op will be added to decrement
- //the reference associated with the routing.
- Store storeOp = new Store(_currentMessage);
- _txnBuffer.enlist(storeOp);
- _currentMessage.setTxnBuffer(_txnBuffer);
- try
- {
- _exchanges.routeContent(_currentMessage);
- _txnBuffer.enlist(new Cleanup(_currentMessage));
- }
- catch (RequiredDeliveryException e)
- {
- //Can only be due to the mandatory flag, as no attempt
- //has yet been made to deliver the message. The
- //message will thus not have been delivered to any
- //queue so we can return the message (without killing
- //the transaction) and for efficiency remove the store
- //operation from the buffer.
- _txnBuffer.cancel(storeOp);
- throw e;
- }
- finally
- {
- _currentMessage = null;
- }
+ _exchanges.routeContent(_currentMessage);
}
- else
+ catch (NoRouteException e)
{
- try
- {
- _exchanges.routeContent(_currentMessage);
- //following check implements the functionality
- //required by the 'immediate' flag:
- _currentMessage.checkDeliveredToConsumer();
- }
- finally
- {
- _currentMessage.decrementReference();
- _currentMessage = null;
- }
+ _returnMessages.add(e);
}
}
@@ -329,13 +304,7 @@
*/
public void close(AMQProtocolSession session) throws AMQException
{
- if (_transactional)
- {
- synchronized(_txnBuffer)
- {
- _txnBuffer.rollback();//releases messages
- }
- }
+ _txnContext.rollback();
unsubscribeAllConsumers(session);
requeue();
}
@@ -353,41 +322,32 @@
/**
* Add a message to the channel-based list of unacknowledged messages
*
- * @param message
- * @param deliveryTag
- * @param queue
+ * @param message the message that was delivered
+ * @param deliveryTag the delivery tag used when delivering the message (see protocol spec for description of
+ * the delivery tag)
+ * @param queue the queue from which the message was delivered
*/
public void addUnacknowledgedMessage(AMQMessage message, long deliveryTag, String consumerTag, AMQQueue queue)
{
- synchronized(_unacknowledgedMessageMapLock)
- {
- _unacknowledgedMessageMap.put(deliveryTag, new UnacknowledgedMessage(queue, message, consumerTag, deliveryTag));
- _lastDeliveryTag = deliveryTag;
- checkSuspension();
- }
+ _unacknowledgedMessageMap.add(deliveryTag, new UnacknowledgedMessage(queue, message, consumerTag, deliveryTag));
+ checkSuspension();
}
/**
* Called to attempt re-enqueue all outstanding unacknowledged messages on the channel.
* May result in delivery to this same channel or to other subscribers.
+ * @throws org.apache.qpid.AMQException if the requeue fails
*/
public void requeue() throws AMQException
{
// we must create a new map since all the messages will get a new delivery tag when they are redelivered
- Map<Long, UnacknowledgedMessage> currentList;
- synchronized(_unacknowledgedMessageMapLock)
- {
- currentList = _unacknowledgedMessageMap;
- _unacknowledgedMessageMap = new LinkedHashMap<Long, UnacknowledgedMessage>(DEFAULT_PREFETCH);
- }
+ Collection<UnacknowledgedMessage> messagesToBeDelivered = _unacknowledgedMessageMap.cancelAllMessages();
- for (UnacknowledgedMessage unacked : currentList.values())
+ for (UnacknowledgedMessage unacked : messagesToBeDelivered)
{
if (unacked.queue != null)
{
- unacked.message.setTxnBuffer(null);
-
- unacked.queue.deliver(unacked.message);
+ _txnContext.deliver(unacked.message, unacked.queue);
}
}
}
@@ -395,53 +355,62 @@
/**
* Called to resend all outstanding unacknowledged messages to this same channel.
*/
- public void resend(AMQProtocolSession session)
+ public void resend(final AMQProtocolSession session) throws AMQException
{
- //messages go to this channel
- synchronized(_unacknowledgedMessageMapLock)
+ _unacknowledgedMessageMap.visit(new UnacknowledgedMessageMap.Visitor()
{
- for (Map.Entry<Long, UnacknowledgedMessage> entry : _unacknowledgedMessageMap.entrySet())
+ public boolean callback(UnacknowledgedMessage message) throws AMQException
{
- long deliveryTag = entry.getKey();
- String consumerTag = entry.getValue().consumerTag;
- AMQMessage msg = entry.getValue().message;
+ long deliveryTag = message.deliveryTag;
+ String consumerTag = message.consumerTag;
+ AMQMessage msg = message.message;
msg.setRedelivered(true);
- session.writeFrame(msg.getDataBlock(_channelId, consumerTag, deliveryTag));
+ msg.writeDeliver(session, _channelId, deliveryTag, consumerTag);
+ // false means continue processing
+ return false;
}
- }
+
+ public void visitComplete()
+ {
+ }
+ });
}
/**
* Callback indicating that a queue has been deleted. We must update the structure of unacknowledged
* messages to remove the queue reference and also decrement any message reference counts, without
- * actually removing the item sine we may get an ack for a delivery tag that was generated from the
+ * actually removing the item since we may get an ack for a delivery tag that was generated from the
* deleted queue.
*
- * @param queue
+ * @param queue the queue that has been deleted
+ * @throws org.apache.qpid.AMQException if there is an error processing the unacked messages
*/
- public void queueDeleted(AMQQueue queue)
+ public void queueDeleted(final AMQQueue queue) throws AMQException
{
- synchronized(_unacknowledgedMessageMapLock)
+ _unacknowledgedMessageMap.visit(new UnacknowledgedMessageMap.Visitor()
{
- for (Map.Entry<Long, UnacknowledgedMessage> unacked : _unacknowledgedMessageMap.entrySet())
+ public boolean callback(UnacknowledgedMessage message) throws AMQException
{
- final UnacknowledgedMessage unackedMsg = unacked.getValue();
- // we can compare the reference safely in this case
- if (unackedMsg.queue == queue)
+ if (message.queue == queue)
{
- unackedMsg.queue = null;
try
{
- unackedMsg.message.decrementReference();
+ message.discard(_storeContext);
+ message.queue = null;
}
catch (AMQException e)
{
- _log.error("Error decrementing ref count on message " + unackedMsg.message.getMessageId() + ": " +
+ _log.error("Error decrementing ref count on message " + message.message.getMessageId() + ": " +
e, e);
}
}
+ return false;
}
- }
+
+ public void visitComplete()
+ {
+ }
+ });
}
/**
@@ -454,150 +423,7 @@
*/
public void acknowledgeMessage(long deliveryTag, boolean multiple) throws AMQException
{
- if (_transactional)
- {
- //check that the tag exists to give early failure
- if (!multiple || deliveryTag > 0)
- {
- checkAck(deliveryTag);
- }
- //we use a single txn op for all acks and update this op
- //as new acks come in. If this is the first ack in the txn
- //we will need to create and enlist the op.
- if (ackOp == null)
- {
- ackOp = new TxAck(new AckMap());
- _txnBuffer.enlist(ackOp);
- }
- //update the op to include this ack request
- if (multiple && deliveryTag == 0)
- {
- synchronized(_unacknowledgedMessageMapLock)
- {
- //if have signalled to ack all, that refers only
- //to all at this time
- ackOp.update(_lastDeliveryTag, multiple);
- }
- }
- else
- {
- ackOp.update(deliveryTag, multiple);
- }
- }
- else
- {
- handleAcknowledgement(deliveryTag, multiple);
- }
- }
-
- private void checkAck(long deliveryTag) throws AMQException
- {
- synchronized(_unacknowledgedMessageMapLock)
- {
- if (!_unacknowledgedMessageMap.containsKey(deliveryTag))
- {
- throw new AMQException("Ack with delivery tag " + deliveryTag + " not known for channel");
- }
- }
- }
-
- private void handleAcknowledgement(long deliveryTag, boolean multiple) throws AMQException
- {
- if (_log.isDebugEnabled())
- {
- _log.debug("Handling acknowledgement for channel " + _channelId + " with delivery tag " + deliveryTag +
- " and multiple " + multiple);
- }
- if (multiple)
- {
- LinkedList<UnacknowledgedMessage> acked = new LinkedList<UnacknowledgedMessage>();
- synchronized(_unacknowledgedMessageMapLock)
- {
- if (deliveryTag == 0)
- {
- //Spec 2.1.6.11 ... If the multiple field is 1, and the delivery tag is zero, tells the server to acknowledge all outstanding mesages.
- _log.trace("Multiple ack on delivery tag 0. ACKing all messages. Current count:" + _unacknowledgedMessageMap.size());
- acked = new LinkedList<UnacknowledgedMessage>(_unacknowledgedMessageMap.values());
- _unacknowledgedMessageMap.clear();
- }
- else
- {
- if (!_unacknowledgedMessageMap.containsKey(deliveryTag))
- {
- throw new AMQException("Multiple ack on delivery tag " + deliveryTag + " not known for channel");
- }
- Iterator<Map.Entry<Long, UnacknowledgedMessage>> i = _unacknowledgedMessageMap.entrySet().iterator();
-
- while (i.hasNext())
- {
-
- Map.Entry<Long, UnacknowledgedMessage> unacked = i.next();
-
- if (unacked.getKey() > deliveryTag)
- {
- //This should not occur now.
- throw new AMQException("UnacknowledgedMessageMap is out of order:" + unacked.getKey() + " When deliveryTag is:" + deliveryTag + "ES:" + _unacknowledgedMessageMap.entrySet().toString());
- }
-
- i.remove();
-
- acked.add(unacked.getValue());
- if (unacked.getKey() == deliveryTag)
- {
- break;
- }
- }
- }
- }// synchronized
-
- if (_log.isTraceEnabled())
- {
- _log.trace("Received multiple ack for delivery tag " + deliveryTag + ". Removing " +
- acked.size() + " items.");
- }
-
- for (UnacknowledgedMessage msg : acked)
- {
- if (!_browsedAcks.contains(deliveryTag))
- {
- msg.discard();
- }
- else
- {
- _browsedAcks.remove(deliveryTag);
- }
- }
-
- }
- else
- {
- UnacknowledgedMessage msg;
- synchronized(_unacknowledgedMessageMapLock)
- {
- msg = _unacknowledgedMessageMap.remove(deliveryTag);
- }
-
- if (msg == null)
- {
- _log.trace("Single ack on delivery tag " + deliveryTag + " not known for channel:" + _channelId);
- throw new AMQException("Single ack on delivery tag " + deliveryTag + " not known for channel:" + _channelId);
- }
-
- if (!_browsedAcks.contains(deliveryTag))
- {
- msg.discard();
- }
- else
- {
- _browsedAcks.remove(deliveryTag);
- }
-
- if (_log.isTraceEnabled())
- {
- _log.trace("Received non-multiple ack for messaging with delivery tag " + deliveryTag);
- }
- }
-
+ _unacknowledgedMessageMap.acknowledgeMessage(deliveryTag, multiple, _txnContext);
checkSuspension();
}
@@ -606,19 +432,22 @@
*
* @return the map of unacknowledged messages
*/
- public Map<Long, UnacknowledgedMessage> getUnacknowledgedMessageMap()
+ public UnacknowledgedMessageMap getUnacknowledgedMessageMap()
{
return _unacknowledgedMessageMap;
}
+ public void addUnacknowledgedBrowsedMessage(AMQMessage msg, long deliveryTag, String consumerTag, AMQQueue queue)
+ {
+ _browsedAcks.add(deliveryTag);
+ addUnacknowledgedMessage(msg, deliveryTag, consumerTag, queue);
+ }
+
private void checkSuspension()
{
boolean suspend;
- //noinspection SynchronizeOnNonFinalField
- synchronized(_unacknowledgedMessageMapLock)
- {
- suspend = _unacknowledgedMessageMap.size() >= _prefetch_HighWaterMark;
- }
+ suspend = _unacknowledgedMessageMap.size() >= _prefetch_HighWaterMark;
+
setSuspended(suspend);
}
@@ -628,11 +457,8 @@
if (isSuspended && !suspended)
{
- synchronized(_unacknowledgedMessageMapLock)
- {
- // Continue being suspended if we are above the _prefetch_LowWaterMark
- suspended = _unacknowledgedMessageMap.size() > _prefetch_LowWaterMark;
- }
+ // Continue being suspended if we are above the _prefetch_LowWaterMark
+ suspended = _unacknowledgedMessageMap.size() > _prefetch_LowWaterMark;
}
boolean wasSuspended = _suspended.getAndSet(suspended);
@@ -661,33 +487,18 @@
public void commit() throws AMQException
{
- if (ackOp != null)
- {
- ackOp.consolidate();
- if (ackOp.checkPersistent())
- {
- _txnBuffer.containsPersistentChanges();
- }
- ackOp = null;//already enlisted, after commit will reset regardless of outcome
- }
-
- _txnBuffer.commit();
- //TODO: may need to return 'immediate' messages at this point
+ _txnContext.commit();
}
public void rollback() throws AMQException
{
- //need to protect rollback and close from each other...
- synchronized(_txnBuffer)
- {
- _txnBuffer.rollback();
- }
+ _txnContext.rollback();
}
public String toString()
{
StringBuilder sb = new StringBuilder(30);
- sb.append("Channel: id ").append(_channelId).append(", transaction mode: ").append(_transactional);
+ sb.append("Channel: id ").append(_channelId).append(", transaction mode: ").append(isTransactional());
sb.append(", prefetch marks: ").append(_prefetch_LowWaterMark);
sb.append("/").append(_prefetch_HighWaterMark);
return sb.toString();
@@ -703,121 +514,18 @@
return _defaultQueue;
}
- public void processReturns(AMQProtocolSession session)
- {
- for (AMQDataBlock block : _returns)
- {
- session.writeFrame(block);
- }
- _returns.clear();
- }
-
- public void addUnacknowledgedBrowsedMessage(AMQMessage msg, long deliveryTag, String consumerTag, AMQQueue queue)
+ public StoreContext getStoreContext()
{
- _browsedAcks.add(deliveryTag);
- addUnacknowledgedMessage(msg, deliveryTag, consumerTag, queue);
+ return _storeContext;
}
- //we use this wrapper to ensure we are always using the correct
- //map instance (its not final unfortunately)
- private class AckMap implements UnacknowledgedMessageMap
+ public void processReturns(AMQProtocolSession session) throws AMQException
{
- public void collect(long deliveryTag, boolean multiple, List<UnacknowledgedMessage> msgs)
- {
- impl().collect(deliveryTag, multiple, msgs);
- }
-
- public void remove(List<UnacknowledgedMessage> msgs)
- {
- impl().remove(msgs);
- }
-
- private UnacknowledgedMessageMap impl()
- {
- return new UnacknowledgedMessageMapImpl(_unacknowledgedMessageMapLock, _unacknowledgedMessageMap);
- }
- }
-
- private class Store implements TxnOp
- {
- //just use this to do a store of the message during the
- //prepare phase. Any enqueueing etc is done by TxnOps enlisted
- //by the queues themselves.
- private final AMQMessage _msg;
-
- Store(AMQMessage msg)
- {
- _msg = msg;
- }
-
- public void prepare() throws AMQException
- {
- _msg.storeMessage();
- //the routers reference can now be released
- _msg.decrementReference();
- }
-
- public void undoPrepare()
- {
- }
-
- public void commit()
- {
- }
-
- public void rollback()
- {
- }
- }
-
- private class Cleanup implements TxnOp
- {
- private final AMQMessage _msg;
-
- Cleanup(AMQMessage msg)
- {
- _msg = msg;
- }
-
- public void prepare() throws AMQException
- {
- }
-
- public void undoPrepare()
- {
- //don't need to do anything here, if the store's txn failed
- //when processing prepare then the message was not stored
- //or enqueued on any queues and can be discarded
- }
-
- public void commit()
- {
- //The routers reference can now be released. This is done
- //here to ensure that it happens after the queues that
- //enqueue it have incremented their counts (which as a
- //memory only operation is done in the commit phase).
- try
- {
- _msg.decrementReference();
- }
- catch (AMQException e)
- {
- _log.error("On commiting transaction, failed to cleanup unused message: " + e, e);
- }
- try
- {
- _msg.checkDeliveredToConsumer();
- }
- catch (NoConsumersException e)
- {
- //TODO: store this for delivery after the commit-ok
- _returns.add(e.getReturnMessage(_channelId));
- }
- }
-
- public void rollback()
+ for (RequiredDeliveryException bouncedMessage : _returnMessages)
{
+ AMQMessage message = bouncedMessage.getAMQMessage();
+ message.writeReturn(session, _channelId, bouncedMessage.getReplyCode(), bouncedMessage.getMessage());
}
+ _returnMessages.clear();
}
-
}
Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/RequiredDeliveryException.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/RequiredDeliveryException.java?view=diff&rev=493872&r1=493871&r2=493872
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/RequiredDeliveryException.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/RequiredDeliveryException.java Sun Jan 7 15:11:53 2007
@@ -7,9 +7,9 @@
* 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
@@ -20,17 +20,9 @@
*/
package org.apache.qpid.server;
-import org.apache.qpid.framing.BasicPublishBody;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.ContentBody;
-import org.apache.qpid.framing.CompositeAMQDataBlock;
-import org.apache.qpid.framing.BasicReturnBody;
-import org.apache.qpid.framing.AMQFrame;
import org.apache.qpid.AMQException;
import org.apache.qpid.server.queue.AMQMessage;
-import java.util.List;
-
/**
* Signals that a required delivery could not be made. This could be bacuse of
* the immediate flag being set and the queue having no consumers, or the mandatory
@@ -38,79 +30,24 @@
*/
public abstract class RequiredDeliveryException extends AMQException
{
- private final String _message;
- private final BasicPublishBody _publishBody;
- private final ContentHeaderBody _contentHeaderBody;
- private final List<ContentBody> _contentBodies;
+ private final AMQMessage _amqMessage;
public RequiredDeliveryException(String message, AMQMessage payload)
{
super(message);
- _message = message;
- _publishBody = payload.getPublishBody();
- _contentHeaderBody = payload.getContentHeaderBody();
- _contentBodies = payload.getContentBodies();
+ _amqMessage = payload;
+ payload.incrementReference();
}
- public RequiredDeliveryException(String message,
- BasicPublishBody publishBody,
- ContentHeaderBody contentHeaderBody,
- List<ContentBody> contentBodies)
+ public AMQMessage getAMQMessage()
{
- super(message);
- _message = message;
- _publishBody = publishBody;
- _contentHeaderBody = contentHeaderBody;
- _contentBodies = contentBodies;
- }
-
- public BasicPublishBody getPublishBody()
- {
- return _publishBody;
- }
-
- public ContentHeaderBody getContentHeaderBody()
- {
- return _contentHeaderBody;
- }
-
- public List<ContentBody> getContentBodies()
- {
- return _contentBodies;
- }
-
- public CompositeAMQDataBlock getReturnMessage(int channel)
- {
- // AMQP version change: All generated *Body classes are now version-aware.
- // Shortcut: hardwire version to 0-8 (major=8, minor=0) for now.
- // TODO: Connect the version to that returned by the ProtocolInitiation
- // for this session.
- BasicReturnBody returnBody = new BasicReturnBody((byte)8, (byte)0);
- returnBody.exchange = _publishBody.exchange;
- returnBody.replyCode = getReplyCode();
- returnBody.replyText = _message;
- returnBody.routingKey = _publishBody.routingKey;
-
- AMQFrame[] allFrames = new AMQFrame[2 + _contentBodies.size()];
-
- AMQFrame returnFrame = new AMQFrame();
- returnFrame.bodyFrame = returnBody;
- returnFrame.channel = channel;
-
- allFrames[0] = returnFrame;
- allFrames[1] = ContentHeaderBody.createAMQFrame(channel, _contentHeaderBody);
- for (int i = 2; i < allFrames.length; i++)
- {
- allFrames[i] = ContentBody.createAMQFrame(channel, _contentBodies.get(i - 2));
- }
-
- return new CompositeAMQDataBlock(allFrames);
+ return _amqMessage;
}
public int getErrorCode()
{
return getReplyCode();
- }
+ }
public abstract int getReplyCode();
}
Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/TxAck.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/TxAck.java?view=diff&rev=493872&r1=493871&r2=493872
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/TxAck.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/TxAck.java Sun Jan 7 15:11:53 2007
@@ -7,9 +7,9 @@
* 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
@@ -22,13 +22,14 @@
import org.apache.qpid.AMQException;
import org.apache.qpid.server.txn.TxnOp;
+import org.apache.qpid.server.store.StoreContext;
import java.util.LinkedList;
import java.util.List;
/**
* A TxnOp implementation for handling accumulated acks
- */
+ */
public class TxAck implements TxnOp
{
private final UnacknowledgedMessageMap _map;
@@ -44,14 +45,14 @@
public void update(long deliveryTag, boolean multiple)
{
- if(!multiple)
+ if (!multiple)
{
//have acked a single message that is not part of
//the previously acked region so record
//individually
_individual.add(deliveryTag);//_multiple && !multiple
}
- else if(deliveryTag > _deliveryTag)
+ else if (deliveryTag > _deliveryTag)
{
//have simply moved the last acked message on a
//bit
@@ -63,7 +64,7 @@
public void consolidate()
{
//lookup all the unacked messages that have been acked in this transaction
- if(_multiple)
+ if (_multiple)
{
//get all the unacked messages for the accumulated
//multiple acks
@@ -71,22 +72,22 @@
}
//get any unacked messages for individual acks outside the
//range covered by multiple acks
- for(long tag : _individual)
+ for (long tag : _individual)
{
if(_deliveryTag < tag)
{
- _map.collect(tag, false, _unacked);
+ _map.collect(tag, false, _unacked);
}
}
}
public boolean checkPersistent() throws AMQException
- {
+ {
//if any of the messages in unacked are persistent the txn
//buffer must be marked as persistent:
- for(UnacknowledgedMessage msg : _unacked)
+ for (UnacknowledgedMessage msg : _unacked)
{
- if(msg.message.isPersistent())
+ if (msg.message.isPersistent())
{
return true;
}
@@ -94,34 +95,34 @@
return false;
}
- public void prepare() throws AMQException
+ public void prepare(StoreContext storeContext) throws AMQException
{
//make persistent changes, i.e. dequeue and decrementReference
- for(UnacknowledgedMessage msg : _unacked)
+ for (UnacknowledgedMessage msg : _unacked)
{
- msg.discard();
+ msg.discard(storeContext);
}
}
-
+
public void undoPrepare()
{
//decrementReference is annoyingly untransactional (due to
//in memory counter) so if we failed in prepare for full
//txn, this op will have to compensate by fixing the count
- //in memory (persistent changes will be rolled back by store)
- for(UnacknowledgedMessage msg : _unacked)
+ //in memory (persistent changes will be rolled back by store)
+ for (UnacknowledgedMessage msg : _unacked)
{
msg.message.incrementReference();
- }
+ }
}
- public void commit()
+ public void commit(StoreContext storeContext)
{
//remove the unacked messages from the channels map
_map.remove(_unacked);
}
- public void rollback()
+ public void rollback(StoreContext storeContext)
{
}
}
Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessage.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessage.java?view=diff&rev=493872&r1=493871&r2=493872
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessage.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessage.java Sun Jan 7 15:11:53 2007
@@ -7,9 +7,9 @@
* 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
@@ -23,6 +23,7 @@
import org.apache.qpid.AMQException;
import org.apache.qpid.server.queue.AMQMessage;
import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.store.StoreContext;
public class UnacknowledgedMessage
{
@@ -30,7 +31,7 @@
public final String consumerTag;
public final long deliveryTag;
public AMQQueue queue;
-
+
public UnacknowledgedMessage(AMQQueue queue, AMQMessage message, String consumerTag, long deliveryTag)
{
this.queue = queue;
@@ -39,13 +40,13 @@
this.deliveryTag = deliveryTag;
}
- public void discard() throws AMQException
+ public void discard(StoreContext storeContext) throws AMQException
{
if (queue != null)
{
- message.dequeue(queue);
+ message.dequeue(storeContext, queue);
}
- message.decrementReference();
+ message.decrementReference(storeContext);
}
}
Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMap.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMap.java?view=diff&rev=493872&r1=493871&r2=493872
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMap.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMap.java Sun Jan 7 15:11:53 2007
@@ -7,9 +7,9 @@
* 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
@@ -20,11 +20,55 @@
*/
package org.apache.qpid.server.ack;
+import org.apache.qpid.AMQException;
+import org.apache.qpid.server.txn.TransactionalContext;
+
+import java.util.Collection;
import java.util.List;
+import java.util.Set;
public interface UnacknowledgedMessageMap
{
- public void collect(long deliveryTag, boolean multiple, List<UnacknowledgedMessage> msgs);
- public void remove(List<UnacknowledgedMessage> msgs);
+ public interface Visitor
+ {
+ /**
+ * @param message the message being iterated over
+ * @return true to stop iteration, false to continue
+ * @throws AMQException
+ */
+ boolean callback(UnacknowledgedMessage message) throws AMQException;
+
+ void visitComplete();
+ }
+
+ void visit(Visitor visitor) throws AMQException;
+
+ void add(long deliveryTag, UnacknowledgedMessage message);
+
+ void collect(long deliveryTag, boolean multiple, List<UnacknowledgedMessage> msgs);
+
+ boolean contains(long deliveryTag) throws AMQException;
+
+ void remove(List<UnacknowledgedMessage> msgs);
+
+ UnacknowledgedMessage remove(long deliveryTag);
+
+ void drainTo(Collection<UnacknowledgedMessage> destination, long deliveryTag) throws AMQException;
+
+ Collection<UnacknowledgedMessage> cancelAllMessages();
+
+ void acknowledgeMessage(long deliveryTag, boolean multiple, TransactionalContext txnContext) throws AMQException;
+
+ int size();
+
+ void clear();
+
+ UnacknowledgedMessage get(long deliveryTag);
+
+ /**
+ * Get the set of delivery tags that are outstanding.
+ * @return a set of delivery tags
+ */
+ Set<Long> getDeliveryTags();
}
Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java?view=diff&rev=493872&r1=493871&r2=493872
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java Sun Jan 7 15:11:53 2007
@@ -7,9 +7,9 @@
* 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
@@ -20,19 +20,34 @@
*/
package org.apache.qpid.server.ack;
-import java.util.List;
-import java.util.Map;
+import org.apache.qpid.server.queue.AMQMessage;
+import org.apache.qpid.server.protocol.AMQProtocolSession;
+import org.apache.qpid.server.txn.TransactionalContext;
+import org.apache.qpid.AMQException;
+
+import java.util.*;
public class UnacknowledgedMessageMapImpl implements UnacknowledgedMessageMap
{
- private final Object _lock;
+ private final Object _lock = new Object();
+
private Map<Long, UnacknowledgedMessage> _map;
- public UnacknowledgedMessageMapImpl(Object lock, Map<Long, UnacknowledgedMessage> map)
+ private long _lastDeliveryTag;
+
+ private final int _prefetchLimit;
+
+ public UnacknowledgedMessageMapImpl(int prefetchLimit)
+ {
+ _prefetchLimit = prefetchLimit;
+ _map = new LinkedHashMap<Long, UnacknowledgedMessage>(prefetchLimit);
+ }
+
+ /*public UnacknowledgedMessageMapImpl(Object lock, Map<Long, UnacknowledgedMessage> map)
{
_lock = lock;
_map = map;
- }
+ } */
public void collect(long deliveryTag, boolean multiple, List<UnacknowledgedMessage> msgs)
{
@@ -47,28 +62,151 @@
}
+ public boolean contains(long deliveryTag) throws AMQException
+ {
+ synchronized (_lock)
+ {
+ return _map.containsKey(deliveryTag);
+ }
+ }
+
public void remove(List<UnacknowledgedMessage> msgs)
{
- synchronized(_lock)
+ synchronized (_lock)
{
for(UnacknowledgedMessage msg : msgs)
{
_map.remove(msg.deliveryTag);
- }
+ }
+ }
+ }
+
+ public UnacknowledgedMessage remove(long deliveryTag)
+ {
+ synchronized (_lock)
+ {
+ return _map.remove(deliveryTag);
+ }
+ }
+
+ public void visit(Visitor visitor) throws AMQException
+ {
+ synchronized (_lock)
+ {
+ Collection<UnacknowledgedMessage> currentEntries = _map.values();
+ for (UnacknowledgedMessage msg: currentEntries)
+ {
+ visitor.callback(msg);
+ }
+ visitor.visitComplete();
+ }
+ }
+
+ public void add(long deliveryTag, UnacknowledgedMessage message)
+ {
+ synchronized( _lock)
+ {
+ _map.put(deliveryTag, message);
+ _lastDeliveryTag = deliveryTag;
+ }
+ }
+
+ public Collection<UnacknowledgedMessage> cancelAllMessages()
+ {
+ synchronized (_lock)
+ {
+ Collection<UnacknowledgedMessage> currentEntries = _map.values();
+ _map = new LinkedHashMap<Long, UnacknowledgedMessage>(_prefetchLimit);
+ return currentEntries;
+ }
+ }
+
+ public void acknowledgeMessage(long deliveryTag, boolean multiple, TransactionalContext txnContext)
+ throws AMQException
+ {
+ synchronized (_lock)
+ {
+ txnContext.acknowledgeMessage(deliveryTag, _lastDeliveryTag, multiple, this);
+ }
+ }
+
+ public int size()
+ {
+ synchronized (_lock)
+ {
+ return _map.size();
+ }
+ }
+
+ public void clear()
+ {
+ synchronized (_lock)
+ {
+ _map.clear();
+ }
+ }
+
+ public void drainTo(Collection<UnacknowledgedMessage> destination, long deliveryTag) throws AMQException
+ {
+ synchronized (_lock)
+ {
+ Iterator<Map.Entry<Long, UnacknowledgedMessage>> it = _map.entrySet().iterator();
+ while (it.hasNext())
+ {
+ Map.Entry<Long, UnacknowledgedMessage> unacked = it.next();
+
+ if (unacked.getKey() > deliveryTag)
+ {
+ //This should not occur now.
+ throw new AMQException("UnacknowledgedMessageMap is out of order:" + unacked.getKey() +
+ " When deliveryTag is:" + deliveryTag + "ES:" + _map.entrySet().toString());
+ }
+
+ it.remove();
+
+ destination.add(unacked.getValue());
+ if (unacked.getKey() == deliveryTag)
+ {
+ break;
+ }
+ }
+ }
+ }
+
+ public void resendMessages(AMQProtocolSession protocolSession, int channelId) throws AMQException
+ {
+ synchronized (_lock)
+ {
+ for (Map.Entry<Long, UnacknowledgedMessage> entry : _map.entrySet())
+ {
+ long deliveryTag = entry.getKey();
+ String consumerTag = entry.getValue().consumerTag;
+ AMQMessage msg = entry.getValue().message;
+
+ msg.writeDeliver(protocolSession, channelId, deliveryTag, consumerTag);
+ }
}
}
- private UnacknowledgedMessage get(long key)
+ public UnacknowledgedMessage get(long key)
{
- synchronized(_lock)
+ synchronized (_lock)
{
return _map.get(key);
}
}
+ public Set<Long> getDeliveryTags()
+ {
+ synchronized (_lock)
+ {
+ return _map.keySet();
+ }
+ }
+
private void collect(long key, List<UnacknowledgedMessage> msgs)
{
- synchronized(_lock)
+ synchronized (_lock)
{
for(Map.Entry<Long, UnacknowledgedMessage> entry : _map.entrySet())
{
@@ -76,9 +214,8 @@
if (entry.getKey() == key)
{
break;
- }
+ }
}
}
}
}
-
Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java?view=diff&rev=493872&r1=493871&r2=493872
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java Sun Jan 7 15:11:53 2007
@@ -20,10 +20,10 @@
*/
package org.apache.qpid.server.exchange;
+import org.apache.log4j.Logger;
import org.apache.qpid.AMQException;
import org.apache.qpid.server.protocol.ExchangeInitialiser;
import org.apache.qpid.server.queue.AMQMessage;
-import org.apache.log4j.Logger;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -84,8 +84,9 @@
final String exchange = payload.getPublishBody().exchange;
final Exchange exch = _exchangeMap.get(exchange);
// there is a small window of opportunity for the exchange to be deleted in between
- // the JmsPublish being received (where the exchange is validated) and the final
+ // the BasicPublish being received (where the exchange is validated) and the final
// content body being received (which triggers this method)
+ // TODO: check where the exchange is validated
if (exch == null)
{
throw new AMQException("Exchange '" + exchange + "' does not exist");
Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java?view=diff&rev=493872&r1=493871&r2=493872
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java Sun Jan 7 15:11:53 2007
@@ -168,8 +168,7 @@
public void route(AMQMessage payload) throws AMQException
{
- BasicPublishBody publishBody = payload.getPublishBody();
-
+ final BasicPublishBody publishBody = payload.getPublishBody();
final String routingKey = publishBody.routingKey;
final List<AMQQueue> queues = (routingKey == null) ? null : _index.get(routingKey);
if (queues == null || queues.isEmpty())
@@ -193,7 +192,7 @@
for (AMQQueue q : queues)
{
- q.deliver(payload);
+ payload.enqueue(q);
}
}
}
Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DestWildExchange.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DestWildExchange.java?view=diff&rev=493872&r1=493871&r2=493872
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DestWildExchange.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DestWildExchange.java Sun Jan 7 15:11:53 2007
@@ -171,7 +171,7 @@
// TODO: modify code generator to add clone() method then clone the deliver body
// without this addition we have a race condition - we will be modifying the body
// before the encoder has encoded the body for delivery
- q.deliver(payload);
+ payload.enqueue(q);
}
}
Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java?view=diff&rev=493872&r1=493871&r2=493872
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java Sun Jan 7 15:11:53 2007
@@ -22,8 +22,8 @@
import org.apache.qpid.AMQException;
import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.queue.AMQMessage;
+import org.apache.qpid.server.queue.AMQQueue;
public interface Exchange
{
Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java?view=diff&rev=493872&r1=493871&r2=493872
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java Sun Jan 7 15:11:53 2007
@@ -145,7 +145,7 @@
* <attributename>=<value>,<attributename>=<value>,...
* @param queueName
* @param binding
- * @throws JMException
+ * @throws javax.management.JMException
*/
public void createNewBinding(String queueName, String binding) throws JMException
{
@@ -192,7 +192,7 @@
{
_logger.debug("Exchange " + getName() + ": routing message with headers " + headers);
}
- boolean delivered = false;
+ boolean routed = false;
for (Registration e : _bindings)
{
if (e.binding.matches(headers))
@@ -202,11 +202,11 @@
_logger.debug("Exchange " + getName() + ": delivering message with headers " +
headers + " to " + e.queue.getName());
}
- e.queue.deliver(payload);
- delivered = true;
+ payload.enqueue(e.queue);
+ routed = true;
}
}
- if (!delivered)
+ if (!routed)
{
String msg = "Exchange " + getName() + ": message not routable.";
Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/MessageRouter.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/MessageRouter.java?view=diff&rev=493872&r1=493871&r2=493872
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/MessageRouter.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/MessageRouter.java Sun Jan 7 15:11:53 2007
@@ -20,8 +20,8 @@
*/
package org.apache.qpid.server.exchange;
-import org.apache.qpid.server.queue.AMQMessage;
import org.apache.qpid.AMQException;
+import org.apache.qpid.server.queue.AMQMessage;
/**
* Separated out from the ExchangeRegistry interface to allow components
@@ -33,6 +33,7 @@
/**
* Routes content through exchanges, delivering it to 1 or more queues.
* @param message the message to be routed
+ *
* @throws org.apache.qpid.AMQException if something goes wrong delivering data
*/
void routeContent(AMQMessage message) throws AMQException;
Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java?view=diff&rev=493872&r1=493871&r2=493872
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java Sun Jan 7 15:11:53 2007
@@ -22,6 +22,7 @@
import org.apache.qpid.server.queue.AMQMessage;
+import org.apache.qpid.AMQException;
import javax.jms.JMSException;
@@ -58,7 +59,8 @@
throw new RuntimeException("Cannot call plus operation on: " + lvalue + " and: " + rvalue);
}
- public String getExpressionSymbol() {
+ public String getExpressionSymbol()
+ {
return "+";
}
};
@@ -193,7 +195,8 @@
}
}
- public Object evaluate(AMQMessage message) throws JMSException {
+ public Object evaluate(AMQMessage message) throws AMQException
+ {
Object lvalue = left.evaluate(message);
if (lvalue == null) {
return null;
Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java?view=diff&rev=493872&r1=493871&r2=493872
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java Sun Jan 7 15:11:53 2007
@@ -23,6 +23,7 @@
import org.apache.qpid.server.queue.AMQMessage;
import org.apache.qpid.server.message.jms.JMSMessage;
+import org.apache.qpid.AMQException;
import javax.jms.JMSException;
@@ -33,13 +34,14 @@
*
* @version $Revision$
*/
-public interface BooleanExpression extends Expression {
-
+public interface BooleanExpression extends Expression
+{
+
/**
* @param message
* @return true if the expression evaluates to Boolean.TRUE.
* @throws JMSException
*/
- public boolean matches(AMQMessage message) throws JMSException;
+ public boolean matches(AMQMessage message) throws AMQException;
}
Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java?view=diff&rev=493872&r1=493871&r2=493872
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java Sun Jan 7 15:11:53 2007
@@ -22,6 +22,7 @@
import org.apache.qpid.server.queue.AMQMessage;
import org.apache.qpid.server.message.jms.JMSMessage;
+import org.apache.qpid.AMQException;
import java.util.HashSet;
import java.util.List;
@@ -123,7 +124,7 @@
/**
* org.apache.activemq.filter.Expression#evaluate(MessageEvaluationContext)
*/
- public Object evaluate(AMQMessage message) throws JMSException {
+ public Object evaluate(AMQMessage message) throws AMQException {
Object rv = this.getRight().evaluate(message);
@@ -139,7 +140,7 @@
return likePattern.matcher((String) rv).matches() ? Boolean.TRUE : Boolean.FALSE;
}
- public boolean matches(AMQMessage message) throws JMSException {
+ public boolean matches(AMQMessage message) throws AMQException {
Object object = evaluate(message);
return object!=null && object==Boolean.TRUE;
}
@@ -199,7 +200,7 @@
private static BooleanExpression doCreateEqual(Expression left, Expression right) {
return new ComparisonExpression(left, right) {
- public Object evaluate(AMQMessage message) throws JMSException {
+ public Object evaluate(AMQMessage message) throws AMQException {
Object lv = left.evaluate(message);
Object rv = right.evaluate(message);
@@ -340,7 +341,8 @@
super(left, right);
}
- public Object evaluate(AMQMessage message) throws JMSException {
+ public Object evaluate(AMQMessage message) throws AMQException
+ {
Comparable lv = (Comparable) left.evaluate(message);
if (lv == null) {
return null;
@@ -457,7 +459,7 @@
protected abstract boolean asBoolean(int answer);
- public boolean matches(AMQMessage message) throws JMSException {
+ public boolean matches(AMQMessage message) throws AMQException {
Object object = evaluate(message);
return object!=null && object==Boolean.TRUE;
}
Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java?view=diff&rev=493872&r1=493871&r2=493872
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java Sun Jan 7 15:11:53 2007
@@ -22,6 +22,7 @@
import org.apache.qpid.server.queue.AMQMessage;
import org.apache.qpid.server.message.jms.JMSMessage;
+import org.apache.qpid.AMQException;
import java.math.BigDecimal;
@@ -29,19 +30,24 @@
/**
* Represents a constant expression
- *
+ *
* @version $Revision$
*/
-public class ConstantExpression implements Expression {
+public class ConstantExpression implements Expression
+{
- static class BooleanConstantExpression extends ConstantExpression implements BooleanExpression {
- public BooleanConstantExpression(Object value) {
+ static class BooleanConstantExpression extends ConstantExpression implements BooleanExpression
+ {
+ public BooleanConstantExpression(Object value)
+ {
super(value);
}
- public boolean matches(AMQMessage message) throws JMSException {
+
+ public boolean matches(AMQMessage message) throws AMQException
+ {
Object object = evaluate(message);
- return object!=null && object==Boolean.TRUE;
- }
+ return object != null && object == Boolean.TRUE;
+ }
}
public static final BooleanConstantExpression NULL = new BooleanConstantExpression(null);
@@ -50,73 +56,92 @@
private Object value;
- public static ConstantExpression createFromDecimal(String text) {
-
- // Strip off the 'l' or 'L' if needed.
- if( text.endsWith("l") || text.endsWith("L") )
- text = text.substring(0, text.length()-1);
-
- Number value;
- try {
- value = new Long(text);
- } catch ( NumberFormatException e) {
- // The number may be too big to fit in a long.
- value = new BigDecimal(text);
- }
-
+ public static ConstantExpression createFromDecimal(String text)
+ {
+
+ // Strip off the 'l' or 'L' if needed.
+ if (text.endsWith("l") || text.endsWith("L"))
+ {
+ text = text.substring(0, text.length() - 1);
+ }
+
+ Number value;
+ try
+ {
+ value = new Long(text);
+ }
+ catch (NumberFormatException e)
+ {
+ // The number may be too big to fit in a long.
+ value = new BigDecimal(text);
+ }
+
long l = value.longValue();
- if (Integer.MIN_VALUE <= l && l <= Integer.MAX_VALUE) {
+ if (Integer.MIN_VALUE <= l && l <= Integer.MAX_VALUE)
+ {
value = new Integer(value.intValue());
}
return new ConstantExpression(value);
}
- public static ConstantExpression createFromHex(String text) {
+ public static ConstantExpression createFromHex(String text)
+ {
Number value = new Long(Long.parseLong(text.substring(2), 16));
long l = value.longValue();
- if (Integer.MIN_VALUE <= l && l <= Integer.MAX_VALUE) {
+ if (Integer.MIN_VALUE <= l && l <= Integer.MAX_VALUE)
+ {
value = new Integer(value.intValue());
}
return new ConstantExpression(value);
}
- public static ConstantExpression createFromOctal(String text) {
+ public static ConstantExpression createFromOctal(String text)
+ {
Number value = new Long(Long.parseLong(text, 8));
long l = value.longValue();
- if (Integer.MIN_VALUE <= l && l <= Integer.MAX_VALUE) {
+ if (Integer.MIN_VALUE <= l && l <= Integer.MAX_VALUE)
+ {
value = new Integer(value.intValue());
}
return new ConstantExpression(value);
}
- public static ConstantExpression createFloat(String text) {
+ public static ConstantExpression createFloat(String text)
+ {
Number value = new Double(text);
return new ConstantExpression(value);
}
- public ConstantExpression(Object value) {
+ public ConstantExpression(Object value)
+ {
this.value = value;
}
- public Object evaluate(AMQMessage message) throws JMSException {
+ public Object evaluate(AMQMessage message) throws AMQException
+ {
return value;
}
- public Object getValue() {
+ public Object getValue()
+ {
return value;
- }
+ }
/**
* @see java.lang.Object#toString()
*/
- public String toString() {
- if (value == null) {
+ public String toString()
+ {
+ if (value == null)
+ {
return "NULL";
}
- if (value instanceof Boolean) {
+ if (value instanceof Boolean)
+ {
return ((Boolean) value).booleanValue() ? "TRUE" : "FALSE";
}
- if (value instanceof String) {
+ if (value instanceof String)
+ {
return encodeString((String) value);
}
return value.toString();
@@ -127,7 +152,8 @@
*
* @see java.lang.Object#hashCode()
*/
- public int hashCode() {
+ public int hashCode()
+ {
return toString().hashCode();
}
@@ -136,9 +162,11 @@
*
* @see java.lang.Object#equals(java.lang.Object)
*/
- public boolean equals(Object o) {
+ public boolean equals(Object o)
+ {
- if (o == null || !this.getClass().equals(o.getClass())) {
+ if (o == null || !this.getClass().equals(o.getClass()))
+ {
return false;
}
return toString().equals(o.toString());
@@ -153,12 +181,15 @@
* @param s
* @return
*/
- public static String encodeString(String s) {
+ public static String encodeString(String s)
+ {
StringBuffer b = new StringBuffer();
b.append('\'');
- for (int i = 0; i < s.length(); i++) {
+ for (int i = 0; i < s.length(); i++)
+ {
char c = s.charAt(i);
- if (c == '\'') {
+ if (c == '\'')
+ {
b.append(c);
}
b.append(c);
@@ -166,5 +197,5 @@
b.append('\'');
return b.toString();
}
-
+
}
Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/Expression.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/Expression.java?view=diff&rev=493872&r1=493871&r2=493872
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/Expression.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/Expression.java Sun Jan 7 15:11:53 2007
@@ -23,6 +23,7 @@
import org.apache.qpid.server.queue.AMQMessage;
import org.apache.qpid.server.message.jms.JMSMessage;
+import org.apache.qpid.AMQException;
import javax.jms.JMSException;
@@ -32,11 +33,12 @@
*
* @version $Revision$
*/
-public interface Expression {
+public interface Expression
+{
/**
* @return the value of this expression
*/
- public Object evaluate(AMQMessage message) throws JMSException;
+ public Object evaluate(AMQMessage message) throws AMQException;
}
Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java?view=diff&rev=493872&r1=493871&r2=493872
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java Sun Jan 7 15:11:53 2007
@@ -64,7 +64,7 @@
_logger.info(message + " match(" + match + ") selector(" + System.identityHashCode(_selector) + "):" + _selector);
return match;
}
- catch (JMSException e)
+ catch (AMQException e)
{
//fixme this needs to be sorted.. it shouldn't happen
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/LogicExpression.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/LogicExpression.java?view=diff&rev=493872&r1=493871&r2=493872
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/LogicExpression.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/LogicExpression.java Sun Jan 7 15:11:53 2007
@@ -22,6 +22,7 @@
import org.apache.qpid.server.queue.AMQMessage;
import org.apache.qpid.server.message.jms.JMSMessage;
+import org.apache.qpid.AMQException;
import javax.jms.JMSException;
@@ -35,7 +36,7 @@
public static BooleanExpression createOR(BooleanExpression lvalue, BooleanExpression rvalue) {
return new LogicExpression(lvalue, rvalue) {
- public Object evaluate(AMQMessage message) throws JMSException {
+ public Object evaluate(AMQMessage message) throws AMQException {
Boolean lv = (Boolean) left.evaluate(message);
// Can we do an OR shortcut??
@@ -56,7 +57,7 @@
public static BooleanExpression createAND(BooleanExpression lvalue, BooleanExpression rvalue) {
return new LogicExpression(lvalue, rvalue) {
- public Object evaluate(AMQMessage message) throws JMSException {
+ public Object evaluate(AMQMessage message) throws AMQException {
Boolean lv = (Boolean) left.evaluate(message);
@@ -85,9 +86,9 @@
super(left, right);
}
- abstract public Object evaluate(AMQMessage message) throws JMSException;
+ abstract public Object evaluate(AMQMessage message) throws AMQException;
- public boolean matches(AMQMessage message) throws JMSException {
+ public boolean matches(AMQMessage message) throws AMQException {
Object object = evaluate(message);
return object!=null && object==Boolean.TRUE;
}
Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/NoConsumerFilter.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/NoConsumerFilter.java?view=diff&rev=493872&r1=493871&r2=493872
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/NoConsumerFilter.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/NoConsumerFilter.java Sun Jan 7 15:11:53 2007
@@ -20,15 +20,9 @@
*/
package org.apache.qpid.server.filter;
-import org.apache.qpid.server.queue.AMQMessage;
-import org.apache.qpid.server.filter.jms.selector.SelectorParser;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.AMQInvalidSelectorException;
import org.apache.log4j.Logger;
-
-
-import javax.jms.InvalidSelectorException;
-import javax.jms.JMSException;
+import org.apache.qpid.AMQException;
+import org.apache.qpid.server.queue.AMQMessage;
public class NoConsumerFilter implements MessageFilter
{
@@ -36,7 +30,7 @@
public NoConsumerFilter() throws AMQException
- {
+ {
_logger.info("Created NoConsumerFilter");
}
Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java?view=diff&rev=493872&r1=493871&r2=493872
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java Sun Jan 7 15:11:53 2007
@@ -47,7 +47,7 @@
interface SubExpression
{
- public Object evaluate(AMQMessage message);
+ public Object evaluate(AMQMessage message) throws AMQException;
}
interface JMSExpression
@@ -65,7 +65,7 @@
}
- public Object evaluate(AMQMessage message)
+ public Object evaluate(AMQMessage message) throws AMQException
{
JMSMessage msg = (JMSMessage) message.getDecodedMessage(AMQMessage.JMS_MESSAGE);
if (msg != null)
@@ -226,7 +226,7 @@
jmsPropertyExpression = (SubExpression) JMS_PROPERTY_EXPRESSIONS.get(name);
}
- public Object evaluate(AMQMessage message) throws JMSException
+ public Object evaluate(AMQMessage message) throws AMQException
{
// try
// {