From cc28c0b57673c1518d9f4c7658eb731980c5208e Mon Sep 17 00:00:00 2001 From: Keith Wall Date: Thu, 29 Mar 2012 08:14:16 +0000 Subject: QPID-3913: Remove unused logsubject git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1306747 13f79535-47bb-0310-9956-ffa450edef68 --- .../server/store/berkeleydb/BDBMessageStore.java | 2 +- .../store/berkeleydb/upgrade/StoreUpgrade.java | 3 +- .../store/berkeleydb/upgrade/UpgradeFrom4To5.java | 53 ++++++++++------------ .../store/berkeleydb/upgrade/UpgradeFrom5To6.java | 10 ++-- .../server/store/berkeleydb/upgrade/Upgrader.java | 7 +-- .../berkeleydb/upgrade/UpgradeFrom4to5Test.java | 4 +- .../berkeleydb/upgrade/UpgradeFrom5To6Test.java | 6 +-- .../store/berkeleydb/upgrade/UpgraderTest.java | 5 +- 8 files changed, 40 insertions(+), 50 deletions(-) (limited to 'java') diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java b/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java index c6d95f7100..589f63f562 100644 --- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java +++ b/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java @@ -325,7 +325,7 @@ public class BDBMessageStore implements MessageStore, DurableConfigurationStore boolean newEnvironment = createEnvironment(storePath, readonly); - new Upgrader(_environment, _logSubject).upgradeIfNecessary(); + new Upgrader(_environment).upgradeIfNecessary(); openDatabases(readonly); diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/StoreUpgrade.java b/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/StoreUpgrade.java index e7a34c524c..df09726c8e 100644 --- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/StoreUpgrade.java +++ b/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/StoreUpgrade.java @@ -23,10 +23,9 @@ package org.apache.qpid.server.store.berkeleydb.upgrade; import com.sleepycat.je.DatabaseException; import com.sleepycat.je.Environment; import org.apache.qpid.AMQStoreException; -import org.apache.qpid.server.logging.LogSubject; public interface StoreUpgrade { - void performUpgrade(LogSubject logSubject, Environment environment, UpgradeInteractionHandler handler) + void performUpgrade(Environment environment, UpgradeInteractionHandler handler) throws DatabaseException, AMQStoreException; } diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java b/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java index 6b063f5c23..d3e4dfce12 100644 --- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java +++ b/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java @@ -40,7 +40,6 @@ import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.framing.ContentHeaderBody; import org.apache.qpid.framing.FieldTable; import org.apache.qpid.framing.abstraction.MessagePublishInfo; -import org.apache.qpid.server.logging.LogSubject; import org.apache.qpid.server.message.MessageMetaData; import org.apache.qpid.server.store.StorableMessageMetaData; import org.apache.qpid.server.store.berkeleydb.AMQShortStringEncoding; @@ -83,8 +82,7 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade private static final Logger _logger = Logger.getLogger(UpgradeFrom4To5.class); - public void performUpgrade(final LogSubject logSubject, final Environment environment, - final UpgradeInteractionHandler handler) throws DatabaseException, AMQStoreException + public void performUpgrade(final Environment environment, final UpgradeInteractionHandler handler) throws DatabaseException, AMQStoreException { _logger.info("Starting store upgrade from version 4"); Transaction transaction = null; @@ -95,15 +93,14 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade transaction = environment.beginTransaction(null, null); // find all queues which are bound to a topic exchange and which have a colon in their name - final List potentialDurableSubs = findPotentialDurableSubscriptions(logSubject, environment, - transaction); - - Set existingQueues = upgradeQueues(logSubject, environment, handler, potentialDurableSubs, transaction); - upgradeQueueBindings(logSubject, environment, handler, potentialDurableSubs, transaction); - Set messagesToDiscard = upgradeDelivery(logSubject, environment, existingQueues, handler, transaction); - upgradeContent(logSubject, environment, handler, messagesToDiscard, transaction); - upgradeMetaData(logSubject, environment, handler, messagesToDiscard, transaction); - renameRemainingDatabases(logSubject, environment, handler, transaction); + final List potentialDurableSubs = findPotentialDurableSubscriptions(environment, transaction); + + Set existingQueues = upgradeQueues(environment, handler, potentialDurableSubs, transaction); + upgradeQueueBindings(environment, handler, potentialDurableSubs, transaction); + Set messagesToDiscard = upgradeDelivery(environment, existingQueues, handler, transaction); + upgradeContent(environment, handler, messagesToDiscard, transaction); + upgradeMetaData(environment, handler, messagesToDiscard, transaction); + renameRemainingDatabases(environment, handler, transaction); transaction.commit(); reportFinished(environment, NEW_DATABASE_NAMES, USER_FRIENDLY_NAMES); @@ -127,8 +124,8 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade } } - private void upgradeQueueBindings(LogSubject logSubject, Environment environment, UpgradeInteractionHandler handler, - final List potentialDurableSubs, Transaction transaction) + private void upgradeQueueBindings(Environment environment, UpgradeInteractionHandler handler, final List potentialDurableSubs, + Transaction transaction) { if (environment.getDatabaseNames().contains(OLD_BINDINGS_DB_NAME)) { @@ -188,8 +185,8 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade } } - private Set upgradeQueues(final LogSubject logSubject, final Environment environment, - final UpgradeInteractionHandler handler, List potentialDurableSubs, Transaction transaction) + private Set upgradeQueues(final Environment environment, final UpgradeInteractionHandler handler, + List potentialDurableSubs, Transaction transaction) { _logger.info("Queues"); final Set existingQueues = new HashSet(); @@ -217,10 +214,10 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade return existingQueues; } - private List findPotentialDurableSubscriptions(final LogSubject logSubject, - final Environment environment, Transaction transaction) + private List findPotentialDurableSubscriptions(final Environment environment, + Transaction transaction) { - final List exchangeNames = findTopicExchanges(logSubject, environment); + final List exchangeNames = findTopicExchanges(environment); final List queues = new ArrayList(); final PartialBindingRecordBinding binding = new PartialBindingRecordBinding(); @@ -241,8 +238,8 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade return queues; } - private Set upgradeDelivery(final LogSubject logSubject, final Environment environment, - final Set existingQueues, final UpgradeInteractionHandler handler, Transaction transaction) + private Set upgradeDelivery(final Environment environment, final Set existingQueues, + final UpgradeInteractionHandler handler, Transaction transaction) { final Set messagesToDiscard = new HashSet(); final Set queuesToDiscard = new HashSet(); @@ -363,7 +360,7 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade new DatabaseTemplate(environment, NEW_QUEUE_DB_NAME, NEW_BINDINGS_DB_NAME, transaction).run(queueCreateOperation); } - private List findTopicExchanges(final LogSubject logSubject, final Environment environment) + private List findTopicExchanges(final Environment environment) { final List topicExchanges = new ArrayList(); final ExchangeRecordBinding binding = new ExchangeRecordBinding(); @@ -385,8 +382,8 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade return topicExchanges; } - private void upgradeMetaData(final LogSubject logSubject, final Environment environment, - final UpgradeInteractionHandler handler, final Set messagesToDiscard, Transaction transaction) + private void upgradeMetaData(final Environment environment, final UpgradeInteractionHandler handler, + final Set messagesToDiscard, Transaction transaction) { _logger.info("Message MetaData"); if (environment.getDatabaseNames().contains(OLD_METADATA_DB_NAME)) @@ -426,8 +423,8 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade } } - private void upgradeContent(final LogSubject logSubject, final Environment environment, - final UpgradeInteractionHandler handler, final Set messagesToDiscard, Transaction transaction) + private void upgradeContent(final Environment environment, final UpgradeInteractionHandler handler, + final Set messagesToDiscard, Transaction transaction) { _logger.info("Message Contents"); if (environment.getDatabaseNames().contains(OLD_CONTENT_DB_NAME)) @@ -486,8 +483,8 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade * For all databases which haven't been otherwise upgraded, we still need to * rename them from _v4 to _v5 */ - private void renameRemainingDatabases(final LogSubject logSubject, final Environment environment, - final UpgradeInteractionHandler handler, Transaction transaction) + private void renameRemainingDatabases(final Environment environment, final UpgradeInteractionHandler handler, + Transaction transaction) { for (String dbName : environment.getDatabaseNames()) { diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java b/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java index 5aaf3675a8..54f6aa6f88 100644 --- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java +++ b/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java @@ -31,7 +31,6 @@ import java.util.TreeMap; import org.apache.log4j.Logger; import org.apache.qpid.AMQStoreException; -import org.apache.qpid.server.logging.LogSubject; import com.sleepycat.bind.tuple.LongBinding; import com.sleepycat.bind.tuple.TupleBinding; @@ -61,8 +60,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade private static final String OLD_DB_NAMES[] = { "exchangeDb_v5", "queueDb_v5", "queueBindingsDb_v5", "deliveryDb_v5", META_DATA_DB_NAME, OLD_CONTENT_DB_NAME, "bridges_v5", "links_v5", "xids_v5" }; - public void performUpgrade(final LogSubject logSubject, final Environment environment, - final UpgradeInteractionHandler handler) throws DatabaseException, AMQStoreException + public void performUpgrade(final Environment environment, final UpgradeInteractionHandler handler) throws DatabaseException, AMQStoreException { _logger.info("Starting store upgrade from version 5"); Transaction transaction = null; @@ -70,7 +68,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade { reportStarting(environment, OLD_DB_NAMES, USER_FRIENDLY_NAMES); transaction = environment.beginTransaction(null, null); - performUpgradeInternal(logSubject, environment, handler, transaction); + performUpgradeInternal(environment, handler, transaction); transaction.commit(); reportFinished(environment, NEW_DB_NAMES, USER_FRIENDLY_NAMES); } @@ -107,8 +105,8 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade * * That is we keep only one record per message, which contains all the message content */ - public void performUpgradeInternal(final LogSubject logSubject, final Environment environment, - final UpgradeInteractionHandler handler, final Transaction transaction) throws AMQStoreException + public void performUpgradeInternal(final Environment environment, final UpgradeInteractionHandler handler, + final Transaction transaction) throws AMQStoreException { _logger.info("Message Contents"); if (environment.getDatabaseNames().contains(OLD_CONTENT_DB_NAME)) diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/Upgrader.java b/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/Upgrader.java index aa165fea2c..77455c2ea1 100644 --- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/Upgrader.java +++ b/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/Upgrader.java @@ -24,7 +24,6 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import org.apache.qpid.AMQStoreException; -import org.apache.qpid.server.logging.LogSubject; import org.apache.qpid.server.store.berkeleydb.BDBMessageStore; import com.sleepycat.bind.tuple.IntegerBinding; @@ -42,12 +41,10 @@ public class Upgrader static final String VERSION_DB_NAME = "VERSION"; private Environment _environment; - private LogSubject _logSubject; - public Upgrader(Environment environment, LogSubject logSubject) + public Upgrader(Environment environment) { _environment = environment; - _logSubject = logSubject; } public void upgradeIfNecessary() throws AMQStoreException @@ -128,7 +125,7 @@ public class Upgrader + "UpgradeFrom"+fromVersion+"To"+toVersion); Constructor ctr = upgradeClass.getConstructor(); StoreUpgrade upgrade = ctr.newInstance(); - upgrade.performUpgrade(_logSubject, _environment, UpgradeInteractionHandler.DEFAULT_HANDLER); + upgrade.performUpgrade(_environment, UpgradeInteractionHandler.DEFAULT_HANDLER); } catch (ClassNotFoundException e) { diff --git a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4to5Test.java b/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4to5Test.java index 9341022a38..c9103b1997 100644 --- a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4to5Test.java +++ b/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4to5Test.java @@ -66,7 +66,7 @@ public class UpgradeFrom4to5Test extends AbstractUpgradeTestCase public void testPerformUpgradeWithHandlerAnsweringYes() throws Exception { UpgradeFrom4To5 upgrade = new UpgradeFrom4To5(); - upgrade.performUpgrade(LOG_SUBJECT, _environment, new StaticAnswerHandler(UpgradeInteractionResponse.YES)); + upgrade.performUpgrade(_environment, new StaticAnswerHandler(UpgradeInteractionResponse.YES)); assertQueues(new HashSet(Arrays.asList(QUEUE_NAMES))); @@ -93,7 +93,7 @@ public class UpgradeFrom4to5Test extends AbstractUpgradeTestCase public void testPerformUpgradeWithHandlerAnsweringNo() throws Exception { UpgradeFrom4To5 upgrade = new UpgradeFrom4To5(); - upgrade.performUpgrade(LOG_SUBJECT, _environment, new StaticAnswerHandler(UpgradeInteractionResponse.NO)); + upgrade.performUpgrade(_environment, new StaticAnswerHandler(UpgradeInteractionResponse.NO)); assertQueues(new HashSet(Arrays.asList(DURABLE_SUBSCRIPTION_QUEUE, DURABLE_SUBSCRIPTION_QUEUE_WITH_SELECTOR, DURABLE_QUEUE))); assertDatabaseRecordCount(DELIVERY_DB_NAME, 12); diff --git a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java b/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java index cca5923ffd..d73a777ca6 100644 --- a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java +++ b/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java @@ -43,7 +43,7 @@ public class UpgradeFrom5To6Test extends AbstractUpgradeTestCase public void testPerformUpgrade() throws Exception { UpgradeFrom5To6 upgrade = new UpgradeFrom5To6(); - upgrade.performUpgrade(LOG_SUBJECT, _environment, UpgradeInteractionHandler.DEFAULT_HANDLER); + upgrade.performUpgrade(_environment, UpgradeInteractionHandler.DEFAULT_HANDLER); assertDatabaseRecordCounts(); assertContent(); @@ -54,7 +54,7 @@ public class UpgradeFrom5To6Test extends AbstractUpgradeTestCase corruptDatabase(); UpgradeFrom5To6 upgrade = new UpgradeFrom5To6(); - upgrade.performUpgrade(LOG_SUBJECT, _environment, new StaticAnswerHandler(UpgradeInteractionResponse.YES)); + upgrade.performUpgrade(_environment, new StaticAnswerHandler(UpgradeInteractionResponse.YES)); assertDatabaseRecordCounts(); } @@ -67,7 +67,7 @@ public class UpgradeFrom5To6Test extends AbstractUpgradeTestCase UpgradeInteractionHandler discardMessageInteractionHandler = new StaticAnswerHandler(UpgradeInteractionResponse.NO); - upgrade.performUpgrade(LOG_SUBJECT, _environment, discardMessageInteractionHandler); + upgrade.performUpgrade(_environment, discardMessageInteractionHandler); assertDatabaseRecordCount("MESSAGE_METADATA", 11); assertDatabaseRecordCount("MESSAGE_CONTENT", 11); diff --git a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgraderTest.java b/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgraderTest.java index 0e9d722089..99c4b7ab5b 100644 --- a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgraderTest.java +++ b/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgraderTest.java @@ -24,7 +24,6 @@ import java.io.File; import java.util.ArrayList; import java.util.List; -import org.apache.qpid.server.logging.subjects.TestBlankSubject; import org.apache.qpid.server.store.berkeleydb.BDBMessageStore; import org.apache.qpid.server.store.berkeleydb.tuple.ContentBinding; @@ -51,7 +50,7 @@ public class UpgraderTest extends AbstractUpgradeTestCase public void setUp() throws Exception { super.setUp(); - _upgrader = new Upgrader(_environment, new TestBlankSubject()); + _upgrader = new Upgrader(_environment); } private int getStoreVersion() @@ -106,7 +105,7 @@ public class UpgraderTest extends AbstractUpgradeTestCase nonExistentStoreLocation.mkdir(); _environment = createEnvironment(nonExistentStoreLocation); - _upgrader = new Upgrader(_environment, new TestBlankSubject()); + _upgrader = new Upgrader(_environment); _upgrader.upgradeIfNecessary(); List databaseNames = _environment.getDatabaseNames(); -- cgit v1.2.1