Skip to content

Fixed resources leaks #191

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 3 commits into from
Jun 23, 2025
Merged

Fixed resources leaks #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a26c5dc
Fix resource leaking in flyway-dialect
alex268 Jun 23, 2025
92338e4
Fix resource leaking in Liquibase dialect
alex268 Jun 23, 2025
4056795
Fix resource leaking in YDB shedlock
alex268 Jun 23, 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
18 changes: 9 additions & 9 deletions flyway-dialect/src/main/java/tech/ydb/flywaydb/database/YdbSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package tech.ydb.flywaydb.database;

import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

import org.flywaydb.core.internal.database.base.Schema;
import org.flywaydb.core.internal.jdbc.JdbcTemplate;

Expand Down Expand Up @@ -75,15 +77,13 @@ public String toString() {
}

private List<String> schemaTables() throws SQLException {
ResultSet rs = jdbcTemplate.getConnection().getMetaData()
.getTables(null, name, null, new String[]{"TABLE"});

List<String> tables = new ArrayList<>();

while (rs.next()) {
tables.add(database.quote(rs.getString("TABLE_NAME")));
DatabaseMetaData md = jdbcTemplate.getConnection().getMetaData();
try (ResultSet rs = md.getTables(null, name, null, new String[]{"TABLE"})) {
List<String> tables = new ArrayList<>();
while (rs.next()) {
tables.add(database.quote(rs.getString("TABLE_NAME")));
}
return tables;
}

return tables;
}
}
16 changes: 8 additions & 8 deletions liquibase-dialect/src/main/java/tech/ydb/liquibase/change/InsertDataChangeYdb.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;

import liquibase.change.ChangeMetaData;
import liquibase.change.ColumnConfig;
import liquibase.change.DatabaseChange;
Expand Down Expand Up @@ -34,14 +35,13 @@ public SqlStatement[] generateStatements(Database database) {

try {
JdbcConnection jdbcConnection = (JdbcConnection) database.getConnection();
ResultSet resultSet = jdbcConnection.getMetaData()
.getColumns(null, null, getTableName(), null);

while (resultSet.next()) {
columnToLiquibaseDataType.put(
resultSet.getString("COLUMN_NAME").toLowerCase(),
DataTypeFactory.getInstance()
.fromDescription(resultSet.getString("TYPE_NAME"), database));
try (ResultSet rs = jdbcConnection.getMetaData().getColumns(null, null, getTableName(), null)) {
while (rs.next()) {
columnToLiquibaseDataType.put(
rs.getString("COLUMN_NAME").toLowerCase(),
DataTypeFactory.getInstance().fromDescription(rs.getString("TYPE_NAME"), database)
);
}
}

StringBuilder yqlInsert = new StringBuilder()
Expand Down
23 changes: 12 additions & 11 deletions liquibase-dialect/src/main/java/tech/ydb/liquibase/change/LoadDataChangeYdb.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package tech.ydb.liquibase.change;

import com.opencsv.exceptions.CsvMalformedLineException;
import java.io.IOException;
import java.sql.ResultSet;
import java.util.ArrayList;
Expand All @@ -9,6 +8,8 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;

import com.opencsv.exceptions.CsvMalformedLineException;
import liquibase.Scope;
import liquibase.change.ChangeMetaData;
import liquibase.change.DatabaseChange;
Expand All @@ -23,6 +24,7 @@
import liquibase.statement.core.InsertStatement;
import liquibase.statement.core.RawSqlStatement;
import liquibase.util.csv.CSVReader;

import tech.ydb.liquibase.database.YdbDatabase;

/**
Expand Down Expand Up @@ -60,17 +62,16 @@ public SqlStatement[] generateStatements(Database database) {
}

JdbcConnection jdbcConnection = (JdbcConnection) database.getConnection();
ResultSet resultSet = jdbcConnection.getMetaData()
.getColumns(null, null, tableName, null);

while (resultSet.next()) {
columnToLiquibaseDataType.put(
resultSet.getString("COLUMN_NAME").toLowerCase(),
DataTypeFactory.getInstance()
.fromDescription(resultSet.getString("TYPE_NAME"), database));
}
try (ResultSet resultSet = jdbcConnection.getMetaData().getColumns(null, null, tableName, null)) {
while (resultSet.next()) {
columnToLiquibaseDataType.put(
resultSet.getString("COLUMN_NAME").toLowerCase(),
DataTypeFactory.getInstance()
.fromDescription(resultSet.getString("TYPE_NAME"), database));
}

return getSqlStatements(database, reader, headers);
return getSqlStatements(database, reader, headers);
}
} catch (CsvMalformedLineException e) {
throw new RuntimeException("Error parsing " + getRelativeTo() + " on line " + e.getLineNumber() + ": " + e.getMessage());
} catch (UnexpectedLiquibaseException ule) {
Expand Down
37 changes: 18 additions & 19 deletions shedlock-ydb/src/main/java/tech/ydb/lock/provider/YdbJDBCLockProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

import java.sql.SQLException;
import java.util.Optional;

import javax.sql.DataSource;

import net.javacrumbs.shedlock.core.LockConfiguration;
import net.javacrumbs.shedlock.core.LockProvider;
import net.javacrumbs.shedlock.core.SimpleLock;
Expand Down Expand Up @@ -31,33 +33,30 @@ public Optional<SimpleLock> lock(LockConfiguration lockConfiguration) {
try {
connection.setAutoCommit(false);

var selectPS = connection.prepareStatement("SELECT locked_by, lock_until FROM shedlock " +
"WHERE name = ? AND lock_until > CurrentUtcTimestamp()");

selectPS.setString(1, lockConfiguration.getName());

try (var rs = selectPS.executeQuery()) {
if (rs.next()) {
LOGGER.debug("Instance[{}] acquire lock is failed. Leader is {}, lock_until = {}",
LOCKED_BY, rs.getString(1), rs.getString(2));
return Optional.empty();
try (var selectPS = connection.prepareStatement("SELECT locked_by, lock_until FROM shedlock " +
"WHERE name = ? AND lock_until > CurrentUtcTimestamp()")) {
selectPS.setString(1, lockConfiguration.getName());
try (var rs = selectPS.executeQuery()) {
if (rs.next()) {
LOGGER.debug("Instance[{}] acquire lock is failed. Leader is {}, lock_until = {}",
LOCKED_BY, rs.getString(1), rs.getString(2));
return Optional.empty();
}
}
}

var upsertPS = connection.prepareStatement("" +
try (var upsertPS = connection.prepareStatement("" +
"UPSERT INTO shedlock(name, lock_until, locked_at, locked_by) " +
"VALUES (?, Unwrap(CurrentUtcTimestamp() + ?), CurrentUtcTimestamp(), ?)"
);

upsertPS.setObject(1, lockConfiguration.getName());
upsertPS.setObject(2, lockConfiguration.getLockAtMostFor());
upsertPS.setObject(3, LOCKED_BY);
upsertPS.execute();
)) {
upsertPS.setObject(1, lockConfiguration.getName());
upsertPS.setObject(2, lockConfiguration.getLockAtMostFor());
upsertPS.setObject(3, LOCKED_BY);
upsertPS.execute();
}

connection.commit();

LOGGER.debug("Instance[{}] is leader", LOCKED_BY);

return Optional.of(new YdbJDBCLock(lockConfiguration.getName(), dataSource));
} finally {
connection.setAutoCommit(autoCommit);
Expand Down