fixup with metaget

Author: Shih-Hao Yeh

evcache-core/src/main/java/com/netflix/evcache/EVCacheImpl.java

@@ -117,6 +117,7 @@ public class EVCacheImpl implements EVCache, EVCacheImplMBean {
     private final Property<Boolean> bypassAddOpt;
     private final Property<Boolean> bypassFixup;
     private final Property<Boolean> fixupAsFail;
+    private final Property<Boolean> fixupVer2;
 
     EVCacheImpl(String appName, String cacheName, int timeToLive, Transcoder<?> transcoder, boolean enableZoneFallback,
             boolean throwException, EVCacheClientPoolManager poolManager) {
@@ -175,9 +176,10 @@ public class EVCacheImpl implements EVCache, EVCacheImplMBean {
         this.maxKeyLength = propertyRepository.get(_appName + ".max.key.length", Integer.class).orElseGet("evcache.max.key.length").orElse(200);
 
         // bypass short-circuit optimization
-        this.bypassAddOpt = propertyRepository.get(_appName + ".bypass.add.opt", Boolean.class).orElse(false);
-        this.bypassFixup = propertyRepository.get(_appName + ".bypass.fixup", Boolean.class).orElse(false);
-        this.fixupAsFail = propertyRepository.get(_appName + ".fixup.as.fail", Boolean.class).orElse(false);
+        this.bypassAddOpt = propertyRepository.get(_appName + ".add.bypass.opt", Boolean.class).orElse(false);
+        this.bypassFixup = propertyRepository.get(_appName + ".add.bypass.fixup", Boolean.class).orElse(false);
+        this.fixupAsFail = propertyRepository.get(_appName + "add.fixup.as.fail", Boolean.class).orElse(false);
+        this.fixupVer2 = propertyRepository.get(_appName + ".add.fixup.ver2", Boolean.class).orElse(false);
 
         // if alias changes, refresh my pool to point to the correct alias app
         this.alias = propertyRepository.get("EVCacheClientPoolManager." + appName + ".alias", String.class);
@@ -3331,7 +3333,7 @@ protected <T> EVCacheLatch add(String key, T value, Transcoder<T> tc, int timeTo
                 cd = _pool.getEVCacheClientForRead().getTranscoder().encode(value);
             }
             if (clientUtil == null) clientUtil = new EVCacheClientUtil(_appName, _pool.getOperationTimeout().get());
-            latch = clientUtil.add(evcKey, cd, evcacheValueTranscoder, timeToLive, policy, clients, latchCount, fixup, bypassAddOpt.get(), fixupAsFail.get());
+            latch = clientUtil.add(evcKey, cd, evcacheValueTranscoder, timeToLive, policy, clients, latchCount, fixup, bypassAddOpt.get(), fixupAsFail.get(), fixupVer2.get());
             if (event != null) {
                 event.setTTL(timeToLive);
                 event.setCachedData(cd);

evcache-core/src/main/java/com/netflix/evcache/pool/EVCacheClientUtil.java

@@ -5,6 +5,7 @@
 import java.util.concurrent.TimeUnit;
 
 import com.netflix.evcache.EVCacheKey;
+import com.netflix.evcache.operation.EVCacheItem;
 import net.spy.memcached.MemcachedClientIF;
 import net.spy.memcached.transcoders.Transcoder;
 import org.slf4j.Logger;
@@ -49,7 +50,7 @@ public EVCacheClientUtil(String appName, long operationTimeout) {
     /**
      * TODO : once metaget is available we need to get the remaining ttl from an existing entry and use it
      */
-    public EVCacheLatch add(EVCacheKey evcKey, final CachedData cd, Transcoder evcacheValueTranscoder, int timeToLive, Policy policy, final EVCacheClient[] clients, int latchCount, boolean fixMissing, boolean bypassAddOpt, boolean fixupAsFail) throws Exception {
+    public EVCacheLatch add(EVCacheKey evcKey, final CachedData cd, Transcoder evcacheValueTranscoder, int timeToLive, Policy policy, final EVCacheClient[] clients, int latchCount, boolean fixMissing, boolean bypassAddOpt, boolean fixupAsFail, boolean newFixup) throws Exception {
         if (cd == null) return null;
 
         final EVCacheLatchImpl latch = new EVCacheLatchImpl(policy, latchCount, _appName);
@@ -83,11 +84,11 @@ public EVCacheLatch add(EVCacheKey evcKey, final CachedData cd, Transcoder evcac
                             return latch;
                         }
                         else {
-                            return fixup(client, clients, evcKey, timeToLive, policy, latch, fixupAsFail);
+                            return fixup(client, clients, evcKey, timeToLive, policy, latch, fixupAsFail, newFixup);
                         }
                     } else {
                         if (log.isDebugEnabled()) log.debug("Add failed after first client. key: " + key + ", client : " + client);
-                        return fixup(client, clients, evcKey, timeToLive, policy, latch, fixupAsFail);
+                        return fixup(client, clients, evcKey, timeToLive, policy, latch, fixupAsFail, newFixup);
                     }
                 }
                 if(firstStatus == null) firstStatus = Boolean.valueOf(status);
@@ -96,16 +97,28 @@ public EVCacheLatch add(EVCacheKey evcKey, final CachedData cd, Transcoder evcac
         return latch;
     }
 
-    private EVCacheLatch fixup(EVCacheClient sourceClient, EVCacheClient[] destClients, EVCacheKey evcKey, int timeToLive, Policy policy, EVCacheLatchImpl prevLatch, boolean fixupAsFail) {
+    private EVCacheLatch fixup(EVCacheClient sourceClient, EVCacheClient[] destClients, EVCacheKey evcKey, int timeToLive, Policy policy, EVCacheLatchImpl prevLatch, boolean fixupAsFail, boolean newFixup) {
         if (log.isDebugEnabled()) log.debug("Trying to fix up!! destClient count = " + destClients.length);
         final EVCacheLatchImpl latch = new EVCacheLatchImpl(policy, destClients.length, _appName);
         try {
-            final CachedData readData = sourceClient.get(evcKey.getDerivedKey(sourceClient.isDuetClient(), sourceClient.getHashingAlgorithm(), sourceClient.shouldEncodeHashKey(), sourceClient.getMaxDigestBytes(), sourceClient.getMaxHashLength(), sourceClient.getBaseEncoder()), ct, false, false);
+            CachedData readData = null;
+            int ttlToSet = timeToLive;
+            if (newFixup) {
+                final EVCacheItem<CachedData> obj = sourceClient.metaGet(evcKey.getDerivedKey(sourceClient.isDuetClient(), sourceClient.getHashingAlgorithm(), sourceClient.shouldEncodeHashKey(), sourceClient.getMaxDigestBytes(), sourceClient.getMaxHashLength(), sourceClient.getBaseEncoder()), ct, false, false);
+                if (obj != null) {
+                    readData = obj.getData();
+                    ttlToSet = (int) obj.getItemMetaData().getSecondsLeftToExpire();
+                    if (log.isDebugEnabled()) log.debug("Applying new fixup. ttlToSet = " + ttlToSet);
+                }
+            }
+            else {
+                 readData = sourceClient.get(evcKey.getDerivedKey(sourceClient.isDuetClient(), sourceClient.getHashingAlgorithm(), sourceClient.shouldEncodeHashKey(), sourceClient.getMaxDigestBytes(), sourceClient.getMaxHashLength(), sourceClient.getBaseEncoder()), ct, false, false);
+            }
 
             if(readData != null) {
-                sourceClient.touch(evcKey.getDerivedKey(sourceClient.isDuetClient(), sourceClient.getHashingAlgorithm(), sourceClient.shouldEncodeHashKey(), sourceClient.getMaxDigestBytes(), sourceClient.getMaxHashLength(), sourceClient.getBaseEncoder()), timeToLive);
+                sourceClient.touch(evcKey.getDerivedKey(sourceClient.isDuetClient(), sourceClient.getHashingAlgorithm(), sourceClient.shouldEncodeHashKey(), sourceClient.getMaxDigestBytes(), sourceClient.getMaxHashLength(), sourceClient.getBaseEncoder()), ttlToSet);
                 for(EVCacheClient destClient : destClients) {
-                    destClient.set(evcKey.getDerivedKey(destClient.isDuetClient(), destClient.getHashingAlgorithm(), destClient.shouldEncodeHashKey(), destClient.getMaxDigestBytes(), destClient.getMaxHashLength(), destClient.getBaseEncoder()), readData, timeToLive, latch);
+                    destClient.set(evcKey.getDerivedKey(destClient.isDuetClient(), destClient.getHashingAlgorithm(), destClient.shouldEncodeHashKey(), destClient.getMaxDigestBytes(), destClient.getMaxHashLength(), destClient.getBaseEncoder()), readData, ttlToSet, latch);
                 }
             }
             latch.await(_operationTimeout, TimeUnit.MILLISECONDS);