This is an automated email from the ASF dual-hosted git repository.
turcsanyi pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 169b53feaa NIFI-11157 - Doc update for scheduling strategy for
MergeContent/Record
169b53feaa is described below
commit 169b53feaa50a1072ba793c215e0afb7330f0d6a
Author: Pierre Villard <pierre.villard...@gmail.com>
AuthorDate: Wed Mar 1 20:09:04 2023 +0100
NIFI-11157 - Doc update for scheduling strategy for MergeContent/Record
This closes #6999.
Signed-off-by: Peter Turcsanyi <turcsa...@apache.org>
---
.../main/java/org/apache/nifi/processors/standard/MergeContent.java | 3 ++-
.../src/main/java/org/apache/nifi/processors/standard/MergeRecord.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java
index d323bce37e..9dc33c3698 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java
@@ -107,7 +107,8 @@ import java.util.zip.ZipOutputStream;
@Tags({"merge", "content", "correlation", "tar", "zip", "stream",
"concatenation", "archive", "flowfile-stream", "flowfile-stream-v3"})
@CapabilityDescription("Merges a Group of FlowFiles together based on a
user-defined strategy and packages them into a single FlowFile. "
+ "It is recommended that the Processor be configured with only a
single incoming connection, as Group of FlowFiles will not be "
- + "created from FlowFiles in different connections. This processor
updates the mime.type attribute as appropriate.")
+ + "created from FlowFiles in different connections. This processor
updates the mime.type attribute as appropriate. "
+ + "NOTE: this processor should NOT be configured with Cron Driven for
the Scheduling Strategy.")
@ReadsAttributes({
@ReadsAttribute(attribute = "fragment.identifier", description =
"Applicable only if the <Merge Strategy> property is set to Defragment. "
+ "All FlowFiles with the same value for this attribute will be
bundled together."),
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeRecord.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeRecord.java
index 187bcec634..bcba47bc9b 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeRecord.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeRecord.java
@@ -76,7 +76,8 @@ import java.util.stream.Collectors;
+ "This Processor works by creating 'bins' and then adding FlowFiles to
these bins until they are full. Once a bin is full, all of the FlowFiles will
be combined into "
+ "a single output FlowFile, and that FlowFile will be routed to the
'merged' Relationship. A bin will consist of potentially many 'like FlowFiles'.
In order for two "
+ "FlowFiles to be considered 'like FlowFiles', they must have the same
Schema (as identified by the Record Reader) and, if the <Correlation Attribute
Name> property "
- + "is set, the same value for the specified attribute. See Processor Usage
and Additional Details for more information.")
+ + "is set, the same value for the specified attribute. See Processor Usage
and Additional Details for more information. NOTE: this processor should NOT be
configured "
+ + "with Cron Driven for the Scheduling Strategy.")
@ReadsAttributes({
@ReadsAttribute(attribute = "fragment.identifier", description =
"Applicable only if the <Merge Strategy> property is set to Defragment. "
+ "All FlowFiles with the same value for this attribute will be
bundled together."),
