Minecraft/PixelBlocks
3
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

restructured sql queries

Browse Source
This commit is contained in:
Elias Müller
2024-10-04 23:34:51 +02:00
parent 92a3edc0b6
commit 39af3589e3
1 changed files with 47 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
src/main/java/eu/mhsl/minecraft/pixelblocks/PixelBlockDatabase.java
View File

@@ -6,8 +6,6 @@ import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import java.sql.*; import java.sql.*;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID; import java.util.UUID;
public class PixelBlockDatabase { public class PixelBlockDatabase {
@@ -15,9 +13,7 @@ public class PixelBlockDatabase {
private final PreparedStatement getAllPixelBlocks; private final PreparedStatement getAllPixelBlocks;
private final PreparedStatement deletePixelBlock; private final PreparedStatement deletePixelBlock;
private final PreparedStatement insertNewPixelBlock; private final PreparedStatement insertOrReplacePixelBlock;
private final PreparedStatement updateExistingPixelBlock;
public PixelBlockDatabase(String url) { public PixelBlockDatabase(String url) {
try { try {
@@ -25,45 +21,39 @@ public class PixelBlockDatabase {
this.db = DriverManager.getConnection(url); this.db = DriverManager.getConnection(url);
this.db.createStatement().execute( this.db.createStatement().execute(
"CREATE TABLE IF NOT EXISTS pixelblocks (" + "CREATE TABLE IF NOT EXISTS pixelblocks (" +
"uuid CHAR(36) PRIMARY KEY, " + "uuid CHAR(36) PRIMARY KEY, " +
"owner CHAR(36), " + "owner CHAR(36), " +
"locationWorldName CHAR(36), " + "locationWorldName CHAR(36), " +
"locationX DOUBLE, " + "locationX DOUBLE, " +
"locationY DOUBLE, " + "locationY DOUBLE, " +
"locationZ DOUBLE, " + "locationZ DOUBLE, " +
"entryLocationWorldName CHAR(36), " + "entryLocationWorldName CHAR(36), " +
"entryLocationX DOUBLE, " + "entryLocationX DOUBLE, " +
"entryLocationY DOUBLE, " + "entryLocationY DOUBLE, " +
"entryLocationZ DOUBLE, " + "entryLocationZ DOUBLE, " +
"direction CHAR(36)" + "direction CHAR(36)" +
")" ")"
); );
this.deletePixelBlock = this.db.prepareStatement("DELETE FROM pixelblocks WHERE uuid = ?"); this.deletePixelBlock = this.db.prepareStatement("DELETE FROM pixelblocks WHERE uuid = ?");
this.getAllPixelBlocks = this.db.prepareStatement("SELECT * FROM pixelblocks"); this.getAllPixelBlocks = this.db.prepareStatement("SELECT * FROM pixelblocks");
this.insertNewPixelBlock = this.db.prepareStatement( this.insertOrReplacePixelBlock = this.db.prepareStatement(
"INSERT INTO pixelblocks(uuid, owner, " + "INSERT OR REPLACE INTO pixelblocks(uuid, owner, " +
"locationWorldName, locationX, locationY, locationZ, " + "locationWorldName, locationX, locationY, locationZ, " +
"entryLocationWorldName, entryLocationX, entryLocationY, entryLocationZ, direction) " + "entryLocationWorldName, entryLocationX, entryLocationY, entryLocationZ, direction) " +
"VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" "VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);"
);
this.updateExistingPixelBlock = this.db.prepareStatement(
"UPDATE pixelblocks " +
"SET owner=?, locationWorldName=?, locationX=?, locationY=?, locationZ=?," +
"entryLocationWorldName=?, entryLocationX=?, entryLocationY=?, entryLocationZ=?, direction=? " +
"WHERE uuid=?;"
); );
} catch (SQLException | RuntimeException | ClassNotFoundException e) { } catch (SQLException | RuntimeException | ClassNotFoundException e) {
throw new RuntimeException("Failed to load Database", e); throw new RuntimeException("Error while initializing database", e);
} }
} }
public void close() throws SQLException { public void close() throws SQLException {
deletePixelBlock.close(); deletePixelBlock.close();
getAllPixelBlocks.close(); getAllPixelBlocks.close();
insertNewPixelBlock.close(); insertOrReplacePixelBlock.close();
updateExistingPixelBlock.close();
db.close(); db.close();
} }
@@ -72,87 +62,40 @@ public class PixelBlockDatabase {
try { try {
this.deletePixelBlock.setString(1, pixelBlock.blockUUID.toString()); this.deletePixelBlock.setString(1, pixelBlock.blockUUID.toString());
this.deletePixelBlock.executeUpdate(); this.deletePixelBlock.executeUpdate();
Main.plugin.getLogger().info("DB: Deleted PixelBlock: " + pixelBlock.blockUUID);
} catch (SQLException e) { } catch (SQLException e) {
throw new RuntimeException("Failed to delete PixelBlock", e); throw new RuntimeException("Failed to delete PixelBlock from the database", e);
} }
}); });
} }
public void savePixelBlock(PixelBlock pixelBlock) { public void savePixelBlock(PixelBlock pixelBlock) {
Bukkit.getScheduler().runTask(Main.plugin, () -> { Bukkit.getScheduler().runTask(Main.plugin, () -> {
List<UUID> storedPixelBlocks = new ArrayList<>();
try { try {
ResultSet pixelBlocksResult = this.getAllPixelBlocks.executeQuery(); this.insertOrReplacePixelBlock.setString(1, pixelBlock.blockUUID.toString());
while (pixelBlocksResult.next()) { this.insertOrReplacePixelBlock.setString(2, pixelBlock.ownerUUID.toString());
storedPixelBlocks.add(UUID.fromString(pixelBlocksResult.getString("uuid")));
this.insertOrReplacePixelBlock.setString(3, pixelBlock.pixelBlockLocation.getWorld().getName());
this.insertOrReplacePixelBlock.setDouble(4, pixelBlock.pixelBlockLocation.getX());
this.insertOrReplacePixelBlock.setDouble(5, pixelBlock.pixelBlockLocation.getY());
this.insertOrReplacePixelBlock.setDouble(6, pixelBlock.pixelBlockLocation.getZ());
if (pixelBlock.lastEntryLocation != null) {
this.insertOrReplacePixelBlock.setString(7, pixelBlock.lastEntryLocation.getWorld().getName());
this.insertOrReplacePixelBlock.setDouble(8, pixelBlock.lastEntryLocation.getX());
this.insertOrReplacePixelBlock.setDouble(9, pixelBlock.lastEntryLocation.getY());
this.insertOrReplacePixelBlock.setDouble(10, pixelBlock.lastEntryLocation.getZ());
} else {
this.insertOrReplacePixelBlock.setString(7, pixelBlock.pixelBlockLocation.getWorld().getName());
this.insertOrReplacePixelBlock.setDouble(8, pixelBlock.pixelBlockLocation.getX());
this.insertOrReplacePixelBlock.setDouble(9, pixelBlock.pixelBlockLocation.getY());
this.insertOrReplacePixelBlock.setDouble(10, pixelBlock.pixelBlockLocation.getZ());
} }
this.insertOrReplacePixelBlock.setString(11, pixelBlock.facingDirection.toString());
this.insertOrReplacePixelBlock.executeUpdate();
} catch (SQLException e) { } catch (SQLException e) {
throw new RuntimeException("Failed to fetch PixelBlock list", e); throw new RuntimeException("Failed to create or update PixelBlock in the database", e);
}
if(!storedPixelBlocks.contains(pixelBlock.blockUUID)) {
// create new entry if it does not exist
try {
this.insertNewPixelBlock.setString(1, pixelBlock.blockUUID.toString());
this.insertNewPixelBlock.setString(2, pixelBlock.ownerUUID.toString());
this.insertNewPixelBlock.setString(3, pixelBlock.pixelBlockLocation.getWorld().getName());
this.insertNewPixelBlock.setDouble(4, pixelBlock.pixelBlockLocation.getX());
this.insertNewPixelBlock.setDouble(5, pixelBlock.pixelBlockLocation.getY());
this.insertNewPixelBlock.setDouble(6, pixelBlock.pixelBlockLocation.getZ());
if(pixelBlock.lastEntryLocation != null) {
this.insertNewPixelBlock.setString(7, pixelBlock.lastEntryLocation.getWorld().getName());
this.insertNewPixelBlock.setDouble(8, pixelBlock.lastEntryLocation.getX());
this.insertNewPixelBlock.setDouble(9, pixelBlock.lastEntryLocation.getY());
this.insertNewPixelBlock.setDouble(10, pixelBlock.lastEntryLocation.getZ());
} else {
this.insertNewPixelBlock.setString(7, Bukkit.getWorlds().getFirst().getName());
this.insertNewPixelBlock.setDouble(8, Bukkit.getWorlds().getFirst().getSpawnLocation().getX());
this.insertNewPixelBlock.setDouble(9, Bukkit.getWorlds().getFirst().getSpawnLocation().getY());
this.insertNewPixelBlock.setDouble(10, Bukkit.getWorlds().getFirst().getSpawnLocation().getZ());
}
this.insertNewPixelBlock.setString(11, pixelBlock.facingDirection.toString());
this.insertNewPixelBlock.executeUpdate();
Main.plugin.getLogger().info("DB: Created PixelBlock: " + pixelBlock.blockUUID);
} catch (SQLException e) {
throw new RuntimeException("Failed to save PixelBlock", e);
}
} else {
// update existing entry
try {
this.updateExistingPixelBlock.setString(1, pixelBlock.ownerUUID.toString());
this.updateExistingPixelBlock.setString(2, pixelBlock.pixelBlockLocation.getWorld().getName());
this.updateExistingPixelBlock.setDouble(3, pixelBlock.pixelBlockLocation.getX());
this.updateExistingPixelBlock.setDouble(4, pixelBlock.pixelBlockLocation.getY());
this.updateExistingPixelBlock.setDouble(5, pixelBlock.pixelBlockLocation.getZ());
if(pixelBlock.lastEntryLocation != null) {
this.updateExistingPixelBlock.setString(6, pixelBlock.lastEntryLocation.getWorld().getName());
this.updateExistingPixelBlock.setDouble(7, pixelBlock.lastEntryLocation.getX());
this.updateExistingPixelBlock.setDouble(8, pixelBlock.lastEntryLocation.getY());
this.updateExistingPixelBlock.setDouble(9, pixelBlock.lastEntryLocation.getZ());
} else {
this.updateExistingPixelBlock.setString(6, Bukkit.getWorlds().getFirst().getName());
this.updateExistingPixelBlock.setDouble(7, Bukkit.getWorlds().getFirst().getSpawnLocation().getX());
this.updateExistingPixelBlock.setDouble(8, Bukkit.getWorlds().getFirst().getSpawnLocation().getY());
this.updateExistingPixelBlock.setDouble(9, Bukkit.getWorlds().getFirst().getSpawnLocation().getZ());
}
this.updateExistingPixelBlock.setString(10, pixelBlock.blockUUID.toString());
this.updateExistingPixelBlock.setString(11, pixelBlock.facingDirection.toString());
this.updateExistingPixelBlock.executeUpdate();
Main.plugin.getLogger().info("DB: Updated PixelBlock: " + pixelBlock.blockUUID);
} catch (SQLException e) {
throw new RuntimeException("Failed updating PixelBlock", e);
}
} }
}); });
} }
@@ -183,10 +126,9 @@ public class PixelBlockDatabase {
Direction.valueOf(allPixelBlocks.getString("direction")) Direction.valueOf(allPixelBlocks.getString("direction"))
); );
block.setLastEntryLocation(entryLocation); block.setLastEntryLocation(entryLocation);
Main.plugin.getLogger().info("DB: Loaded PixelBlock: " + block.blockUUID);
} }
} catch (SQLException e) { } catch (SQLException e) {
throw new RuntimeException("Failed loading PixelBlocks", e); throw new RuntimeException("Failed loading PixelBlocks from the database", e);
} }
} }
} }