[
https://issues.apache.org/jira/browse/BEAM-2863?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16330858#comment-16330858
]
ASF GitHub Bot commented on BEAM-2863:
--------------------------------------
lukecwik closed pull request #4439: [BEAM-2863] Fix translation of side inputs
due to missing method.
URL: https://github.com/apache/beam/pull/4439
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/ForwardingPTransform.java
b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/ForwardingPTransform.java
index ccf41f3adce..532c1f17b62 100644
---
a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/ForwardingPTransform.java
+++
b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/ForwardingPTransform.java
@@ -17,6 +17,7 @@
*/
package org.apache.beam.runners.core.construction;
+import java.util.Map;
import org.apache.beam.sdk.coders.CannotProvideCoderException;
import org.apache.beam.sdk.options.PipelineOptions;
import org.apache.beam.sdk.transforms.PTransform;
@@ -24,6 +25,8 @@
import org.apache.beam.sdk.values.PCollection;
import org.apache.beam.sdk.values.PInput;
import org.apache.beam.sdk.values.POutput;
+import org.apache.beam.sdk.values.PValue;
+import org.apache.beam.sdk.values.TupleTag;
/**
* A base class for implementing {@link PTransform} overrides, which behave
identically to the
@@ -48,6 +51,11 @@ public OutputT expand(InputT input) {
return res;
}
+ @Override
+ public Map<TupleTag<?>, PValue> getAdditionalInputs() {
+ return delegate().getAdditionalInputs();
+ }
+
@Override
public void validate(PipelineOptions options) {
delegate().validate(options);
diff --git
a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/ForwardingPTransformTest.java
b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/ForwardingPTransformTest.java
index 4741b6b469a..979a978afcd 100644
---
a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/ForwardingPTransformTest.java
+++
b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/ForwardingPTransformTest.java
@@ -20,12 +20,21 @@
import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertThat;
import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import com.google.common.collect.ImmutableMap;
+import java.util.Map;
+import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.options.PipelineOptions;
+import org.apache.beam.sdk.transforms.Create;
import org.apache.beam.sdk.transforms.PTransform;
import org.apache.beam.sdk.transforms.display.DisplayData;
import org.apache.beam.sdk.values.PCollection;
+import org.apache.beam.sdk.values.PValue;
+import org.apache.beam.sdk.values.TupleTag;
import org.apache.beam.sdk.values.WindowingStrategy;
import org.junit.Before;
import org.junit.Rule;
@@ -34,7 +43,6 @@
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import org.mockito.Mock;
-import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
/**
@@ -63,10 +71,10 @@ public void setup() {
@Test
public void applyDelegates() {
@SuppressWarnings("unchecked")
- PCollection<Integer> collection = Mockito.mock(PCollection.class);
+ PCollection<Integer> collection = mock(PCollection.class);
@SuppressWarnings("unchecked")
- PCollection<String> output = Mockito.mock(PCollection.class);
- Mockito.when(delegate.expand(collection)).thenReturn(output);
+ PCollection<String> output = mock(PCollection.class);
+ when(delegate.expand(collection)).thenReturn(output);
PCollection<String> result = forwarding.expand(collection);
assertThat(result, equalTo(output));
}
@@ -74,15 +82,23 @@ public void applyDelegates() {
@Test
public void getNameDelegates() {
String name = "My_forwardingptransform-name;for!thisTest";
- Mockito.when(delegate.getName()).thenReturn(name);
+ when(delegate.getName()).thenReturn(name);
assertThat(forwarding.getName(), equalTo(name));
}
+ @Test
+ public void getAdditionalInputsDelegates() {
+ Map<TupleTag<?>, PValue> additionalInputs = ImmutableMap.<TupleTag<?>,
PValue>of(
+ new TupleTag<Object>("test_tag"),
Pipeline.create().apply(Create.of("1")));
+ when(delegate.getAdditionalInputs()).thenReturn(additionalInputs);
+ assertThat(forwarding.getAdditionalInputs(), equalTo(additionalInputs));
+ }
+
@Test
public void validateDelegates() {
@SuppressWarnings("unchecked")
- PipelineOptions options = Mockito.mock(PipelineOptions.class);
- Mockito.doThrow(RuntimeException.class).when(delegate).validate(options);
+ PipelineOptions options = mock(PipelineOptions.class);
+ doThrow(RuntimeException.class).when(delegate).validate(options);
thrown.expect(RuntimeException.class);
forwarding.validate(options);
@@ -104,16 +120,16 @@ public void getDefaultOutputCoderDelegates() throws
Exception {
PCollection.IsBounded.BOUNDED,
null /* coder */);
@SuppressWarnings("unchecked")
- Coder<String> outputCoder = Mockito.mock(Coder.class);
+ Coder<String> outputCoder = mock(Coder.class);
- Mockito.when(delegate.expand(input)).thenReturn(output);
- Mockito.when(delegate.getDefaultOutputCoder(input,
output)).thenReturn(outputCoder);
+ when(delegate.expand(input)).thenReturn(output);
+ when(delegate.getDefaultOutputCoder(input,
output)).thenReturn(outputCoder);
assertThat(forwarding.expand(input).getCoder(), equalTo(outputCoder));
}
@Test
public void populateDisplayDataDelegates() {
- Mockito.doThrow(RuntimeException.class)
+ doThrow(RuntimeException.class)
.when(delegate)
.populateDisplayData(any(DisplayData.Builder.class));
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> Add support for Side Inputs over the Fn API
> -------------------------------------------
>
> Key: BEAM-2863
> URL: https://issues.apache.org/jira/browse/BEAM-2863
> Project: Beam
> Issue Type: Improvement
> Components: beam-model
> Reporter: Luke Cwik
> Assignee: Luke Cwik
> Priority: Major
> Labels: portability
> Fix For: 2.3.0
>
>
> See:
> * https://s.apache.org/beam-side-inputs-1-pager
> * http://s.apache.org/beam-fn-api-state-api
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
