[
https://issues.apache.org/jira/browse/BEAM-3952?focusedWorklogId=90982&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-90982
]
ASF GitHub Bot logged work on BEAM-3952:
----------------------------------------
Author: ASF GitHub Bot
Created on: 13/Apr/18 21:22
Start Date: 13/Apr/18 21:22
Worklog Time Spent: 10m
Work Description: tgroh closed pull request #4995: [BEAM-3952][BEAM-3988]
Fix GreedyPipelineFuser test
URL: https://github.com/apache/beam/pull/4995
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/graph/QueryablePipeline.java
b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/graph/QueryablePipeline.java
index 27c46fdabe3..4373d78eb58 100644
---
a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/graph/QueryablePipeline.java
+++
b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/graph/QueryablePipeline.java
@@ -110,16 +110,9 @@ private QueryablePipeline(Collection<String> transformIds,
Components components
return ids;
}
- /**
- * Returns true if the provided transform is a primitive. A primitive has no
subtransforms and
- * produces a new {@link PCollection}.
- *
- * <p>Note that this precludes primitive transforms which only consume input
and produce no
- * PCollections as output.
- */
+ /** Returns true if the provided transform is a primitive. A primitive has
no subtransforms. */
private static boolean isPrimitiveTransform(PTransform transform) {
- return transform.getSubtransformsCount() == 0
- &&
!transform.getInputsMap().values().containsAll(transform.getOutputsMap().values());
+ return transform.getSubtransformsCount() == 0;
}
private MutableNetwork<PipelineNode, PipelineEdge> buildNetwork(
diff --git
a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/graph/GreedyStageFuserTest.java
b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/graph/GreedyStageFuserTest.java
index ee64eca03e3..369160a73d5 100644
---
a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/graph/GreedyStageFuserTest.java
+++
b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/graph/GreedyStageFuserTest.java
@@ -672,6 +672,7 @@ public void materializesWithDifferentEnvConsumer() {
PTransform parDoTransform =
PTransform.newBuilder()
.putInputs("input", "impulse.out")
+ .putOutputs("out", "parDo.out")
.setSpec(
FunctionSpec.newBuilder()
.setUrn(PTransformTranslation.PAR_DO_TRANSFORM_URN)
@@ -680,20 +681,20 @@ public void materializesWithDifferentEnvConsumer() {
.setDoFn(SdkFunctionSpec.newBuilder().setEnvironmentId("common"))
.build()
.toByteString()))
- .putOutputs("out", "parDo.out")
.build();
+ PCollection parDoOutput =
PCollection.newBuilder().setUniqueName("parDo.out").build();
QueryablePipeline p =
QueryablePipeline.forPrimitivesIn(
partialComponents
.toBuilder()
.putTransforms("parDo", parDoTransform)
- .putPcollections(
- "parDo.out",
PCollection.newBuilder().setUniqueName("parDo.out").build())
+ .putPcollections("parDo.out", parDoOutput)
.putTransforms(
"window",
PTransform.newBuilder()
.putInputs("input", "parDo.out")
+ .putOutputs("output", "window.out")
.setSpec(
FunctionSpec.newBuilder()
.setUrn(PTransformTranslation.ASSIGN_WINDOWS_TRANSFORM_URN)
@@ -704,6 +705,8 @@ public void materializesWithDifferentEnvConsumer() {
.build()
.toByteString()))
.build())
+ .putPcollections(
+ "window.out",
PCollection.newBuilder().setUniqueName("window.out").build())
.putEnvironments("rare",
Environment.newBuilder().setUrl("rare").build())
.putEnvironments("common", env)
.build());
@@ -711,7 +714,9 @@ public void materializesWithDifferentEnvConsumer() {
ExecutableStage subgraph =
GreedyStageFuser.forGrpcPortRead(
p, impulseOutputNode, p.getPerElementConsumers(impulseOutputNode));
- assertThat(subgraph.getOutputPCollections(), emptyIterable());
+ assertThat(
+ subgraph.getOutputPCollections(),
+ contains(PipelineNode.pCollection("parDo.out", parDoOutput)));
assertThat(subgraph.getInputPCollection(), equalTo(impulseOutputNode));
assertThat(subgraph.getEnvironment(), equalTo(env));
assertThat(
----------------------------------------------------------------
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:
us...@infra.apache.org
Issue Time Tracking
-------------------
Worklog Id: (was: 90982)
Time Spent: 40m (was: 0.5h)
> GreedyStageFuserTest broken
> ---------------------------
>
> Key: BEAM-3952
> URL: https://issues.apache.org/jira/browse/BEAM-3952
> Project: Beam
> Issue Type: Bug
> Components: runner-core
> Reporter: Ben Sidhom
> Assignee: Thomas Groh
> Priority: Minor
> Fix For: Not applicable
>
> Time Spent: 40m
> Remaining Estimate: 0h
>
> The materializesWithDifferentEnvConsumer test is currently failing due to a
> bad assertion. The fused subgraph contains the parDo.out PCollection but the
> test expects an empty output.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
