[BEAM-1223] Relaxed some visibility concerns for Sum*Fn, Min*Fn, Max*Fn and MeanFn until it's supported by Dataflow.
Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/0697b059 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/0697b059 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/0697b059 Branch: refs/heads/master Commit: 0697b05956e2d431c0ec9034e239f67eeff9c040 Parents: 488de7b Author: Stas Levin <[email protected]> Authored: Tue Jan 3 20:59:22 2017 +0200 Committer: Luke Cwik <[email protected]> Committed: Tue Jan 3 14:29:05 2017 -0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/beam/sdk/transforms/Max.java | 8 ++++---- .../src/main/java/org/apache/beam/sdk/transforms/Mean.java | 6 +++--- .../src/main/java/org/apache/beam/sdk/transforms/Min.java | 8 ++++---- .../src/main/java/org/apache/beam/sdk/transforms/Sum.java | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/0697b059/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Max.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Max.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Max.java index 91851bc..69aaaf2 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Max.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Max.java @@ -212,7 +212,7 @@ public class Max { ///////////////////////////////////////////////////////////////////////////// - private static class MaxFn<T> extends BinaryCombineFn<T> { + public static class MaxFn<T> extends BinaryCombineFn<T> { private final T identity; private final Comparator<? super T> comparator; @@ -241,7 +241,7 @@ public class Max { } } - private static class MaxIntegerFn extends Combine.BinaryCombineIntegerFn { + public static class MaxIntegerFn extends Combine.BinaryCombineIntegerFn { @Override public int apply(int left, int right) { @@ -254,7 +254,7 @@ public class Max { } } - private static class MaxLongFn extends Combine.BinaryCombineLongFn { + public static class MaxLongFn extends Combine.BinaryCombineLongFn { @Override public long apply(long left, long right) { @@ -267,7 +267,7 @@ public class Max { } } - private static class MaxDoubleFn extends Combine.BinaryCombineDoubleFn { + public static class MaxDoubleFn extends Combine.BinaryCombineDoubleFn { @Override public double apply(double left, double right) { http://git-wip-us.apache.org/repos/asf/beam/blob/0697b059/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Mean.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Mean.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Mean.java index 7e62e9d..d650f07 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Mean.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Mean.java @@ -64,7 +64,7 @@ public class Mean { * @param <NumT> the type of the {@code Number}s being combined */ public static <NumT extends Number> Combine.Globally<NumT, Double> globally() { - return Combine.<NumT, Double>globally(new MeanFn<>()); + return Combine.<NumT, Double>globally(Mean.<NumT>of()); } /** @@ -81,7 +81,7 @@ public class Mean { * @param <NumT> the type of the {@code Number}s being combined */ public static <K, NumT extends Number> Combine.PerKey<K, NumT, Double> perKey() { - return Combine.<K, NumT, Double>perKey(new MeanFn<>()); + return Combine.<K, NumT, Double>perKey(Mean.<NumT>of()); } /** @@ -101,7 +101,7 @@ public class Mean { ///////////////////////////////////////////////////////////////////////////// - private static class MeanFn<NumT extends Number> + public static class MeanFn<NumT extends Number> extends Combine.AccumulatingCombineFn<NumT, CountSum<NumT>, Double> { /** * Constructs a combining function that computes the mean over http://git-wip-us.apache.org/repos/asf/beam/blob/0697b059/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Min.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Min.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Min.java index 109f4e5..ce3b64a 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Min.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Min.java @@ -212,7 +212,7 @@ public class Min { ///////////////////////////////////////////////////////////////////////////// - private static class MinFn<T> extends BinaryCombineFn<T> { + public static class MinFn<T> extends BinaryCombineFn<T> { private final T identity; private final Comparator<? super T> comparator; @@ -241,7 +241,7 @@ public class Min { } } - private static class MinIntegerFn extends Combine.BinaryCombineIntegerFn { + public static class MinIntegerFn extends Combine.BinaryCombineIntegerFn { @Override public int apply(int left, int right) { @@ -254,7 +254,7 @@ public class Min { } } - private static class MinLongFn extends Combine.BinaryCombineLongFn { + public static class MinLongFn extends Combine.BinaryCombineLongFn { @Override public long apply(long left, long right) { @@ -267,7 +267,7 @@ public class Min { } } - private static class MinDoubleFn extends Combine.BinaryCombineDoubleFn { + public static class MinDoubleFn extends Combine.BinaryCombineDoubleFn { @Override public double apply(double left, double right) { http://git-wip-us.apache.org/repos/asf/beam/blob/0697b059/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Sum.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Sum.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Sum.java index ccade4d..4e0f680 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Sum.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Sum.java @@ -140,7 +140,7 @@ public class Sum { ///////////////////////////////////////////////////////////////////////////// - private static class SumIntegerFn extends Combine.BinaryCombineIntegerFn { + public static class SumIntegerFn extends Combine.BinaryCombineIntegerFn { @Override public int apply(int a, int b) { @@ -153,7 +153,7 @@ public class Sum { } } - private static class SumLongFn extends Combine.BinaryCombineLongFn { + public static class SumLongFn extends Combine.BinaryCombineLongFn { @Override public long apply(long a, long b) { @@ -166,7 +166,7 @@ public class Sum { } } - private static class SumDoubleFn extends Combine.BinaryCombineDoubleFn { + public static class SumDoubleFn extends Combine.BinaryCombineDoubleFn { @Override public double apply(double a, double b) {
