You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ke...@apache.org on 2016/12/14 22:34:03 UTC
[1/3] incubator-beam git commit: SimpleDoFnRunner observes window if
SideInputReader is nonempty
Repository: incubator-beam
Updated Branches:
refs/heads/release-0.4.0-incubating 10bb4767a -> ea0d7f5c2
SimpleDoFnRunner observes window if SideInputReader is nonempty
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/122f0513
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/122f0513
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/122f0513
Branch: refs/heads/release-0.4.0-incubating
Commit: 122f05131c803ecaa082dfbc9ad6876b0ca467b8
Parents: 10bb476
Author: Kenneth Knowles <kl...@google.com>
Authored: Wed Dec 14 11:26:27 2016 -0800
Committer: Kenneth Knowles <kl...@google.com>
Committed: Wed Dec 14 14:00:07 2016 -0800
----------------------------------------------------------------------
.../main/java/org/apache/beam/runners/core/SimpleDoFnRunner.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/122f0513/runners/core-java/src/main/java/org/apache/beam/runners/core/SimpleDoFnRunner.java
----------------------------------------------------------------------
diff --git a/runners/core-java/src/main/java/org/apache/beam/runners/core/SimpleDoFnRunner.java b/runners/core-java/src/main/java/org/apache/beam/runners/core/SimpleDoFnRunner.java
index 0d41a8d..af7f5ca 100644
--- a/runners/core-java/src/main/java/org/apache/beam/runners/core/SimpleDoFnRunner.java
+++ b/runners/core-java/src/main/java/org/apache/beam/runners/core/SimpleDoFnRunner.java
@@ -114,7 +114,7 @@ public class SimpleDoFnRunner<InputT, OutputT> implements DoFnRunner<InputT, Out
WindowingStrategy<?, ?> windowingStrategy) {
this.fn = fn;
this.signature = DoFnSignatures.getSignature(fn.getClass());
- this.observesWindow = signature.processElement().observesWindow();
+ this.observesWindow = signature.processElement().observesWindow() || !sideInputReader.isEmpty();
this.invoker = DoFnInvokers.invokerFor(fn);
this.outputManager = outputManager;
this.mainOutputTag = mainOutputTag;
[2/3] incubator-beam git commit: Fix NPE in
StatefulParDoEvaluatorFactoryTest mocking
Posted by ke...@apache.org.
Fix NPE in StatefulParDoEvaluatorFactoryTest mocking
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/d9f24b86
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/d9f24b86
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/d9f24b86
Branch: refs/heads/release-0.4.0-incubating
Commit: d9f24b86c644ea85fd197eaab4c2d16b20a70d5f
Parents: 122f051
Author: Kenneth Knowles <kl...@google.com>
Authored: Wed Dec 14 13:12:43 2016 -0800
Committer: Kenneth Knowles <kl...@google.com>
Committed: Wed Dec 14 14:00:14 2016 -0800
----------------------------------------------------------------------
.../beam/runners/direct/StatefulParDoEvaluatorFactoryTest.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d9f24b86/runners/direct-java/src/test/java/org/apache/beam/runners/direct/StatefulParDoEvaluatorFactoryTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/StatefulParDoEvaluatorFactoryTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/StatefulParDoEvaluatorFactoryTest.java
index 7c086a1..326310b 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/StatefulParDoEvaluatorFactoryTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/StatefulParDoEvaluatorFactoryTest.java
@@ -31,6 +31,7 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import org.apache.beam.runners.direct.DirectRunner.CommittedBundle;
import org.apache.beam.runners.direct.DirectRunner.UncommittedBundle;
@@ -94,6 +95,11 @@ public class StatefulParDoEvaluatorFactoryTest implements Serializable {
public void setup() {
MockitoAnnotations.initMocks(this);
when((StateInternals<Object>) mockStepContext.stateInternals()).thenReturn(stateInternals);
+ when(mockEvaluationContext.createSideInputReader(anyList()))
+ .thenReturn(
+ SideInputContainer.create(
+ mockEvaluationContext, Collections.<PCollectionView<?>>emptyList())
+ .createReaderForViews(Collections.<PCollectionView<?>>emptyList()));
}
@Test
[3/3] incubator-beam git commit: This closes #1619
Posted by ke...@apache.org.
This closes #1619
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/ea0d7f5c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/ea0d7f5c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/ea0d7f5c
Branch: refs/heads/release-0.4.0-incubating
Commit: ea0d7f5c26fd97e8528d0614cdce8215ea05557c
Parents: 10bb476 d9f24b8
Author: Kenneth Knowles <kl...@google.com>
Authored: Wed Dec 14 14:33:04 2016 -0800
Committer: Kenneth Knowles <kl...@google.com>
Committed: Wed Dec 14 14:33:04 2016 -0800
----------------------------------------------------------------------
.../java/org/apache/beam/runners/core/SimpleDoFnRunner.java | 2 +-
.../beam/runners/direct/StatefulParDoEvaluatorFactoryTest.java | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------