NIFI-11402 - PutBigQuery fix for case sensitivity and error handling #7140
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bejancsaba
reviewed
Apr 9, 2023
| @@ -303,6 +301,7 @@ private void finishProcessing(ProcessSession session, FlowFile flowFile, StreamW | |||
| flowFile = session.putAttribute(flowFile, BigQueryAttributes.JOB_NB_RECORDS_ATTR, isBatch() ? "0" : String.valueOf(appendSuccessCount.get() * recordBatchCount)); | |||
| session.penalize(flowFile); | |||
| session.transfer(flowFile, REL_FAILURE); | |||
| error.set(null); // set error to null for next execution | |||
There was a problem hiding this comment.
Thanks for catching this. What do you think about adding a unit test covering this scenario (failing before the change and passing after it)
@Test
void testNextFlowFileProcessedWhenIntermittentErrorResolved() {
when(writeClient.createWriteStream(isA(CreateWriteStreamRequest.class))).thenReturn(writeStream);
TableSchema myTableSchema = mockTableSchema(FIELD_1_NAME, TableFieldSchema.Type.STRING, FIELD_2_NAME, TableFieldSchema.Type.STRING);
when(writeStream.getTableSchema()).thenReturn(myTableSchema);
when(streamWriter.append(isA(ProtoRows.class), isA(Long.class)))
.thenReturn(ApiFutures.immediateFailedFuture(new StatusRuntimeException(Status.INTERNAL)))
.thenReturn(ApiFutures.immediateFuture(AppendRowsResponse.newBuilder().setAppendResult(mock(AppendRowsResponse.AppendResult.class)).build()));
runner.setProperty(PutBigQuery.RETRY_COUNT, "0");
runner.enqueue(csvContentWithLines(1));
runner.enqueue(csvContentWithLines(1));
runner.run(2);
verify(streamWriter, times(2)).append(any(ProtoRows.class), anyLong());
runner.assertQueueEmpty();
runner.assertTransferCount(PutBigQuery.REL_FAILURE, 1);
runner.assertTransferCount(PutBigQuery.REL_SUCCESS, 1);
}
| @@ -434,6 +433,9 @@ private static Map<String, Object> convertMapRecord(Map<String, Object> map) { | |||
| Map<String, Object> result = new HashMap<>(); | |||
| for (String key : map.keySet()) { | |||
| Object obj = map.get(key); | |||
| // BigQuery is not case sensitive on the column names but the protobuf message | |||
| // expect all column names to be lower case | |||
| key = key.toLowerCase(); | |||
There was a problem hiding this comment.
This is good to know. Thanks.
|
Thanks for the review @bejancsaba and thanks for providing a unit test, definitely agree that's much better with one, I added it to my PR. Much appreciated. |
bejancsaba
pushed a commit
that referenced
this pull request
Apr 19, 2023
This closes #7140. Signed-off-by: Csaba Bejan <bejan.csaba@gmail.com>
|
Thanks @pvillard31 looks good, merged and backported to support/nifi-1.x as well |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
NIFI-11402
Fix case sensitivity issue, by forcing lower case on the field names.
Fix error handling by setting the error to null after the error has been processed. Otherwise, any subsequent execution would keep failing with the same error and the user would have to create a new instance of the processor.
Tracking
Please complete the following tracking steps prior to pull request creation.
Issue Tracking
Pull Request Tracking
NIFI-00000NIFI-00000Pull Request Formatting
mainbranchVerification
Please indicate the verification steps performed prior to pull request creation.
Build
mvn clean install -P contrib-checkLicensing
LICENSEandNOTICEfilesDocumentation