Repository: nifi Updated Branches: refs/heads/master f0a7dda84 -> bcfd6f0b1
NIFI-5781 - Incorrect schema for provenance events in SiteToSiteProvenanceReportingTask Signed-off-by: Matthew Burgess <mattyb...@apache.org> This closes #3123 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/bcfd6f0b Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/bcfd6f0b Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/bcfd6f0b Branch: refs/heads/master Commit: bcfd6f0b13ec9bf595652c8cf11be55b63b30ba7 Parents: f0a7dda Author: Pierre Villard <pierre.villard...@gmail.com> Authored: Thu Nov 1 15:19:06 2018 +0100 Committer: Matthew Burgess <mattyb...@apache.org> Committed: Thu Nov 1 10:58:46 2018 -0400 ---------------------------------------------------------------------- .../additionalDetails.html | 32 ++++++++++---------- .../src/main/resources/schema-provenance.avsc | 32 ++++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/bcfd6f0b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/resources/docs/org.apache.nifi.reporting.SiteToSiteProvenanceReportingTask/additionalDetails.html ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/resources/docs/org.apache.nifi.reporting.SiteToSiteProvenanceReportingTask/additionalDetails.html b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/resources/docs/org.apache.nifi.reporting.SiteToSiteProvenanceReportingTask/additionalDetails.html index 676674e..fee9e93 100644 --- a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/resources/docs/org.apache.nifi.reporting.SiteToSiteProvenanceReportingTask/additionalDetails.html +++ b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/resources/docs/org.apache.nifi.reporting.SiteToSiteProvenanceReportingTask/additionalDetails.html @@ -40,9 +40,9 @@ <pre> <code> { - "namespace": "nifi", - "name": "provenanceEvent", - "type": "record", + "type" : "record", + "name" : "provenance", + "namespace" : "provenance", "fields": [ { "name": "eventId", "type": "string" }, { "name": "eventOrdinal", "type": "long" }, @@ -50,27 +50,27 @@ { "name": "timestampMillis", "type": "long" }, { "name": "durationMillis", "type": "long" }, { "name": "lineageStart", "type": { "type": "long", "logicalType": "timestamp-millis" } }, - { "name": "details", "type": "string" }, - { "name": "componentId", "type": "string" }, - { "name": "componentType", "type": "string" }, - { "name": "componentName", "type": "string" }, - { "name": "processGroupId", "type": "string" }, - { "name": "processGroupName", "type": "string" }, - { "name": "entityId", "type": "string" }, - { "name": "entityType", "type": "string" }, + { "name": "details", "type": ["null", "string"] }, + { "name": "componentId", "type": ["null", "string"] }, + { "name": "componentType", "type": ["null", "string"] }, + { "name": "componentName", "type": ["null", "string"] }, + { "name": "processGroupId", "type": ["null", "string"] }, + { "name": "processGroupName", "type": ["null", "string"] }, + { "name": "entityId", "type": ["null", "string"] }, + { "name": "entityType", "type": ["null", "string"] }, { "name": "entitySize", "type": ["null", "long"] }, { "name": "previousEntitySize", "type": ["null", "long"] }, { "name": "updatedAttributes", "type": { "type": "map", "values": "string" } }, { "name": "previousAttributes", "type": { "type": "map", "values": "string" } }, - { "name": "actorHostname", "type": "string" }, - { "name": "contentURI", "type": "string" }, - { "name": "previousContentURI", "type": "string" }, + { "name": "actorHostname", "type": ["null", "string"] }, + { "name": "contentURI", "type": ["null", "string"] }, + { "name": "previousContentURI", "type": ["null", "string"] }, { "name": "parentIds", "type": { "type": "array", "items": "string" } }, { "name": "childIds", "type": { "type": "array", "items": "string" } }, { "name": "platform", "type": "string" }, { "name": "application", "type": "string" }, - { "name": "remoteIdentifier", "type": "string" }, - { "name": "alternateIdentifier", "type": "string" }, + { "name": "remoteIdentifier", "type": ["null", "string"] }, + { "name": "alternateIdentifier", "type": ["null", "string"] }, { "name": "transitUri", "type": ["null", "string"] } ] } http://git-wip-us.apache.org/repos/asf/nifi/blob/bcfd6f0b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/resources/schema-provenance.avsc ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/resources/schema-provenance.avsc b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/resources/schema-provenance.avsc index 840bde6..d6cdd95 100644 --- a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/resources/schema-provenance.avsc +++ b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/resources/schema-provenance.avsc @@ -1,7 +1,7 @@ { - "namespace": "nifi", - "name": "provenanceEvent", - "type": "record", + "type" : "record", + "name" : "provenance", + "namespace" : "provenance", "fields": [ { "name": "eventId", "type": "string" }, { "name": "eventOrdinal", "type": "long" }, @@ -9,27 +9,27 @@ { "name": "timestampMillis", "type": "long" }, { "name": "durationMillis", "type": "long" }, { "name": "lineageStart", "type": { "type": "long", "logicalType": "timestamp-millis" } }, - { "name": "details", "type": "string" }, - { "name": "componentId", "type": "string" }, - { "name": "componentType", "type": "string" }, - { "name": "componentName", "type": "string" }, - { "name": "processGroupId", "type": "string" }, - { "name": "processGroupName", "type": "string" }, - { "name": "entityId", "type": "string" }, - { "name": "entityType", "type": "string" }, + { "name": "details", "type": ["null", "string"] }, + { "name": "componentId", "type": ["null", "string"] }, + { "name": "componentType", "type": ["null", "string"] }, + { "name": "componentName", "type": ["null", "string"] }, + { "name": "processGroupId", "type": ["null", "string"] }, + { "name": "processGroupName", "type": ["null", "string"] }, + { "name": "entityId", "type": ["null", "string"] }, + { "name": "entityType", "type": ["null", "string"] }, { "name": "entitySize", "type": ["null", "long"] }, { "name": "previousEntitySize", "type": ["null", "long"] }, { "name": "updatedAttributes", "type": { "type": "map", "values": "string" } }, { "name": "previousAttributes", "type": { "type": "map", "values": "string" } }, - { "name": "actorHostname", "type": "string" }, - { "name": "contentURI", "type": "string" }, - { "name": "previousContentURI", "type": "string" }, + { "name": "actorHostname", "type": ["null", "string"] }, + { "name": "contentURI", "type": ["null", "string"] }, + { "name": "previousContentURI", "type": ["null", "string"] }, { "name": "parentIds", "type": { "type": "array", "items": "string" } }, { "name": "childIds", "type": { "type": "array", "items": "string" } }, { "name": "platform", "type": "string" }, { "name": "application", "type": "string" }, - { "name": "remoteIdentifier", "type": "string" }, - { "name": "alternateIdentifier", "type": "string" }, + { "name": "remoteIdentifier", "type": ["null", "string"] }, + { "name": "alternateIdentifier", "type": ["null", "string"] }, { "name": "transitUri", "type": ["null", "string"] } ] } \ No newline at end of file
