MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Threadlocal hikari connection defined.

Browse Source
This commit is contained in:
MagicBot
2023-05-20 10:51:25 -04:00
parent e7fa9cc494
commit 82498e8e5a
4 changed files with 51 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/db/handlers/dbCityHandler.java
+6 -6
View File
@@ -49,27 +49,27 @@ public class dbCityHandler extends dbHandlerBase {
try { try {
boolean work = execute(); boolean work = execute();
if (work) { if (work) {
ResultSet rs = this.cs.get().getResultSet(); ResultSet rs = this.callableStatement.get().getResultSet();
while (rs.next()) { while (rs.next()) {
addObject(list, rs); addObject(list, rs);
} }
rs.close(); rs.close();
} else { } else {
Logger.info("City Placement Failed: " + this.cs.get().toString()); Logger.info("City Placement Failed: " + this.callableStatement.get().toString());
return list; //city creation failure return list; //city creation failure
} }
while (this.cs.get().getMoreResults()) { while (this.callableStatement.get().getMoreResults()) {
ResultSet rs = this.cs.get().getResultSet(); ResultSet rs = this.callableStatement.get().getResultSet();
while (rs.next()) { while (rs.next()) {
addObject(list, rs); addObject(list, rs);
} }
rs.close(); rs.close();
} }
} catch (SQLException e) { } catch (SQLException e) {
Logger.info("City Placement Failed, SQLException: " + this.cs.get().toString() + e.toString()); Logger.info("City Placement Failed, SQLException: " + this.callableStatement.get().toString() + e.toString());
return list; //city creation failure return list; //city creation failure
} catch (UnknownHostException e) { } catch (UnknownHostException e) {
Logger.info("City Placement Failed, UnknownHostException: " + this.cs.get().toString()); Logger.info("City Placement Failed, UnknownHostException: " + this.callableStatement.get().toString());
return list; //city creation failure return list; //city creation failure
} finally { } finally {
closeCallable(); closeCallable();
src/engine/db/handlers/dbHandlerBase.java
+33 -44
View File
@@ -30,28 +30,22 @@ public abstract class dbHandlerBase {
*/ */
protected Class<? extends AbstractGameObject> localClass = null; protected Class<? extends AbstractGameObject> localClass = null;
protected GameObjectType localObjectType; protected GameObjectType localObjectType;
protected final ThreadLocal<CallableStatement> cs = new ThreadLocal<>(); protected final ThreadLocal<CallableStatement> callableStatement = new ThreadLocal<>();
protected final ThreadLocal<Connection> connection = new ThreadLocal<>();
protected final void prepareCallable(final String sql) { protected final void prepareCallable(final String sql) {
try { try {
this.cs.set((CallableStatement) DbManager.getConnection().prepareCall(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY)); this.connection.set(DbManager.getConnection());
this.callableStatement.set(this.connection.get().prepareCall(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY));
} catch (SQLException e) { } catch (SQLException e) {
Logger.error("DbManager.getConn", e); Logger.error("DbManager.getConn", e);
Logger.error("SQL Error number: " + e.getErrorCode()); Logger.error("SQL Error number: " + e.getErrorCode());
} }
} }
protected final void setDate(int parameterIndex, Date value) {
try {
this.cs.get().setDate(parameterIndex, value);
} catch (SQLException e) {
Logger.error("SQL Error number: " + e.getErrorCode());
}
}
protected final void setInt(int parameterIndex, int value) { protected final void setInt(int parameterIndex, int value) {
try { try {
this.cs.get().setInt(parameterIndex, value); this.callableStatement.get().setInt(parameterIndex, value);
} catch (SQLException e) { } catch (SQLException e) {
Logger.error("SQL Error number: " + e.getErrorCode()); Logger.error("SQL Error number: " + e.getErrorCode());
} }
@@ -59,7 +53,7 @@ public abstract class dbHandlerBase {
protected final void setLong(int parameterIndex, long value) { protected final void setLong(int parameterIndex, long value) {
try { try {
this.cs.get().setLong(parameterIndex, value); this.callableStatement.get().setLong(parameterIndex, value);
} catch (SQLException e) { } catch (SQLException e) {
Logger.error("SQL Error number: " + e.getErrorCode()); Logger.error("SQL Error number: " + e.getErrorCode());
} }
@@ -67,7 +61,7 @@ public abstract class dbHandlerBase {
protected final void setFloat(int parameterIndex, float value) { protected final void setFloat(int parameterIndex, float value) {
try { try {
this.cs.get().setFloat(parameterIndex, value); this.callableStatement.get().setFloat(parameterIndex, value);
} catch (SQLException e) { } catch (SQLException e) {
Logger.error("SQL Error number: " + e.getErrorCode()); Logger.error("SQL Error number: " + e.getErrorCode());
} }
@@ -75,7 +69,7 @@ public abstract class dbHandlerBase {
protected final void setShort(int parameterIndex, short value) { protected final void setShort(int parameterIndex, short value) {
try { try {
this.cs.get().setShort(parameterIndex, value); this.callableStatement.get().setShort(parameterIndex, value);
} catch (SQLException e) { } catch (SQLException e) {
Logger.error("SQL Error number: " + e.getErrorCode()); Logger.error("SQL Error number: " + e.getErrorCode());
} }
@@ -83,15 +77,7 @@ public abstract class dbHandlerBase {
protected final void setString(int parameterIndex, String value) { protected final void setString(int parameterIndex, String value) {
try { try {
this.cs.get().setString(parameterIndex, value); this.callableStatement.get().setString(parameterIndex, value);
} catch (SQLException e) {
Logger.error("SQL Error number: " + e.getErrorCode());
}
}
protected final void setBytes(int parameterIndex, byte[] value) {
try {
this.cs.get().setBytes(parameterIndex, value);
} catch (SQLException e) { } catch (SQLException e) {
Logger.error("SQL Error number: " + e.getErrorCode()); Logger.error("SQL Error number: " + e.getErrorCode());
} }
@@ -99,7 +85,7 @@ public abstract class dbHandlerBase {
protected final void setByte(int parameterIndex, byte value) { protected final void setByte(int parameterIndex, byte value) {
try { try {
this.cs.get().setByte(parameterIndex, value); this.callableStatement.get().setByte(parameterIndex, value);
} catch (SQLException e) { } catch (SQLException e) {
Logger.error("SQL Error number: " + e.getErrorCode()); Logger.error("SQL Error number: " + e.getErrorCode());
} }
@@ -107,7 +93,7 @@ public abstract class dbHandlerBase {
protected final void setBoolean(int parameterIndex, boolean value) { protected final void setBoolean(int parameterIndex, boolean value) {
try { try {
this.cs.get().setBoolean(parameterIndex, value); this.callableStatement.get().setBoolean(parameterIndex, value);
} catch (SQLException e) { } catch (SQLException e) {
Logger.error("SQL Error number: " + e.getErrorCode()); Logger.error("SQL Error number: " + e.getErrorCode());
} }
@@ -115,7 +101,7 @@ public abstract class dbHandlerBase {
protected final void setNULL(int parameterIndex, int type) { protected final void setNULL(int parameterIndex, int type) {
try { try {
this.cs.get().setNull(parameterIndex, type); this.callableStatement.get().setNull(parameterIndex, type);
} catch (SQLException e) { } catch (SQLException e) {
Logger.error("SQL Error number: " + e.getErrorCode()); Logger.error("SQL Error number: " + e.getErrorCode());
} }
@@ -124,7 +110,7 @@ public abstract class dbHandlerBase {
protected final void setLocalDateTime(int parameterIndex, LocalDateTime localDateTime) { protected final void setLocalDateTime(int parameterIndex, LocalDateTime localDateTime) {
try { try {
this.cs.get().setTimestamp(parameterIndex, Timestamp.valueOf(localDateTime)); this.callableStatement.get().setTimestamp(parameterIndex, Timestamp.valueOf(localDateTime));
} catch (SQLException e) { } catch (SQLException e) {
Logger.error("SQL Error number: " + e.getErrorCode()); Logger.error("SQL Error number: " + e.getErrorCode());
} }
@@ -132,7 +118,7 @@ public abstract class dbHandlerBase {
protected final void setTimeStamp(int parameterIndex, long time) { protected final void setTimeStamp(int parameterIndex, long time) {
try { try {
this.cs.get().setTimestamp(parameterIndex, new java.sql.Timestamp(time)); this.callableStatement.get().setTimestamp(parameterIndex, new java.sql.Timestamp(time));
} catch (SQLException e) { } catch (SQLException e) {
Logger.error("SQL Error number: " + e.getErrorCode()); Logger.error("SQL Error number: " + e.getErrorCode());
} }
@@ -140,7 +126,7 @@ public abstract class dbHandlerBase {
protected final boolean execute() { protected final boolean execute() {
try { try {
return this.cs.get().execute(); return this.callableStatement.get().execute();
} catch (SQLException e) { } catch (SQLException e) {
Logger.error("SQL Error number: " + e.getErrorCode()); Logger.error("SQL Error number: " + e.getErrorCode());
logSQLCommand(); logSQLCommand();
@@ -150,7 +136,7 @@ public abstract class dbHandlerBase {
protected final ResultSet executeQuery() { protected final ResultSet executeQuery() {
try { try {
return this.cs.get().executeQuery(); return this.callableStatement.get().executeQuery();
} catch (SQLException e) { } catch (SQLException e) {
Logger.error("SQL Error number: " + e.getErrorCode()); Logger.error("SQL Error number: " + e.getErrorCode());
logSQLCommand(); logSQLCommand();
@@ -164,7 +150,7 @@ public abstract class dbHandlerBase {
protected final int executeUpdate(boolean close) { protected final int executeUpdate(boolean close) {
try { try {
return this.cs.get().executeUpdate(); return this.callableStatement.get().executeUpdate();
} catch (SQLException e) { } catch (SQLException e) {
Logger.error("SQL Error number: " + e.getErrorCode()); Logger.error("SQL Error number: " + e.getErrorCode());
logSQLCommand(); logSQLCommand();
@@ -177,7 +163,7 @@ public abstract class dbHandlerBase {
protected final void logSQLCommand() { protected final void logSQLCommand() {
try { try {
Logger.error("Failed SQL Command: " + this.cs.get().toString()); Logger.error("Failed SQL Command: " + this.callableStatement.get().toString());
} catch (Exception e) { } catch (Exception e) {
} }
@@ -273,8 +259,8 @@ public abstract class dbHandlerBase {
protected final int insertGetUUID() { protected final int insertGetUUID() {
int key = 0; int key = 0;
try { try {
this.cs.get().executeUpdate(); this.callableStatement.get().executeUpdate();
ResultSet rs = this.cs.get().getGeneratedKeys(); ResultSet rs = this.callableStatement.get().getGeneratedKeys();
if (rs.next()) if (rs.next())
key = rs.getInt(1); key = rs.getInt(1);
} catch (SQLException e) { } catch (SQLException e) {
@@ -309,7 +295,7 @@ public abstract class dbHandlerBase {
protected <T extends AbstractGameObject> AbstractGameObject getObjectSingle(int id, boolean forceFromDB, boolean storeInCache) { protected <T extends AbstractGameObject> AbstractGameObject getObjectSingle(int id, boolean forceFromDB, boolean storeInCache) {
if (cs.get() == null){ if (callableStatement.get() == null) {
return null; return null;
} }
@@ -324,9 +310,9 @@ public abstract class dbHandlerBase {
try { try {
if (MBServerStatics.DB_ENABLE_QUERY_OUTPUT) if (MBServerStatics.DB_ENABLE_QUERY_OUTPUT)
Logger.info( "[GetObjectList] Executing query:" + cs.get().toString()); Logger.info("[GetObjectList] Executing query:" + callableStatement.get().toString());
ResultSet rs = cs.get().executeQuery(); ResultSet rs = callableStatement.get().executeQuery();
if (rs.next()) { if (rs.next()) {
out = localClass.getConstructor(ResultSet.class).newInstance(rs); out = localClass.getConstructor(ResultSet.class).newInstance(rs);
@@ -356,8 +342,11 @@ public abstract class dbHandlerBase {
protected void closeCallable() { protected void closeCallable() {
try { try {
if (this.cs.get() != null) if (this.callableStatement.get() != null)
this.cs.get().close(); this.callableStatement.get().close();
this.connection.get().close();
} catch (SQLException e) {} } catch (SQLException e) {}
} }
@@ -376,20 +365,20 @@ public abstract class dbHandlerBase {
ArrayList<T> out = new ArrayList<>(listSize); ArrayList<T> out = new ArrayList<>(listSize);
if (this.cs.get() == null) if (this.callableStatement.get() == null)
return out; return out;
try { try {
CallableStatement css = this.cs.get(); CallableStatement css = this.callableStatement.get();
if (css != null) if (css != null)
query = this.cs.get().toString(); query = this.callableStatement.get().toString();
if (MBServerStatics.DB_ENABLE_QUERY_OUTPUT) if (MBServerStatics.DB_ENABLE_QUERY_OUTPUT)
Logger.info( "[GetObjectList] Executing query:" + query); Logger.info( "[GetObjectList] Executing query:" + query);
ResultSet rs = this.cs.get().executeQuery(); ResultSet rs = this.callableStatement.get().executeQuery();
while (rs.next()) { while (rs.next()) {
@@ -424,7 +413,7 @@ public abstract class dbHandlerBase {
protected HashSet<Integer> getIntegerList(final int columnNumber) { protected HashSet<Integer> getIntegerList(final int columnNumber) {
if (MBServerStatics.DB_ENABLE_QUERY_OUTPUT) if (MBServerStatics.DB_ENABLE_QUERY_OUTPUT)
Logger.info("[GetIntegerList] Executing query:" + this.cs.toString()); Logger.info("[GetIntegerList] Executing query:" + this.callableStatement.toString());
HashSet<Integer> out = new HashSet<>(); HashSet<Integer> out = new HashSet<>();
src/engine/db/handlers/dbShrineHandler.java
+6 -6
View File
@@ -67,27 +67,27 @@ public class dbShrineHandler extends dbHandlerBase {
try { try {
boolean work = execute(); boolean work = execute();
if (work) { if (work) {
ResultSet rs = this.cs.get().getResultSet(); ResultSet rs = this.callableStatement.get().getResultSet();
while (rs.next()) { while (rs.next()) {
addObject(list, rs); addObject(list, rs);
} }
rs.close(); rs.close();
} else { } else {
Logger.info("Shrine Creation Failed: " + this.cs.get().toString()); Logger.info("Shrine Creation Failed: " + this.callableStatement.get().toString());
return list; //city creation failure return list; //city creation failure
} }
while (this.cs.get().getMoreResults()) { while (this.callableStatement.get().getMoreResults()) {
ResultSet rs = this.cs.get().getResultSet(); ResultSet rs = this.callableStatement.get().getResultSet();
while (rs.next()) { while (rs.next()) {
addObject(list, rs); addObject(list, rs);
} }
rs.close(); rs.close();
} }
} catch (SQLException e) { } catch (SQLException e) {
Logger.info("Shrine Creation Failed, SQLException: " + this.cs.get().toString() + e.toString()); Logger.info("Shrine Creation Failed, SQLException: " + this.callableStatement.get().toString() + e.toString());
return list; //city creation failure return list; //city creation failure
} catch (UnknownHostException e) { } catch (UnknownHostException e) {
Logger.info("Shrine Creation Failed, UnknownHostException: " + this.cs.get().toString()); Logger.info("Shrine Creation Failed, UnknownHostException: " + this.callableStatement.get().toString());
return list; //city creation failure return list; //city creation failure
} finally { } finally {
closeCallable(); closeCallable();
src/engine/db/handlers/dbWarehouseHandler.java
+6 -6
View File
@@ -84,27 +84,27 @@ public class dbWarehouseHandler extends dbHandlerBase {
try { try {
boolean work = execute(); boolean work = execute();
if (work) { if (work) {
ResultSet rs = this.cs.get().getResultSet(); ResultSet rs = this.callableStatement.get().getResultSet();
while (rs.next()) { while (rs.next()) {
addObject(list, rs); addObject(list, rs);
} }
rs.close(); rs.close();
} else { } else {
Logger.info("Warehouse Creation Failed: " + this.cs.get().toString()); Logger.info("Warehouse Creation Failed: " + this.callableStatement.get().toString());
return list; //city creation failure return list; //city creation failure
} }
while (this.cs.get().getMoreResults()) { while (this.callableStatement.get().getMoreResults()) {
ResultSet rs = this.cs.get().getResultSet(); ResultSet rs = this.callableStatement.get().getResultSet();
while (rs.next()) { while (rs.next()) {
addObject(list, rs); addObject(list, rs);
} }
rs.close(); rs.close();
} }
} catch (SQLException e) { } catch (SQLException e) {
Logger.info("Warehouse Creation Failed, SQLException: " + this.cs.get().toString() + e.toString()); Logger.info("Warehouse Creation Failed, SQLException: " + this.callableStatement.get().toString() + e.toString());
return list; //city creation failure return list; //city creation failure
} catch (UnknownHostException e) { } catch (UnknownHostException e) {
Logger.info("Warehouse Creation Failed, UnknownHostException: " + this.cs.get().toString()); Logger.info("Warehouse Creation Failed, UnknownHostException: " + this.callableStatement.get().toString());
return list; //city creation failure return list; //city creation failure
} finally { } finally {
closeCallable(); closeCallable();