HHH-11268 Changes required after upgrading to Infinispan to 8.2

Author: rvansa

hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java

@@ -622,7 +622,7 @@ else if ( (suffixLoc = key.indexOf( WAKE_UP_INTERVAL_SUFFIX )) != -1
 }
 else if ( (suffixLoc = key.indexOf( MAX_ENTRIES_SUFFIX )) != -1 ) {
 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 ) {
 builder = getOrCreateConfig( prefixLoc, key, suffixLoc );

hibernate-infinispan/src/main/resources/org/hibernate/cache/infinispan/builder/infinispan-configs-local.xml

@@ -6,8 +6,8 @@
  ~ 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"
- xmlns="urn:infinispan:config:8.0"
- xsi:schemaLocation="urn:infinispan:config:8.0 http://www.infinispan.org/schemas/infinispan-config-8.0.xsd">
+ xmlns="urn:infinispan:config:8.2"
+ 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 -->
  <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. -->
  <local-cache-configuration name="entity" simple-cache="true" statistics="false" statistics-available="false">
  <transaction mode="NONE" />
- <eviction max-entries="10000" strategy="LRU"/>
+ <eviction size="10000" strategy="LRU"/>
  <expiration max-idle="100000" interval="5000"/>
  </local-cache-configuration>
 
  <!-- A config appropriate for query caching. Does not replicate queries. -->
  <local-cache-configuration name="local-query" simple-cache="true" statistics="false" statistics-available="false">
  <transaction mode="NONE" />
- <eviction max-entries="10000" strategy="LRU"/>
+ <eviction size="10000" strategy="LRU"/>
  <expiration max-idle="100000" interval="5000"/>
  </local-cache-configuration>
 

hibernate-infinispan/src/main/resources/org/hibernate/cache/infinispan/builder/infinispan-configs.xml

@@ -6,8 +6,8 @@
  ~ 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"
- xmlns="urn:infinispan:config:8.0"
- xsi:schemaLocation="urn:infinispan:config:8.0 http://www.infinispan.org/schemas/infinispan-config-8.0.xsd">
+ xmlns="urn:infinispan:config:8.2"
+ xsi:schemaLocation="urn:infinispan:config:8.2 http://www.infinispan.org/schemas/infinispan-config-8.2.xsd">
 
  <jgroups>
  <stack-file name="hibernate-jgroups" path="${hibernate.cache.infinispan.jgroups_cfg:default-configs/default-jgroups-tcp.xml}"/>
@@ -23,23 +23,23 @@
  <invalidation-cache-configuration name="entity" mode="SYNC" remote-timeout="20000" statistics="false" statistics-available="false">
  <locking concurrency-level="1000" acquire-timeout="15000"/>
  <transaction mode="NONE" />
- <eviction max-entries="10000" strategy="LRU"/>
+ <eviction size="10000" strategy="LRU"/>
  <expiration max-idle="100000" interval="5000"/>
  </invalidation-cache-configuration>
 
  <!-- A config appropriate for query caching. Does not replicate queries. -->
  <local-cache-configuration name="local-query" statistics="false" statistics-available="false">
  <locking concurrency-level="1000" acquire-timeout="15000"/>
  <transaction mode="NONE" />
- <eviction max-entries="10000" strategy="LRU"/>
+ <eviction size="10000" strategy="LRU"/>
  <expiration max-idle="100000" interval="5000"/>
  </local-cache-configuration>
 
  <!-- A query cache that replicates queries. Replication is asynchronous. -->
  <replicated-cache-configuration name="replicated-query" mode="ASYNC" statistics="false" statistics-available="false">
  <locking concurrency-level="1000" acquire-timeout="15000"/>
  <transaction mode="NONE" />
- <eviction max-entries="10000" strategy="LRU"/>
+ <eviction size="10000" strategy="LRU"/>
  <expiration max-idle="100000" interval="5000"/>
  </replicated-cache-configuration>
 

hibernate-infinispan/src/test/resources/alternative-infinispan-configs.xml

@@ -6,8 +6,8 @@
  ~ 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"
- xmlns="urn:infinispan:config:7.2"
- xsi:schemaLocation="urn:infinispan:config:7.2 http://www.infinispan.org/schemas/infinispan-config-7.2.xsd">
+ xmlns="urn:infinispan:config:8.2"
+ xsi:schemaLocation="urn:infinispan:config:8.2 http://www.infinispan.org/schemas/infinispan-config-8.2.xsd">
 
  <jgroups>
  <stack-file name="hibernate-jgroups" path="${hibernate.cache.infinispan.jgroups_cfg:default-configs/default-jgroups-tcp.xml}"/>
@@ -22,31 +22,31 @@
  <invalidation-cache name="entity" mode="SYNC" remote-timeout="20000">
  <locking concurrency-level="1000" acquire-timeout="15000"/>
  <transaction mode="NONE" />
- <eviction max-entries="10000" strategy="LRU"/>
+ <eviction size="10000" strategy="LRU"/>
  <expiration max-idle="100000" interval="5000"/>
  </invalidation-cache>
 
  <!-- Default configuration for immutable entities -->
  <invalidation-cache name="immutable-entity" mode="SYNC" remote-timeout="20000">
  <locking concurrency-level="1000" acquire-timeout="15000"/>
  <transaction mode="NONE"/>
- <eviction max-entries="10000" strategy="LRU"/>
+ <eviction size="10000" strategy="LRU"/>
  <expiration max-idle="100000" interval="5000"/>
  </invalidation-cache>
 
  <!-- A config appropriate for query caching. Does not replicate queries. -->
  <local-cache name="local-query">
  <locking concurrency-level="1000" acquire-timeout="15000"/>
  <transaction mode="NONE" />
- <eviction max-entries="10000" strategy="LRU"/>
+ <eviction size="10000" strategy="LRU"/>
  <expiration max-idle="100000" interval="5000"/>
  </local-cache>
 
  <!-- A query cache that replicates queries. Replication is asynchronous. -->
  <replicated-cache name="replicated-query" mode="ASYNC">
  <locking concurrency-level="1000" acquire-timeout="15000"/>
  <transaction mode="NONE" />
- <eviction max-entries="10000" strategy="LRU"/>
+ <eviction size="10000" strategy="LRU"/>
  <expiration max-idle="100000" interval="5000"/>
  </replicated-cache>