NIFI-3335: Incorporated review comments

apache · Jul 26, 2017 · 16e1832 · 16e1832
1 parent be79615
commit 16e1832
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/...ors/src/main/java/org/apache/nifi/processors/standard/AbstractDatabaseFetchProcessor.java b/...ors/src/main/java/org/apache/nifi/processors/standard/AbstractDatabaseFetchProcessor.java
@@ -168,6 +168,9 @@ public abstract class AbstractDatabaseFetchProcessor extends AbstractSessionFact
 
     private static SimpleDateFormat TIME_TYPE_FORMAT = new SimpleDateFormat("HH:mm:ss.SSS");
 
+    // A Map (name to value) of initial maximum-value properties, filled at schedule-time and used at trigger-time
+    protected Map<String,String> maxValueProperties;
+
     static {
         // Load the DatabaseAdapters
         ArrayList<AllowableValue> dbAdapterValues = new ArrayList<>();

diff --git a/...dard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateTableFetch.java b/...dard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateTableFetch.java
@@ -153,6 +153,7 @@ protected Collection<ValidationResult> customValidate(ValidationContext validati
     @Override
     @OnScheduled
     public void setup(final ProcessContext context) {
+        maxValueProperties = getDefaultMaxValueProperties(context.getProperties());
         // Pre-fetch the column types if using a static table name and max-value columns
         if (!isDynamicTableName && !isDynamicMaxValues) {
             super.setup(context);
@@ -202,7 +203,6 @@ public void onTrigger(final ProcessContext context, final ProcessSessionFactory
             final Map<String, String> statePropertyMap = new HashMap<>(stateMap.toMap());
 
             // If an initial max value for column(s) has been specified using properties, and this column is not in the state manager, sync them to the state property map
-            final Map<String,String> maxValueProperties = getDefaultMaxValueProperties(context.getProperties());
             for (final Map.Entry<String, String> maxProp : maxValueProperties.entrySet()) {
                 String maxPropKey = maxProp.getKey().toLowerCase();
                 String fullyQualifiedMaxPropKey = getStateKey(tableName, maxPropKey);

diff --git a/...dard-processors/src/main/java/org/apache/nifi/processors/standard/QueryDatabaseTable.java b/...dard-processors/src/main/java/org/apache/nifi/processors/standard/QueryDatabaseTable.java
@@ -176,6 +176,7 @@ protected List<PropertyDescriptor> getSupportedPropertyDescriptors() {
 
     @OnScheduled
     public void setup(final ProcessContext context) {
+        maxValueProperties = getDefaultMaxValueProperties(context.getProperties());
         super.setup(context);
     }
 
@@ -205,8 +206,6 @@ public void onTrigger(final ProcessContext context, final ProcessSessionFactory
                 .defaultScale(context.getProperty(DEFAULT_SCALE).evaluateAttributeExpressions().asInteger())
                 .build();
 
-        final Map<String,String> maxValueProperties = getDefaultMaxValueProperties(context.getProperties());
-
         final StateManager stateManager = context.getStateManager();
         final StateMap stateMap;