Remove extra memcache ops for non-cacheable entities

stickfigure · stickfigure · commit 1261d17774e7 · 2017-06-28T13:27:30.000-07:00
Fixes issue #329
diff --git a/src/main/java/com/googlecode/objectify/cache/EntityMemcache.java b/src/main/java/com/googlecode/objectify/cache/EntityMemcache.java
@@ -325,27 +325,35 @@ public void empty(Iterable<Key> keys)
 
 	/**
 	 * Put buckets in the cache, checking for cacheability and collisions.
-	 * @return the set of keys that were *successfully* put without collision
+	 * @return the set of keys that were *successfully* handled. That includes buckets that were put without collision
+	 * and buckets that didn't need to be cached.
 	 */
 	private Set<Key> cachePutIfUntouched(Iterable<Bucket> buckets)
 	{
-		Map<Key, CasValues> payload = new HashMap<>();
+		final Map<Key, CasValues> payload = new HashMap<>();
+		final Set<Key> successes = new HashSet<>();
 
 		for (Bucket buck: buckets)
 		{
-			if (!buck.isCacheable())
+			if (!buck.isCacheable()) {
+				successes.add(buck.getKey());
 				continue;
+			}
 
 			Integer expirySeconds = cacheControl.getExpirySeconds(buck.getKey());
-			if (expirySeconds == null)
+			if (expirySeconds == null) {
+				successes.add(buck.getKey());
 				continue;
+			}
 
 			Expiration expiration = expirySeconds == 0 ? null : Expiration.byDeltaSeconds(expirySeconds);
 
 			payload.put(buck.getKey(), new CasValues(buck.iv, buck.getNextToStore(), expiration));
 		}
 
-		return this.memcache.putIfUntouched(payload);
+		successes.addAll(this.memcache.putIfUntouched(payload));
+
+		return successes;
 	}
 
 	/**
diff --git a/src/test/java/com/googlecode/objectify/test/CachingUncacheableTests.java b/src/test/java/com/googlecode/objectify/test/CachingUncacheableTests.java
@@ -9,6 +9,7 @@
 import com.google.appengine.api.memcache.MemcacheServiceFactory;
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.ObjectifyFactory;
+import com.googlecode.objectify.annotation.Cache;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
 import com.googlecode.objectify.test.util.TestBase;
@@ -35,6 +36,14 @@ static class Uncacheable {
 		String stuff;
 	}
 
+	/** */
+	@Entity
+	@Cache
+	static class Cacheable {
+		@Id Long id;
+		String stuff;
+	}
+
 	@Data
 	static class CallCounter implements InvocationHandler {
 		private final Object base;
@@ -75,6 +84,7 @@ public AsyncMemcacheService getAsyncMemcacheService(final String s) {
 		});
 
 		fact().register(Uncacheable.class);
+		fact().register(Cacheable.class);	// needed to get caching in the code path
 	}
 
 	/** */
