You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2018/06/15 11:57:01 UTC
nifi git commit: NIFI-5303: Fixed QueryDatabaseTable to work with DB2
Repository: nifi
Updated Branches:
refs/heads/master 90b8e7f9f -> 0886dcb0b
NIFI-5303: Fixed QueryDatabaseTable to work with DB2
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #2788.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/0886dcb0
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/0886dcb0
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/0886dcb0
Branch: refs/heads/master
Commit: 0886dcb0b4b66712fe94d6ecbb1377d807e862a0
Parents: 90b8e7f
Author: Matthew Burgess <ma...@apache.org>
Authored: Tue Jun 12 12:26:19 2018 -0400
Committer: Pierre Villard <pi...@gmail.com>
Committed: Fri Jun 15 13:56:52 2018 +0200
----------------------------------------------------------------------
.../nifi/processors/standard/QueryDatabaseTable.java | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/0886dcb0/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryDatabaseTable.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryDatabaseTable.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryDatabaseTable.java
index c12b3b9..1dfe64c 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryDatabaseTable.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryDatabaseTable.java
@@ -367,6 +367,16 @@ public class QueryDatabaseTable extends AbstractDatabaseFetchProcessor {
if (maxFragments > 0 && fragmentIndex >= maxFragments) {
break;
}
+
+ // If we aren't splitting up the data into flow files or fragments, then the result set has been entirely fetched so don't loop back around
+ if (maxFragments == 0 && maxRowsPerFlowFile == 0) {
+ break;
+ }
+
+ // If we are splitting up the data into flow files, don't loop back around if we've gotten all results
+ if(maxRowsPerFlowFile > 0 && nrOfRows.get() < maxRowsPerFlowFile) {
+ break;
+ }
}
// Even though the maximum value and total count are known at this point, to maintain consistent behavior if Output Batch Size is set, do not store the attributes