HHH-5793 - Query and timestamp caches to use cluster cache loader

* Query and timestamp caches now use cluster cache loader instead of
state transfer in order to remain asynchronous.
* To maintain previous semantics, after query or timestamp regions have
been completely evicted, a check has been added to avoid going remote if
the region was invalid.

hibernate-infinispan/hibernate-infinispan.gradle

@@ -1,5 +1,5 @@
 dependencies {
-   infinispanVersion = '4.2.0.ALPHA3'
+   infinispanVersion = '4.2.0.CR4'
    jnpVersion = '5.0.3.GA'
 
    compile(project(':hibernate-core'))

hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseRegion.java

@@ -169,7 +169,7 @@ public abstract class BaseRegion implements Region {
    }
 
    public boolean checkValid() {
-      boolean valid = invalidateState.get() == InvalidateState.VALID;
+      boolean valid = isValid();
       if (!valid) {
          synchronized (invalidationMutex) {
             if (invalidateState.compareAndSet(InvalidateState.INVALID, InvalidateState.CLEARING)) {
@@ -188,26 +188,34 @@ public abstract class BaseRegion implements Region {
                }
             }
          }
-         valid = invalidateState.get() == InvalidateState.VALID;
+         valid = isValid();
       }
       
       return valid;
    }
 
+   protected boolean isValid() {
+      return invalidateState.get() == InvalidateState.VALID;
+   }
+
    /**
     * Performs a Infinispan <code>get(Fqn, Object)</code>
     *
     * @param key The key of the item to get
-    * @param opt any option to add to the get invocation. May be <code>null</code>
     * @param suppressTimeout should any TimeoutException be suppressed?
+    * @param flagAdapters flags to add to the get invocation
     * @return The retrieved object
-      * @throws CacheException issue managing transaction or talking to cache
+    * @throws CacheException issue managing transaction or talking to cache
     */
-   protected Object get(Object key, FlagAdapter opt, boolean suppressTimeout) throws CacheException {
+   protected Object get(Object key, boolean suppressTimeout, FlagAdapter... flagAdapters) throws CacheException {
+      CacheAdapter localCacheAdapter = cacheAdapter;
+      if (flagAdapters != null && flagAdapters.length > 0)
+         localCacheAdapter = cacheAdapter.withFlags(flagAdapters);
+
       if (suppressTimeout)
-         return cacheAdapter.getAllowingTimeout(key);
+         return localCacheAdapter.getAllowingTimeout(key);
       else
-         return cacheAdapter.get(key);
+         return localCacheAdapter.get(key);
    }
    
    public Object getOwnerForPut() {
@@ -295,4 +303,4 @@ public abstract class BaseRegion implements Region {
       }
    }
 
-}
+}

hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/query/QueryResultsRegionImpl.java

@@ -47,6 +47,13 @@ public class QueryResultsRegionImpl extends BaseTransactionalDataRegion implemen
    }
 
    public Object get(Object key) throws CacheException {
+      // If the region is not valid, skip cache store to avoid going remote to retrieve the query.
+      // The aim of this is to maintain same logic/semantics as when state transfer was configured.
+      // TODO: Once https://issues.jboss.org/browse/ISPN-835 has been resolved, revert to state transfer and remove workaround
+      boolean skipCacheStore = false;
+      if (!isValid())
+         skipCacheStore = true;
+
       if (!checkValid())
          return null;
 
@@ -55,7 +62,10 @@ public class QueryResultsRegionImpl extends BaseTransactionalDataRegion implemen
       // to avoid holding locks that would prevent updates.
       // Add a zero (or low) timeout option so we don't block
       // waiting for tx's that did a put to commit
-      return get(key, FlagAdapter.ZERO_LOCK_ACQUISITION_TIMEOUT, true);
+      if (skipCacheStore)
+         return get(key, true, FlagAdapter.ZERO_LOCK_ACQUISITION_TIMEOUT, FlagAdapter.SKIP_CACHE_STORE);
+      else
+         return get(key, true, FlagAdapter.ZERO_LOCK_ACQUISITION_TIMEOUT);
    }   
 
    public void put(Object key, Object value) throws CacheException {
@@ -83,5 +93,4 @@ public class QueryResultsRegionImpl extends BaseTransactionalDataRegion implemen
                .putAllowingTimeout(key, value);
       }
    }
-
 }

hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/timestamp/TimestampsRegionImpl.java

@@ -57,8 +57,20 @@ public class TimestampsRegionImpl extends BaseGeneralDataRegion implements Times
 
    public Object get(Object key) throws CacheException {
       Object value = localCache.get(key);
+
+      // If the region is not valid, skip cache store to avoid going remote to retrieve the query.
+      // The aim of this is to maintain same logic/semantics as when state transfer was configured.
+      // TODO: Once https://issues.jboss.org/browse/ISPN-835 has been resolved, revert to state transfer and remove workaround
+      boolean skipCacheStore = false;
+      if (!isValid())
+         skipCacheStore = true;
+
       if (value == null && checkValid()) {
-         value = get(key, null, false);
+         if (skipCacheStore)
+            value = get(key, false, FlagAdapter.SKIP_CACHE_STORE);
+         else
+            value = get(key, false);
+
          if (value != null)
             localCache.put(key, value);
       }

hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/FlagAdapter.java

@@ -35,7 +35,8 @@ public enum FlagAdapter {
    ZERO_LOCK_ACQUISITION_TIMEOUT,
    CACHE_MODE_LOCAL,
    FORCE_ASYNCHRONOUS,
-   FORCE_SYNCHRONOUS;
+   FORCE_SYNCHRONOUS,
+   SKIP_CACHE_STORE;
    
    Flag toFlag() {
       switch(this) {
@@ -47,6 +48,8 @@ public enum FlagAdapter {
             return Flag.FORCE_ASYNCHRONOUS;
          case FORCE_SYNCHRONOUS:
             return Flag.FORCE_SYNCHRONOUS;
+         case SKIP_CACHE_STORE:
+            return Flag.SKIP_CACHE_STORE;
          default:
             throw new CacheException("Unmatched Infinispan flag " + this);
       }

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

@@ -82,7 +82,6 @@
    <!-- A query cache that replicates queries. Replication is asynchronous. -->
    <namedCache name="replicated-query">
       <clustering mode="replication">
-         <stateRetrieval fetchInMemoryState="false"/>
          <async/>
       </clustering>
       <locking isolationLevel="READ_COMMITTED" concurrencyLevel="1000"
@@ -91,6 +90,16 @@
          the eviction thread will never run.  A separate executor is used for eviction in each cache. -->
       <eviction wakeUpInterval="5000" maxEntries="10000" strategy="LRU"/>
       <expiration maxIdle="100000"/>
+      <!-- State transfer forces all replication calls to be synchronous,
+           so for calls to remain async, use a cluster cache loader instead -->
+      <loaders passivation="false" shared="false" preload="false">
+         <loader class="org.infinispan.loaders.cluster.ClusterCacheLoader" fetchPersistentState="false"
+                 ignoreModifications="false" purgeOnStartup="false">
+            <properties>
+               <property name="remoteCallTimeout" value="20000"/>
+            </properties>
+         </loader>
+      </loaders>
    </namedCache>
 
    <!-- Optimized for timestamp caching. A clustered timestamp cache
@@ -98,7 +107,6 @@
         itself is configured with CacheMode=LOCAL. -->
    <namedCache name="timestamps">
       <clustering mode="replication">
-         <stateRetrieval fetchInMemoryState="true" timeout="20000"/>
          <async/>
       </clustering>
       <locking isolationLevel="READ_COMMITTED" concurrencyLevel="1000"
@@ -106,6 +114,16 @@
       <lazyDeserialization enabled="true"/>
       <!--  Don't ever evict modification timestamps -->
       <eviction wakeUpInterval="0" strategy="NONE"/>
+      <!-- State transfer forces all replication calls to be synchronous,
+           so for calls to remain async, use a cluster cache loader instead -->
+      <loaders passivation="false" shared="false" preload="false">
+         <loader class="org.infinispan.loaders.cluster.ClusterCacheLoader" fetchPersistentState="false"
+                 ignoreModifications="false" purgeOnStartup="false">
+            <properties>
+               <property name="remoteCallTimeout" value="20000"/>
+            </properties>
+         </loader>
+      </loaders>
    </namedCache>
 
 </infinispan>