Author: kwall
Date: Thu Mar 29 08:14:16 2012
New Revision: 1306747
URL: http://svn.apache.org/viewvc?rev=1306747&view=rev
Log:
QPID-3913: Remove unused logsubject
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/StoreUpgrade.java
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/Upgrader.java
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4to5Test.java
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgraderTest.java
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java?rev=1306747&r1=1306746&r2=1306747&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
Thu Mar 29 08:14:16 2012
@@ -325,7 +325,7 @@ public class BDBMessageStore implements
boolean newEnvironment = createEnvironment(storePath, readonly);
- new Upgrader(_environment, _logSubject).upgradeIfNecessary();
+ new Upgrader(_environment).upgradeIfNecessary();
openDatabases(readonly);
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/StoreUpgrade.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/StoreUpgrade.java?rev=1306747&r1=1306746&r2=1306747&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/StoreUpgrade.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/StoreUpgrade.java
Thu Mar 29 08:14:16 2012
@@ -23,10 +23,9 @@ package org.apache.qpid.server.store.ber
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;
}
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java?rev=1306747&r1=1306746&r2=1306747&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
Thu Mar 29 08:14:16 2012
@@ -40,7 +40,6 @@ import org.apache.qpid.framing.AMQShortS
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 Abs
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 Abs
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<AMQShortString> potentialDurableSubs =
findPotentialDurableSubscriptions(logSubject, environment,
- transaction);
+ final List<AMQShortString> potentialDurableSubs =
findPotentialDurableSubscriptions(environment, transaction);
- Set<String> existingQueues = upgradeQueues(logSubject,
environment, handler, potentialDurableSubs, transaction);
- upgradeQueueBindings(logSubject, environment, handler,
potentialDurableSubs, transaction);
- Set<Long> messagesToDiscard = upgradeDelivery(logSubject,
environment, existingQueues, handler, transaction);
- upgradeContent(logSubject, environment, handler,
messagesToDiscard, transaction);
- upgradeMetaData(logSubject, environment, handler,
messagesToDiscard, transaction);
- renameRemainingDatabases(logSubject, environment, handler,
transaction);
+ Set<String> existingQueues = upgradeQueues(environment, handler,
potentialDurableSubs, transaction);
+ upgradeQueueBindings(environment, handler, potentialDurableSubs,
transaction);
+ Set<Long> 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 Abs
}
}
- private void upgradeQueueBindings(LogSubject logSubject, Environment
environment, UpgradeInteractionHandler handler,
- final List<AMQShortString> potentialDurableSubs, Transaction
transaction)
+ private void upgradeQueueBindings(Environment environment,
UpgradeInteractionHandler handler, final List<AMQShortString>
potentialDurableSubs,
+ Transaction transaction)
{
if (environment.getDatabaseNames().contains(OLD_BINDINGS_DB_NAME))
{
@@ -188,8 +185,8 @@ public class UpgradeFrom4To5 extends Abs
}
}
- private Set<String> upgradeQueues(final LogSubject logSubject, final
Environment environment,
- final UpgradeInteractionHandler handler, List<AMQShortString>
potentialDurableSubs, Transaction transaction)
+ private Set<String> upgradeQueues(final Environment environment, final
UpgradeInteractionHandler handler,
+ List<AMQShortString> potentialDurableSubs, Transaction transaction)
{
_logger.info("Queues");
final Set<String> existingQueues = new HashSet<String>();
@@ -217,10 +214,10 @@ public class UpgradeFrom4To5 extends Abs
return existingQueues;
}
- private List<AMQShortString> findPotentialDurableSubscriptions(final
LogSubject logSubject,
- final Environment environment, Transaction transaction)
+ private List<AMQShortString> findPotentialDurableSubscriptions(final
Environment environment,
+ Transaction transaction)
{
- final List<AMQShortString> exchangeNames =
findTopicExchanges(logSubject, environment);
+ final List<AMQShortString> exchangeNames =
findTopicExchanges(environment);
final List<AMQShortString> queues = new ArrayList<AMQShortString>();
final PartialBindingRecordBinding binding = new
PartialBindingRecordBinding();
@@ -241,8 +238,8 @@ public class UpgradeFrom4To5 extends Abs
return queues;
}
- private Set<Long> upgradeDelivery(final LogSubject logSubject, final
Environment environment,
- final Set<String> existingQueues, final UpgradeInteractionHandler
handler, Transaction transaction)
+ private Set<Long> upgradeDelivery(final Environment environment, final
Set<String> existingQueues,
+ final UpgradeInteractionHandler handler, Transaction transaction)
{
final Set<Long> messagesToDiscard = new HashSet<Long>();
final Set<String> queuesToDiscard = new HashSet<String>();
@@ -363,7 +360,7 @@ public class UpgradeFrom4To5 extends Abs
new DatabaseTemplate(environment, NEW_QUEUE_DB_NAME,
NEW_BINDINGS_DB_NAME, transaction).run(queueCreateOperation);
}
- private List<AMQShortString> findTopicExchanges(final LogSubject
logSubject, final Environment environment)
+ private List<AMQShortString> findTopicExchanges(final Environment
environment)
{
final List<AMQShortString> topicExchanges = new
ArrayList<AMQShortString>();
final ExchangeRecordBinding binding = new ExchangeRecordBinding();
@@ -385,8 +382,8 @@ public class UpgradeFrom4To5 extends Abs
return topicExchanges;
}
- private void upgradeMetaData(final LogSubject logSubject, final
Environment environment,
- final UpgradeInteractionHandler handler, final Set<Long>
messagesToDiscard, Transaction transaction)
+ private void upgradeMetaData(final Environment environment, final
UpgradeInteractionHandler handler,
+ final Set<Long> messagesToDiscard, Transaction transaction)
{
_logger.info("Message MetaData");
if (environment.getDatabaseNames().contains(OLD_METADATA_DB_NAME))
@@ -426,8 +423,8 @@ public class UpgradeFrom4To5 extends Abs
}
}
- private void upgradeContent(final LogSubject logSubject, final Environment
environment,
- final UpgradeInteractionHandler handler, final Set<Long>
messagesToDiscard, Transaction transaction)
+ private void upgradeContent(final Environment environment, final
UpgradeInteractionHandler handler,
+ final Set<Long> messagesToDiscard, Transaction transaction)
{
_logger.info("Message Contents");
if (environment.getDatabaseNames().contains(OLD_CONTENT_DB_NAME))
@@ -486,8 +483,8 @@ public class UpgradeFrom4To5 extends Abs
* 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())
{
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java?rev=1306747&r1=1306746&r2=1306747&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
Thu Mar 29 08:14:16 2012
@@ -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 Abs
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 Abs
{
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 Abs
*
* 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))
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/Upgrader.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/Upgrader.java?rev=1306747&r1=1306746&r2=1306747&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/Upgrader.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/Upgrader.java
Thu Mar 29 08:14:16 2012
@@ -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<StoreUpgrade> ctr = upgradeClass.getConstructor();
StoreUpgrade upgrade = ctr.newInstance();
- upgrade.performUpgrade(_logSubject, _environment,
UpgradeInteractionHandler.DEFAULT_HANDLER);
+ upgrade.performUpgrade(_environment,
UpgradeInteractionHandler.DEFAULT_HANDLER);
}
catch (ClassNotFoundException e)
{
Modified:
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4to5Test.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4to5Test.java?rev=1306747&r1=1306746&r2=1306747&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4to5Test.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4to5Test.java
Thu Mar 29 08:14:16 2012
@@ -66,7 +66,7 @@ public class UpgradeFrom4to5Test extends
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<String>(Arrays.asList(QUEUE_NAMES)));
@@ -93,7 +93,7 @@ public class UpgradeFrom4to5Test extends
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<String>(Arrays.asList(DURABLE_SUBSCRIPTION_QUEUE,
DURABLE_SUBSCRIPTION_QUEUE_WITH_SELECTOR, DURABLE_QUEUE)));
assertDatabaseRecordCount(DELIVERY_DB_NAME, 12);
Modified:
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java?rev=1306747&r1=1306746&r2=1306747&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java
Thu Mar 29 08:14:16 2012
@@ -43,7 +43,7 @@ public class UpgradeFrom5To6Test extends
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
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
UpgradeInteractionHandler discardMessageInteractionHandler = new
StaticAnswerHandler(UpgradeInteractionResponse.NO);
- upgrade.performUpgrade(LOG_SUBJECT, _environment,
discardMessageInteractionHandler);
+ upgrade.performUpgrade(_environment, discardMessageInteractionHandler);
assertDatabaseRecordCount("MESSAGE_METADATA", 11);
assertDatabaseRecordCount("MESSAGE_CONTENT", 11);
Modified:
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgraderTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgraderTest.java?rev=1306747&r1=1306746&r2=1306747&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgraderTest.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgraderTest.java
Thu Mar 29 08:14:16 2012
@@ -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 Abstra
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 Abstra
nonExistentStoreLocation.mkdir();
_environment = createEnvironment(nonExistentStoreLocation);
- _upgrader = new Upgrader(_environment, new TestBlankSubject());
+ _upgrader = new Upgrader(_environment);
_upgrader.upgradeIfNecessary();
List<String> databaseNames = _environment.getDatabaseNames();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
