You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@nifi.apache.org by GitBox <gi...@apache.org> on 2021/03/29 22:28:16 UTC
[GitHub] [nifi] mattyb149 opened a new pull request #4951: NIFI-8376: Gracefully handle SQL exceptions in ResultSetRecordSet
mattyb149 opened a new pull request #4951:
URL: https://github.com/apache/nifi/pull/4951
Thank you for submitting a contribution to Apache NiFi.
Please provide a short description of the PR here:
#### Description of PR
Removes the call to `isAfterLast()` in favor of catching SQLFeatureNotSupportedException in `getArray()` instead, since such an exception can be thrown on either method call.
In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
### For all changes:
- [x] Is there a JIRA ticket associated with this PR? Is it referenced
in the commit message?
- [x] 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.
- [x] Has your PR been rebased against the latest commit within the target branch (typically `main`)?
- [x] 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?
- [x] Have you written or updated unit tests to verify your changes?
- [x] 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](http://www.apache.org/legal/resolved.html#category-a)?
- [ ] 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.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] exceptionfactory commented on a change in pull request #4951: NIFI-8376: Gracefully handle SQL exceptions in ResultSetRecordSet
Posted by GitBox <gi...@apache.org>.
exceptionfactory commented on a change in pull request #4951:
URL: https://github.com/apache/nifi/pull/4951#discussion_r662594551
##########
File path: nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/ResultSetRecordSetTest.java
##########
@@ -241,6 +243,45 @@ public void testCreateRecord() throws SQLException {
assertEquals(bigDecimal5Value, record.getValue(COLUMN_NAME_BIG_DECIMAL_5));
}
+ @Test(expected = SQLException.class)
+ public void testCreateSchemaArrayThrowsException() throws SQLException {
+ // given
Review comment:
Although various tests use different approaches, I recommend removing the given/when/then comments.
##########
File path: nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/ResultSetRecordSetTest.java
##########
@@ -241,6 +243,45 @@ public void testCreateRecord() throws SQLException {
assertEquals(bigDecimal5Value, record.getValue(COLUMN_NAME_BIG_DECIMAL_5));
}
+ @Test(expected = SQLException.class)
Review comment:
To provide more precision in testing, the `assertThrows()` method supports indicating the expected exception on the particular method being called. In addition, should the expected exception be `SQLFeatureNotSupportedException`?
##########
File path: nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/ResultSetRecordSetTest.java
##########
@@ -241,6 +243,45 @@ public void testCreateRecord() throws SQLException {
assertEquals(bigDecimal5Value, record.getValue(COLUMN_NAME_BIG_DECIMAL_5));
}
+ @Test(expected = SQLException.class)
+ public void testCreateSchemaArrayThrowsException() throws SQLException {
+ // given
+ final List<RecordField> fields = new ArrayList<>();
+ fields.add(new RecordField("column", RecordFieldType.DECIMAL.getDecimalDataType(30, 10)));
+ final RecordSchema recordSchema = new SimpleRecordSchema(fields);
+ final ResultSet resultSet = givenResultSetForArrayThrowsException(true);
+
+ // when
+ final ResultSetRecordSet testSubject = new ResultSetRecordSet(resultSet, recordSchema);
+ }
+
+ @Test
+ public void testCreateSchemaArrayThrowsNotSupportedException() throws SQLException {
+ // given
+ final List<RecordField> fields = new ArrayList<>();
+ fields.add(new RecordField("column", RecordFieldType.DECIMAL.getDecimalDataType(30, 10)));
+ final RecordSchema recordSchema = new SimpleRecordSchema(fields);
+ final ResultSet resultSet = givenResultSetForArrayThrowsException(false);
+
+ // when
+ final ResultSetRecordSet testSubject = new ResultSetRecordSet(resultSet, recordSchema);
+ final RecordSchema resultSchema = testSubject.getSchema();
+
+ // then
+ assertEquals(RecordFieldType.ARRAY.getArrayDataType(RecordFieldType.STRING.getDataType()), resultSchema.getField(0).getDataType());
+ }
+
+ private ResultSet givenResultSetForArrayThrowsException(boolean featureSupported) throws SQLException {
+ final ResultSet resultSet = Mockito.mock(ResultSet.class);
+ final ResultSetMetaData resultSetMetaData = Mockito.mock(ResultSetMetaData.class);
+ when(resultSet.getMetaData()).thenReturn(resultSetMetaData);
+ when(resultSet.getArray(ArgumentMatchers.anyInt())).thenThrow(featureSupported ? new SQLException("test exception") : new SQLFeatureNotSupportedException("not supported"));
+ when(resultSetMetaData.getColumnCount()).thenReturn(1);
+ when(resultSetMetaData.getColumnLabel(1)).thenReturn("column");
Review comment:
To avoid unexpected results, passing the column label as a parameteror using a static variable would be helpful.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] ottobackwards commented on pull request #4951: NIFI-8376: Gracefully handle SQL exceptions in ResultSetRecordSet
Posted by GitBox <gi...@apache.org>.
ottobackwards commented on pull request #4951:
URL: https://github.com/apache/nifi/pull/4951#issuecomment-810157223
+1. @mattyb149 I'm not working on my dev machine so I'm not going to merge, but this LGTM.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] exceptionfactory commented on a change in pull request #4951: NIFI-8376: Gracefully handle SQL exceptions in ResultSetRecordSet
Posted by GitBox <gi...@apache.org>.
exceptionfactory commented on a change in pull request #4951:
URL: https://github.com/apache/nifi/pull/4951#discussion_r662595184
##########
File path: nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/ResultSetRecordSetTest.java
##########
@@ -241,6 +243,45 @@ public void testCreateRecord() throws SQLException {
assertEquals(bigDecimal5Value, record.getValue(COLUMN_NAME_BIG_DECIMAL_5));
}
+ @Test(expected = SQLException.class)
+ public void testCreateSchemaArrayThrowsException() throws SQLException {
+ // given
+ final List<RecordField> fields = new ArrayList<>();
+ fields.add(new RecordField("column", RecordFieldType.DECIMAL.getDecimalDataType(30, 10)));
+ final RecordSchema recordSchema = new SimpleRecordSchema(fields);
+ final ResultSet resultSet = givenResultSetForArrayThrowsException(true);
+
+ // when
+ final ResultSetRecordSet testSubject = new ResultSetRecordSet(resultSet, recordSchema);
+ }
+
+ @Test
+ public void testCreateSchemaArrayThrowsNotSupportedException() throws SQLException {
+ // given
+ final List<RecordField> fields = new ArrayList<>();
+ fields.add(new RecordField("column", RecordFieldType.DECIMAL.getDecimalDataType(30, 10)));
+ final RecordSchema recordSchema = new SimpleRecordSchema(fields);
+ final ResultSet resultSet = givenResultSetForArrayThrowsException(false);
+
+ // when
+ final ResultSetRecordSet testSubject = new ResultSetRecordSet(resultSet, recordSchema);
+ final RecordSchema resultSchema = testSubject.getSchema();
+
+ // then
+ assertEquals(RecordFieldType.ARRAY.getArrayDataType(RecordFieldType.STRING.getDataType()), resultSchema.getField(0).getDataType());
+ }
+
+ private ResultSet givenResultSetForArrayThrowsException(boolean featureSupported) throws SQLException {
+ final ResultSet resultSet = Mockito.mock(ResultSet.class);
+ final ResultSetMetaData resultSetMetaData = Mockito.mock(ResultSetMetaData.class);
+ when(resultSet.getMetaData()).thenReturn(resultSetMetaData);
+ when(resultSet.getArray(ArgumentMatchers.anyInt())).thenThrow(featureSupported ? new SQLException("test exception") : new SQLFeatureNotSupportedException("not supported"));
+ when(resultSetMetaData.getColumnCount()).thenReturn(1);
+ when(resultSetMetaData.getColumnLabel(1)).thenReturn("column");
Review comment:
To avoid unexpected results, passing the column label as a parameter or using a static variable would be helpful.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] MikeThomsen commented on a change in pull request #4951: NIFI-8376: Gracefully handle SQL exceptions in ResultSetRecordSet
Posted by GitBox <gi...@apache.org>.
MikeThomsen commented on a change in pull request #4951:
URL: https://github.com/apache/nifi/pull/4951#discussion_r704388164
##########
File path: nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/ResultSetRecordSetTest.java
##########
@@ -241,6 +243,45 @@ public void testCreateRecord() throws SQLException {
assertEquals(bigDecimal5Value, record.getValue(COLUMN_NAME_BIG_DECIMAL_5));
}
+ @Test(expected = SQLException.class)
Review comment:
I think SQLException is fine, and we can fold this into the nifi-commons JUnit 5 PR.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] exceptionfactory commented on pull request #4951: NIFI-8376: Gracefully handle SQL exceptions in ResultSetRecordSet
Posted by GitBox <gi...@apache.org>.
exceptionfactory commented on pull request #4951:
URL: https://github.com/apache/nifi/pull/4951#issuecomment-914634591
@mattyb149, following up on this PR, I noted a few small recommendations for improving the unit tests, but otherwise this looks good.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] asfgit closed pull request #4951: NIFI-8376: Gracefully handle SQL exceptions in ResultSetRecordSet
Posted by GitBox <gi...@apache.org>.
asfgit closed pull request #4951:
URL: https://github.com/apache/nifi/pull/4951
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org