[
https://issues.apache.org/jira/browse/BEAM-3125?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16327614#comment-16327614
]
ASF GitHub Bot commented on BEAM-3125:
--------------------------------------
lukecwik closed pull request #4353: [BEAM-3125] Creating FlattenRunner in Java
SDK Harness
URL: https://github.com/apache/beam/pull/4353
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/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/FlattenRunner.java
b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/FlattenRunner.java
new file mode 100644
index 00000000000..3ae267b2876
--- /dev/null
+++
b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/FlattenRunner.java
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.beam.fn.harness;
+
+import static com.google.common.collect.Iterables.getOnlyElement;
+
+import com.google.auto.service.AutoService;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Multimap;
+import java.io.IOException;
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+import org.apache.beam.fn.harness.data.BeamFnDataClient;
+import org.apache.beam.fn.harness.data.MultiplexingFnDataReceiver;
+import org.apache.beam.fn.harness.fn.ThrowingRunnable;
+import org.apache.beam.fn.harness.state.BeamFnStateClient;
+import org.apache.beam.model.pipeline.v1.RunnerApi;
+import org.apache.beam.model.pipeline.v1.RunnerApi.Coder;
+import org.apache.beam.model.pipeline.v1.RunnerApi.PCollection;
+import org.apache.beam.runners.core.construction.PTransformTranslation;
+import org.apache.beam.sdk.fn.data.FnDataReceiver;
+import org.apache.beam.sdk.options.PipelineOptions;
+import org.apache.beam.sdk.util.WindowedValue;
+
+/** Executes flatten PTransforms. */
+public class FlattenRunner<InputT>{
+ /** A registrar which provides a factory to handle flatten PTransforms. */
+ @AutoService(PTransformRunnerFactory.Registrar.class)
+ public static class Registrar implements
+ PTransformRunnerFactory.Registrar {
+
+ @Override
+ public Map<String, PTransformRunnerFactory> getPTransformRunnerFactories()
{
+ return ImmutableMap.of(
+ PTransformTranslation.FLATTEN_TRANSFORM_URN, new Factory());
+ }
+ }
+
+ /** A factory for {@link FlattenRunner}. */
+ static class Factory<InputT> implements
+ PTransformRunnerFactory<FlattenRunner<InputT>> {
+ @Override
+ public FlattenRunner<InputT> createRunnerForPTransform(
+ PipelineOptions pipelineOptions,
+ BeamFnDataClient beamFnDataClient,
+ BeamFnStateClient beamFnStateClient,
+ String pTransformId,
+ RunnerApi.PTransform pTransform,
+ Supplier<String> processBundleInstructionId,
+ Map<String, PCollection> pCollections,
+ Map<String, Coder> coders,
+ Map<String, RunnerApi.WindowingStrategy> windowingStrategies,
+ Multimap<String, FnDataReceiver<WindowedValue<?>>>
pCollectionIdsToConsumers,
+ Consumer<ThrowingRunnable> addStartFunction,
+ Consumer<ThrowingRunnable> addFinishFunction)
+ throws IOException {
+
+ // Give each input a MultiplexingFnDataReceiver to all outputs of the
flatten.
+ ImmutableSet.Builder<FnDataReceiver<WindowedValue<InputT>>>
consumersBuilder =
+ new ImmutableSet.Builder<FnDataReceiver<WindowedValue<InputT>>>();
+ String output = getOnlyElement(pTransform.getOutputsMap().values());
+ consumersBuilder.addAll((Iterable)
pCollectionIdsToConsumers.get(output));
+
+ FnDataReceiver<WindowedValue<InputT>> receiver =
+ MultiplexingFnDataReceiver.forConsumers(consumersBuilder.build());
+ FlattenRunner<InputT> runner = new FlattenRunner<>();
+
+ for (String pCollectionId : pTransform.getInputsMap().values()) {
+ pCollectionIdsToConsumers.put(pCollectionId, (FnDataReceiver)
receiver);
+ }
+
+ return runner;
+ }
+ }
+}
diff --git
a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/FlattenRunnerTest.java
b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/FlattenRunnerTest.java
new file mode 100644
index 00000000000..e6f849c23ca
--- /dev/null
+++
b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/FlattenRunnerTest.java
@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.beam.fn.harness;
+
+import static org.apache.beam.sdk.util.WindowedValue.valueInGlobalWindow;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.junit.Assert.assertThat;
+
+import com.google.common.base.Suppliers;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Multimap;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import org.apache.beam.model.pipeline.v1.RunnerApi;
+import org.apache.beam.runners.core.construction.PTransformTranslation;
+import org.apache.beam.sdk.fn.data.FnDataReceiver;
+import org.apache.beam.sdk.options.PipelineOptionsFactory;
+import org.apache.beam.sdk.util.WindowedValue;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/** Tests for {@link FlattenRunner}. */
+@RunWith(JUnit4.class)
+public class FlattenRunnerTest {
+
+ /**
+ * Create a Flatten that has 4 inputs (inputATarget1, inputATarget2,
inputBTarget, inputCTarget)
+ * and one output (mainOutput). Validate that inputs are flattened together
and directed to the
+ * output.
+ */
+ @Test
+ public void testCreatingAndProcessingDoFlatten() throws Exception {
+ String pTransformId = "pTransformId";
+ String mainOutputId = "101";
+
+ RunnerApi.FunctionSpec functionSpec =
+ RunnerApi.FunctionSpec.newBuilder()
+ .setUrn(PTransformTranslation.FLATTEN_TRANSFORM_URN)
+ .build();
+ RunnerApi.PTransform pTransform = RunnerApi.PTransform.newBuilder()
+ .setSpec(functionSpec)
+ .putInputs("inputA", "inputATarget")
+ .putInputs("inputB", "inputBTarget")
+ .putInputs("inputC", "inputCTarget")
+ .putOutputs(mainOutputId, "mainOutputTarget")
+ .build();
+
+ List<WindowedValue<String>> mainOutputValues = new ArrayList<>();
+ Multimap<String, FnDataReceiver<WindowedValue<?>>> consumers =
HashMultimap.create();
+ consumers.put("mainOutputTarget",
+ (FnDataReceiver) (FnDataReceiver<WindowedValue<String>>)
mainOutputValues::add);
+
+ new FlattenRunner.Factory<>().createRunnerForPTransform(
+ PipelineOptionsFactory.create(),
+ null /* beamFnDataClient */,
+ null /* beamFnStateClient */,
+ pTransformId,
+ pTransform,
+ Suppliers.ofInstance("57L")::get,
+ Collections.emptyMap(),
+ Collections.emptyMap(),
+ Collections.emptyMap(),
+ consumers,
+ null /* addStartFunction */,
+ null /* addFinishFunction */);
+
+ mainOutputValues.clear();
+ assertThat(consumers.keySet(), containsInAnyOrder(
+ "inputATarget", "inputBTarget", "inputCTarget", "mainOutputTarget"));
+
+
Iterables.getOnlyElement(consumers.get("inputATarget")).accept(valueInGlobalWindow("A1"));
+
Iterables.getOnlyElement(consumers.get("inputATarget")).accept(valueInGlobalWindow("A2"));
+
Iterables.getOnlyElement(consumers.get("inputBTarget")).accept(valueInGlobalWindow("B"));
+
Iterables.getOnlyElement(consumers.get("inputCTarget")).accept(valueInGlobalWindow("C"));
+ assertThat(mainOutputValues, contains(
+ valueInGlobalWindow("A1"),
+ valueInGlobalWindow("A2"),
+ valueInGlobalWindow("B"),
+ valueInGlobalWindow("C")));
+
+ mainOutputValues.clear();
+ }
+}
diff --git
a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/FnApiDoFnRunnerTest.java
b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/FnApiDoFnRunnerTest.java
index b132336d0cc..5b17bf3bc68 100644
---
a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/FnApiDoFnRunnerTest.java
+++
b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/FnApiDoFnRunnerTest.java
@@ -165,7 +165,7 @@ public void testCreatingAndProcessingDoFn() throws
Exception {
Iterables.getOnlyElement(consumers.get("inputATarget")).accept(valueInGlobalWindow("A1"));
Iterables.getOnlyElement(consumers.get("inputATarget")).accept(valueInGlobalWindow("A2"));
-
Iterables.getOnlyElement(consumers.get("inputATarget")).accept(valueInGlobalWindow("B"));
+
Iterables.getOnlyElement(consumers.get("inputBTarget")).accept(valueInGlobalWindow("B"));
assertThat(mainOutputValues, contains(
valueInGlobalWindow("MainOutputA1"),
valueInGlobalWindow("MainOutputA2"),
----------------------------------------------------------------
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]
> Portable flattens in Java SDK Harness
> -------------------------------------
>
> Key: BEAM-3125
> URL: https://issues.apache.org/jira/browse/BEAM-3125
> Project: Beam
> Issue Type: Sub-task
> Components: sdk-java-harness
> Reporter: Daniel Oliveira
> Assignee: Daniel Oliveira
> Priority: Major
> Labels: portability
>
> Add flattens to the graphs executed in the Java SDK Harness. This means
> creating the flatten nodes and wiring it up to everything.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
