wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix DB leaks in FullDataV2Repo

Browse Source
This commit is contained in:
James Seibel
2025-02-16 20:07:00 -06:00
parent 2deb24ec1e
commit c296795280
1 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/distanthorizons/core/sql/repo/FullDataSourceV2Repo.java
+28 -30
View File
@@ -446,9 +446,8 @@ public class FullDataSourceV2Repo extends AbstractDhRepo<Long, FullDataSourceV2D
@Nullable
public Long getTimestampForPos(long pos)
{
try
try(PreparedStatement preparedStatement = this.createPreparedStatement(this.getTimestampForPosSql))
{
PreparedStatement preparedStatement = this.createPreparedStatement(this.getTimestampForPosSql);
if (preparedStatement == null)
{
return null;
@@ -488,9 +487,8 @@ public class FullDataSourceV2Repo extends AbstractDhRepo<Long, FullDataSourceV2D
"AND PosZ BETWEEN ? AND ?;";
public Map<Long, Long> getTimestampsForRange(byte detailLevel, int startPosX, int startPosZ, int endPosX, int endPosZ)
{
try
try(PreparedStatement preparedStatement = this.createPreparedStatement(this.getTimestampForRangeSql))
{
PreparedStatement preparedStatement = this.createPreparedStatement(this.getTimestampForRangeSql);
if (preparedStatement == null)
{
return new HashMap<>();
@@ -539,27 +537,29 @@ public class FullDataSourceV2Repo extends AbstractDhRepo<Long, FullDataSourceV2D
{
LongArrayList list = new LongArrayList();
PreparedStatement statement = this.createPreparedStatement(this.getAllPositionsSql);
if (statement == null)
try (PreparedStatement statement = this.createPreparedStatement(this.getAllPositionsSql))
{
return list;
}
try(ResultSet result = this.query(statement))
{
while (result != null && result.next())
if (statement == null)
{
byte detailLevel = result.getByte("DetailLevel");
byte sectionDetailLevel = (byte) (detailLevel + DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL);
int posX = result.getInt("PosX");
int posZ = result.getInt("PosZ");
long pos = DhSectionPos.encode(sectionDetailLevel, posX, posZ);
list.add(pos);
return list;
}
return list;
try(ResultSet result = this.query(statement))
{
while (result != null && result.next())
{
byte detailLevel = result.getByte("DetailLevel");
byte sectionDetailLevel = (byte) (detailLevel + DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL);
int posX = result.getInt("PosX");
int posZ = result.getInt("PosZ");
long pos = DhSectionPos.encode(sectionDetailLevel, posX, posZ);
list.add(pos);
}
return list;
}
}
catch (SQLException e)
{
@@ -580,14 +580,13 @@ public class FullDataSourceV2Repo extends AbstractDhRepo<Long, FullDataSourceV2D
{
int detailLevel = DhSectionPos.getDetailLevel(pos) - DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL;
PreparedStatement statement = this.createPreparedStatement(this.getDataSizeInBytesSql);
if (statement == null)
try (PreparedStatement statement = this.createPreparedStatement(this.getDataSizeInBytesSql))
{
return 0L;
}
if (statement == null)
{
return 0L;
}
try
{
int i = 1;
statement.setInt(i++, detailLevel);
statement.setInt(i++, DhSectionPos.getX(pos));
@@ -616,9 +615,8 @@ public class FullDataSourceV2Repo extends AbstractDhRepo<Long, FullDataSourceV2D
/** @return the total size in bytes of the full data for this entire database */
public long getTotalDataSizeInBytes()
{
PreparedStatement statement = this.createPreparedStatement(this.getTotalDataSizeInBytesSql);
try(ResultSet result = this.query(statement))
try (PreparedStatement statement = this.createPreparedStatement(this.getTotalDataSizeInBytesSql);
ResultSet result = this.query(statement))
{
if (result == null || !result.next())
{