You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by dh...@apache.org on 2016/09/13 00:40:56 UTC
[25/50] [abbrv] incubator-beam git commit: Delegate
populateDipslayData to wrapped combineFn's
Delegate populateDipslayData to wrapped combineFn's
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/60d8cd90
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/60d8cd90
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/60d8cd90
Branch: refs/heads/gearpump-runner
Commit: 60d8cd90ab9f0947baaf7b50168f8a7b570215f8
Parents: 9943fd7d
Author: Scott Wegner <sw...@google.com>
Authored: Fri Aug 19 13:32:45 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Mon Sep 12 17:40:12 2016 -0700
----------------------------------------------------------------------
.../org/apache/beam/sdk/transforms/Combine.java | 39 ++++++--------------
1 file changed, 11 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/60d8cd90/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java
index d432e15..2b89372 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java
@@ -1740,7 +1740,7 @@ public class Combine {
public static class PerKey<K, InputT, OutputT>
extends PTransform<PCollection<KV<K, InputT>>, PCollection<KV<K, OutputT>>> {
- private final transient PerKeyCombineFn<? super K, ? super InputT, ?, OutputT> fn;
+ private final PerKeyCombineFn<? super K, ? super InputT, ?, OutputT> fn;
private final DisplayData.Item<? extends Class<?>> fnDisplayData;
private final boolean fewKeys;
private final List<PCollectionView<?>> sideInputs;
@@ -1820,8 +1820,8 @@ public class Combine {
@Override
public void populateDisplayData(Builder builder) {
super.populateDisplayData(builder);
- builder.addIfNotDefault(DisplayData.item("fanout", hotKeyFanout)
- .withLabel("Key Fanout Size"), 0);
+ builder.add(DisplayData.item("fanout", hotKeyFanout)
+ .withLabel("Key Fanout Size"));
}
@Override
@@ -1866,7 +1866,7 @@ public class Combine {
public static class PerKeyWithHotKeyFanout<K, InputT, OutputT>
extends PTransform<PCollection<KV<K, InputT>>, PCollection<KV<K, OutputT>>> {
- private final transient PerKeyCombineFn<? super K, ? super InputT, ?, OutputT> fn;
+ private final PerKeyCombineFn<? super K, ? super InputT, ?, OutputT> fn;
private final DisplayData.Item<? extends Class<?>> fnDisplayData;
private final SerializableFunction<? super K, Integer> hotKeyFanout;
@@ -1955,12 +1955,7 @@ public class Combine {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
- super.populateDisplayData(builder);
- builder.add(DisplayData.item("fanoutFn", hotKeyFanout.getClass())
- .withLabel("Fanout Function"));
- if (hotKeyFanout instanceof HasDisplayData) {
- ((HasDisplayData) hotKeyFanout).populateDisplayData(builder);
- }
+ builder.include(PerKeyWithHotKeyFanout.this);
}
};
postCombine =
@@ -2008,12 +2003,7 @@ public class Combine {
}
@Override
public void populateDisplayData(DisplayData.Builder builder) {
- super.populateDisplayData(builder);
- builder.add(DisplayData.item("fanoutFn", hotKeyFanout.getClass())
- .withLabel("Fanout Function"));
- if (hotKeyFanout instanceof HasDisplayData) {
- ((HasDisplayData) hotKeyFanout).populateDisplayData(builder);
- }
+ builder.include(PerKeyWithHotKeyFanout.this);
}
};
} else {
@@ -2057,12 +2047,7 @@ public class Combine {
}
@Override
public void populateDisplayData(DisplayData.Builder builder) {
- super.populateDisplayData(builder);
- builder.add(DisplayData.item("fanoutFn", hotKeyFanout.getClass())
- .withLabel("Fanout Function"));
- if (hotKeyFanout instanceof HasDisplayData) {
- ((HasDisplayData) hotKeyFanout).populateDisplayData(builder);
- }
+ builder.include(PerKeyWithHotKeyFanout.this);
}
};
postCombine =
@@ -2111,12 +2096,7 @@ public class Combine {
}
@Override
public void populateDisplayData(DisplayData.Builder builder) {
- super.populateDisplayData(builder);
- builder.add(DisplayData.item("fanoutFn", hotKeyFanout.getClass())
- .withLabel("Fanout Function"));
- if (hotKeyFanout instanceof HasDisplayData) {
- ((HasDisplayData) hotKeyFanout).populateDisplayData(builder);
- }
+ builder.include(PerKeyWithHotKeyFanout.this);
}
};
}
@@ -2200,6 +2180,9 @@ public class Combine {
super.populateDisplayData(builder);
Combine.populateDisplayData(builder, fn, fnDisplayData);
+ if (hotKeyFanout instanceof HasDisplayData) {
+ builder.include((HasDisplayData) hotKeyFanout);
+ }
builder.add(DisplayData.item("fanoutFn", hotKeyFanout.getClass())
.withLabel("Fanout Function"));
}