Github user rmetzger commented on a diff in the pull request:

    https://github.com/apache/flink/pull/967#discussion_r36280632
  
    --- Diff: 
flink-optimizer/src/main/java/org/apache/flink/optimizer/plantranslate/JobGraphGenerator.java
 ---
    @@ -920,15 +928,33 @@ private JobVertex 
createBulkIterationHead(BulkPartialSolutionPlanNode pspn) {
                        }
                        
                        // reset the vertex type to iteration head
    -                   
headVertex.setInvokableClass(IterationHeadPactTask.class);
    +                   if(s.equals(BulkIterationStrategy.PLAIN) ) {
    +                           
headVertex.setInvokableClass(IterationHeadPactTask.class);
    +                   }
    +                   else if(s.equals(BulkIterationStrategy.SSP)) {
    +//                 
headVertex.setInvokableClass(ABSPIterationHeadPactTask.class);
    +                           
headVertex.setInvokableClass(SSPIterationHeadPactTask.class);
    +                   }
                        headConfig = new 
TaskConfig(headVertex.getConfiguration());
                        toReturn = null;
                } else {
                        // instantiate the head vertex and give it a no-op 
driver as the driver strategy.
                        // everything else happens in the post visit, after the 
input (the initial partial solution)
                        // is connected.
    +//<<<<<<< HEAD
                        headVertex = new JobVertex("PartialSolution 
("+iteration.getNodeName()+")");
    -                   
headVertex.setInvokableClass(IterationHeadPactTask.class);
    +//                 headVertex = new AbstractJobVertex("PartialSolution 
("+iteration.getNodeName()+")");
    +
    +                   if(s.equals(BulkIterationStrategy.PLAIN) ) {
    +                           
headVertex.setInvokableClass(IterationHeadPactTask.class);
    +                   }
    +                   else if(s.equals(BulkIterationStrategy.SSP)) {
    +//                 
headVertex.setInvokableClass(ABSPIterationHeadPactTask.class);
    +                           
headVertex.setInvokableClass(SSPIterationHeadPactTask.class);
    +                   }
    +//=======
    +//                 
headVertex.setInvokableClass(IterationHeadPactTask.class);
    +//>>>>>>> upstream/master
    --- End diff --
    
    Okay ;)


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

Reply via email to