Skip to content

Remove unnecessary InputStream.close call #1982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 4, 2025
Merged

Remove unnecessary InputStream.close call #1982

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d685640
fix
eric-maynard Jun 30, 2025
27e648b
separate stream handling from statement
eric-maynard Jul 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 8 additions & 15 deletions ...bc/src/main/java/org/apache/polaris/persistence/relational/jdbc/DatasourceOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,15 @@ DatabaseType getDatabaseType() {
* @throws SQLException : Exception while executing the script.
*/
public void executeScript(InputStream scriptInputStream) throws SQLException {
try {
try (BufferedReader scriptReader =
new BufferedReader(
new InputStreamReader(Objects.requireNonNull(scriptInputStream), UTF_8))) {
List<String> scriptLines = scriptReader.lines().toList();
runWithinTransaction(
connection -> {
try (Statement statement = connection.createStatement();
BufferedReader reader =
new BufferedReader(
new InputStreamReader(Objects.requireNonNull(scriptInputStream), UTF_8))) {
try (Statement statement = connection.createStatement()) {
StringBuilder sqlBuffer = new StringBuilder();
String line;
while ((line = reader.readLine()) != null) {
for (String line : scriptLines) {
line = line.trim();
if (!line.isEmpty() && !line.startsWith("--")) { // Ignore empty lines and comments
sqlBuffer.append(line).append("\n");
Expand All @@ -110,16 +109,10 @@ public void executeScript(InputStream scriptInputStream) throws SQLException {
}
}
return true;
} catch (IOException e) {
throw new RuntimeException(e);
}
});
} finally {
try {
scriptInputStream.close();
} catch (IOException e) {
LOGGER.error("Failed to close input stream: {}", e.getMessage());
}
} catch (IOException e) {
throw new RuntimeException(e);
}
}

Expand Down
Loading