Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: use try-with-resources for ranking db operations

Browse Source
This commit is contained in:
P0nk
2021-04-04 23:56:46 +02:00
parent f1ff0cb55f
commit 8b686b60f1
1 changed files with 57 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/main/java/net/server/task/RankingLoginTask.java
View File

@@ -21,14 +21,15 @@
*/ */
package net.server.task; package net.server.task;
import client.MapleJob;
import config.YamlConfig;
import net.server.Server;
import tools.DatabaseConnection;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import client.MapleJob;
import config.YamlConfig;
import tools.DatabaseConnection;
import net.server.Server;
/** /**
* @author Matze * @author Matze
@@ -36,14 +37,15 @@ import net.server.Server;
* @author Ronan * @author Ronan
*/ */
public class RankingLoginTask implements Runnable { public class RankingLoginTask implements Runnable {
private Connection con;
private long lastUpdate = System.currentTimeMillis(); private long lastUpdate = System.currentTimeMillis();
private void resetMoveRank(boolean job) throws SQLException { private void resetMoveRank(boolean job) throws SQLException {
String query = "UPDATE characters SET " + (job == true ? "jobRankMove = 0" : "rankMove = 0"); String query = "UPDATE characters SET " + (job ? "jobRankMove = 0" : "rankMove = 0");
try (Connection con = DatabaseConnection.getConnection()) {
PreparedStatement reset = con.prepareStatement(query); PreparedStatement reset = con.prepareStatement(query);
reset.executeUpdate(); reset.executeUpdate();
} }
}
private void updateRanking(int job, int world) throws SQLException { private void updateRanking(int job, int world) throws SQLException {
String sqlCharSelect = "SELECT c.id, " + (job != -1 ? "c.jobRank, c.jobRankMove" : "c.rank, c.rankMove") + ", a.lastlogin AS lastlogin, a.loggedin FROM characters AS c LEFT JOIN accounts AS a ON c.accountid = a.id WHERE c.gm < 2 AND c.world = ? "; String sqlCharSelect = "SELECT c.id, " + (job != -1 ? "c.jobRank, c.jobRankMove" : "c.rank, c.rankMove") + ", a.lastlogin AS lastlogin, a.loggedin FROM characters AS c LEFT JOIN accounts AS a ON c.accountid = a.id WHERE c.gm < 2 AND c.world = ? ";
@@ -52,13 +54,15 @@ public class RankingLoginTask implements Runnable {
} }
sqlCharSelect += "ORDER BY c.level DESC , c.exp DESC , c.lastExpGainTime ASC, c.fame DESC , c.meso DESC"; sqlCharSelect += "ORDER BY c.level DESC , c.exp DESC , c.lastExpGainTime ASC, c.fame DESC , c.meso DESC";
PreparedStatement charSelect = con.prepareStatement(sqlCharSelect); try (Connection con = DatabaseConnection.getConnection();
PreparedStatement charSelect = con.prepareStatement(sqlCharSelect)) {
charSelect.setInt(1, world); charSelect.setInt(1, world);
if (job != -1) { if (job != -1) {
charSelect.setInt(2, job); charSelect.setInt(2, job);
} }
ResultSet rs = charSelect.executeQuery();
PreparedStatement ps = con.prepareStatement("UPDATE characters SET " + (job != -1 ? "jobRank = ?, jobRankMove = ? " : "rank = ?, rankMove = ? ") + "WHERE id = ?"); try (ResultSet rs = charSelect.executeQuery();
PreparedStatement ps = con.prepareStatement("UPDATE characters SET " + (job != -1 ? "jobRank = ?, jobRankMove = ? " : "rank = ?, rankMove = ? ") + "WHERE id = ?")) {
int rank = 0; int rank = 0;
while (rs.next()) { while (rs.next()) {
@@ -73,19 +77,17 @@ public class RankingLoginTask implements Runnable {
ps.setInt(3, rs.getInt("id")); ps.setInt(3, rs.getInt("id"));
ps.executeUpdate(); ps.executeUpdate();
} }
}
rs.close(); }
charSelect.close();
ps.close();
} }
@Override @Override
public void run() { public void run() {
try { try (Connection con = DatabaseConnection.getConnection()) {
con = DatabaseConnection.getConnection();
con.setAutoCommit(false); con.setAutoCommit(false);
if(YamlConfig.config.server.USE_REFRESH_RANK_MOVE == true) { try {
if (YamlConfig.config.server.USE_REFRESH_RANK_MOVE) {
resetMoveRank(true); resetMoveRank(true);
resetMoveRank(false); resetMoveRank(false);
} }
@@ -100,17 +102,14 @@ public class RankingLoginTask implements Runnable {
con.setAutoCommit(true); con.setAutoCommit(true);
lastUpdate = System.currentTimeMillis(); lastUpdate = System.currentTimeMillis();
con.close();
} catch (SQLException ex) { } catch (SQLException ex) {
ex.printStackTrace();
try {
con.rollback(); con.rollback();
throw ex;
} finally {
con.setAutoCommit(true); con.setAutoCommit(true);
if(!con.isClosed()) con.close(); }
} catch (SQLException ex2) { } catch (SQLException e) {
ex2.printStackTrace(); e.printStackTrace();
}
} }
} }
} }