From 75aff523121d7a2d61b6e3e6aface9d7b98c4887 Mon Sep 17 00:00:00 2001
From: Greg Burd <gburd@onshape.com>
Date: Wed, 13 Sep 2017 08:33:48 -0400
Subject: [PATCH] Honor the ignoreCache() when selecting from UOW cache.

---
 pom.xml                                              |  2 +-
 .../core/operation/AbstractOptionalOperation.java    |  5 +++--
 .../core/operation/AbstractStatementOperation.java   | 12 ++++++++++++
 .../core/operation/AbstractStreamOperation.java      |  5 +++--
 .../net/helenus/core/operation/SelectOperation.java  | 10 ----------
 5 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0669e3b..f30e432 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.helenus</groupId>
     <artifactId>helenus-core</artifactId>
-    <version>2.0.28-SNAPSHOT</version>
+    <version>2.0.29-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>helenus</name>
diff --git a/src/main/java/net/helenus/core/operation/AbstractOptionalOperation.java b/src/main/java/net/helenus/core/operation/AbstractOptionalOperation.java
index c374f62..ba99e2a 100644
--- a/src/main/java/net/helenus/core/operation/AbstractOptionalOperation.java
+++ b/src/main/java/net/helenus/core/operation/AbstractOptionalOperation.java
@@ -74,18 +74,19 @@ public abstract class AbstractOptionalOperation<E, O extends AbstractOptionalOpe
 
       Optional<E> result = null;
       String key = getStatementCacheKey();
-      if (key != null) {
+      if (enableCache && key != null) {
         Set<E> cachedResult = (Set<E>) uow.cacheLookup(key);
         if (cachedResult != null) {
           //TODO(gburd): what about select ResultSet, Tuple... etc.?
           uowCacheHits.mark();
           logger.info("UOW({}) cache hit, {} -> {}", uow.hashCode(), key, cachedResult.toString());
           result = cachedResult.stream().findFirst();
+        } else {
+          uowCacheMiss.mark();
         }
       }
 
       if (result == null) {
-        uowCacheMiss.mark();
         ResultSet resultSet = execute(sessionOps, uow, traceContext, showValues, true);
         result = transform(resultSet);
 
diff --git a/src/main/java/net/helenus/core/operation/AbstractStatementOperation.java b/src/main/java/net/helenus/core/operation/AbstractStatementOperation.java
index ea40f87..19a0682 100644
--- a/src/main/java/net/helenus/core/operation/AbstractStatementOperation.java
+++ b/src/main/java/net/helenus/core/operation/AbstractStatementOperation.java
@@ -38,6 +38,7 @@ public abstract class AbstractStatementOperation<E, O extends AbstractStatementO
 
   public abstract Statement buildStatement(boolean cached);
 
+  protected boolean enableCache = true;
   protected boolean showValues = true;
   protected TraceContext traceContext;
   private ConsistencyLevel consistencyLevel;
@@ -52,6 +53,17 @@ public abstract class AbstractStatementOperation<E, O extends AbstractStatementO
     this.consistencyLevel = sessionOperations.getDefaultConsistencyLevel();
   }
 
+
+  public O ignoreCache(boolean enabled) {
+    enableCache = enabled;
+    return (O) this;
+  }
+
+  public O ignoreCache() {
+    enableCache = true;
+    return (O) this;
+  }
+
   public O showValues(boolean enabled) {
     this.showValues = enabled;
     return (O) this;
diff --git a/src/main/java/net/helenus/core/operation/AbstractStreamOperation.java b/src/main/java/net/helenus/core/operation/AbstractStreamOperation.java
index 6bace7a..ff80787 100644
--- a/src/main/java/net/helenus/core/operation/AbstractStreamOperation.java
+++ b/src/main/java/net/helenus/core/operation/AbstractStreamOperation.java
@@ -78,18 +78,19 @@ public abstract class AbstractStreamOperation<E, O extends AbstractStreamOperati
     try {
       Stream<E> result = null;
       String key = getStatementCacheKey();
-      if (key != null) {
+      if (enableCache && key != null) {
         Set<E> cachedResult = (Set<E>) uow.cacheLookup(key);
         if (cachedResult != null) {
           //TODO(gburd): what about select ResultSet, Tuple... etc.?
           uowCacheHits.mark();
           logger.info("UOW({}) cache hit, {} -> {}", uow.hashCode(), key, cachedResult.toString());
           result = cachedResult.stream();
+        } else {
+          uowCacheMiss.mark();
         }
       }
 
       if (result == null) {
-        uowCacheMiss.mark();
         ResultSet resultSet = execute(sessionOps, uow, traceContext, showValues, true);
         result = transform(resultSet);
 
diff --git a/src/main/java/net/helenus/core/operation/SelectOperation.java b/src/main/java/net/helenus/core/operation/SelectOperation.java
index 2040997..358eb2f 100644
--- a/src/main/java/net/helenus/core/operation/SelectOperation.java
+++ b/src/main/java/net/helenus/core/operation/SelectOperation.java
@@ -48,7 +48,6 @@ public final class SelectOperation<E> extends AbstractFilterStreamOperation<E, S
   protected List<Ordering> ordering = null;
   protected Integer limit = null;
   protected boolean allowFiltering = false;
-  protected boolean cacheEntity = false;
 
   public SelectOperation(AbstractSessionOperations sessionOperations) {
     super(sessionOperations);
@@ -77,8 +76,6 @@ public final class SelectOperation<E> extends AbstractFilterStreamOperation<E, S
 
     super(sessionOperations);
 
-    cacheEntity = entity.isCacheable();
-
     entity
         .getOrderedProperties()
         .stream()
@@ -94,8 +91,6 @@ public final class SelectOperation<E> extends AbstractFilterStreamOperation<E, S
     super(sessionOperations);
     this.rowMapper = rowMapper;
 
-    cacheEntity = entity.isCacheable();
-
     entity
         .getOrderedProperties()
         .stream()
@@ -174,11 +169,6 @@ public final class SelectOperation<E> extends AbstractFilterStreamOperation<E, S
     return this;
   }
 
-  public SelectOperation<E> ignoreCache() {
-    cacheEntity = false;
-    return this;
-  }
-
   public SelectOperation<E> limit(Integer limit) {
     this.limit = limit;
     return this;