[jboss-cvs] JBoss Messaging SVN: r3746 - in branches/Branch_Stable_temp/src: main/org/jboss/messaging/core/impl and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 20 14:34:31 EST 2008
Author: timfox
Date: 2008-02-20 14:34:30 -0500 (Wed, 20 Feb 2008)
New Revision: 3746
Modified:
branches/Branch_Stable_temp/src/etc/server/default/deploy/mssql-persistence-service.xml
branches/Branch_Stable_temp/src/etc/server/default/deploy/mysql-persistence-service.xml
branches/Branch_Stable_temp/src/etc/server/default/deploy/oracle-persistence-service.xml
branches/Branch_Stable_temp/src/etc/server/default/deploy/postgresql-persistence-service.xml
branches/Branch_Stable_temp/src/etc/server/default/deploy/sybase-persistence-service.xml
branches/Branch_Stable_temp/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java
Log:
temp
Modified: branches/Branch_Stable_temp/src/etc/server/default/deploy/mssql-persistence-service.xml
===================================================================
--- branches/Branch_Stable_temp/src/etc/server/default/deploy/mssql-persistence-service.xml 2008-02-20 19:10:31 UTC (rev 3745)
+++ branches/Branch_Stable_temp/src/etc/server/default/deploy/mssql-persistence-service.xml 2008-02-20 19:34:30 UTC (rev 3746)
@@ -29,10 +29,14 @@
<attribute name="CreateTablesOnStartup">true</attribute>
- <!-- If true then will use JDBC batch updates -->
+ <!-- If true then we will automatically detect and reject duplicate messages sent during failover -->
- <attribute name="UsingBatchUpdates">true</attribute>
+ <attribute name="DetectDuplicates">true</attribute>
+ <!-- The size of the id cache to use when detecting duplicate messages -->
+
+ <attribute name="IDCacheSize">500</attribute>
+
<attribute name="SqlProperties"><![CDATA[
CREATE_DUAL=CREATE TABLE JBM_DUAL (DUMMY INTEGER, PRIMARY KEY (DUMMY))
CREATE_MESSAGE_REFERENCE=CREATE TABLE JBM_MSG_REF (MESSAGE_ID BIGINT, CHANNEL_ID BIGINT, TRANSACTION_ID BIGINT, STATE CHAR(1), ORD BIGINT, PAGE_ORD BIGINT, DELIVERY_COUNT INT, SCHED_DELIVERY BIGINT, PRIMARY KEY(MESSAGE_ID, CHANNEL_ID))
Modified: branches/Branch_Stable_temp/src/etc/server/default/deploy/mysql-persistence-service.xml
===================================================================
--- branches/Branch_Stable_temp/src/etc/server/default/deploy/mysql-persistence-service.xml 2008-02-20 19:10:31 UTC (rev 3745)
+++ branches/Branch_Stable_temp/src/etc/server/default/deploy/mysql-persistence-service.xml 2008-02-20 19:34:30 UTC (rev 3746)
@@ -13,7 +13,7 @@
<!-- Persistence Manager MBean configuration
======================================== -->
- <mbean code="org.jbos.messaging.core.jmx.JDBCPersistenceManagerService"
+ <mbean code="org.jboss.messaging.core.jmx.JDBCPersistenceManagerService"
name="jboss.messaging:service=PersistenceManager"
xmbean-dd="xmdesc/JDBCPersistenceManager-xmbean.xml">
@@ -29,12 +29,12 @@
<attribute name="CreateTablesOnStartup">true</attribute>
- <!-- If true then will use JDBC batch updates -->
+ <!-- If true then we will automatically detect and reject duplicate messages sent during failover -->
- <attribute name="UsingBatchUpdates">true</attribute>
-
<attribute name="DetectDuplicates">true</attribute>
+ <!-- The size of the id cache to use when detecting duplicate messages -->
+
<attribute name="IDCacheSize">500</attribute>
<attribute name="SqlProperties"><![CDATA[
Modified: branches/Branch_Stable_temp/src/etc/server/default/deploy/oracle-persistence-service.xml
===================================================================
--- branches/Branch_Stable_temp/src/etc/server/default/deploy/oracle-persistence-service.xml 2008-02-20 19:10:31 UTC (rev 3745)
+++ branches/Branch_Stable_temp/src/etc/server/default/deploy/oracle-persistence-service.xml 2008-02-20 19:34:30 UTC (rev 3746)
@@ -29,10 +29,14 @@
<attribute name="CreateTablesOnStartup">true</attribute>
- <!-- If true then will use JDBC batch updates -->
+ <!-- If true then we will automatically detect and reject duplicate messages sent during failover -->
- <attribute name="UsingBatchUpdates">true</attribute>
+ <attribute name="DetectDuplicates">true</attribute>
+ <!-- The size of the id cache to use when detecting duplicate messages -->
+
+ <attribute name="IDCacheSize">500</attribute>
+
<!-- Some databases don't support inserting blobs using INSERT INTO ... SELECT FROM -->
<attribute name="SupportsBlobOnSelect">false</attribute>
Modified: branches/Branch_Stable_temp/src/etc/server/default/deploy/postgresql-persistence-service.xml
===================================================================
--- branches/Branch_Stable_temp/src/etc/server/default/deploy/postgresql-persistence-service.xml 2008-02-20 19:10:31 UTC (rev 3745)
+++ branches/Branch_Stable_temp/src/etc/server/default/deploy/postgresql-persistence-service.xml 2008-02-20 19:34:30 UTC (rev 3746)
@@ -29,10 +29,14 @@
<attribute name="CreateTablesOnStartup">true</attribute>
- <!-- If true then will use JDBC batch updates -->
+ <!-- If true then we will automatically detect and reject duplicate messages sent during failover -->
- <attribute name="UsingBatchUpdates">true</attribute>
+ <attribute name="DetectDuplicates">true</attribute>
+ <!-- The size of the id cache to use when detecting duplicate messages -->
+
+ <attribute name="IDCacheSize">500</attribute>
+
<attribute name="SqlProperties"><![CDATA[
CREATE_DUAL=CREATE TABLE JBM_DUAL (DUMMY INTEGER, PRIMARY KEY (DUMMY))
CREATE_MESSAGE_REFERENCE=CREATE TABLE JBM_MSG_REF (MESSAGE_ID BIGINT, CHANNEL_ID BIGINT, TRANSACTION_ID BIGINT, STATE CHAR(1), ORD BIGINT, PAGE_ORD BIGINT, DELIVERY_COUNT INTEGER, SCHED_DELIVERY BIGINT, PRIMARY KEY(MESSAGE_ID, CHANNEL_ID))
Modified: branches/Branch_Stable_temp/src/etc/server/default/deploy/sybase-persistence-service.xml
===================================================================
--- branches/Branch_Stable_temp/src/etc/server/default/deploy/sybase-persistence-service.xml 2008-02-20 19:10:31 UTC (rev 3745)
+++ branches/Branch_Stable_temp/src/etc/server/default/deploy/sybase-persistence-service.xml 2008-02-20 19:34:30 UTC (rev 3746)
@@ -29,10 +29,14 @@
<attribute name="CreateTablesOnStartup">true</attribute>
- <!-- If true then will use JDBC batch updates -->
+ <!-- If true then we will automatically detect and reject duplicate messages sent during failover -->
- <attribute name="UsingBatchUpdates">true</attribute>
+ <attribute name="DetectDuplicates">true</attribute>
+ <!-- The size of the id cache to use when detecting duplicate messages -->
+
+ <attribute name="IDCacheSize">500</attribute>
+
<!-- If true then will add a trailing byte to all byte arrays otherwise Sybase truncates them
Only known to be necessary for Sybase -->
Modified: branches/Branch_Stable_temp/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java
===================================================================
--- branches/Branch_Stable_temp/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java 2008-02-20 19:10:31 UTC (rev 3745)
+++ branches/Branch_Stable_temp/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java 2008-02-20 19:34:30 UTC (rev 3746)
@@ -1581,8 +1581,10 @@
try
{
- pos = idCacheCounter++;
+ pos = idCacheCounter;
+ idCacheCounter++;
+
if (idCacheCounter == idCacheSize)
{
idCacheCounter = 0;
@@ -1654,7 +1656,7 @@
rs = st.executeQuery();
- int maxCounter = 0;
+ int maxCounter = -1;
int c = 0;
More information about the jboss-cvs-commits
mailing list