[hornetq-commits] JBoss hornetq SVN: r11324 - in branches/HORNETQ-720_Replication: hornetq-core/src/main/java/org/hornetq/core/paging/impl and 6 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Mon Sep 12 09:32:26 EDT 2011
Author: borges
Date: 2011-09-12 09:32:26 -0400 (Mon, 12 Sep 2011)
New Revision: 11324
Modified:
branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/paging/PagingStore.java
branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PagingStoreImpl.java
branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java
branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java
branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingTest.java
branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/PagingCounterTest.java
branches/HORNETQ-720_Replication/tests/stress-tests/src/test/java/org/hornetq/tests/stress/paging/PageCursorStressTest.java
Log:
Change PagingStore.getCursorProvier --> getCursorProvi_d_er
Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/paging/PagingStore.java
===================================================================
--- branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/paging/PagingStore.java 2011-09-12 13:30:42 UTC (rev 11323)
+++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/paging/PagingStore.java 2011-09-12 13:32:26 UTC (rev 11324)
@@ -80,7 +80,7 @@
PagingManager getPagingManager();
- PageCursorProvider getCursorProvier();
+ PageCursorProvider getCursorProvider();
void processReload() throws Exception;
Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PagingStoreImpl.java
===================================================================
--- branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PagingStoreImpl.java 2011-09-12 13:30:42 UTC (rev 11323)
+++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PagingStoreImpl.java 2011-09-12 13:32:26 UTC (rev 11324)
@@ -234,7 +234,7 @@
lock.writeLock().unlock();
}
- public PageCursorProvider getCursorProvier()
+ public PageCursorProvider getCursorProvider()
{
return cursorProvider;
}
Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
===================================================================
--- branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2011-09-12 13:30:42 UTC (rev 11323)
+++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2011-09-12 13:32:26 UTC (rev 11324)
@@ -1747,7 +1747,7 @@
{
SimpleString address = queueInfo.getAddress();
PagingStore store = pagingManager.getPageStore(address);
- subs = store.getCursorProvier().getSubscription(queueID);
+ subs = store.getCursorProvider().getSubscription(queueID);
pageSubscriptions.put(queueID, subs);
}
}
Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java
===================================================================
--- branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java 2011-09-12 13:30:42 UTC (rev 11323)
+++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java 2011-09-12 13:32:26 UTC (rev 11324)
@@ -174,10 +174,12 @@
}
else if (type == PacketImpl.REPLICATION_PAGE_WRITE)
{
+ System.out.println("PAGE_WRITE");
handlePageWrite((ReplicationPageWriteMessage)packet);
}
else if (type == PacketImpl.REPLICATION_PAGE_EVENT)
{
+ System.out.println("PAGE_EVENT");
handlePageEvent((ReplicationPageEventMessage)packet);
}
else if (type == PacketImpl.REPLICATION_LARGE_MESSAGE_BEGIN)
Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-09-12 13:30:42 UTC (rev 11323)
+++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-09-12 13:32:26 UTC (rev 11324)
@@ -1658,7 +1658,7 @@
Filter filter = FilterImpl.createFilter(queueBindingInfo.getFilterString());
- PageSubscription subscription = pagingManager.getPageStore(queueBindingInfo.getAddress()).getCursorProvier().createSubscription(queueBindingInfo.getId(), filter, true);
+ PageSubscription subscription = pagingManager.getPageStore(queueBindingInfo.getAddress()).getCursorProvider().createSubscription(queueBindingInfo.getId(), filter, true);
Queue queue = queueFactory.createQueue(queueBindingInfo.getId(),
queueBindingInfo.getAddress(),
@@ -1772,7 +1772,7 @@
}
else
{
- pageSubscription = pagingManager.getPageStore(address).getCursorProvier().createSubscription(queueID, filter, durable);
+ pageSubscription = pagingManager.getPageStore(address).getCursorProvider().createSubscription(queueID, filter, durable);
}
final Queue queue = queueFactory.createQueue(queueID,
Modified: branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingTest.java
===================================================================
--- branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingTest.java 2011-09-12 13:30:42 UTC (rev 11323)
+++ branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingTest.java 2011-09-12 13:32:26 UTC (rev 11324)
@@ -787,7 +787,7 @@
session.commit();
PagingStore store = server.getPagingManager().getPageStore(ADDRESS);
- store.getCursorProvier().cleanup();
+ store.getCursorProvider().cleanup();
long timeout = System.currentTimeMillis() + 5000;
while (store.isPaging() && timeout > System.currentTimeMillis())
@@ -3381,7 +3381,7 @@
}
PagingStore store = server.getPagingManager().getPageStore(ADDRESS);
- store.getCursorProvier().cleanup();
+ store.getCursorProvider().cleanup();
long timeout = System.currentTimeMillis() + 5000;
while (store.isPaging() && timeout > System.currentTimeMillis())
@@ -3499,7 +3499,7 @@
}
PagingStore store = server.getPagingManager().getPageStore(ADDRESS);
- store.getCursorProvier().cleanup();
+ store.getCursorProvider().cleanup();
long timeout = System.currentTimeMillis() + 5000;
while (store.isPaging() && timeout > System.currentTimeMillis())
@@ -3507,7 +3507,7 @@
Thread.sleep(100);
}
- store.getCursorProvier().cleanup();
+ store.getCursorProvider().cleanup();
Thread.sleep(1000);
@@ -3711,9 +3711,9 @@
pgStoreAddress = server.getPagingManager().getPageStore(ADDRESS);
- pgStoreAddress.getCursorProvier().getSubscription(server.locateQueue(ADDRESS).getID()).cleanupEntries();
+ pgStoreAddress.getCursorProvider().getSubscription(server.locateQueue(ADDRESS).getID()).cleanupEntries();
- pgStoreAddress.getCursorProvier().cleanup();
+ pgStoreAddress.getCursorProvider().cleanup();
while (timeout > System.currentTimeMillis() && pgStoreAddress.isPaging())
{
Modified: branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/PagingCounterTest.java
===================================================================
--- branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/PagingCounterTest.java 2011-09-12 13:30:42 UTC (rev 11323)
+++ branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/paging/PagingCounterTest.java 2011-09-12 13:32:26 UTC (rev 11324)
@@ -257,7 +257,7 @@
{
PageSubscription subscription = server.getPagingManager()
.getPageStore(new SimpleString("A1"))
- .getCursorProvier()
+ .getCursorProvider()
.getSubscription(queue.getID());
PageSubscriptionCounter counter = subscription.getCounter();
Modified: branches/HORNETQ-720_Replication/tests/stress-tests/src/test/java/org/hornetq/tests/stress/paging/PageCursorStressTest.java
===================================================================
--- branches/HORNETQ-720_Replication/tests/stress-tests/src/test/java/org/hornetq/tests/stress/paging/PageCursorStressTest.java 2011-09-12 13:30:42 UTC (rev 11323)
+++ branches/HORNETQ-720_Replication/tests/stress-tests/src/test/java/org/hornetq/tests/stress/paging/PageCursorStressTest.java 2011-09-12 13:32:26 UTC (rev 11324)
@@ -119,7 +119,7 @@
final int NUM_MESSAGES = 100;
- PageSubscription cursor = lookupPageStore(ADDRESS).getCursorProvier().getSubscription(queue.getID());
+ PageSubscription cursor = lookupPageStore(ADDRESS).getCursorProvider().getSubscription(queue.getID());
Iterator<PagedReference> iterEmpty = cursor.iterator();
@@ -278,7 +278,7 @@
PageSubscription cursor = this.server.getPagingManager()
.getPageStore(ADDRESS)
- .getCursorProvier()
+ .getCursorProvider()
.getSubscription(queue.getID());
PageCache firstPage = cursorProvider.getPageCache(new PagePositionImpl(server.getPagingManager()
@@ -319,7 +319,7 @@
server.start();
- cursor = this.server.getPagingManager().getPageStore(ADDRESS).getCursorProvier().getSubscription(queue.getID());
+ cursor = this.server.getPagingManager().getPageStore(ADDRESS).getCursorProvider().getSubscription(queue.getID());
iterator = cursor.iterator();
@@ -359,12 +359,12 @@
System.out.println("Number of pages = " + numberOfPages);
- PageCursorProvider cursorProvider = this.server.getPagingManager().getPageStore(ADDRESS).getCursorProvier();
+ PageCursorProvider cursorProvider = this.server.getPagingManager().getPageStore(ADDRESS).getCursorProvider();
System.out.println("cursorProvider = " + cursorProvider);
PageSubscription cursor = this.server.getPagingManager()
.getPageStore(ADDRESS)
- .getCursorProvier()
+ .getCursorProvider()
.getSubscription(queue.getID());
System.out.println("Cursor: " + cursor);
@@ -387,7 +387,7 @@
server.start();
- cursor = this.server.getPagingManager().getPageStore(ADDRESS).getCursorProvier().getSubscription(queue.getID());
+ cursor = this.server.getPagingManager().getPageStore(ADDRESS).getCursorProvider().getSubscription(queue.getID());
iterator = cursor.iterator();
for (int i = 10; i <= 20; i++)
@@ -419,12 +419,12 @@
System.out.println("Number of pages = " + numberOfPages);
- PageCursorProvider cursorProvider = this.server.getPagingManager().getPageStore(ADDRESS).getCursorProvier();
+ PageCursorProvider cursorProvider = this.server.getPagingManager().getPageStore(ADDRESS).getCursorProvider();
System.out.println("cursorProvider = " + cursorProvider);
PageSubscription cursor = this.server.getPagingManager()
.getPageStore(ADDRESS)
- .getCursorProvier()
+ .getCursorProvider()
.getSubscription(queue.getID());
System.out.println("Cursor: " + cursor);
@@ -451,7 +451,7 @@
server.start();
- cursor = this.server.getPagingManager().getPageStore(ADDRESS).getCursorProvier().getSubscription(queue.getID());
+ cursor = this.server.getPagingManager().getPageStore(ADDRESS).getCursorProvider().getSubscription(queue.getID());
tx = new TransactionImpl(server.getStorageManager(), 60 * 1000);
iterator = cursor.iterator();
@@ -489,12 +489,12 @@
final int messageSize = 1024 * 1024;
- PageCursorProvider cursorProvider = this.server.getPagingManager().getPageStore(ADDRESS).getCursorProvier();
+ PageCursorProvider cursorProvider = this.server.getPagingManager().getPageStore(ADDRESS).getCursorProvider();
System.out.println("cursorProvider = " + cursorProvider);
PageSubscription cursor = this.server.getPagingManager()
.getPageStore(ADDRESS)
- .getCursorProvier()
+ .getCursorProvider()
.getSubscription(queue.getID());
System.out.println("Cursor: " + cursor);
@@ -532,7 +532,7 @@
pageStore = lookupPageStore(ADDRESS);
- cursor = this.server.getPagingManager().getPageStore(ADDRESS).getCursorProvier().getSubscription(queue.getID());
+ cursor = this.server.getPagingManager().getPageStore(ADDRESS).getCursorProvider().getSubscription(queue.getID());
iterator = cursor.iterator();
for (int i = 0; i < NUM_MESSAGES * 2; i++)
@@ -564,7 +564,7 @@
pageStore = lookupPageStore(ADDRESS);
- cursor = this.server.getPagingManager().getPageStore(ADDRESS).getCursorProvier().getSubscription(queue.getID());
+ cursor = this.server.getPagingManager().getPageStore(ADDRESS).getCursorProvider().getSubscription(queue.getID());
iterator = cursor.iterator();
for (int i = 0; i < NUM_MESSAGES * 3; i++)
@@ -632,12 +632,12 @@
final int messageSize = 1024;
- PageCursorProvider cursorProvider = this.server.getPagingManager().getPageStore(ADDRESS).getCursorProvier();
+ PageCursorProvider cursorProvider = this.server.getPagingManager().getPageStore(ADDRESS).getCursorProvider();
System.out.println("cursorProvider = " + cursorProvider);
PageSubscription cursor = this.server.getPagingManager()
.getPageStore(ADDRESS)
- .getCursorProvier()
+ .getCursorProvider()
.getSubscription(queue.getID());
System.out.println("Cursor: " + cursor);
@@ -773,12 +773,12 @@
final int messageSize = 100 * 1024;
- PageCursorProvider cursorProvider = this.server.getPagingManager().getPageStore(ADDRESS).getCursorProvier();
+ PageCursorProvider cursorProvider = this.server.getPagingManager().getPageStore(ADDRESS).getCursorProvider();
System.out.println("cursorProvider = " + cursorProvider);
PageSubscription cursor = this.server.getPagingManager()
.getPageStore(ADDRESS)
- .getCursorProvier()
+ .getCursorProvider()
.getSubscription(queue.getID());
LinkedListIterator<PagedReference> iterator = cursor.iterator();
@@ -857,12 +857,12 @@
final int messageSize = 100 * 1024;
- PageCursorProvider cursorProvider = this.server.getPagingManager().getPageStore(ADDRESS).getCursorProvier();
+ PageCursorProvider cursorProvider = this.server.getPagingManager().getPageStore(ADDRESS).getCursorProvider();
System.out.println("cursorProvider = " + cursorProvider);
PageSubscription cursor = this.server.getPagingManager()
.getPageStore(ADDRESS)
- .getCursorProvier()
+ .getCursorProvider()
.getSubscription(queue.getID());
LinkedListIterator<PagedReference> iterator = cursor.iterator();
@@ -1188,7 +1188,7 @@
*/
private PageCursorProvider lookupCursorProvider() throws Exception
{
- return lookupPageStore(ADDRESS).getCursorProvier();
+ return lookupPageStore(ADDRESS).getCursorProvider();
}
/**
More information about the hornetq-commits
mailing list