nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mattyb...@apache.org
Subject nifi git commit: NIFI-3540: QueryDatabaseTable Failing to Track MS SQL Max Values
Date Thu, 02 Mar 2017 15:12:15 GMT
Repository: nifi
Updated Branches:
  refs/heads/master 0d66b6dcd -> bf2f04fb5


NIFI-3540: QueryDatabaseTable Failing to Track MS SQL Max Values

Signed-off-by: Matt Burgess <mattyb149@apache.org>

This closes #1547


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/bf2f04fb
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/bf2f04fb
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/bf2f04fb

Branch: refs/heads/master
Commit: bf2f04fb5f96af854d5b6e57efb18f9a8eb544b8
Parents: 0d66b6d
Author: patricker <patricker@gmail.com>
Authored: Tue Feb 28 13:18:36 2017 -0700
Committer: Matt Burgess <mattyb149@apache.org>
Committed: Thu Mar 2 10:04:09 2017 -0500

----------------------------------------------------------------------
 .../apache/nifi/processors/standard/QueryDatabaseTable.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/bf2f04fb/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 1d898b4..c95b8cf 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
@@ -281,7 +281,7 @@ public class QueryDatabaseTable extends AbstractDatabaseFetchProcessor
{
                     try {
                         fileToProcess = session.write(fileToProcess, out -> {
                             // Max values will be updated in the state property map by the
callback
-                            final MaxValueResultSetRowCollector maxValCollector = new MaxValueResultSetRowCollector(statePropertyMap,
dbAdapter);
+                            final MaxValueResultSetRowCollector maxValCollector = new MaxValueResultSetRowCollector(tableName,
statePropertyMap, dbAdapter);
                             try {
                                 nrOfRows.set(JdbcCommon.convertToAvroStream(resultSet, out,
tableName, maxValCollector, maxRowsPerFlowFile, convertNamesForAvro));
                             } catch (SQLException | RuntimeException e) {
@@ -419,10 +419,12 @@ public class QueryDatabaseTable extends AbstractDatabaseFetchProcessor
{
     protected class MaxValueResultSetRowCollector implements JdbcCommon.ResultSetRowCallback
{
         DatabaseAdapter dbAdapter;
         Map<String, String> newColMap;
+        String tableName;
 
-        public MaxValueResultSetRowCollector(Map<String, String> stateMap, DatabaseAdapter
dbAdapter) {
+        public MaxValueResultSetRowCollector(String tableName, Map<String, String>
stateMap, DatabaseAdapter dbAdapter) {
             this.dbAdapter = dbAdapter;
             newColMap = stateMap;
+            this.tableName = tableName;
         }
 
         @Override
@@ -437,7 +439,7 @@ public class QueryDatabaseTable extends AbstractDatabaseFetchProcessor
{
                 if (nrOfColumns > 0) {
                     for (int i = 1; i <= nrOfColumns; i++) {
                         String colName = meta.getColumnName(i).toLowerCase();
-                        String fullyQualifiedMaxValueKey = getStateKey(meta.getTableName(i),
colName);
+                        String fullyQualifiedMaxValueKey = getStateKey(tableName, colName);
                         Integer type = columnTypeMap.get(fullyQualifiedMaxValueKey);
                         // Skip any columns we're not keeping track of or whose value is
null
                         if (type == null || resultSet.getObject(i) == null) {


Mime
View raw message