Skip to content

Commit

Permalink
Merge pull request #197 from Marakaner/fix/sql-with-resource
Browse files Browse the repository at this point in the history 
sql using resource blocks with AutoClosable interface
  • Loading branch information
@FllipEis
FllipEis authored Nov 15, 2024
2 parents e7927e8 + 8b989ae commit e970f1c
Show file tree
Hide file tree
Showing 2 changed files with 138 additions and 118 deletions.
130 changes: 69 additions & 61 deletions ...e/src/main/kotlin/eu/thesimplecloud/base/manager/database/SQLOfflineCloudPlayerHandler.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,8 @@ package eu.thesimplecloud.base.manager.database
import eu.thesimplecloud.api.player.IOfflineCloudPlayer
import eu.thesimplecloud.api.player.OfflineCloudPlayer
import eu.thesimplecloud.jsonlib.JsonLib
import eu.thesimplecloud.launcher.startup.Launcher
import java.sql.*
import java.util.*
import java.util.concurrent.TimeUnit


/**
Expand All @@ -40,42 +38,36 @@ import java.util.concurrent.TimeUnit
class SQLOfflineCloudPlayerHandler(private val databaseConnectionInformation: DatabaseConnectionInformation) :
AbstractOfflineCloudPlayerHandler() {

var connection: Connection? = null
private set

private val playerCollectionName = databaseConnectionInformation.collectionPrefix + "players"

init {
runReconnectLoop()
createDatabaseAndIndicesIfNotExist()
}

private fun createDatabaseAndIndicesIfNotExist() {
if (!doesTableExist()) {
val statement =
connection!!.prepareStatement("CREATE TABLE IF NOT EXISTS `$playerCollectionName` (`uniqueId` varchar(36), `name` varchar(16), `data` LONGBLOB)")
statement.executeUpdate()
createIndex("uniqueId")
createIndex("name")
getConnection().use { connection ->
connection.prepareStatement("CREATE TABLE IF NOT EXISTS `$playerCollectionName` (`uniqueId` varchar(36), `name` varchar(16), `data` LONGBLOB)")
.use { statement ->
statement.executeUpdate()
createIndex("uniqueId")
createIndex("name")
}
}
}
}

private fun runReconnectLoop() {
reconnect()
Launcher.instance.scheduler.scheduleAtFixedRate({
reconnect()
}, 1, 1, TimeUnit.HOURS)
}

private fun reconnect() = synchronized(this) {
closeConnection()
this.connection =
DriverManager.getConnection("jdbc:mysql://${databaseConnectionInformation.host}:${databaseConnectionInformation.port}/${databaseConnectionInformation.databaseName}?user=${databaseConnectionInformation.userName}&password=${databaseConnectionInformation.password}&serverTimezone=UTC&autoReconnect=true")
private fun getConnection(): Connection {
return DriverManager.getConnection("jdbc:mysql://${databaseConnectionInformation.host}:${databaseConnectionInformation.port}/${databaseConnectionInformation.databaseName}?user=${databaseConnectionInformation.userName}&password=${databaseConnectionInformation.password}&serverTimezone=UTC&autoReconnect=true")
}

private fun createIndex(columnName: String) {
val statement = connection!!.prepareStatement("ALTER TABLE $playerCollectionName ADD INDEX ($columnName)")
statement.executeUpdate()
getConnection().use { connection ->
connection.prepareStatement("ALTER TABLE $playerCollectionName ADD INDEX ($columnName)")
.use { statement ->
statement.executeUpdate()
}
}
}

override fun getOfflinePlayer(playerUniqueId: UUID): IOfflineCloudPlayer? {
Expand All @@ -88,13 +80,17 @@ class SQLOfflineCloudPlayerHandler(private val databaseConnectionInformation: Da

private fun loadPlayer(value: String, fieldName: String): IOfflineCloudPlayer? = synchronized(this) {
if (!exist(value, fieldName)) return null
val statement =
connection!!.prepareStatement("SELECT `data` FROM `$playerCollectionName` WHERE `$fieldName` = ?")
statement.setString(1, value)
val resultSet = statement.executeQuery()
val allDataStrings = getAllDataStringsFromResultSet(resultSet)
val players = allDataStrings.mapNotNull { loadPlayerFromJsonString(it) }
return getPlayerWithLatestLogin(players)

getConnection().use { conn ->
conn.prepareStatement("SELECT `data` FROM `$playerCollectionName` WHERE `$fieldName` = ?")
.use { statement ->
statement.setString(1, value)
val resultSet = statement.executeQuery()
val allDataStrings = getAllDataStringsFromResultSet(resultSet)
val players = allDataStrings.mapNotNull { loadPlayerFromJsonString(it) }
return getPlayerWithLatestLogin(players)
}
}
}

private fun getAllDataStringsFromResultSet(resultSet: ResultSet): List<String> {
Expand All @@ -117,50 +113,62 @@ class SQLOfflineCloudPlayerHandler(private val databaseConnectionInformation: Da

override fun saveCloudPlayer(offlineCloudPlayer: OfflineCloudPlayer): Unit = synchronized(this) {
val newData = JsonLib.fromObject(offlineCloudPlayer, databaseGson).getAsJsonString()
if (!exist(offlineCloudPlayer.getUniqueId().toString(), "uniqueId")) {
val statement =
connection!!.prepareStatement("INSERT INTO `$playerCollectionName` (`uniqueId`, `name`, `data`) VALUES (?, ?, ?)")
statement.setString(1, offlineCloudPlayer.getUniqueId().toString())
statement.setString(2, offlineCloudPlayer.getName())
statement.setString(3, newData)
statement.executeUpdate()
} else {
val statement =
connection!!.prepareStatement("UPDATE `$playerCollectionName` SET `data` = ?, `name` = ? WHERE `uniqueId` = ?")
statement.setString(1, newData)
statement.setString(2, offlineCloudPlayer.getName())
statement.setString(3, offlineCloudPlayer.getUniqueId().toString())
statement.executeUpdate()

getConnection().use { connection ->
if (!exist(offlineCloudPlayer.getUniqueId().toString(), "uniqueId")) {
connection.prepareStatement("INSERT INTO `$playerCollectionName` (`uniqueId`, `name`, `data`) VALUES (?, ?, ?)")
.use { statement ->
statement.setString(1, offlineCloudPlayer.getUniqueId().toString())
statement.setString(2, offlineCloudPlayer.getName())
statement.setString(3, newData)
statement.executeUpdate()
}
} else {
connection.prepareStatement("UPDATE `$playerCollectionName` SET `data` = ?, `name` = ? WHERE `uniqueId` = ?")
.use { statement ->
statement.setString(1, newData)
statement.setString(2, offlineCloudPlayer.getName())
statement.setString(3, offlineCloudPlayer.getUniqueId().toString())
statement.executeUpdate()
}
}
}
}

override fun getRegisteredPlayerCount(): Int {
val statement = connection!!.prepareStatement("SELECT COUNT(*) FROM `$playerCollectionName`")
val resultSet = statement.executeQuery()
return if (!resultSet.next()) {
0
} else {
resultSet.getInt(1)
getConnection().use { connection ->
connection.prepareStatement("SELECT COUNT(*) FROM `$playerCollectionName`").use { statement ->
val resultSet = statement.executeQuery()
return if (!resultSet.next()) {
0
} else {
resultSet.getInt(1)
}
}
}
}

override fun closeConnection() {
connection?.close()
//nothing to do
}

private fun exist(searchValue: String, fieldName: String): Boolean {
val prepareStatement =
connection!!.prepareStatement("SELECT `data` FROM `$playerCollectionName` WHERE `$fieldName` = ?")
prepareStatement.setString(1, searchValue)
val resultSet = prepareStatement.executeQuery()
return resultSet.next()
getConnection().use { connection ->
connection.prepareStatement("SELECT `data` FROM `$playerCollectionName` WHERE `$fieldName` = ?")
.use { statement ->
statement.setString(1, searchValue)
val resultSet = statement.executeQuery()
return resultSet.next()
}
}
}

private fun doesTableExist(): Boolean {
val meta: DatabaseMetaData = connection!!.metaData
val res = meta.getTables(null, null, this.playerCollectionName, arrayOf("TABLE"))
return res.next()
getConnection().use { connection ->
val meta: DatabaseMetaData = connection.metaData
val res = meta.getTables(null, null, this.playerCollectionName, arrayOf("TABLE"))
return res.next()
}
}


}
126 changes: 69 additions & 57 deletions ...rc/main/kotlin/eu/thesimplecloud/base/manager/database/SQLiteOfflineCloudPlayerHandler.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ import java.util.concurrent.TimeUnit
class SQLiteOfflineCloudPlayerHandler(private val databaseConnectionInformation: DatabaseConnectionInformation) :
AbstractOfflineCloudPlayerHandler() {

var connection: Connection? = null
private set

private val databaseFile = File("storage/database.db")

private val playerCollectionName = databaseConnectionInformation.collectionPrefix + "players"
Expand All @@ -26,35 +23,33 @@ class SQLiteOfflineCloudPlayerHandler(private val databaseConnectionInformation:

//Class.forName("org.sqlite.JDBC");

runReconnectLoop()
createDatabaseAndIndicesIfNotExist()
}

private fun createDatabaseAndIndicesIfNotExist() {
if (!doesTableExist()) {
val statement =
connection!!.prepareStatement("CREATE TABLE IF NOT EXISTS `$playerCollectionName` (`uniqueId` varchar(36), `name` varchar(16), `data` LONGBLOB)")
statement.executeUpdate()
createIndex("uniqueId")
createIndex("name")
getConnection().use { connection ->
connection.prepareStatement("CREATE TABLE IF NOT EXISTS `$playerCollectionName` (`uniqueId` varchar(36), `name` varchar(16), `data` LONGBLOB)")
.use { statement ->
statement.executeUpdate()
createIndex("uniqueId")
createIndex("name")
}
}
}
}

private fun runReconnectLoop() {
reconnect()
Launcher.instance.scheduler.scheduleAtFixedRate({
reconnect()
}, 1, 1, TimeUnit.HOURS)
}

private fun reconnect() = synchronized(this) {
closeConnection()
this.connection = DriverManager.getConnection("jdbc:sqlite:${databaseFile.path}")
private fun getConnection(): Connection {
return DriverManager.getConnection("jdbc:sqlite:${databaseFile.path}")
}

private fun createIndex(columnName: String) {
val statement = connection!!.prepareStatement("CREATE INDEX ${columnName} ON $playerCollectionName ($columnName)")
statement.executeUpdate()
getConnection().use { connection ->
connection.prepareStatement("CREATE INDEX ${columnName} ON $playerCollectionName ($columnName)")
.use { statement ->
statement.executeUpdate()
}
}
}

override fun getOfflinePlayer(playerUniqueId: UUID): IOfflineCloudPlayer? {
Expand All @@ -67,13 +62,17 @@ class SQLiteOfflineCloudPlayerHandler(private val databaseConnectionInformation:

private fun loadPlayer(value: String, fieldName: String): IOfflineCloudPlayer? = synchronized(this) {
if (!exist(value, fieldName)) return null
val statement =
connection!!.prepareStatement("SELECT `data` FROM `$playerCollectionName` WHERE `$fieldName` = ?")
statement.setString(1, value)
val resultSet = statement.executeQuery()
val allDataStrings = getAllDataStringsFromResultSet(resultSet)
val players = allDataStrings.mapNotNull { loadPlayerFromJsonString(it) }
return getPlayerWithLatestLogin(players)

getConnection().use { conn ->
conn.prepareStatement("SELECT `data` FROM `$playerCollectionName` WHERE `$fieldName` = ?")
.use { statement ->
statement.setString(1, value)
val resultSet = statement.executeQuery()
val allDataStrings = getAllDataStringsFromResultSet(resultSet)
val players = allDataStrings.mapNotNull { loadPlayerFromJsonString(it) }
return getPlayerWithLatestLogin(players)
}
}
}

private fun getAllDataStringsFromResultSet(resultSet: ResultSet): List<String> {
Expand All @@ -96,48 +95,61 @@ class SQLiteOfflineCloudPlayerHandler(private val databaseConnectionInformation:

override fun saveCloudPlayer(offlineCloudPlayer: OfflineCloudPlayer): Unit = synchronized(this) {
val newData = JsonLib.fromObject(offlineCloudPlayer, databaseGson).getAsJsonString()
if (!exist(offlineCloudPlayer.getUniqueId().toString(), "uniqueId")) {
val statement =
connection!!.prepareStatement("INSERT INTO `$playerCollectionName` (`uniqueId`, `name`, `data`) VALUES (?, ?, ?)")
statement.setString(1, offlineCloudPlayer.getUniqueId().toString())
statement.setString(2, offlineCloudPlayer.getName())
statement.setString(3, newData)
statement.executeUpdate()
} else {
val statement =
connection!!.prepareStatement("UPDATE `$playerCollectionName` SET `data` = ?, `name` = ? WHERE `uniqueId` = ?")
statement.setString(1, newData)
statement.setString(2, offlineCloudPlayer.getName())
statement.setString(3, offlineCloudPlayer.getUniqueId().toString())
statement.executeUpdate()

getConnection().use { connection ->
if (!exist(offlineCloudPlayer.getUniqueId().toString(), "uniqueId")) {
connection.prepareStatement("INSERT INTO `$playerCollectionName` (`uniqueId`, `name`, `data`) VALUES (?, ?, ?)")
.use { statement ->
statement.setString(1, offlineCloudPlayer.getUniqueId().toString())
statement.setString(2, offlineCloudPlayer.getName())
statement.setString(3, newData)
statement.executeUpdate()
}
} else {
connection.prepareStatement("UPDATE `$playerCollectionName` SET `data` = ?, `name` = ? WHERE `uniqueId` = ?")
.use { statement ->
statement.setString(1, newData)
statement.setString(2, offlineCloudPlayer.getName())
statement.setString(3, offlineCloudPlayer.getUniqueId().toString())
statement.executeUpdate()
}
}
}
}

override fun getRegisteredPlayerCount(): Int {
val statement = connection!!.prepareStatement("SELECT COUNT(*) FROM `$playerCollectionName`")
val resultSet = statement.executeQuery()
return if (!resultSet.next()) {
0
} else {
resultSet.getInt(1)
getConnection().use { connection ->
connection.prepareStatement("SELECT COUNT(*) FROM `$playerCollectionName`").use { statement ->
val resultSet = statement.executeQuery()
return if (!resultSet.next()) {
0
} else {
resultSet.getInt(1)
}
}
}
}

override fun closeConnection() {
connection?.close()
//nothing to do
}

private fun exist(searchValue: String, fieldName: String): Boolean {
val prepareStatement =
connection!!.prepareStatement("SELECT `data` FROM `$playerCollectionName` WHERE `$fieldName` = ?")
prepareStatement.setString(1, searchValue)
val resultSet = prepareStatement.executeQuery()
return resultSet.next()
getConnection().use { connection ->
connection.prepareStatement("SELECT `data` FROM `$playerCollectionName` WHERE `$fieldName` = ?")
.use { statement ->
statement.setString(1, searchValue)
val resultSet = statement.executeQuery()
return resultSet.next()
}
}
}

private fun doesTableExist(): Boolean {
val meta: DatabaseMetaData = connection!!.metaData
val res = meta.getTables(null, null, this.playerCollectionName, arrayOf("TABLE"))
return res.next()
getConnection().use { connection ->
val meta: DatabaseMetaData = connection.metaData
val res = meta.getTables(null, null, this.playerCollectionName, arrayOf("TABLE"))
return res.next()
}
}
}

0 comments on commit e970f1c

Please sign in to comment.