Author: rgodfrey
Date: Mon May 7 23:17:39 2012
New Revision: 1335301
URL: http://svn.apache.org/viewvc?rev=1335301&view=rev
Log:
QPID-3986 : [Java Broker] Tidy up constant use for Underfull/Overfull properties
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreConstants.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java?rev=1335301&r1=1335300&r2=1335301&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
Mon May 7 23:17:39 2012
@@ -54,28 +54,12 @@ import org.apache.qpid.server.federation
import org.apache.qpid.server.federation.BrokerLink;
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.*;
import
org.apache.qpid.server.store.ConfigurationRecoveryHandler.BindingRecoveryHandler;
import
org.apache.qpid.server.store.ConfigurationRecoveryHandler.ExchangeRecoveryHandler;
import
org.apache.qpid.server.store.ConfigurationRecoveryHandler.QueueRecoveryHandler;
-import org.apache.qpid.server.store.ConfiguredObjectHelper;
-import org.apache.qpid.server.store.ConfiguredObjectRecord;
-import org.apache.qpid.server.store.DurableConfigurationStore;
-import org.apache.qpid.server.store.Event;
-import org.apache.qpid.server.store.EventListener;
-import org.apache.qpid.server.store.EventManager;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.store.MessageStoreRecoveryHandler;
import
org.apache.qpid.server.store.MessageStoreRecoveryHandler.StoredMessageRecoveryHandler;
-import org.apache.qpid.server.store.State;
-import org.apache.qpid.server.store.StateManager;
-import org.apache.qpid.server.store.StorableMessageMetaData;
-import org.apache.qpid.server.store.StoreFuture;
-import org.apache.qpid.server.store.StoredMemoryMessage;
-import org.apache.qpid.server.store.StoredMessage;
-import org.apache.qpid.server.store.TransactionLogRecoveryHandler;
import
org.apache.qpid.server.store.TransactionLogRecoveryHandler.QueueEntryRecoveryHandler;
-import org.apache.qpid.server.store.TransactionLogResource;
import org.apache.qpid.server.store.berkeleydb.entry.PreparedTransaction;
import org.apache.qpid.server.store.berkeleydb.entry.QueueEntryKey;
import org.apache.qpid.server.store.berkeleydb.entry.Xid;
@@ -97,10 +81,6 @@ public abstract class AbstractBDBMessage
public static final int VERSION = 6;
- public static final String ENVIRONMENT_PATH_PROPERTY = "environment-path";
- public static final String OVERFULL_SIZE_PROPERTY = "overfull-size";
- public static final String UNDERFULL_SIZE_PROPERTY = "underfull-size";
-
private Environment _environment;
private String CONFIGURED_OBJECTS = "CONFIGURED_OBJECTS";
@@ -229,11 +209,11 @@ public abstract class AbstractBDBMessage
*/
public void configure(String name, Configuration storeConfig) throws
Exception
{
- final String storeLocation =
storeConfig.getString(ENVIRONMENT_PATH_PROPERTY,
+ final String storeLocation =
storeConfig.getString(MessageStoreConstants.ENVIRONMENT_PATH_PROPERTY,
System.getProperty("QPID_WORK") + File.separator + "bdbstore"
+ File.separator + name);
- _persistentSizeHighThreshold =
storeConfig.getLong(OVERFULL_SIZE_PROPERTY, Long.MAX_VALUE);
- _persistentSizeLowThreshold =
storeConfig.getLong(UNDERFULL_SIZE_PROPERTY, _persistentSizeHighThreshold);
+ _persistentSizeHighThreshold =
storeConfig.getLong(MessageStoreConstants.OVERFULL_SIZE_PROPERTY,
Long.MAX_VALUE);
+ _persistentSizeLowThreshold =
storeConfig.getLong(MessageStoreConstants.UNDERFULL_SIZE_PROPERTY,
_persistentSizeHighThreshold);
if(_persistentSizeLowThreshold > _persistentSizeHighThreshold ||
_persistentSizeLowThreshold < 0l)
{
_persistentSizeLowThreshold = _persistentSizeLowThreshold;
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreConstants.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreConstants.java?rev=1335301&r1=1335300&r2=1335301&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreConstants.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreConstants.java
Mon May 7 23:17:39 2012
@@ -23,5 +23,7 @@ public class MessageStoreConstants
{
public static final String ENVIRONMENT_PATH_PROPERTY = "environment-path";
+ public static final String OVERFULL_SIZE_PROPERTY = "overfull-size";
+ public static final String UNDERFULL_SIZE_PROPERTY = "underfull-size";
}
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java?rev=1335301&r1=1335300&r2=1335301&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
Mon May 7 23:17:39 2012
@@ -90,9 +90,6 @@ public class DerbyMessageStore implement
private static final Logger _logger =
Logger.getLogger(DerbyMessageStore.class);
- public static final String OVERFULL_SIZE_PROPERTY = "overfull-size";
- public static final String UNDERFULL_SIZE_PROPERTY = "underfull-size";
-
private static final String SQL_DRIVER_NAME =
"org.apache.derby.jdbc.EmbeddedDriver";
private static final String DB_VERSION_TABLE_NAME = "QPID_DB_VERSION";
@@ -235,7 +232,7 @@ public class DerbyMessageStore implement
private static final String DERBY_SINGLE_DB_SHUTDOWN_CODE = "08006";
private final StateManager _stateManager;
-
+
private final EventManager _eventManager = new EventManager();
private long _totalStoreSize;
@@ -317,8 +314,8 @@ public class DerbyMessageStore implement
_storeLocation = databasePath;
- _persistentSizeHighThreshold =
storeConfiguration.getLong(OVERFULL_SIZE_PROPERTY, -1l);
- _persistentSizeLowThreshold =
storeConfiguration.getLong(UNDERFULL_SIZE_PROPERTY,
_persistentSizeHighThreshold);
+ _persistentSizeHighThreshold =
storeConfiguration.getLong(MessageStoreConstants.OVERFULL_SIZE_PROPERTY, -1l);
+ _persistentSizeLowThreshold =
storeConfiguration.getLong(MessageStoreConstants.UNDERFULL_SIZE_PROPERTY,
_persistentSizeHighThreshold);
if(_persistentSizeLowThreshold > _persistentSizeHighThreshold ||
_persistentSizeLowThreshold < 0l)
{
_persistentSizeLowThreshold = _persistentSizeHighThreshold;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
