You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2019/08/20 09:14:24 UTC

[nifi] branch master updated: NIFI-6562 Expose ExecutionNode in ProcessContext

This is an automated email from the ASF dual-hosted git repository.

pvillard pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/master by this push:
     new 0b74795  NIFI-6562 Expose ExecutionNode in ProcessContext
0b74795 is described below

commit 0b74795578ab929a672c07b0ee92d3912bcfa83f
Author: Peter Wicks <pa...@gmail.com>
AuthorDate: Fri Aug 16 18:18:27 2019 +0000

    NIFI-6562 Expose ExecutionNode in ProcessContext
    
    Signed-off-by: Pierre Villard <pi...@gmail.com>
    
    This closes #3656.
---
 .../src/main/java/org/apache/nifi/processor/ProcessContext.java    | 6 ++++++
 .../src/main/java/org/apache/nifi/util/MockProcessContext.java     | 6 ++++++
 .../nifi/controller/scheduling/ConnectableProcessContext.java      | 6 ++++++
 .../java/org/apache/nifi/processor/StandardProcessContext.java     | 7 +++++++
 .../src/main/java/org/apache/nifi/mock/MockProcessContext.java     | 6 ++++++
 .../org/apache/nifi/stateless/core/StatelessProcessContext.java    | 6 ++++++
 6 files changed, 37 insertions(+)

diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/ProcessContext.java b/nifi-api/src/main/java/org/apache/nifi/processor/ProcessContext.java
index 2bbe06a..ea925ec 100644
--- a/nifi-api/src/main/java/org/apache/nifi/processor/ProcessContext.java
+++ b/nifi-api/src/main/java/org/apache/nifi/processor/ProcessContext.java
@@ -24,6 +24,7 @@ import org.apache.nifi.components.PropertyValue;
 import org.apache.nifi.components.state.StateManager;
 import org.apache.nifi.context.PropertyContext;
 import org.apache.nifi.controller.ControllerServiceLookup;
+import org.apache.nifi.scheduling.ExecutionNode;
 
 /**
  * <p>
@@ -78,6 +79,11 @@ public interface ProcessContext extends PropertyContext {
     int getMaxConcurrentTasks();
 
     /**
+     * @return the Nodes where this processor will be scheduled to run.
+     */
+    ExecutionNode getExecutionNode();
+
+    /**
      * @return the annotation data configured for this processor
      */
     String getAnnotationData();
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java b/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java
index f79dfee..3e9b7e0 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java
@@ -32,6 +32,7 @@ import org.apache.nifi.processor.ProcessContext;
 import org.apache.nifi.processor.Processor;
 import org.apache.nifi.processor.Relationship;
 import org.apache.nifi.registry.VariableRegistry;
+import org.apache.nifi.scheduling.ExecutionNode;
 import org.apache.nifi.state.MockStateManager;
 import org.junit.Assert;
 
@@ -237,6 +238,11 @@ public class MockProcessContext extends MockControllerServiceLookup implements P
         return maxConcurrentTasks;
     }
 
+    @Override
+    public ExecutionNode getExecutionNode() {
+        return ExecutionNode.ALL;
+    }
+
     public void setAnnotationData(final String annotationData) {
         this.annotationData = annotationData;
     }
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/ConnectableProcessContext.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/ConnectableProcessContext.java
index 3116401..5300cb48 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/ConnectableProcessContext.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/ConnectableProcessContext.java
@@ -38,6 +38,7 @@ import org.apache.nifi.processor.DataUnit;
 import org.apache.nifi.processor.ProcessContext;
 import org.apache.nifi.processor.Relationship;
 import org.apache.nifi.processor.exception.ProcessException;
+import org.apache.nifi.scheduling.ExecutionNode;
 import org.apache.nifi.util.Connectables;
 
 /**
@@ -190,6 +191,11 @@ public class ConnectableProcessContext implements ProcessContext {
     }
 
     @Override
+    public ExecutionNode getExecutionNode() {
+        return ExecutionNode.ALL;
+    }
+
+    @Override
     public String getAnnotationData() {
         return null;
     }
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardProcessContext.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardProcessContext.java
index 6a51cc1..fd25256 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardProcessContext.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardProcessContext.java
@@ -31,6 +31,7 @@ import org.apache.nifi.controller.lifecycle.TaskTermination;
 import org.apache.nifi.controller.service.ControllerServiceProvider;
 import org.apache.nifi.encrypt.StringEncryptor;
 import org.apache.nifi.processor.exception.TerminatedTaskException;
+import org.apache.nifi.scheduling.ExecutionNode;
 import org.apache.nifi.util.Connectables;
 
 import java.util.Collection;
@@ -144,6 +145,12 @@ public class StandardProcessContext implements ProcessContext, ControllerService
     }
 
     @Override
+    public ExecutionNode getExecutionNode() {
+        verifyTaskActive();
+        return procNode.getExecutionNode();
+    }
+
+    @Override
     public String getAnnotationData() {
         verifyTaskActive();
         return procNode.getAnnotationData();
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/mock/MockProcessContext.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/mock/MockProcessContext.java
index cb17324..d97cf1c 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/mock/MockProcessContext.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/mock/MockProcessContext.java
@@ -22,6 +22,7 @@ import org.apache.nifi.components.state.StateManager;
 import org.apache.nifi.controller.ControllerServiceLookup;
 import org.apache.nifi.processor.ProcessContext;
 import org.apache.nifi.processor.Relationship;
+import org.apache.nifi.scheduling.ExecutionNode;
 
 import java.util.Collections;
 import java.util.Map;
@@ -55,6 +56,11 @@ public class MockProcessContext implements ProcessContext {
     }
 
     @Override
+    public ExecutionNode getExecutionNode() {
+        return ExecutionNode.ALL;
+    }
+
+    @Override
     public String getAnnotationData() {
         return "";
     }
diff --git a/nifi-stateless/nifi-stateless-core/src/main/java/org/apache/nifi/stateless/core/StatelessProcessContext.java b/nifi-stateless/nifi-stateless-core/src/main/java/org/apache/nifi/stateless/core/StatelessProcessContext.java
index 3d215e1..f9fcb9e 100644
--- a/nifi-stateless/nifi-stateless-core/src/main/java/org/apache/nifi/stateless/core/StatelessProcessContext.java
+++ b/nifi-stateless/nifi-stateless-core/src/main/java/org/apache/nifi/stateless/core/StatelessProcessContext.java
@@ -41,6 +41,7 @@ import org.apache.nifi.processor.ProcessContext;
 import org.apache.nifi.processor.Processor;
 import org.apache.nifi.processor.Relationship;
 import org.apache.nifi.registry.VariableRegistry;
+import org.apache.nifi.scheduling.ExecutionNode;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -196,6 +197,11 @@ public class StatelessProcessContext implements ProcessContext, ControllerServic
         return maxConcurrentTasks;
     }
 
+    @Override
+    public ExecutionNode getExecutionNode() {
+        return ExecutionNode.ALL;
+    }
+
     public void setAnnotationData(final String annotationData) {
         this.annotationData = annotationData;
     }