Repository: samza
Updated Branches:
  refs/heads/master 46c25cf90 -> 0fb025b2e


SAMZA-1256: Improve trace logging for troubleshooting the fluent API

Author: Jacob Maes <[email protected]>

Reviewers: Jagadish <[email protected]>, Prateek Maheshwari 
<[email protected]>

Closes #155 from jmakes/operator-trace-logging


Project: http://git-wip-us.apache.org/repos/asf/samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/0fb025b2
Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/0fb025b2
Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/0fb025b2

Branch: refs/heads/master
Commit: 0fb025b2e4ffad13804501f0c58483febe1772d0
Parents: 46c25cf
Author: Jacob Maes <[email protected]>
Authored: Wed May 3 13:54:35 2017 -0700
Committer: Jacob Maes <[email protected]>
Committed: Wed May 3 13:54:35 2017 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/samza/operators/windows/WindowKey.java | 2 +-
 .../src/main/java/org/apache/samza/operators/WindowState.java   | 5 +++++
 .../main/java/org/apache/samza/operators/impl/TriggerKey.java   | 5 +++++
 .../org/apache/samza/operators/impl/WindowOperatorImpl.java     | 3 ++-
 4 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/samza/blob/0fb025b2/samza-api/src/main/java/org/apache/samza/operators/windows/WindowKey.java
----------------------------------------------------------------------
diff --git 
a/samza-api/src/main/java/org/apache/samza/operators/windows/WindowKey.java 
b/samza-api/src/main/java/org/apache/samza/operators/windows/WindowKey.java
index a1e7774..6c66654 100644
--- a/samza-api/src/main/java/org/apache/samza/operators/windows/WindowKey.java
+++ b/samza-api/src/main/java/org/apache/samza/operators/windows/WindowKey.java
@@ -52,7 +52,7 @@ public class WindowKey<K> {
   @Override
   public String toString() {
     String wndKey = "";
-    if (!(key instanceof Void)) {
+    if (!(key instanceof Void) && key != null) {
       wndKey = String.format("%s:", key.toString());
     }
     return String.format("%s%s", wndKey, paneId);

http://git-wip-us.apache.org/repos/asf/samza/blob/0fb025b2/samza-core/src/main/java/org/apache/samza/operators/WindowState.java
----------------------------------------------------------------------
diff --git 
a/samza-core/src/main/java/org/apache/samza/operators/WindowState.java 
b/samza-core/src/main/java/org/apache/samza/operators/WindowState.java
index 4e80862..801044b 100644
--- a/samza-core/src/main/java/org/apache/samza/operators/WindowState.java
+++ b/samza-core/src/main/java/org/apache/samza/operators/WindowState.java
@@ -41,4 +41,9 @@ public class WindowState<WV> {
   public long getEarliestTimestamp() {
     return earliestRecvTime;
   }
+
+  @Override
+  public String toString() {
+    return String.format("WindowState: {time=%d, value=%s}", earliestRecvTime, 
wv);
+  }
 }

http://git-wip-us.apache.org/repos/asf/samza/blob/0fb025b2/samza-core/src/main/java/org/apache/samza/operators/impl/TriggerKey.java
----------------------------------------------------------------------
diff --git 
a/samza-core/src/main/java/org/apache/samza/operators/impl/TriggerKey.java 
b/samza-core/src/main/java/org/apache/samza/operators/impl/TriggerKey.java
index 49fefc0..c089737 100644
--- a/samza-core/src/main/java/org/apache/samza/operators/impl/TriggerKey.java
+++ b/samza-core/src/main/java/org/apache/samza/operators/impl/TriggerKey.java
@@ -70,4 +70,9 @@ public class TriggerKey<WK> {
   public FiringType getType() {
     return type;
   }
+
+  @Override
+  public String toString() {
+    return String.format("TriggerKey: {type=%s, key=%s}", type, key);
+  }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/samza/blob/0fb025b2/samza-core/src/main/java/org/apache/samza/operators/impl/WindowOperatorImpl.java
----------------------------------------------------------------------
diff --git 
a/samza-core/src/main/java/org/apache/samza/operators/impl/WindowOperatorImpl.java
 
b/samza-core/src/main/java/org/apache/samza/operators/impl/WindowOperatorImpl.java
index b99f719..a297aba 100644
--- 
a/samza-core/src/main/java/org/apache/samza/operators/impl/WindowOperatorImpl.java
+++ 
b/samza-core/src/main/java/org/apache/samza/operators/impl/WindowOperatorImpl.java
@@ -109,6 +109,7 @@ public class WindowOperatorImpl<M, WK, WV> extends 
OperatorImpl<M, WindowPane<WK
 
     WindowKey<WK> storeKey =  getStoreKey(message);
     WindowState<WV> existingState = store.get(storeKey);
+    LOG.trace("Store key ({}) has existing state ({})", storeKey, 
existingState);
     WindowState<WV> newState = applyFoldFunction(existingState, message);
 
     LOG.trace("New window value: {}, earliest timestamp: {}",
@@ -185,7 +186,7 @@ public class WindowOperatorImpl<M, WK, WV> extends 
OperatorImpl<M, WindowPane<WK
     long earliestTimestamp;
 
     if (existingState == null) {
-      LOG.trace("No existing state found for key");
+      LOG.trace("No existing state found for key. Invoking initializer.");
       wv = window.getInitializer().get();
       earliestTimestamp = clock.currentTimeMillis();
     } else {

Reply via email to