[jboss-cvs] JBoss Messaging SVN: r6474 - in trunk: src/main/org/jboss/messaging/core/persistence/impl/journal and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Apr 17 09:40:56 EDT 2009
Author: jmesnil
Date: 2009-04-17 09:40:56 -0400 (Fri, 17 Apr 2009)
New Revision: 6474
Modified:
trunk/src/main/org/jboss/messaging/core/persistence/StorageManager.java
trunk/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java
trunk/src/main/org/jboss/messaging/core/persistence/impl/nullpm/NullStorageManager.java
trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
trunk/tests/src/org/jboss/messaging/tests/performance/persistence/StorageManagerTimingTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreImplTest.java
Log:
StorageManager API refactoring
* refactored API method to remove unneeded dependencies (post office, storate manager, address settings repository) and replace with the minimal dependencies (paging manager)
Modified: trunk/src/main/org/jboss/messaging/core/persistence/StorageManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/persistence/StorageManager.java 2009-04-17 12:40:57 UTC (rev 6473)
+++ trunk/src/main/org/jboss/messaging/core/persistence/StorageManager.java 2009-04-17 13:40:56 UTC (rev 6474)
@@ -28,15 +28,13 @@
import javax.transaction.xa.Xid;
import org.jboss.messaging.core.paging.PageTransactionInfo;
+import org.jboss.messaging.core.paging.PagingManager;
import org.jboss.messaging.core.postoffice.Binding;
-import org.jboss.messaging.core.postoffice.PostOffice;
import org.jboss.messaging.core.server.LargeServerMessage;
import org.jboss.messaging.core.server.MessageReference;
import org.jboss.messaging.core.server.MessagingComponent;
import org.jboss.messaging.core.server.Queue;
import org.jboss.messaging.core.server.ServerMessage;
-import org.jboss.messaging.core.settings.HierarchicalRepository;
-import org.jboss.messaging.core.settings.impl.AddressSettings;
import org.jboss.messaging.core.transaction.ResourceManager;
import org.jboss.messaging.utils.Pair;
import org.jboss.messaging.utils.SimpleString;
@@ -108,11 +106,9 @@
void deletePageTransactional(long txID, long recordID) throws Exception;
- void loadMessageJournal(PostOffice postOffice,
- StorageManager storageManager,
- HierarchicalRepository<AddressSettings> addressSettingsRepository,
- Map<Long, Queue> queues,
+ void loadMessageJournal(PagingManager pagingManager,
ResourceManager resourceManager,
+ Map<Long, Queue> queues,
Map<SimpleString, List<Pair<byte[], Long>>> duplicateIDMap) throws Exception;
// Bindings related operations
Modified: trunk/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java 2009-04-17 12:40:57 UTC (rev 6473)
+++ trunk/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java 2009-04-17 13:40:56 UTC (rev 6474)
@@ -60,7 +60,6 @@
import org.jboss.messaging.core.persistence.QueueBindingInfo;
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.postoffice.Binding;
-import org.jboss.messaging.core.postoffice.PostOffice;
import org.jboss.messaging.core.remoting.impl.wireformat.XidCodecSupport;
import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.core.server.JournalType;
@@ -69,8 +68,6 @@
import org.jboss.messaging.core.server.Queue;
import org.jboss.messaging.core.server.ServerMessage;
import org.jboss.messaging.core.server.impl.ServerMessageImpl;
-import org.jboss.messaging.core.settings.HierarchicalRepository;
-import org.jboss.messaging.core.settings.impl.AddressSettings;
import org.jboss.messaging.core.transaction.ResourceManager;
import org.jboss.messaging.core.transaction.Transaction;
import org.jboss.messaging.core.transaction.TransactionOperation;
@@ -458,11 +455,9 @@
int deliveryCount;
}
- public void loadMessageJournal(final PostOffice postOffice,
- final StorageManager storageManager,
- final HierarchicalRepository<AddressSettings> addressSettingsRepository,
- final Map<Long, Queue> queues,
+ public void loadMessageJournal(final PagingManager pagingManager,
final ResourceManager resourceManager,
+ final Map<Long, Queue> queues,
final Map<SimpleString, List<Pair<byte[], Long>>> duplicateIDMap) throws Exception
{
List<RecordInfo> records = new ArrayList<RecordInfo>();
@@ -593,8 +588,6 @@
pageTransactionInfo.setRecordID(record.id);
- PagingManager pagingManager = postOffice.getPagingManager();
-
pagingManager.addTransaction(pageTransactionInfo);
break;
@@ -679,25 +672,19 @@
}
}
- loadPreparedTransactions(postOffice,
- storageManager,
- addressSettingsRepository,
- queues,
+ loadPreparedTransactions(pagingManager,
resourceManager,
+ queues,
preparedTransactions,
duplicateIDMap);
}
- private void loadPreparedTransactions(final PostOffice postOffice,
- final StorageManager storageManager,
- final HierarchicalRepository<AddressSettings> addressSettingsRepository,
- final Map<Long, Queue> queues,
+ private void loadPreparedTransactions(final PagingManager pagingManager,
final ResourceManager resourceManager,
+ final Map<Long, Queue> queues,
final List<PreparedTransactionInfo> preparedTransactions,
final Map<SimpleString, List<Pair<byte[], Long>>> duplicateIDMap) throws Exception
{
- final PagingManager pagingManager = postOffice.getPagingManager();
-
// recover prepared transactions
for (PreparedTransactionInfo preparedTransaction : preparedTransactions)
{
Modified: trunk/src/main/org/jboss/messaging/core/persistence/impl/nullpm/NullStorageManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/persistence/impl/nullpm/NullStorageManager.java 2009-04-17 12:40:57 UTC (rev 6473)
+++ trunk/src/main/org/jboss/messaging/core/persistence/impl/nullpm/NullStorageManager.java 2009-04-17 13:40:56 UTC (rev 6474)
@@ -30,16 +30,14 @@
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.paging.PageTransactionInfo;
+import org.jboss.messaging.core.paging.PagingManager;
import org.jboss.messaging.core.persistence.QueueBindingInfo;
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.postoffice.Binding;
-import org.jboss.messaging.core.postoffice.PostOffice;
import org.jboss.messaging.core.server.LargeServerMessage;
import org.jboss.messaging.core.server.MessageReference;
import org.jboss.messaging.core.server.Queue;
import org.jboss.messaging.core.server.ServerMessage;
-import org.jboss.messaging.core.settings.HierarchicalRepository;
-import org.jboss.messaging.core.settings.impl.AddressSettings;
import org.jboss.messaging.core.transaction.ResourceManager;
import org.jboss.messaging.utils.Pair;
import org.jboss.messaging.utils.SimpleString;
@@ -228,12 +226,10 @@
public void deleteMessageTransactional(final long txID, final long messageID, final long queueID) throws Exception
{
}
-
- public void loadMessageJournal(PostOffice postOffice,
- StorageManager storageManager,
- HierarchicalRepository<AddressSettings> addressSettingsRepository,
- Map<Long, Queue> queues,
+
+ public void loadMessageJournal(PagingManager pagingManager,
ResourceManager resourceManager,
+ Map<Long, Queue> queues,
Map<SimpleString, List<Pair<byte[], Long>>> duplicateIDMap) throws Exception
{
}
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2009-04-17 12:40:57 UTC (rev 6473)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2009-04-17 13:40:56 UTC (rev 6474)
@@ -387,11 +387,9 @@
Map<SimpleString, List<Pair<byte[], Long>>> duplicateIDMap = new HashMap<SimpleString, List<Pair<byte[], Long>>>();
- storageManager.loadMessageJournal(postOffice,
- storageManager,
- addressSettingsRepository,
- queues,
+ storageManager.loadMessageJournal(pagingManager,
resourceManager,
+ queues,
duplicateIDMap);
for (Map.Entry<SimpleString, List<Pair<byte[], Long>>> entry : duplicateIDMap.entrySet())
Modified: trunk/tests/src/org/jboss/messaging/tests/performance/persistence/StorageManagerTimingTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/performance/persistence/StorageManagerTimingTest.java 2009-04-17 12:40:57 UTC (rev 6473)
+++ trunk/tests/src/org/jboss/messaging/tests/performance/persistence/StorageManagerTimingTest.java 2009-04-17 13:40:56 UTC (rev 6474)
@@ -129,11 +129,9 @@
final JournalStorageManager journal = new JournalStorageManager(configuration);
journal.start();
- FakePostOffice office = new FakePostOffice();
-
HashMap<Long, Queue> queues = new HashMap<Long, Queue>();
- journal.loadMessageJournal(office, null, null, queues, null, null);
+ journal.loadMessageJournal(null, null, queues, null);
final byte[] bytes = new byte[900];
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreImplTest.java 2009-04-17 12:40:57 UTC (rev 6473)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreImplTest.java 2009-04-17 13:40:56 UTC (rev 6474)
@@ -1007,16 +1007,13 @@
}
/* (non-Javadoc)
- * @see org.jboss.messaging.core.persistence.StorageManager#loadMessageJournal(org.jboss.messaging.core.postoffice.PostOffice, org.jboss.messaging.core.persistence.StorageManager, org.jboss.messaging.core.settings.HierarchicalRepository, java.util.Map, org.jboss.messaging.core.transaction.ResourceManager, java.util.Map)
+ * @see org.jboss.messaging.core.persistence.StorageManager#loadMessageJournal(org.jboss.messaging.core.paging.PagingManager, java.util.Map, org.jboss.messaging.core.transaction.ResourceManager, java.util.Map)
*/
- public void loadMessageJournal(final PostOffice postOffice,
- final StorageManager storageManager,
- final HierarchicalRepository<AddressSettings> addressSettingsRepository,
- final Map<Long, Queue> queues,
- final ResourceManager resourceManager,
- final Map<SimpleString, List<Pair<byte[], Long>>> duplicateIDMap) throws Exception
+ public void loadMessageJournal(PagingManager pagingManager,
+ ResourceManager resourceManager,
+ Map<Long, Queue> queues,
+ Map<SimpleString, List<Pair<byte[], Long>>> duplicateIDMap) throws Exception
{
-
}
/* (non-Javadoc)
More information about the jboss-cvs-commits
mailing list