Skip to content

NIFI-8320: Fix column mismatch in PutDatabaseRecord#5024

Closed
mattyb149 wants to merge 4 commits intoapache:mainfrom
mattyb149:NIFI-8320
Closed

NIFI-8320: Fix column mismatch in PutDatabaseRecord#5024
mattyb149 wants to merge 4 commits intoapache:mainfrom
mattyb149:NIFI-8320

Conversation

@mattyb149
Copy link
Contributor

Thank you for submitting a contribution to Apache NiFi.

Please provide a short description of the PR here:

Description of PR

There are two index mappings in PutDatabaseRecord, one for included record fields and a missing one for table columns. The code erroneously used the record field index which may not map to the same column index in the table. This change does a name lookup to get the column corresponding to the record at the field index, and uses that to determine data type.

In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:

For all changes:

  • Is there a JIRA ticket associated with this PR? Is it referenced
    in the commit message?

  • Does your PR title start with NIFI-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.

  • Has your PR been rebased against the latest commit within the target branch (typically main)?

  • Is your initial contribution a single, squashed commit? Additional commits in response to PR reviewer feedback should be made on this branch and pushed to allow change tracking. Do not squash or use --force when pushing to allow for clean monitoring of changes.

For code changes:

  • Have you ensured that the full suite of tests is executed via mvn -Pcontrib-check clean install at the root nifi folder?
  • Have you written or updated unit tests to verify your changes?
  • Have you verified that the full build is successful on JDK 8?
  • Have you verified that the full build is successful on JDK 11?
  • If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?
  • If applicable, have you updated the LICENSE file, including the main LICENSE file under nifi-assembly?
  • If applicable, have you updated the NOTICE file, including the main NOTICE file found under nifi-assembly?
  • If adding new Properties, have you added .displayName in addition to .name (programmatic access) for each of the new properties?

For documentation related changes:

  • Have you ensured that format looks appropriate for the output in which it is rendered?

Note:

Please ensure that once the PR is submitted, you check GitHub Actions CI for build issues and submit an update to your PR as soon as possible.

Copy link
Contributor

@gresockj gresockj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good overall, just a couple minor suggestions.

final ColumnDescription column = columns.get(currentFieldIndex);
int sqlType = column.dataType;
final String fieldName = currentRecord.getSchema().getField(currentFieldIndex).getFieldName();
String columnName = normalizeColumnName(currentRecord.getSchema().getField(currentFieldIndex).getFieldName(), settings.translateFieldNames);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very minor, but can you reuse fieldName here? Also, I see currentRecord.getSchema() called a couple times, could that be pulled into a local variable around line 693?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah my bad that's sloppy, I'll change it to reuse local variables for schema, field name, and columns

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

call normalizeColumnName method too many times, maybe store the columnName in a list is better.

@naddym
Copy link
Contributor

naddym commented Apr 30, 2021

@mattyb149 Can you please also include a testcase of incorrect column ordering while providing values. I ended up creating a duplicate PR #5043. However, an important testcase can be included from there. Thanks.

Copy link
Contributor

@exceptionfactory exceptionfactory left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for resolving the issue and adding the unit tests for verification @mattyb149! +1 Merging.

@asfgit asfgit closed this in 3963f66 Apr 30, 2021
@exceptionfactory
Copy link
Contributor

exceptionfactory commented Apr 30, 2021

Thanks to @gresockj, @naddym, @gardellajuanpablo, @greyp9, and @ldd200888 for the comments and contributions, very helpful!

adenes pushed a commit to adenes/nifi that referenced this pull request Jul 5, 2021
This closes apache#5024

Signed-off-by: David Handermann <exceptionfactory@apache.org>
krisztina-zsihovszki pushed a commit to krisztina-zsihovszki/nifi that referenced this pull request Jun 28, 2022
This closes apache#5024

Signed-off-by: David Handermann <exceptionfactory@apache.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants