From ac7db5f2434a684fd6de2120aeefe0811140fa8d Mon Sep 17 00:00:00 2001
From: Greg Burd <gburd@onshape.com>
Date: Wed, 20 Sep 2017 10:48:47 -0400
Subject: [PATCH] Alias writeTime and ttl on SELECT/caching.  Shorten UOW log
 to avoid leaking information.

---
 .../net/helenus/core/operation/AbstractOptionalOperation.java | 2 +-
 .../net/helenus/core/operation/AbstractStreamOperation.java   | 2 +-
 src/main/java/net/helenus/core/operation/SelectOperation.java | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/net/helenus/core/operation/AbstractOptionalOperation.java b/src/main/java/net/helenus/core/operation/AbstractOptionalOperation.java
index 8083785..93ec79d 100644
--- a/src/main/java/net/helenus/core/operation/AbstractOptionalOperation.java
+++ b/src/main/java/net/helenus/core/operation/AbstractOptionalOperation.java
@@ -78,7 +78,7 @@ public abstract class AbstractOptionalOperation<E, O extends AbstractOptionalOpe
         if (cachedResult != null) {
           //TODO(gburd): what about select ResultSet, Tuple... etc.?
           uowCacheHits.mark();
-          logger.info("UOW({}) cache hit, {} -> {}", uow.hashCode(), key, cachedResult.toString());
+          logger.info("UOW({}) cache hit, {}", uow.hashCode(), key);
           result = cachedResult.stream().findFirst();
         } else {
           uowCacheMiss.mark();
diff --git a/src/main/java/net/helenus/core/operation/AbstractStreamOperation.java b/src/main/java/net/helenus/core/operation/AbstractStreamOperation.java
index 6cec8f9..57d7507 100644
--- a/src/main/java/net/helenus/core/operation/AbstractStreamOperation.java
+++ b/src/main/java/net/helenus/core/operation/AbstractStreamOperation.java
@@ -83,7 +83,7 @@ public abstract class AbstractStreamOperation<E, O extends AbstractStreamOperati
         if (cachedResult != null) {
           //TODO(gburd): what about select ResultSet, Tuple... etc.?
           uowCacheHits.mark();
-          logger.info("UOW({}) cache hit, {} -> {}", uow.hashCode(), key, cachedResult.toString());
+          logger.info("UOW({}) cache hit, {}", uow.hashCode());
           result = cachedResult.stream();
         } else {
           uowCacheMiss.mark();
diff --git a/src/main/java/net/helenus/core/operation/SelectOperation.java b/src/main/java/net/helenus/core/operation/SelectOperation.java
index c5d2fdc..81a9588 100644
--- a/src/main/java/net/helenus/core/operation/SelectOperation.java
+++ b/src/main/java/net/helenus/core/operation/SelectOperation.java
@@ -241,8 +241,8 @@ public final class SelectOperation<E> extends AbstractFilterStreamOperation<E, S
                 columnName = Iterables.getLast(prop).getColumnName().toCql(true);
               }
               if (!prop.getProperty().getDataType().isCollectionType()) {
-                selection.writeTime(columnName);
-                selection.ttl(columnName);
+                selection.writeTime(columnName).as(columnName + "_writeTime");
+                selection.ttl(columnName).as(columnName + "_ttl");
               }
             }
             break;