You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by tg...@apache.org on 2017/06/09 18:33:23 UTC
[1/2] beam git commit: Fix compile error occurs in some JDKs
Repository: beam
Updated Branches:
refs/heads/master 1c6861f22 -> 97957ea0e
Fix compile error occurs in some JDKs
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/b7ae7ecf
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/b7ae7ecf
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/b7ae7ecf
Branch: refs/heads/master
Commit: b7ae7ecffcd08b6a0ccc8296210d36b90306c171
Parents: 1c6861f
Author: Mark Liu <ma...@google.com>
Authored: Wed Jun 7 16:27:34 2017 -0700
Committer: Thomas Groh <tg...@google.com>
Committed: Fri Jun 9 10:54:12 2017 -0700
----------------------------------------------------------------------
.../runners/flink/FlinkStreamingTransformTranslators.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/b7ae7ecf/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkStreamingTransformTranslators.java
----------------------------------------------------------------------
diff --git a/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkStreamingTransformTranslators.java b/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkStreamingTransformTranslators.java
index ef46b63..fef32de 100644
--- a/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkStreamingTransformTranslators.java
+++ b/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkStreamingTransformTranslators.java
@@ -363,8 +363,13 @@ class FlinkStreamingTransformTranslators {
Map<TupleTag<?>, OutputTag<WindowedValue<?>>> tagsToOutputTags = Maps.newHashMap();
for (Map.Entry<TupleTag<?>, PValue> entry : outputs.entrySet()) {
if (!tagsToOutputTags.containsKey(entry.getKey())) {
- tagsToOutputTags.put(entry.getKey(), new OutputTag<>(entry.getKey().getId(),
- (TypeInformation) context.getTypeInfo((PCollection<?>) entry.getValue())));
+ tagsToOutputTags.put(
+ entry.getKey(),
+ new OutputTag<WindowedValue<?>>(
+ entry.getKey().getId(),
+ (TypeInformation) context.getTypeInfo((PCollection<?>) entry.getValue())
+ )
+ );
}
}
[2/2] beam git commit: This closes #3320
Posted by tg...@apache.org.
This closes #3320
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/97957ea0
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/97957ea0
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/97957ea0
Branch: refs/heads/master
Commit: 97957ea0ec1625b0e937a4f3c9ea2bee316d24d4
Parents: 1c6861f b7ae7ec
Author: Thomas Groh <tg...@google.com>
Authored: Fri Jun 9 10:54:13 2017 -0700
Committer: Thomas Groh <tg...@google.com>
Committed: Fri Jun 9 10:54:13 2017 -0700
----------------------------------------------------------------------
.../runners/flink/FlinkStreamingTransformTranslators.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------