6:27 a.m.
Author: nfilotto
Date: 2012-03-09 07:27:21 -0500 (Fri, 09 Mar 2012)
New Revision: 5831
Modified:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/infinispan/CacheKey.java
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/cache-server-configuration.xml
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/portal/cluster/infinispan-data.xml
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/distributed-cache-configuration.xml
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-infinispan-config.xml
jcr/trunk/pom.xml
Log:
EXOJCR-1789: Upgrade ISPN to 5.1.2 FINAL and indirectly to JGroups 3.0.6.Final
Modified:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/infinispan/CacheKey.java
===================================================================
---
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/infinispan/CacheKey.java 2012-03-09
12:25:55 UTC (rev 5830)
+++
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/infinispan/CacheKey.java 2012-03-09
12:27:21 UTC (rev 5831)
@@ -45,21 +45,21 @@
* the workspace is not distributed the value of this variable will be
* null to avoid consuming more memory for nothing
*/
- protected String ownerId;
+ private String ownerId;
- protected String id;
+ private String id;
- protected int hash;
+ private int hash;
/**
* The value used in case, the grouping is enabled
*/
- protected String group;
+ private String group;
/**
* The full name of the group
*/
- protected String fullGroupName;
+ private String fullGroupName;
public CacheKey()
{
@@ -74,7 +74,11 @@
{
this.ownerId = ownerId;
this.id = id;
- this.hash = id.hashCode();
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + ((ownerId == null) ? 0 : ownerId.hashCode());
+ this.hash = result;
this.group = group;
}
@@ -195,7 +199,11 @@
buf = new byte[in.readInt()];
in.readFully(buf);
id = new String(buf, Constants.DEFAULT_ENCODING);
- hash = id.hashCode();
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + ((ownerId == null) ? 0 : ownerId.hashCode());
+ hash = result;
}
/**
Modified:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/cache-server-configuration.xml
===================================================================
---
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/cache-server-configuration.xml 2012-03-09
12:25:55 UTC (rev 5830)
+++
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/cache-server-configuration.xml 2012-03-09
12:27:21 UTC (rev 5831)
@@ -33,7 +33,7 @@
<description>The parameters of the configuration</description>
<property name="configurationFile"
value="udp-mux-v3.xml"></property>
<property name="invalidationThreshold"
value="0"></property>
- <property name="numOwners" value="3"></property>
+ <property name="numOwners" value="2"></property>
<property name="numVirtualNodes"
value="1"></property>
</properties-param>
<properties-param profiles="tcp">
@@ -41,7 +41,7 @@
<description>The parameters of the configuration</description>
<property name="configurationFile"
value="tcp-mux-v3.xml"></property>
<property name="invalidationThreshold"
value="-1"></property>
- <property name="numOwners" value="3"></property>
+ <property name="numOwners" value="2"></property>
<property name="numVirtualNodes"
value="1"></property>
</properties-param>
</init-params>
Modified:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/portal/cluster/infinispan-data.xml
===================================================================
---
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/portal/cluster/infinispan-data.xml 2012-03-09
12:25:55 UTC (rev 5830)
+++
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/portal/cluster/infinispan-data.xml 2012-03-09
12:27:21 UTC (rev 5831)
@@ -49,7 +49,7 @@
<locking isolationLevel="READ_COMMITTED"
lockAcquisitionTimeout="20000" writeSkewCheck="false"
concurrencyLevel="500" useLockStriping="true"/>
<transaction
transactionManagerLookupClass="org.exoplatform.services.transaction.infinispan.JBossStandaloneJTAManagerLookup"
syncRollbackPhase="true" syncCommitPhase="true"
transactionMode="TRANSACTIONAL"/>
<jmxStatistics enabled="true"/>
- <eviction strategy="LRU" threadPolicy="DEFAULT"
maxEntries="1000000"/>
+ <eviction strategy="LIRS" threadPolicy="DEFAULT"
maxEntries="1000000"/>
<expiration wakeUpInterval="5000"/>
</default>
</infinispan>
Modified:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/distributed-cache-configuration.xml
===================================================================
---
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/distributed-cache-configuration.xml 2012-03-09
12:25:55 UTC (rev 5830)
+++
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/distributed-cache-configuration.xml 2012-03-09
12:27:21 UTC (rev 5831)
@@ -36,7 +36,7 @@
<jmxStatistics enabled="true"/>
<clustering mode="distribution">
<l1 enabled="true" invalidationThreshold="-1"/>
- <hash numOwners="3" rehashRpcTimeout="120000">
+ <hash numOwners="2" rehashRpcTimeout="120000">
<groups enabled="true"/>
</hash>
<sync replTimeout="180000"/>
@@ -48,7 +48,7 @@
<jmxStatistics enabled="true"/>
<clustering mode="distribution">
<l1 enabled="true" invalidationThreshold="-1"/>
- <hash numOwners="3" rehashRpcTimeout="120000"/>
+ <hash numOwners="2" rehashRpcTimeout="120000"/>
<sync replTimeout="180000"/>
</clustering>
</namedCache>
Modified:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-infinispan-config.xml
===================================================================
---
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-infinispan-config.xml 2012-03-09
12:25:55 UTC (rev 5830)
+++
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-infinispan-config.xml 2012-03-09
12:27:21 UTC (rev 5831)
@@ -49,7 +49,7 @@
<locking isolationLevel="READ_COMMITTED"
lockAcquisitionTimeout="20000" writeSkewCheck="false"
concurrencyLevel="500" useLockStriping="true"/>
<transaction
transactionManagerLookupClass="org.exoplatform.services.transaction.infinispan.JBossStandaloneJTAManagerLookup"
syncRollbackPhase="true" syncCommitPhase="true"/>
<jmxStatistics enabled="true"/>
- <eviction strategy="LRU" threadPolicy="DEFAULT"
maxEntries="1000000"/>
+ <eviction strategy="LIRS" threadPolicy="DEFAULT"
maxEntries="1000000"/>
<expiration wakeUpInterval="5000"/>
</default>
</infinispan>
Modified: jcr/trunk/pom.xml
===================================================================
--- jcr/trunk/pom.xml 2012-03-09 12:25:55 UTC (rev 5830)
+++ jcr/trunk/pom.xml 2012-03-09 12:27:21 UTC (rev 5831)
@@ -397,12 +397,12 @@
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core</artifactId>
- <version>5.1.1.FINAL</version>
+ <version>5.1.2.FINAL</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-cachestore-jdbc</artifactId>
- <version>5.1.1.FINAL</version>
+ <version>5.1.2.FINAL</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>