Repository: flink Updated Branches: refs/heads/master 0d2903541 -> a27451d8e
[FLINK-4833] properly log exceptions in CountMinHeavyHitter This closes #2660 Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/a27451d8 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/a27451d8 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/a27451d8 Branch: refs/heads/master Commit: a27451d8e75bf8b8c69e1f3e6abe3b59685649c6 Parents: 0d29035 Author: Maximilian Michels <[email protected]> Authored: Thu Oct 20 10:50:15 2016 +0200 Committer: Maximilian Michels <[email protected]> Committed: Fri Oct 21 13:57:15 2016 +0200 ---------------------------------------------------------------------- .../heavyhitters/CountMinHeavyHitter.java | 9 +++++++-- .../heavyhitters/HeavyHitterMergeException.java | 4 ++++ 2 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/a27451d8/flink-contrib/flink-operator-stats/src/main/java/org/apache/flink/contrib/operatorstatistics/heavyhitters/CountMinHeavyHitter.java ---------------------------------------------------------------------- diff --git a/flink-contrib/flink-operator-stats/src/main/java/org/apache/flink/contrib/operatorstatistics/heavyhitters/CountMinHeavyHitter.java b/flink-contrib/flink-operator-stats/src/main/java/org/apache/flink/contrib/operatorstatistics/heavyhitters/CountMinHeavyHitter.java index 0c3d202..30a6c1b 100644 --- a/flink-contrib/flink-operator-stats/src/main/java/org/apache/flink/contrib/operatorstatistics/heavyhitters/CountMinHeavyHitter.java +++ b/flink-contrib/flink-operator-stats/src/main/java/org/apache/flink/contrib/operatorstatistics/heavyhitters/CountMinHeavyHitter.java @@ -123,9 +123,9 @@ public class CountMinHeavyHitter implements HeavyHitter, Serializable { cardinality+=cmToMerge.cardinality; }catch (ClassCastException ex){ - throw new CMHeavyHitterMergeException("Both heavy hitter objects must belong to the same class"); + throw new CMHeavyHitterMergeException("Both heavy hitter objects must belong to the same class", ex); }catch (Exception ex){ - throw new CMHeavyHitterMergeException("Cannot merge count min sketches: "+ex.getMessage()); + throw new CMHeavyHitterMergeException("Cannot merge count min sketches: ", ex); } } @@ -138,9 +138,14 @@ public class CountMinHeavyHitter implements HeavyHitter, Serializable { } protected static class CMHeavyHitterMergeException extends HeavyHitterMergeException { + public CMHeavyHitterMergeException(String message) { super(message); } + + public CMHeavyHitterMergeException(String message, Throwable cause) { + super(message, cause); + } } @Override http://git-wip-us.apache.org/repos/asf/flink/blob/a27451d8/flink-contrib/flink-operator-stats/src/main/java/org/apache/flink/contrib/operatorstatistics/heavyhitters/HeavyHitterMergeException.java ---------------------------------------------------------------------- diff --git a/flink-contrib/flink-operator-stats/src/main/java/org/apache/flink/contrib/operatorstatistics/heavyhitters/HeavyHitterMergeException.java b/flink-contrib/flink-operator-stats/src/main/java/org/apache/flink/contrib/operatorstatistics/heavyhitters/HeavyHitterMergeException.java index 26175dc..7a65a53 100644 --- a/flink-contrib/flink-operator-stats/src/main/java/org/apache/flink/contrib/operatorstatistics/heavyhitters/HeavyHitterMergeException.java +++ b/flink-contrib/flink-operator-stats/src/main/java/org/apache/flink/contrib/operatorstatistics/heavyhitters/HeavyHitterMergeException.java @@ -25,4 +25,8 @@ public class HeavyHitterMergeException extends Exception { public HeavyHitterMergeException(String message) { super(message); } + + public HeavyHitterMergeException(String message, Throwable cause) { + super(message, cause); + } }
