[ 
https://issues.apache.org/jira/browse/BEAM-3513?focusedWorklogId=94236&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-94236
 ]

ASF GitHub Bot logged work on BEAM-3513:
----------------------------------------

                Author: ASF GitHub Bot
            Created on: 23/Apr/18 18:25
            Start Date: 23/Apr/18 18:25
    Worklog Time Spent: 10m 
      Work Description: tgroh closed pull request #5119: [BEAM-3513] Removing 
PrimitiveCombineGroupedValues override w/ FnAPI.
URL: https://github.com/apache/beam/pull/5119
 
 
   

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/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java
 
b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java
index f7eca249952..43121a248e2 100644
--- 
a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java
+++ 
b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java
@@ -447,12 +447,17 @@ public static DataflowRunner fromOptions(PipelineOptions 
options) {
     overridesBuilder
         .add(
             PTransformOverride.of(
-                PTransformMatchers.classEqualTo(Reshuffle.class), new 
ReshuffleOverrideFactory()))
-        // Order is important. Streaming views almost all use Combine 
internally.
-        .add(
-            PTransformOverride.of(
-                PTransformMatchers.classEqualTo(Combine.GroupedValues.class),
-                new PrimitiveCombineGroupedValuesOverrideFactory()))
+                PTransformMatchers.classEqualTo(Reshuffle.class), new 
ReshuffleOverrideFactory()));
+    // Order is important. Streaming views almost all use Combine internally.
+    // TODO (BEAM-4118) Remove this check once combiner lifting is implemented 
for the FnAPI.
+    if (!hasExperiment(options, "beam_fn_api")) {
+      overridesBuilder
+          .add(
+              PTransformOverride.of(
+                  PTransformMatchers.classEqualTo(Combine.GroupedValues.class),
+                  new PrimitiveCombineGroupedValuesOverrideFactory()));
+    }
+    overridesBuilder
         .add(
             PTransformOverride.of(
                 PTransformMatchers.classEqualTo(ParDo.SingleOutput.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]


Issue Time Tracking
-------------------

    Worklog Id:     (was: 94236)
    Time Spent: 1h 10m  (was: 1h)

> Use portable CombinePayload in Java DataflowRunner
> --------------------------------------------------
>
>                 Key: BEAM-3513
>                 URL: https://issues.apache.org/jira/browse/BEAM-3513
>             Project: Beam
>          Issue Type: Sub-task
>          Components: runner-dataflow
>            Reporter: Kenneth Knowles
>            Assignee: Daniel Oliveira
>            Priority: Major
>              Labels: portability
>          Time Spent: 1h 10m
>  Remaining Estimate: 0h
>
> The Java-specific blobs transmitted to Dataflow need more context, in the 
> form of portability framework protos.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

Reply via email to