Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-11268 Upgrade Infinispan to version 8.2.5

This commit is contained in:
Radim Vansa 2016-11-21 13:22:30 +01:00 committed by Gail Badner
parent fe3957df0c
commit 247e6085a4
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java vendored
View File

@ -597,7 +597,7 @@ public class InfinispanRegionFactory implements RegionFactory {
} }
else if ( (suffixLoc = key.indexOf( MAX_ENTRIES_SUFFIX )) != -1 ) { else if ( (suffixLoc = key.indexOf( MAX_ENTRIES_SUFFIX )) != -1 ) {
builder = getOrCreateConfig( prefixLoc, key, suffixLoc ); builder = getOrCreateConfig( prefixLoc, key, suffixLoc );
builder.eviction().maxEntries( Long.parseLong(value) ); builder.eviction().size( Long.parseLong(value) );
} }
else if ( (suffixLoc = key.indexOf( LIFESPAN_SUFFIX )) != -1 ) { else if ( (suffixLoc = key.indexOf( LIFESPAN_SUFFIX )) != -1 ) {
builder = getOrCreateConfig( prefixLoc, key, suffixLoc ); builder = getOrCreateConfig( prefixLoc, key, suffixLoc );

8
hibernate-infinispan/src/main/resources/org/hibernate/cache/infinispan/builder/infinispan-configs-local.xml vendored
View File

@ -6,8 +6,8 @@
~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>. ~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
--> -->
<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:infinispan:config:8.0" xmlns="urn:infinispan:config:8.2"
xsi:schemaLocation="urn:infinispan:config:8.0 http://www.infinispan.org/schemas/infinispan-config-8.0.xsd"> xsi:schemaLocation="urn:infinispan:config:8.2 http://www.infinispan.org/schemas/infinispan-config-8.2.xsd">
<!-- This configuration is suitable for non-clustered environments, where only single instance accesses the DB --> <!-- This configuration is suitable for non-clustered environments, where only single instance accesses the DB -->
<cache-container name="SampleCacheManager" statistics="false" default-cache="the-default-cache" shutdown-hook="DEFAULT"> <cache-container name="SampleCacheManager" statistics="false" default-cache="the-default-cache" shutdown-hook="DEFAULT">
@ -18,14 +18,14 @@
<!-- Default configuration is appropriate for entity/collection caching. --> <!-- Default configuration is appropriate for entity/collection caching. -->
<local-cache-configuration name="entity" simple-cache="true" statistics="false" statistics-available="false"> <local-cache-configuration name="entity" simple-cache="true" statistics="false" statistics-available="false">
<transaction mode="NONE" /> <transaction mode="NONE" />
<eviction max-entries="10000" strategy="LRU"/> <eviction size="10000" strategy="LRU"/>
<expiration max-idle="100000" interval="5000"/> <expiration max-idle="100000" interval="5000"/>
</local-cache-configuration> </local-cache-configuration>
<!-- A config appropriate for query caching. Does not replicate queries. --> <!-- A config appropriate for query caching. Does not replicate queries. -->
<local-cache-configuration name="local-query" simple-cache="true" statistics="false" statistics-available="false"> <local-cache-configuration name="local-query" simple-cache="true" statistics="false" statistics-available="false">
<transaction mode="NONE" /> <transaction mode="NONE" />
<eviction max-entries="10000" strategy="LRU"/> <eviction size="10000" strategy="LRU"/>
<expiration max-idle="100000" interval="5000"/> <expiration max-idle="100000" interval="5000"/>
</local-cache-configuration> </local-cache-configuration>

10
hibernate-infinispan/src/main/resources/org/hibernate/cache/infinispan/builder/infinispan-configs.xml vendored
View File

@ -6,8 +6,8 @@
~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>. ~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
--> -->
<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:infinispan:config:8.0" xmlns="urn:infinispan:config:8.2"
xsi:schemaLocation="urn:infinispan:config:8.0 http://www.infinispan.org/schemas/infinispan-config-8.0.xsd"> xsi:schemaLocation="urn:infinispan:config:8.2 http://www.infinispan.org/schemas/infinispan-config-8.2.xsd">
<jgroups> <jgroups>
<stack-file name="hibernate-jgroups" path="${hibernate.cache.infinispan.jgroups_cfg:default-configs/default-jgroups-tcp.xml}"/> <stack-file name="hibernate-jgroups" path="${hibernate.cache.infinispan.jgroups_cfg:default-configs/default-jgroups-tcp.xml}"/>
@ -23,7 +23,7 @@
<invalidation-cache-configuration name="entity" mode="SYNC" remote-timeout="20000" statistics="false" statistics-available="false"> <invalidation-cache-configuration name="entity" mode="SYNC" remote-timeout="20000" statistics="false" statistics-available="false">
<locking concurrency-level="1000" acquire-timeout="15000"/> <locking concurrency-level="1000" acquire-timeout="15000"/>
<transaction mode="NONE" /> <transaction mode="NONE" />
<eviction max-entries="10000" strategy="LRU"/> <eviction size="10000" strategy="LRU"/>
<expiration max-idle="100000" interval="5000"/> <expiration max-idle="100000" interval="5000"/>
</invalidation-cache-configuration> </invalidation-cache-configuration>
@ -31,7 +31,7 @@
<local-cache-configuration name="local-query" statistics="false" statistics-available="false"> <local-cache-configuration name="local-query" statistics="false" statistics-available="false">
<locking concurrency-level="1000" acquire-timeout="15000"/> <locking concurrency-level="1000" acquire-timeout="15000"/>
<transaction mode="NONE" /> <transaction mode="NONE" />
<eviction max-entries="10000" strategy="LRU"/> <eviction size="10000" strategy="LRU"/>
<expiration max-idle="100000" interval="5000"/> <expiration max-idle="100000" interval="5000"/>
</local-cache-configuration> </local-cache-configuration>
@ -39,7 +39,7 @@
<replicated-cache-configuration name="replicated-query" mode="ASYNC" statistics="false" statistics-available="false"> <replicated-cache-configuration name="replicated-query" mode="ASYNC" statistics="false" statistics-available="false">
<locking concurrency-level="1000" acquire-timeout="15000"/> <locking concurrency-level="1000" acquire-timeout="15000"/>
<transaction mode="NONE" /> <transaction mode="NONE" />
<eviction max-entries="10000" strategy="LRU"/> <eviction size="10000" strategy="LRU"/>
<expiration max-idle="100000" interval="5000"/> <expiration max-idle="100000" interval="5000"/>
</replicated-cache-configuration> </replicated-cache-configuration>

12
hibernate-infinispan/src/test/resources/alternative-infinispan-configs.xml
View File

@ -6,8 +6,8 @@
~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>. ~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
--> -->
<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:infinispan:config:7.2" xmlns="urn:infinispan:config:8.2"
xsi:schemaLocation="urn:infinispan:config:7.2 http://www.infinispan.org/schemas/infinispan-config-7.2.xsd"> xsi:schemaLocation="urn:infinispan:config:8.2 http://www.infinispan.org/schemas/infinispan-config-8.2.xsd">
<jgroups> <jgroups>
<stack-file name="hibernate-jgroups" path="${hibernate.cache.infinispan.jgroups_cfg:default-configs/default-jgroups-tcp.xml}"/> <stack-file name="hibernate-jgroups" path="${hibernate.cache.infinispan.jgroups_cfg:default-configs/default-jgroups-tcp.xml}"/>
@ -22,7 +22,7 @@
<invalidation-cache name="entity" mode="SYNC" remote-timeout="20000"> <invalidation-cache name="entity" mode="SYNC" remote-timeout="20000">
<locking concurrency-level="1000" acquire-timeout="15000"/> <locking concurrency-level="1000" acquire-timeout="15000"/>
<transaction mode="NONE" /> <transaction mode="NONE" />
<eviction max-entries="10000" strategy="LRU"/> <eviction size="10000" strategy="LRU"/>
<expiration max-idle="100000" interval="5000"/> <expiration max-idle="100000" interval="5000"/>
</invalidation-cache> </invalidation-cache>
@ -30,7 +30,7 @@
<invalidation-cache name="immutable-entity" mode="SYNC" remote-timeout="20000"> <invalidation-cache name="immutable-entity" mode="SYNC" remote-timeout="20000">
<locking concurrency-level="1000" acquire-timeout="15000"/> <locking concurrency-level="1000" acquire-timeout="15000"/>
<transaction mode="NONE"/> <transaction mode="NONE"/>
<eviction max-entries="10000" strategy="LRU"/> <eviction size="10000" strategy="LRU"/>
<expiration max-idle="100000" interval="5000"/> <expiration max-idle="100000" interval="5000"/>
</invalidation-cache> </invalidation-cache>
@ -38,7 +38,7 @@
<local-cache name="local-query"> <local-cache name="local-query">
<locking concurrency-level="1000" acquire-timeout="15000"/> <locking concurrency-level="1000" acquire-timeout="15000"/>
<transaction mode="NONE" /> <transaction mode="NONE" />
<eviction max-entries="10000" strategy="LRU"/> <eviction size="10000" strategy="LRU"/>
<expiration max-idle="100000" interval="5000"/> <expiration max-idle="100000" interval="5000"/>
</local-cache> </local-cache>
@ -46,7 +46,7 @@
<replicated-cache name="replicated-query" mode="ASYNC"> <replicated-cache name="replicated-query" mode="ASYNC">
<locking concurrency-level="1000" acquire-timeout="15000"/> <locking concurrency-level="1000" acquire-timeout="15000"/>
<transaction mode="NONE" /> <transaction mode="NONE" />
<eviction max-entries="10000" strategy="LRU"/> <eviction size="10000" strategy="LRU"/>
<expiration max-idle="100000" interval="5000"/> <expiration max-idle="100000" interval="5000"/>
</replicated-cache> </replicated-cache>