[jboss-cvs] JBoss Messaging SVN: r4915 - in trunk: src/main/org/jboss/messaging/core/paging/impl and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Sep 5 18:38:01 EDT 2008
Author: clebert.suconic at jboss.com
Date: 2008-09-05 18:38:01 -0400 (Fri, 05 Sep 2008)
New Revision: 4915
Modified:
trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java
trunk/src/main/org/jboss/messaging/core/paging/impl/PagingManagerImpl.java
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/MessageReferenceImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java
trunk/src/main/org/jboss/messaging/core/transaction/impl/TransactionImpl.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/persistence/impl/journal/JournalStorageManagerTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessageReferenceImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/QueueImplTest.java
Log:
Small Tweak: renaming generateMessageID to generateID as this sequence is not used just for messages
Modified: trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java 2008-09-05 20:41:22 UTC (rev 4914)
+++ trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java 2008-09-05 22:38:01 UTC (rev 4915)
@@ -781,7 +781,7 @@
long maxTransactionID = -1;
- long maxMessageID = -1;
+ long maxID = -1;
for (JournalFile file: orderedFiles)
{
@@ -849,7 +849,7 @@
continue;
}
recordID = bb.getLong();
- maxMessageID = Math.max(maxMessageID, recordID);
+ maxID = Math.max(maxID, recordID);
}
// The variable record portion used on Updates and Appends
@@ -1237,7 +1237,7 @@
checkAndReclaimFiles();
- return maxMessageID;
+ return maxID;
}
public int getAlignment() throws Exception
Modified: trunk/src/main/org/jboss/messaging/core/paging/impl/PagingManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/impl/PagingManagerImpl.java 2008-09-05 20:41:22 UTC (rev 4914)
+++ trunk/src/main/org/jboss/messaging/core/paging/impl/PagingManagerImpl.java 2008-09-05 22:38:01 UTC (rev 4915)
@@ -210,7 +210,7 @@
}
}
- msg.getMessage().setMessageID(storageManager.generateMessageID());
+ msg.getMessage().setMessageID(storageManager.generateID());
refsToAdd.addAll(postOffice.route(msg.getMessage()));
Modified: trunk/src/main/org/jboss/messaging/core/persistence/StorageManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/persistence/StorageManager.java 2008-09-05 20:41:22 UTC (rev 4914)
+++ trunk/src/main/org/jboss/messaging/core/persistence/StorageManager.java 2008-09-05 22:38:01 UTC (rev 4915)
@@ -46,7 +46,7 @@
// Message related operations
- long generateMessageID();
+ long generateID();
long generateTransactionID();
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 2008-09-05 20:41:22 UTC (rev 4914)
+++ trunk/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java 2008-09-05 22:38:01 UTC (rev 4915)
@@ -101,7 +101,7 @@
public static final byte SET_SCHEDULED_DELIVERY_TIME = 44;
- private final AtomicLong messageIDSequence = new AtomicLong(0);
+ private final AtomicLong idSequence = new AtomicLong(0);
private final AtomicLong bindingIDSequence = new AtomicLong(0);
@@ -184,9 +184,9 @@
this.bindingsJournal = bindingsJournal;
}
- public long generateMessageID()
+ public long generateID()
{
- return messageIDSequence.getAndIncrement();
+ return idSequence.getAndIncrement();
}
public long generateTransactionID()
@@ -227,7 +227,7 @@
// Instead of updating the record, we delete the old one as that is better for reclaiming
messageJournal.appendDeleteRecordTransactional(txID, pageTransaction.getRecordID());
}
- pageTransaction.setRecordID(generateMessageID());
+ pageTransaction.setRecordID(generateID());
messageJournal.appendAddRecordTransactional(txID, pageTransaction.getRecordID(), PAGE_TRANSACTION, pageTransaction);
}
@@ -238,7 +238,7 @@
// To avoid linked list effect on reclaiming, we delete and add a new record, instead of simply updating it
messageJournal.appendDeleteRecordTransactional(txID, lastPage.getRecordId());
}
- lastPage.setRecordId(generateMessageID());
+ lastPage.setRecordId(generateID());
messageJournal.appendAddRecordTransactional(txID, lastPage.getRecordId(), LAST_PAGE, lastPage);
}
@@ -292,9 +292,9 @@
List<PreparedTransactionInfo> preparedTransactions = new ArrayList<PreparedTransactionInfo>();
- long maxMessageID = messageJournal.load(records, preparedTransactions);
+ long maxID = messageJournal.load(records, preparedTransactions);
- messageIDSequence.set(maxMessageID + 1);
+ idSequence.set(maxID + 1);
//TODO - Use load(ReloadManager) instead of Load(lists)
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 2008-09-05 20:41:22 UTC (rev 4914)
+++ trunk/src/main/org/jboss/messaging/core/persistence/impl/nullpm/NullStorageManager.java 2008-09-05 22:38:01 UTC (rev 4915)
@@ -133,7 +133,7 @@
{
}
- public long generateMessageID()
+ public long generateID()
{
return messageIDSequence.getAndIncrement();
}
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessageReferenceImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessageReferenceImpl.java 2008-09-05 20:41:22 UTC (rev 4914)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessageReferenceImpl.java 2008-09-05 22:38:01 UTC (rev 4915)
@@ -256,7 +256,7 @@
ServerMessage copy = message.copy();
- long newMessageId = pm.generateMessageID();
+ long newMessageId = pm.generateID();
copy.setMessageID(newMessageId);
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java 2008-09-05 20:41:22 UTC (rev 4914)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java 2008-09-05 22:38:01 UTC (rev 4915)
@@ -322,7 +322,7 @@
{
// We only set the messageID after we are sure the message is not being paged
// Paged messages won't have an ID until they are depaged
- msg.setMessageID(storageManager.generateMessageID());
+ msg.setMessageID(storageManager.generateID());
List<MessageReference> refs = postOffice.route(msg);
Modified: trunk/src/main/org/jboss/messaging/core/transaction/impl/TransactionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/transaction/impl/TransactionImpl.java 2008-09-05 20:41:22 UTC (rev 4914)
+++ trunk/src/main/org/jboss/messaging/core/transaction/impl/TransactionImpl.java 2008-09-05 22:38:01 UTC (rev 4915)
@@ -451,7 +451,7 @@
// Paged messages won't have an ID until they are depaged
if (message.getMessageID() == 0l)
{
- message.setMessageID(storageManager.generateMessageID());
+ message.setMessageID(storageManager.generateID());
}
List<MessageReference> refs = postOffice.route(message);
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/persistence/impl/journal/JournalStorageManagerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/persistence/impl/journal/JournalStorageManagerTest.java 2008-09-05 20:41:22 UTC (rev 4914)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/persistence/impl/journal/JournalStorageManagerTest.java 2008-09-05 22:38:01 UTC (rev 4915)
@@ -400,7 +400,7 @@
EasyMock.verify(refs2.toArray());
EasyMock.verify(queue1, queue2, queue3);
- assertEquals(msg1ID + 1, jsm.generateMessageID());
+ assertEquals(msg1ID + 1, jsm.generateID());
}
public void testAddBindingWithFilter() throws Exception
@@ -776,11 +776,11 @@
JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
- assertEquals(id++, jsm.generateMessageID());
- assertEquals(id++, jsm.generateMessageID());
- assertEquals(id++, jsm.generateMessageID());
- assertEquals(id++, jsm.generateMessageID());
- assertEquals(id++, jsm.generateMessageID());
+ assertEquals(id++, jsm.generateID());
+ assertEquals(id++, jsm.generateID());
+ assertEquals(id++, jsm.generateID());
+ assertEquals(id++, jsm.generateID());
+ assertEquals(id++, jsm.generateID());
}
public void testGenerateTransactionID()
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessageReferenceImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessageReferenceImplTest.java 2008-09-05 20:41:22 UTC (rev 4914)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessageReferenceImplTest.java 2008-09-05 22:38:01 UTC (rev 4915)
@@ -165,7 +165,7 @@
EasyMock.expect(serverMessage.copy()).andReturn(serverMessage);
- EasyMock.expect(sm.generateMessageID()).andReturn(2l);
+ EasyMock.expect(sm.generateID()).andReturn(2l);
serverMessage.setMessageID(2);
@@ -242,7 +242,7 @@
EasyMock.expect(serverMessage.copy()).andReturn(serverMessage);
- EasyMock.expect(sm.generateMessageID()).andReturn(2l);
+ EasyMock.expect(sm.generateID()).andReturn(2l);
serverMessage.setMessageID(2);
@@ -332,7 +332,7 @@
EasyMock.expect(serverMessage.isDurable()).andStubReturn(true);
EasyMock.expect(serverMessage.getMessageID()).andStubReturn(999l);
EasyMock.expect(queue.isDurable()).andStubReturn(true);
- EasyMock.expect(sm.generateMessageID()).andReturn(2l);
+ EasyMock.expect(sm.generateID()).andReturn(2l);
EasyMock.expect(sm.generateTransactionID()).andReturn(1l);
EasyMock.expect(po.getBinding(expQName)).andReturn(expQBinding);
EasyMock.expect(serverMessage.copy()).andReturn(serverMessage);
@@ -386,7 +386,7 @@
EasyMock.expect(serverMessage.isDurable()).andStubReturn(true);
EasyMock.expect(serverMessage.getMessageID()).andStubReturn(999l);
EasyMock.expect(queue.isDurable()).andStubReturn(true);
- EasyMock.expect(sm.generateMessageID()).andReturn(2l);
+ EasyMock.expect(sm.generateID()).andReturn(2l);
EasyMock.expect(sm.generateTransactionID()).andReturn(1l);
EasyMock.expect(po.getBinding(expQName)).andReturn(null);
EasyMock.expect(po.addBinding(expQName, expQName, null, true)).andReturn(expQBinding);
@@ -439,7 +439,7 @@
EasyMock.expect(persistenceManager.generateTransactionID()).andReturn(tid);
EasyMock.expect(serverMessage.copy()).andReturn(copyMessage);
- EasyMock.expect(persistenceManager.generateMessageID()).andReturn(newMessageID);
+ EasyMock.expect(persistenceManager.generateID()).andReturn(newMessageID);
copyMessage.setMessageID(newMessageID);
EasyMock.expect(copyMessage.getDestination()).andReturn(fromAddress);
copyMessage.putStringProperty(MessageImpl.HDR_ORIGIN_QUEUE, fromAddress);
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/QueueImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/QueueImplTest.java 2008-09-05 20:41:22 UTC (rev 4914)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/QueueImplTest.java 2008-09-05 22:38:01 UTC (rev 4915)
@@ -1340,7 +1340,7 @@
MessageReference messageReference = generateReference(queue, messageID);
StorageManager storageManager = EasyMock.createMock(StorageManager.class);
EasyMock.expect(storageManager.generateTransactionID()).andReturn(randomLong());
- EasyMock.expect(storageManager.generateMessageID()).andReturn(randomLong());
+ EasyMock.expect(storageManager.generateID()).andReturn(randomLong());
storageManager.storeDeleteTransactional(EasyMock.anyLong(), EasyMock.eq(messageID));
storageManager.commit(EasyMock.anyLong());
@@ -1398,7 +1398,7 @@
MessageReference messageReference = generateReference(queue, messageID);
StorageManager storageManager = createMock(StorageManager.class);
expect(storageManager.generateTransactionID()).andReturn(randomLong());
- expect(storageManager.generateMessageID()).andReturn(randomLong());
+ expect(storageManager.generateID()).andReturn(randomLong());
storageManager.storeDeleteTransactional(anyLong(), eq(messageID));
storageManager.commit(anyLong());
@@ -1458,7 +1458,7 @@
MessageReference messageReference = generateReference(queue, messageID);
StorageManager storageManager = EasyMock.createMock(StorageManager.class);
- EasyMock.expect(storageManager.generateMessageID()).andReturn(newMessageID);
+ EasyMock.expect(storageManager.generateID()).andReturn(newMessageID);
EasyMock.expect(storageManager.generateTransactionID()).andReturn(tid);
storageManager.storeDeleteTransactional(EasyMock.anyLong(), EasyMock.eq(messageID));
storageManager.commit(EasyMock.anyLong());
More information about the jboss-cvs-commits
mailing list