Repository: nifi Updated Branches: refs/heads/master 7bbb5a823 -> 82c5126f3
NIFI-5494 - Added ExpressionLanguage support to 'Hive Configuration Resources' Signed-off-by: Pierre Villard <[email protected]> This closes #2946. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/82c5126f Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/82c5126f Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/82c5126f Branch: refs/heads/master Commit: 82c5126f3c94fd075bd5bb7bcef187c3507faaea Parents: 7bbb5a8 Author: zenfenan <[email protected]> Authored: Sun Aug 12 20:23:02 2018 +0530 Committer: Pierre Villard <[email protected]> Committed: Wed Aug 22 13:04:21 2018 +0200 ---------------------------------------------------------------------- .../java/org/apache/nifi/processors/hive/PutHiveStreaming.java | 3 ++- .../java/org/apache/nifi/processors/hive/PutHive3Streaming.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/82c5126f/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/PutHiveStreaming.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/PutHiveStreaming.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/PutHiveStreaming.java index 40ba9e2..450f157 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/PutHiveStreaming.java +++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/PutHiveStreaming.java @@ -182,6 +182,7 @@ public class PutHiveStreaming extends AbstractSessionFactoryProcessor { + "Please see the Hive documentation for more details.") .required(false) .addValidator(HiveUtils.createMultipleFilesExistValidator()) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) .build(); public static final PropertyDescriptor DB_NAME = new PropertyDescriptor.Builder() @@ -424,7 +425,7 @@ public class PutHiveStreaming extends AbstractSessionFactoryProcessor { ComponentLog log = getLogger(); final Integer heartbeatInterval = context.getProperty(HEARTBEAT_INTERVAL).evaluateAttributeExpressions().asInteger(); - final String configFiles = context.getProperty(HIVE_CONFIGURATION_RESOURCES).getValue(); + final String configFiles = context.getProperty(HIVE_CONFIGURATION_RESOURCES).evaluateAttributeExpressions().getValue(); hiveConfig = hiveConfigurator.getConfigurationFromFiles(configFiles); // If more than one concurrent task, force 'hcatalog.hive.client.cache.disabled' to true http://git-wip-us.apache.org/repos/asf/nifi/blob/82c5126f/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/processors/hive/PutHive3Streaming.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/processors/hive/PutHive3Streaming.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/processors/hive/PutHive3Streaming.java index 6e87771..82843cf 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/processors/hive/PutHive3Streaming.java +++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/processors/hive/PutHive3Streaming.java @@ -133,6 +133,7 @@ public class PutHive3Streaming extends AbstractProcessor { + "Please see the Hive documentation for more details.") .required(false) .addValidator(HiveUtils.createMultipleFilesExistValidator()) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) .build(); static final PropertyDescriptor DB_NAME = new PropertyDescriptor.Builder() @@ -301,7 +302,7 @@ public class PutHive3Streaming extends AbstractProcessor { ComponentLog log = getLogger(); rollbackOnFailure = context.getProperty(ROLLBACK_ON_FAILURE).asBoolean(); - final String configFiles = context.getProperty(HIVE_CONFIGURATION_RESOURCES).getValue(); + final String configFiles = context.getProperty(HIVE_CONFIGURATION_RESOURCES).evaluateAttributeExpressions().getValue(); hiveConfig = hiveConfigurator.getConfigurationFromFiles(configFiles); // If more than one concurrent task, force 'hcatalog.hive.client.cache.disabled' to true
