Author: rgodfrey
Date: Tue May 13 03:35:38 2008
New Revision: 655798
URL: http://svn.apache.org/viewvc?rev=655798&view=rev
Log:
Changes to MessageStore interface
Modified:
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java
incubator/qpid/branches/broker-queue-refactor/java/systests/src/main/java/org/apache/qpid/server/store/SkeletonMessageStore.java
Modified:
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java?rev=655798&r1=655797&r2=655798&view=diff
==============================================================================
---
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
(original)
+++
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
Tue May 13 03:35:38 2008
@@ -222,7 +222,7 @@
try
{
queue.delete();
- _messageStore.removeQueue(new AMQShortString(queueName));
+ _messageStore.removeQueue(queue);
}
catch (AMQException ex)
Modified:
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java?rev=655798&r1=655797&r2=655798&view=diff
==============================================================================
---
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java
(original)
+++
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java
Tue May 13 03:35:38 2008
@@ -112,7 +112,7 @@
if (queue.isDurable())
{
- store.removeQueue(queue.getName());
+ store.removeQueue(queue);
}
MethodRegistry methodRegistry = session.getMethodRegistry();
Modified:
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java?rev=655798&r1=655797&r2=655798&view=diff
==============================================================================
---
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
(original)
+++
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
Tue May 13 03:35:38 2008
@@ -28,7 +28,6 @@
import org.apache.qpid.server.txn.TransactionalContext;
import org.apache.qpid.server.protocol.AMQProtocolSession;
import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.store.StoreContext;
import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.exchange.NoRouteException;
import org.apache.qpid.server.exchange.Exchange;
@@ -36,7 +35,6 @@
import org.apache.qpid.common.ClientProperties;
import org.apache.log4j.Logger;
-import java.util.List;
import java.util.ArrayList;
import java.util.Collection;
@@ -143,7 +141,7 @@
if(q.isDurable())
{
-
_messageStore.enqueueMessage(_txnContext.getStoreContext(), q.getName(),
_messageId);
+
_messageStore.enqueueMessage(_txnContext.getStoreContext(), q, _messageId);
}
}
}
Modified:
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java?rev=655798&r1=655797&r2=655798&view=diff
==============================================================================
---
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
(original)
+++
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
Tue May 13 03:35:38 2008
@@ -336,7 +336,7 @@
public QueueEntry enqueue(StoreContext storeContext, AMQMessage message)
throws AMQException
{
- // need to get the enqueue lock
+
incrementQueueCount();
@@ -579,7 +579,7 @@
AMQMessage msg = entry.getMessage();
if(isDurable() && msg.isPersistent())
{
- _virtualHost.getMessageStore().dequeueMessage(storeContext,
getName(), msg.getMessageId());
+ _virtualHost.getMessageStore().dequeueMessage(storeContext,
this, msg.getMessageId());
}
//entry.dispose(storeContext);
@@ -853,7 +853,7 @@
if(message.isPersistent() && toQueue.isDurable())
{
- store.enqueueMessage(storeContext, toQueue.getName(),
message.getMessageId());
+ store.enqueueMessage(storeContext, toQueue,
message.getMessageId());
}
// dequeue does not decrement the refence count
entry.dequeue(storeContext);
@@ -946,7 +946,7 @@
if(message.isReferenced() && message.isPersistent() &&
toQueue.isDurable())
{
- store.enqueueMessage(storeContext, toQueue.getName(),
message.getMessageId());
+ store.enqueueMessage(storeContext, toQueue,
message.getMessageId());
}
}
Modified:
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java?rev=655798&r1=655797&r2=655798&view=diff
==============================================================================
---
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
(original)
+++
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
Tue May 13 03:35:38 2008
@@ -736,9 +736,10 @@
return DriverManager.getConnection(_connectionURL);
}
- public void removeQueue(AMQShortString name) throws AMQException
+ public void removeQueue(final AMQQueue queue) throws AMQException
{
+ AMQShortString name = queue.getName();
_logger.debug("public void removeQueue(AMQShortString name = " + name
+ "): called");
Connection conn = null;
@@ -782,12 +783,13 @@
}
- public void enqueueMessage(StoreContext context, AMQShortString name, Long
messageId) throws AMQException
+ public void enqueueMessage(StoreContext context, final AMQQueue queue,
Long messageId) throws AMQException
{
boolean localTx = getOrCreateTransaction(context);
Connection conn = getConnection(context);
ConnectionWrapper connWrapper = (ConnectionWrapper)
context.getPayload();
+ AMQShortString name = queue.getName();
try
{
@@ -822,9 +824,10 @@
}
- public void dequeueMessage(StoreContext context, AMQShortString name, Long
messageId) throws AMQException
+ public void dequeueMessage(StoreContext context, final AMQQueue queue,
Long messageId) throws AMQException
{
+ AMQShortString name = queue.getName();
boolean localTx = getOrCreateTransaction(context);
Connection conn = getConnection(context);
ConnectionWrapper connWrapper = (ConnectionWrapper)
context.getPayload();
Modified:
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java?rev=655798&r1=655797&r2=655798&view=diff
==============================================================================
---
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
(original)
+++
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
Tue May 13 03:35:38 2008
@@ -126,17 +126,17 @@
// Not required to do anything
}
- public void removeQueue(AMQShortString name) throws AMQException
+ public void removeQueue(final AMQQueue queue) throws AMQException
{
// Not required to do anything
}
- public void enqueueMessage(StoreContext context, AMQShortString name, Long
messageId) throws AMQException
+ public void enqueueMessage(StoreContext context, final AMQQueue queue,
Long messageId) throws AMQException
{
// Not required to do anything
}
- public void dequeueMessage(StoreContext context, AMQShortString name, Long
messageId) throws AMQException
+ public void dequeueMessage(StoreContext context, final AMQQueue queue,
Long messageId) throws AMQException
{
// Not required to do anything
}
Modified:
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java?rev=655798&r1=655797&r2=655798&view=diff
==============================================================================
---
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java
(original)
+++
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java
Tue May 13 03:35:38 2008
@@ -138,33 +138,30 @@
/**
* Removes the specified queue from the persistent store.
*
- * @param name The queue to remove.
- *
+ * @param queue The queue to remove.
* @throws AMQException If the operation fails for any reason.
*/
- void removeQueue(AMQShortString name) throws AMQException;
+ void removeQueue(final AMQQueue queue) throws AMQException;
/**
* Places a message onto a specified queue, in a given transactional
context.
*
* @param context The transactional context for the operation.
- * @param name The name of the queue to place the message on.
+ * @param queue The queue to place the message on.
* @param messageId The message to enqueue.
- *
* @throws AMQException If the operation fails for any reason.
*/
- void enqueueMessage(StoreContext context, AMQShortString name, Long
messageId) throws AMQException;
+ void enqueueMessage(StoreContext context, final AMQQueue queue, Long
messageId) throws AMQException;
/**
* Extracts a message from a specified queue, in a given transactional
context.
*
* @param context The transactional context for the operation.
- * @param name The name of the queue to take the message from.
+ * @param queue The queue to place the message on.
* @param messageId The message to dequeue.
- *
* @throws AMQException If the operation fails for any reason, or if the
specified message does not exist.
*/
- void dequeueMessage(StoreContext context, AMQShortString name, Long
messageId) throws AMQException;
+ void dequeueMessage(StoreContext context, final AMQQueue queue, Long
messageId) throws AMQException;
/**
* Begins a transactional context.
Modified:
incubator/qpid/branches/broker-queue-refactor/java/systests/src/main/java/org/apache/qpid/server/store/SkeletonMessageStore.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/broker-queue-refactor/java/systests/src/main/java/org/apache/qpid/server/store/SkeletonMessageStore.java?rev=655798&r1=655797&r2=655798&view=diff
==============================================================================
---
incubator/qpid/branches/broker-queue-refactor/java/systests/src/main/java/org/apache/qpid/server/store/SkeletonMessageStore.java
(original)
+++
incubator/qpid/branches/broker-queue-refactor/java/systests/src/main/java/org/apache/qpid/server/store/SkeletonMessageStore.java
Tue May 13 03:35:38 2008
@@ -129,17 +129,17 @@
return null;
}
- public void removeQueue(AMQShortString name) throws AMQException
+ public void removeQueue(final AMQQueue queue) throws AMQException
{
}
- public void enqueueMessage(StoreContext context, AMQShortString name, Long
messageId) throws AMQException
+ public void enqueueMessage(StoreContext context, final AMQQueue queue,
Long messageId) throws AMQException
{
}
- public void dequeueMessage(StoreContext context, AMQShortString name, Long
messageId) throws AMQException
+ public void dequeueMessage(StoreContext context, final AMQQueue queue,
Long messageId) throws AMQException
{
}
