This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.11.x in repository https://gitbox.apache.org/repos/asf/nifi.git
commit c44204d77c95a18a140c1c0d6077c3c0544954b1 Author: Peter Turcsanyi <[email protected]> AuthorDate: Thu Mar 12 09:31:45 2020 +0100 NIFI-7248: Atlas reporting task handles PutHive3Streaming Signed-off-by: Pierre Villard <[email protected]> This closes #4138. --- .../nifi/atlas/provenance/analyzer/PutHiveStreaming.java | 5 ++++- .../nifi/atlas/provenance/analyzer/TestPutHiveStreaming.java | 12 ++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/main/java/org/apache/nifi/atlas/provenance/analyzer/PutHiveStreaming.java b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/main/java/org/apache/nifi/atlas/provenance/analyzer/PutHiveStreaming.java index 78c37ea..de705da 100644 --- a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/main/java/org/apache/nifi/atlas/provenance/analyzer/PutHiveStreaming.java +++ b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/main/java/org/apache/nifi/atlas/provenance/analyzer/PutHiveStreaming.java @@ -37,6 +37,9 @@ public class PutHiveStreaming extends AbstractHiveAnalyzer { @Override public DataSetRefs analyze(AnalysisContext context, ProvenanceEventRecord event) { + if (event.getTransitUri() == null) { + return null; + } final URI uri = parseUri(event.getTransitUri()); final String clusterName = context.getClusterResolver().fromHostNames(uri.getHost()); @@ -55,6 +58,6 @@ public class PutHiveStreaming extends AbstractHiveAnalyzer { @Override public String targetComponentTypePattern() { - return "^PutHiveStreaming$"; + return "^PutHive(3)?Streaming$"; } } diff --git a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/test/java/org/apache/nifi/atlas/provenance/analyzer/TestPutHiveStreaming.java b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/test/java/org/apache/nifi/atlas/provenance/analyzer/TestPutHiveStreaming.java index 5184025..606f6d5 100644 --- a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/test/java/org/apache/nifi/atlas/provenance/analyzer/TestPutHiveStreaming.java +++ b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/test/java/org/apache/nifi/atlas/provenance/analyzer/TestPutHiveStreaming.java @@ -38,8 +38,16 @@ import static org.mockito.Mockito.when; public class TestPutHiveStreaming { @Test - public void testTableLineage() { - final String processorName = "PutHiveStreaming"; + public void testTableLineageHive1() { + testTableLineage("PutHiveStreaming"); + } + + @Test + public void testTableLineageHive3() { + testTableLineage("PutHive3Streaming"); + } + + private void testTableLineage(String processorName) { final String transitUri = "thrift://0.example.com:9083"; final ProvenanceEventRecord record = Mockito.mock(ProvenanceEventRecord.class); when(record.getComponentType()).thenReturn(processorName);
