Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-9800: Unwrap SQLException in PutDatabaseRecord when table does not exist 

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

This closes #5871
This commit is contained in:
Matthew Burgess 2022-03-16 11:12:07 -04:00
parent 2dc23e7309
commit c84f438782
No known key found for this signature in database
GPG Key ID: 05D3DEB8126DAD24
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutDatabaseRecord.java
View File

@ -604,17 +604,28 @@ public class PutDatabaseRecord extends AbstractProcessor {
}
final SchemaKey schemaKey = new PutDatabaseRecord.SchemaKey(catalog, schemaName, tableName);
final TableSchema tableSchema = schemaCache.get(schemaKey, key -> {
try {
final TableSchema schema = TableSchema.from(con, catalog, schemaName, tableName, settings.translateFieldNames, updateKeys, log);
getLogger().debug("Fetched Table Schema {} for table name {}", schema, tableName);
return schema;
} catch (SQLException e) {
throw new ProcessException(e);
final TableSchema tableSchema;
try {
tableSchema = schemaCache.get(schemaKey, key -> {
try {
final TableSchema schema = TableSchema.from(con, catalog, schemaName, tableName, settings.translateFieldNames, updateKeys, log);
getLogger().debug("Fetched Table Schema {} for table name {}", schema, tableName);
return schema;
} catch (SQLException e) {
// Wrap this in a runtime exception, it is unwrapped in the outer try
throw new ProcessException(e);
}
});
if (tableSchema == null) {
throw new IllegalArgumentException("No table schema specified!");
}
} catch (ProcessException pe) {
// Unwrap the SQLException if one occurred
if (pe.getCause() instanceof SQLException) {
throw (SQLException) pe.getCause();
} else {
throw pe;
}
});
if (tableSchema == null) {
throw new IllegalArgumentException("No table schema specified!");
}
// build the fully qualified table name