[jboss-cvs] JBoss Messaging SVN: r5401 - in trunk/src/main/org/jboss/messaging/core/paging: impl and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 20 12:37:49 EST 2008
Author: timfox
Date: 2008-11-20 12:37:49 -0500 (Thu, 20 Nov 2008)
New Revision: 5401
Modified:
trunk/src/main/org/jboss/messaging/core/paging/LastPageRecord.java
trunk/src/main/org/jboss/messaging/core/paging/impl/LastPageRecordImpl.java
trunk/src/main/org/jboss/messaging/core/paging/impl/PageImpl.java
trunk/src/main/org/jboss/messaging/core/paging/impl/PageMessageImpl.java
trunk/src/main/org/jboss/messaging/core/paging/impl/PageTransactionInfoImpl.java
trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreFactoryNIO.java
Log:
Some more small changes to paging
Modified: trunk/src/main/org/jboss/messaging/core/paging/LastPageRecord.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/LastPageRecord.java 2008-11-20 17:22:09 UTC (rev 5400)
+++ trunk/src/main/org/jboss/messaging/core/paging/LastPageRecord.java 2008-11-20 17:37:49 UTC (rev 5401)
@@ -42,8 +42,6 @@
SimpleString getDestination();
- void setDestination(SimpleString destination);
-
/** Last Page ID*/
long getLastId();
Modified: trunk/src/main/org/jboss/messaging/core/paging/impl/LastPageRecordImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/impl/LastPageRecordImpl.java 2008-11-20 17:22:09 UTC (rev 5400)
+++ trunk/src/main/org/jboss/messaging/core/paging/impl/LastPageRecordImpl.java 2008-11-20 17:37:49 UTC (rev 5401)
@@ -22,6 +22,8 @@
package org.jboss.messaging.core.paging.impl;
+import static org.jboss.messaging.util.DataConstants.SIZE_LONG;
+
import org.jboss.messaging.core.paging.LastPageRecord;
import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.util.SimpleString;
@@ -37,11 +39,11 @@
// Attributes ----------------------------------------------------
- private long recordId = 0;
+ private volatile long recordId = 0;
- private SimpleString destination;
+ private volatile SimpleString destination;
- private long lastId;
+ private volatile long lastId;
// Static --------------------------------------------------------
@@ -103,7 +105,7 @@
public int getEncodeSize()
{
- return 8 + SimpleString.sizeofString(destination);
+ return SIZE_LONG + SimpleString.sizeofString(destination);
}
// Package protected ---------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/core/paging/impl/PageImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/impl/PageImpl.java 2008-11-20 17:22:09 UTC (rev 5400)
+++ trunk/src/main/org/jboss/messaging/core/paging/impl/PageImpl.java 2008-11-20 17:37:49 UTC (rev 5401)
@@ -22,6 +22,9 @@
package org.jboss.messaging.core.paging.impl;
+import static org.jboss.messaging.util.DataConstants.SIZE_BYTE;
+import static org.jboss.messaging.util.DataConstants.SIZE_INT;
+
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.concurrent.atomic.AtomicInteger;
@@ -43,16 +46,12 @@
{
// Constants -----------------------------------------------------
- private static final int SIZE_INTEGER = 4;
+ public static final int SIZE_RECORD = SIZE_BYTE + SIZE_INT + SIZE_BYTE;
- private static final int SIZE_BYTE = 1;
+ private static final byte START_BYTE = (byte)'{';
- public static final int SIZE_RECORD = SIZE_BYTE + SIZE_INTEGER + SIZE_BYTE;
+ private static final byte END_BYTE = (byte)'}';
- public static final byte START_BYTE = (byte)'{';
-
- public static final byte END_BYTE = (byte)'}';
-
// Attributes ----------------------------------------------------
private final int pageId;
@@ -113,7 +112,7 @@
if (byteRead == START_BYTE)
{
- if (buffer.position() + SIZE_INTEGER < buffer.limit())
+ if (buffer.position() + SIZE_INT < buffer.limit())
{
int messageSize = buffer.getInt();
int oldPos = buffer.position();
Modified: trunk/src/main/org/jboss/messaging/core/paging/impl/PageMessageImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/impl/PageMessageImpl.java 2008-11-20 17:22:09 UTC (rev 5400)
+++ trunk/src/main/org/jboss/messaging/core/paging/impl/PageMessageImpl.java 2008-11-20 17:37:49 UTC (rev 5401)
@@ -22,6 +22,10 @@
package org.jboss.messaging.core.paging.impl;
+import static org.jboss.messaging.util.DataConstants.SIZE_BYTE;
+import static org.jboss.messaging.util.DataConstants.SIZE_INT;
+import static org.jboss.messaging.util.DataConstants.SIZE_LONG;
+
import java.nio.ByteBuffer;
import org.jboss.messaging.core.paging.PageMessage;
@@ -31,7 +35,6 @@
import org.jboss.messaging.core.server.ServerLargeMessage;
import org.jboss.messaging.core.server.ServerMessage;
import org.jboss.messaging.core.server.impl.ServerMessageImpl;
-import org.jboss.messaging.util.DataConstants;
/**
*
@@ -129,7 +132,7 @@
public int getEncodeSize()
{
- return DataConstants.SIZE_LONG + DataConstants.SIZE_BYTE + DataConstants.SIZE_INT + message.getEncodeSize();
+ return SIZE_LONG + SIZE_BYTE + SIZE_INT + message.getEncodeSize();
}
// Package protected ---------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/core/paging/impl/PageTransactionInfoImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/impl/PageTransactionInfoImpl.java 2008-11-20 17:22:09 UTC (rev 5400)
+++ trunk/src/main/org/jboss/messaging/core/paging/impl/PageTransactionInfoImpl.java 2008-11-20 17:37:49 UTC (rev 5401)
@@ -22,15 +22,18 @@
package org.jboss.messaging.core.paging.impl;
+import static org.jboss.messaging.util.DataConstants.SIZE_INT;
+import static org.jboss.messaging.util.DataConstants.SIZE_LONG;
+
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
import org.jboss.messaging.core.paging.PageTransactionInfo;
import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
+import org.jboss.messaging.util.DataConstants;
/**
- *
- *
+ *
* @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
*
*/
@@ -42,13 +45,13 @@
private long transactionID;
- private long recordID;
+ private volatile long recordID;
private CountDownLatch countDownCompleted;
private volatile boolean complete;
- final AtomicInteger numberOfMessages = new AtomicInteger(0);
+ private final AtomicInteger numberOfMessages = new AtomicInteger(0);
// Static --------------------------------------------------------
@@ -123,7 +126,7 @@
public synchronized int getEncodeSize()
{
- return 8 /* long */+ 4 /* int */;
+ return SIZE_LONG + SIZE_INT;
}
public void complete()
Modified: trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreFactoryNIO.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreFactoryNIO.java 2008-11-20 17:22:09 UTC (rev 5400)
+++ trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreFactoryNIO.java 2008-11-20 17:37:49 UTC (rev 5401)
@@ -76,7 +76,7 @@
public void stop() throws InterruptedException
{
executor.shutdown();
- executor.awaitTermination(60, TimeUnit.SECONDS);
+ executor.awaitTermination(30, TimeUnit.SECONDS);
}
public PagingStore newStore(final SimpleString destinationName, final QueueSettings settings)
More information about the jboss-cvs-commits
mailing list