You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2012/03/30 10:55:06 UTC
svn commit: r1307317 [2/2] - in /qpid/trunk/qpid/java:
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/entry/
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/...
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java?rev=1307317&r1=1307316&r2=1307317&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java Fri Mar 30 08:55:05 2012
@@ -61,7 +61,6 @@ public class SimpleAMQQueueTest extends
protected SimpleAMQQueue _queue;
protected VirtualHost _virtualHost;
- protected TestableMemoryMessageStore _store = new TestableMemoryMessageStore();
protected AMQShortString _qname = new AMQShortString("qname");
protected AMQShortString _owner = new AMQShortString("owner");
protected AMQShortString _routingKey = new AMQShortString("routing key");
@@ -106,7 +105,9 @@ public class SimpleAMQQueueTest extends
ApplicationRegistry applicationRegistry = (ApplicationRegistry)ApplicationRegistry.getInstance();
PropertiesConfiguration env = new PropertiesConfiguration();
- _virtualHost = new VirtualHostImpl(ApplicationRegistry.getInstance(), new VirtualHostConfiguration(getClass().getName(), env), _store);
+ VirtualHostConfiguration vHostConfig = new VirtualHostConfiguration(getClass().getName(), env);
+ vHostConfig.setMessageStoreClass(TestableMemoryMessageStore.class.getName());
+ _virtualHost = new VirtualHostImpl(ApplicationRegistry.getInstance(), vHostConfig);
applicationRegistry.getVirtualHostRegistry().registerVirtualHost(_virtualHost);
_queue = (SimpleAMQQueue) AMQQueueFactory.createAMQQueueImpl(_qname, false, _owner, false, false, _virtualHost, _arguments);
@@ -634,11 +635,12 @@ public class SimpleAMQQueueTest extends
qs.add(_queue);
MessageMetaData metaData = msg.headersReceived(System.currentTimeMillis());
- StoredMessage handle = _store.addMessage(metaData);
+ TestableMemoryMessageStore store = (TestableMemoryMessageStore) _virtualHost.getMessageStore();
+ StoredMessage handle = store.addMessage(metaData);
msg.setStoredMessage(handle);
- ServerTransaction txn = new AutoCommitTransaction(_store);
+ ServerTransaction txn = new AutoCommitTransaction(store);
txn.enqueue(qs, msg, new ServerTransaction.Action()
{
@@ -653,7 +655,7 @@ public class SimpleAMQQueueTest extends
}, 0L);
// Check that it is enqueued
- AMQQueue data = _store.getMessages().get(1L);
+ AMQQueue data = store.getMessages().get(1L);
assertNull(data);
// Dequeue message
@@ -664,7 +666,7 @@ public class SimpleAMQQueueTest extends
_queue.dequeue(entry,null);
// Check that it is dequeued
- data = _store.getMessages().get(1L);
+ data = store.getMessages().get(1L);
assertNull(data);
}
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java?rev=1307317&r1=1307316&r2=1307317&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java Fri Mar 30 08:55:05 2012
@@ -298,7 +298,7 @@ public class MessageStoreTest extends In
1, queueRegistry.getQueues().size());
//test that removing the queue means it is not recovered next time
- getVirtualHost().getDurableConfigurationStore().removeQueue(queueRegistry.getQueue(durableQueueName));
+ getVirtualHost().getMessageStore().removeQueue(queueRegistry.getQueue(durableQueueName));
reloadVirtualHost();
@@ -351,7 +351,7 @@ public class MessageStoreTest extends In
origExchangeCount + 1, exchangeRegistry.getExchangeNames().size());
//test that removing the exchange means it is not recovered next time
- getVirtualHost().getDurableConfigurationStore().removeExchange(exchangeRegistry.getExchange(directExchangeName));
+ getVirtualHost().getMessageStore().removeExchange(exchangeRegistry.getExchange(directExchangeName));
reloadVirtualHost();
@@ -707,7 +707,7 @@ public class MessageStoreTest extends In
if (queue.isDurable() && !queue.isAutoDelete())
{
- getVirtualHost().getDurableConfigurationStore().createQueue(queue, queueArguments);
+ getVirtualHost().getMessageStore().createQueue(queue, queueArguments);
}
}
catch (AMQException e)
@@ -751,7 +751,7 @@ public class MessageStoreTest extends In
getVirtualHost().getExchangeRegistry().registerExchange(exchange);
if (durable)
{
- getVirtualHost().getDurableConfigurationStore().createExchange(exchange);
+ getVirtualHost().getMessageStore().createExchange(exchange);
}
}
catch (AMQException e)
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java?rev=1307317&r1=1307316&r2=1307317&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java Fri Mar 30 08:55:05 2012
@@ -26,6 +26,8 @@ import org.apache.qpid.AMQStoreException
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.FieldTable;
import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.federation.Bridge;
+import org.apache.qpid.server.federation.BrokerLink;
import org.apache.qpid.server.logging.LogSubject;
import org.apache.qpid.server.message.EnqueableMessage;
import org.apache.qpid.server.queue.AMQQueue;
@@ -45,8 +47,8 @@ public class SkeletonMessageStore implem
public void configureMessageStore(String name,
MessageStoreRecoveryHandler recoveryHandler,
- Configuration config,
- LogSubject logSubject) throws Exception
+ TransactionLogRecoveryHandler tlogRecoveryHandler,
+ Configuration config, LogSubject logSubject) throws Exception
{
}
@@ -98,14 +100,6 @@ public class SkeletonMessageStore implem
}
- public void configureTransactionLog(String name,
- TransactionLogRecoveryHandler recoveryHandler,
- Configuration storeConfiguration,
- LogSubject logSubject) throws Exception
- {
-
- }
-
public Transaction newTransaction()
{
return new Transaction()
@@ -162,4 +156,24 @@ public class SkeletonMessageStore implem
}
+ @Override
+ public void createBrokerLink(BrokerLink link) throws AMQStoreException
+ {
+ }
+
+ @Override
+ public void deleteBrokerLink(BrokerLink link) throws AMQStoreException
+ {
+ }
+
+ @Override
+ public void createBridge(Bridge bridge) throws AMQStoreException
+ {
+ }
+
+ @Override
+ public void deleteBridge(Bridge bridge) throws AMQStoreException
+ {
+ }
+
}
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java?rev=1307317&r1=1307316&r2=1307317&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java Fri Mar 30 08:55:05 2012
@@ -24,14 +24,21 @@ import org.apache.commons.configuration.
import org.apache.commons.lang.NotImplementedException;
import org.apache.qpid.AMQStoreException;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.framing.FieldTable;
+import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.federation.Bridge;
+import org.apache.qpid.server.federation.BrokerLink;
import org.apache.qpid.server.logging.LogSubject;
import org.apache.qpid.server.message.EnqueableMessage;
+import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.store.ConfigurationRecoveryHandler;
import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.store.MessageStore.StoreFuture;
-import org.apache.qpid.server.store.MessageStore.Transaction;
import org.apache.qpid.server.store.MessageStoreRecoveryHandler;
import org.apache.qpid.server.store.StorableMessageMetaData;
+import org.apache.qpid.server.store.StoreFuture;
import org.apache.qpid.server.store.StoredMessage;
+import org.apache.qpid.server.store.Transaction;
import org.apache.qpid.server.store.TransactionLogRecoveryHandler;
import org.apache.qpid.server.store.TransactionLogResource;
@@ -126,30 +133,23 @@ class MockStoreTransaction implements Tr
{
public void configureMessageStore(final String name,
final MessageStoreRecoveryHandler recoveryHandler,
- final Configuration config,
- final LogSubject logSubject) throws Exception
+ TransactionLogRecoveryHandler tlogRecoveryHandler,
+ final Configuration config, final LogSubject logSubject) throws Exception
{
- //TODO.
}
public void close() throws Exception
{
- //TODO.
}
public <T extends StorableMessageMetaData> StoredMessage<T> addMessage(final T metaData)
{
- return null; //TODO.
+ return null;
}
public boolean isPersistent()
{
- return false; //TODO.
- }
-
- public void configureTransactionLog(String name, TransactionLogRecoveryHandler recoveryHandler,
- Configuration storeConfiguration, LogSubject logSubject) throws Exception
- {
+ return false;
}
public Transaction newTransaction()
@@ -157,6 +157,82 @@ class MockStoreTransaction implements Tr
storeTransaction.setState(TransactionState.STARTED);
return storeTransaction;
}
+
+ @Override
+ public void configureConfigStore(String name,
+ ConfigurationRecoveryHandler recoveryHandler,
+ Configuration config, LogSubject logSubject)
+ throws Exception
+ {
+ }
+
+ @Override
+ public void createExchange(Exchange exchange)
+ throws AMQStoreException
+ {
+ }
+
+ @Override
+ public void removeExchange(Exchange exchange)
+ throws AMQStoreException
+ {
+ }
+
+ @Override
+ public void bindQueue(Exchange exchange, AMQShortString routingKey,
+ AMQQueue queue, FieldTable args) throws AMQStoreException
+ {
+ }
+
+ @Override
+ public void unbindQueue(Exchange exchange,
+ AMQShortString routingKey, AMQQueue queue, FieldTable args)
+ throws AMQStoreException
+ {
+ }
+
+ @Override
+ public void createQueue(AMQQueue queue) throws AMQStoreException
+ {
+ }
+
+ @Override
+ public void createQueue(AMQQueue queue, FieldTable arguments)
+ throws AMQStoreException
+ {
+ }
+
+ @Override
+ public void removeQueue(AMQQueue queue) throws AMQStoreException
+ {
+ }
+
+ @Override
+ public void updateQueue(AMQQueue queue) throws AMQStoreException
+ {
+ }
+
+ @Override
+ public void createBrokerLink(BrokerLink link)
+ throws AMQStoreException
+ {
+ }
+
+ @Override
+ public void deleteBrokerLink(BrokerLink link)
+ throws AMQStoreException
+ {
+ }
+
+ @Override
+ public void createBridge(Bridge bridge) throws AMQStoreException
+ {
+ }
+
+ @Override
+ public void deleteBridge(Bridge bridge) throws AMQStoreException
+ {
+ }
};
}
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java?rev=1307317&r1=1307316&r2=1307317&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java Fri Mar 30 08:55:05 2012
@@ -38,7 +38,6 @@ import org.apache.qpid.server.registry.I
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.security.auth.manager.AuthenticationManager;
import org.apache.qpid.server.stats.StatisticsCounter;
-import org.apache.qpid.server.store.DurableConfigurationStore;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.txn.DtxRegistry;
@@ -111,11 +110,6 @@ public class MockVirtualHost implements
return null;
}
- public DurableConfigurationStore getDurableConfigurationStore()
- {
- return null;
- }
-
public ExchangeFactory getExchangeFactory()
{
return null;
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java?rev=1307317&r1=1307316&r2=1307317&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java Fri Mar 30 08:55:05 2012
@@ -38,7 +38,7 @@ import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.Iterator;
-public class SlowMessageStore implements MessageStore, DurableConfigurationStore
+public class SlowMessageStore implements MessageStore
{
private static final Logger _logger = Logger.getLogger(SlowMessageStore.class);
private static final String DELAYS = "delays";
@@ -160,11 +160,11 @@ public class SlowMessageStore implements
public void configureMessageStore(String name,
- MessageStoreRecoveryHandler recoveryHandler,
- Configuration config,
- LogSubject logSubject) throws Exception
+ MessageStoreRecoveryHandler messageRecoveryHandler,
+ TransactionLogRecoveryHandler tlogRecoveryHandler,
+ Configuration config, LogSubject logSubject) throws Exception
{
- _realStore.configureMessageStore(name, recoveryHandler, config, logSubject);
+ _realStore.configureMessageStore(name, messageRecoveryHandler, tlogRecoveryHandler, config, logSubject);
}
public void close() throws Exception
@@ -227,14 +227,6 @@ public class SlowMessageStore implements
doPostDelay("removeQueue");
}
- public void configureTransactionLog(String name,
- TransactionLogRecoveryHandler recoveryHandler,
- Configuration storeConfiguration, LogSubject logSubject)
- throws Exception
- {
- _realStore.configureTransactionLog(name, recoveryHandler, storeConfiguration, logSubject);
- }
-
public Transaction newTransaction()
{
doPreDelay("beginTran");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org