From 8522015edc408703824319e3fd98aaf6114c5683 Mon Sep 17 00:00:00 2001 From: baconwaifu Date: Thu, 15 Aug 2019 00:51:21 -0400 Subject: [PATCH 1/2] Add initial postgres support; internal webserver works perfectly --- .../src/main/java/org/dynmap/DynmapCore.java | 4 + .../postgresql/PostgreSQLMapStorage.java | 1052 +++++++++++++++++ 2 files changed, 1056 insertions(+) create mode 100644 DynmapCore/src/main/java/org/dynmap/storage/postgresql/PostgreSQLMapStorage.java diff --git a/DynmapCore/src/main/java/org/dynmap/DynmapCore.java b/DynmapCore/src/main/java/org/dynmap/DynmapCore.java index f4259be6..b844cb53 100644 --- a/DynmapCore/src/main/java/org/dynmap/DynmapCore.java +++ b/DynmapCore/src/main/java/org/dynmap/DynmapCore.java @@ -57,6 +57,7 @@ import org.dynmap.storage.filetree.FileTreeMapStorage; import org.dynmap.storage.mysql.MySQLMapStorage; import org.dynmap.storage.mariadb.MariaDBMapStorage; import org.dynmap.storage.sqllte.SQLiteMapStorage; +import org.dynmap.storage.postgresql.PostgreSQLMapStorage; import org.dynmap.utils.BlockStep; import org.dynmap.utils.ImageIOManager; import org.dynmap.web.BanIPFilter; @@ -388,6 +389,9 @@ public class DynmapCore implements DynmapCommonAPI { else if (storetype.equals("mariadb")) { defaultStorage = new MariaDBMapStorage(); } + else if (storetype.equals("postgres") || storetype.equals("postgresql")) { + defaultStorage = new PostgreSQLMapStorage(); + } else { Log.severe("Invalid storage type for map data: " + storetype); return false; diff --git a/DynmapCore/src/main/java/org/dynmap/storage/postgresql/PostgreSQLMapStorage.java b/DynmapCore/src/main/java/org/dynmap/storage/postgresql/PostgreSQLMapStorage.java new file mode 100644 index 00000000..25b083dc --- /dev/null +++ b/DynmapCore/src/main/java/org/dynmap/storage/postgresql/PostgreSQLMapStorage.java @@ -0,0 +1,1052 @@ +package org.dynmap.storage.postgresql; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.nio.charset.Charset; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; + +import org.dynmap.DynmapCore; +import org.dynmap.DynmapWorld; +import org.dynmap.Log; +import org.dynmap.MapType; +import org.dynmap.WebAuthManager; +import org.dynmap.MapType.ImageVariant; +import org.dynmap.PlayerFaces.FaceType; +import org.dynmap.storage.MapStorage; +import org.dynmap.storage.MapStorageTile; +import org.dynmap.storage.MapStorageTileEnumCB; +import org.dynmap.utils.BufferInputStream; +import org.dynmap.utils.BufferOutputStream; + +public class PostgreSQLMapStorage extends MapStorage { + private String connectionString; + private String userid; + private String password; + private String database; + private String hostname; + private String prefix = ""; + private String flags; + private String tableTiles; + private String tableMaps; + private String tableFaces; + private String tableMarkerIcons; + private String tableMarkerFiles; + private String tableStandaloneFiles; + private String tableSchemaVersion; + + private int port; + private static final int POOLSIZE = 5; + private Connection[] cpool = new Connection[POOLSIZE]; + private int cpoolCount = 0; + private static final Charset UTF8 = Charset.forName("UTF-8"); + + private HashMap mapKey = new HashMap(); + + public class StorageTile extends MapStorageTile { + private Integer mapkey; + private String uri; + protected StorageTile(DynmapWorld world, MapType map, int x, int y, + int zoom, ImageVariant var) { + super(world, map, x, y, zoom, var); + + mapkey = getMapKey(world, map, var); + + if (zoom > 0) { + uri = map.getPrefix() + var.variantSuffix + "/"+ (x >> 5) + "_" + (y >> 5) + "/" + "zzzzzzzzzzzzzzzz".substring(0, zoom) + "_" + x + "_" + y + "." + map.getImageFormat().getFileExt(); + } + else { + uri = map.getPrefix() + var.variantSuffix + "/"+ (x >> 5) + "_" + (y >> 5) + "/" + x + "_" + y + "." + map.getImageFormat().getFileExt(); + } + } + + @Override + public boolean exists() { + if (mapkey == null) return false; + boolean rslt = false; + Connection c = null; + boolean err = false; + try { + c = getConnection(); + Statement stmt = c.createStatement(); + ResultSet rs = stmt.executeQuery("SELECT HashCode FROM " + tableTiles + " WHERE MapID=" + mapkey + " AND x=" + x + " AND y=" + y + " AND zoom=" + zoom + ";"); + rslt = rs.next(); + rs.close(); + stmt.close(); + } catch (SQLException x) { + Log.severe("Tile exists error - " + x.getMessage()); + err = true; + } finally { + releaseConnection(c, err); + } + return rslt; + } + + @Override + public boolean matchesHashCode(long hash) { + if (mapkey == null) return false; + boolean rslt = false; + Connection c = null; + boolean err = false; + try { + c = getConnection(); + Statement stmt = c.createStatement(); + ResultSet rs = stmt.executeQuery("SELECT HashCode FROM " + tableTiles + " WHERE MapID=" + mapkey + " AND x=" + x + " AND y=" + y + " AND zoom=" + zoom + ";"); + if (rs.next()) { + long v = rs.getLong("HashCode"); + rslt = (v == hash); + } + rs.close(); + stmt.close(); + } catch (SQLException x) { + Log.severe("Tile matches hash error - " + x.getMessage()); + err = true; + } finally { + releaseConnection(c, err); + } + return rslt; + } + + @Override + public TileRead read() { + if (mapkey == null) return null; + TileRead rslt = null; + Connection c = null; + boolean err = false; + try { + c = getConnection(); + Statement stmt = c.createStatement(); + ResultSet rs = stmt.executeQuery("SELECT HashCode,LastUpdate,Format,Image FROM " + tableTiles + " WHERE MapID=" + mapkey + " AND x=" + x + " AND y=" + y + " AND zoom=" + zoom + ";"); + if (rs.next()) { + rslt = new TileRead(); + rslt.hashCode = rs.getLong("HashCode"); + rslt.lastModified = rs.getLong("LastUpdate"); + rslt.format = MapType.ImageEncoding.fromOrd(rs.getInt("Format")); + byte[] img = rs.getBytes("Image"); + rslt.image = new BufferInputStream(img); + } + rs.close(); + stmt.close(); + } catch (SQLException x) { + Log.severe("Tile read error - " + x.getMessage()); + err = true; + } finally { + releaseConnection(c, err); + } + return rslt; + } + + @Override + public boolean write(long hash, BufferOutputStream encImage) { + if (mapkey == null) return false; + Connection c = null; + boolean err = false; + boolean exists = exists(); + // If delete, and doesn't exist, quit + if ((encImage == null) && (!exists)) return false; + + try { + c = getConnection(); + PreparedStatement stmt; + if (encImage == null) { // If delete + stmt = c.prepareStatement("DELETE FROM " + tableTiles + " WHERE MapID=? AND x=? and y=? AND zoom=?;"); + stmt.setInt(1, mapkey); + stmt.setInt(2, x); + stmt.setInt(3, y); + stmt.setInt(4, zoom); + } + else if (exists) { + stmt = c.prepareStatement("UPDATE " + tableTiles + " SET HashCode=?, LastUpdate=?, Format=?, Image=? WHERE MapID=? AND x=? and y=? AND zoom=?;"); + stmt.setLong(1, hash); + stmt.setLong(2, System.currentTimeMillis()); + stmt.setInt(3, map.getImageFormat().getEncoding().ordinal()); + stmt.setBinaryStream(4, new BufferInputStream(encImage.buf, encImage.len), encImage.len); + stmt.setInt(5, mapkey); + stmt.setInt(6, x); + stmt.setInt(7, y); + stmt.setInt(8, zoom); + } + else { + stmt = c.prepareStatement("INSERT INTO " + tableTiles + " (MapID,x,y,zoom,HashCode,LastUpdate,Format,Image) VALUES (?,?,?,?,?,?,?,?);"); + stmt.setInt(1, mapkey); + stmt.setInt(2, x); + stmt.setInt(3, y); + stmt.setInt(4, zoom); + stmt.setLong(5, hash); + stmt.setLong(6, System.currentTimeMillis()); + stmt.setInt(7, map.getImageFormat().getEncoding().ordinal()); + stmt.setBinaryStream(8, new BufferInputStream(encImage.buf, encImage.len), encImage.len); + } + stmt.executeUpdate(); + stmt.close(); + // Signal update for zoom out + if (zoom == 0) { + world.enqueueZoomOutUpdate(this); + } + } catch (SQLException x) { + Log.severe("Tile write error - " + x.getMessage()); + err = true; + } finally { + releaseConnection(c, err); + } + return !err; + } + + @Override + public boolean getWriteLock() { + return PostgreSQLMapStorage.this.getWriteLock(uri); + } + + @Override + public void releaseWriteLock() { + PostgreSQLMapStorage.this.releaseWriteLock(uri); + } + + @Override + public boolean getReadLock(long timeout) { + return PostgreSQLMapStorage.this.getReadLock(uri, timeout); + } + + @Override + public void releaseReadLock() { + PostgreSQLMapStorage.this.releaseReadLock(uri); + } + + @Override + public void cleanup() { + } + + @Override + public String getURI() { + return uri; + } + + @Override + public void enqueueZoomOutUpdate() { + world.enqueueZoomOutUpdate(this); + } + + @Override + public MapStorageTile getZoomOutTile() { + int xx, yy; + int step = 1 << zoom; + if(x >= 0) + xx = x - (x % (2*step)); + else + xx = x + (x % (2*step)); + yy = -y; + if(yy >= 0) + yy = yy - (yy % (2*step)); + else + yy = yy + (yy % (2*step)); + yy = -yy; + return new StorageTile(world, map, xx, yy, zoom+1, var); + } + + @Override + public boolean equals(Object o) { + if (o instanceof StorageTile) { + StorageTile st = (StorageTile) o; + return uri.equals(st.uri); + } + return false; + } + + @Override + public int hashCode() { + return uri.hashCode(); + } + } + + public PostgreSQLMapStorage(){ + } + + @Override + public boolean init(DynmapCore core) { + if (!super.init(core)) { + return false; + } + database = core.configuration.getString("storage/database", "dynmap"); + hostname = core.configuration.getString("storage/hostname", "localhost"); + port = core.configuration.getInteger("storage/port", 5432); + userid = core.configuration.getString("storage/userid", "dynmap"); + password = core.configuration.getString("storage/password", "dynmap"); + prefix = core.configuration.getString("storage/prefix", ""); + flags = core.configuration.getString("storage/flags", "?allowReconnect=true"); + tableTiles = prefix + "Tiles"; + tableMaps = prefix + "Maps"; + tableFaces = prefix + "Faces"; + tableMarkerIcons = prefix + "MarkerIcons"; + tableMarkerFiles = prefix + "MarkerFiles"; + tableStandaloneFiles = prefix + "StandaloneFiles"; + tableSchemaVersion = prefix + "SchemaVersion"; + + connectionString = "jdbc:postgresql://" + hostname + ":" + port + "/" + database + flags; + Log.info("Opening PostgreSQL database " + hostname + ":" + port + "/" + database + " as map store"); + try { + Class.forName("org.postgresql.Driver"); + // Initialize/update tables, if needed + if(!initializeTables()) { + return false; + } + } catch (ClassNotFoundException cnfx) { + Log.severe("PostgreSQL-JDBC classes not found - PostgreSQL data source not usable"); + return false; + } + return writeConfigPHP(core); + } + private boolean writeConfigPHP(DynmapCore core) { + FileWriter fw = null; + try { + fw = new FileWriter(new File(baseStandaloneDir, "PostgreSQL_config.php")); + fw.write("\n"); + } catch (IOException iox) { + Log.severe("Error writing PostgreSQL_config.php", iox); + return false; + } finally { + if (fw != null) { + try { fw.close(); } catch (IOException x) {} + } + } + return true; + } + + private int getSchemaVersion() { + int ver = 0; + boolean err = false; + Connection c = null; + try { + c = getConnection(); // Get connection (create DB if needed) + Statement stmt = c.createStatement(); + ResultSet rs = stmt.executeQuery( "SELECT level FROM " + tableSchemaVersion + ";"); + if (rs.next()) { + ver = rs.getInt("level"); + } + rs.close(); + stmt.close(); + } catch (SQLException x) { + err = true; + } finally { + if (c != null) { releaseConnection(c, err); } + } + return ver; + } + + private void doUpdate(Connection c, String sql) throws SQLException { + Statement stmt = c.createStatement(); + stmt.executeUpdate(sql); + stmt.close(); + } + + private void doLoadMaps() { + Connection c = null; + boolean err = false; + + mapKey.clear(); + // Read the maps table - cache results + try { + c = getConnection(); + Statement stmt = c.createStatement(); + ResultSet rs = stmt.executeQuery("SELECT * from " + tableMaps + ";"); + while (rs.next()) { + int key = rs.getInt("ID"); + String worldID = rs.getString("WorldID"); + String mapID = rs.getString("MapID"); + String variant = rs.getString("Variant"); + long serverid = rs.getLong("ServerID"); + if (serverid == serverID) { // One of ours + mapKey.put(worldID + ":" + mapID + ":" + variant, key); + } + } + rs.close(); + stmt.close(); + } catch (SQLException x) { + Log.severe("Error loading map table - " + x.getMessage()); + err = true; + } finally { + releaseConnection(c, err); + c = null; + } + } + + private Integer getMapKey(DynmapWorld w, MapType mt, ImageVariant var) { + String id = w.getName() + ":" + mt.getPrefix() + ":" + var.toString(); + synchronized(mapKey) { + Integer k = mapKey.get(id); + if (k == null) { // No hit: new value so we need to add it to table + Connection c = null; + boolean err = false; + try { + c = getConnection(); + // Insert row + PreparedStatement stmt = c.prepareStatement("INSERT INTO " + tableMaps + " (WorldID,MapID,Variant,ServerID) VALUES (?, ?, ?, ?);"); + stmt.setString(1, w.getName()); + stmt.setString(2, mt.getPrefix()); + stmt.setString(3, var.toString()); + stmt.setLong(4, serverID); + stmt.executeUpdate(); + stmt.close(); + // Query key assigned + stmt = c.prepareStatement("SELECT ID FROM " + tableMaps + " WHERE WorldID = ? AND MapID = ? AND Variant = ? AND ServerID = ?;"); + stmt.setString(1, w.getName()); + stmt.setString(2, mt.getPrefix()); + stmt.setString(3, var.toString()); + stmt.setLong(4, serverID); + ResultSet rs = stmt.executeQuery(); + if (rs.next()) { + k = rs.getInt("ID"); + mapKey.put(id, k); + } + rs.close(); + stmt.close(); + } catch (SQLException x) { + Log.severe("Error updating Maps table - " + x.getMessage()); + err = true; + } finally { + releaseConnection(c, err); + } + } + + return k; + } + } + + private boolean initializeTables() { + Connection c = null; + boolean err = false; + int version = getSchemaVersion(); // Get the existing schema version for the DB (if any) + // If new, add our tables + if (version == 0) { + try { + c = getConnection(); + doUpdate(c, "CREATE TABLE " + tableMaps + " (ID SERIAL PRIMARY KEY, WorldID VARCHAR(64) NOT NULL, MapID VARCHAR(64) NOT NULL, Variant VARCHAR(16) NOT NULL, ServerID BIGINT NOT NULL DEFAULT 0)"); + doUpdate(c, "CREATE TABLE " + tableTiles + " (MapID INT NOT NULL, x INT NOT NULL, y INT NOT NULL, zoom INT NOT NULL, HashCode BIGINT NOT NULL, LastUpdate BIGINT NOT NULL, Format INT NOT NULL, Image BYTEA, PRIMARY KEY(MapID, x, y, zoom))"); + doUpdate(c, "CREATE TABLE " + tableFaces + " (PlayerName VARCHAR(64) NOT NULL, TypeID INT NOT NULL, Image BYTEA, PRIMARY KEY(PlayerName, TypeID))"); + doUpdate(c, "CREATE TABLE " + tableMarkerIcons + " (IconName VARCHAR(128) PRIMARY KEY NOT NULL, Image BYTEA)"); + doUpdate(c, "CREATE TABLE " + tableMarkerFiles + " (FileName VARCHAR(128) PRIMARY KEY NOT NULL, Content TEXT)"); + doUpdate(c, "CREATE TABLE " + tableStandaloneFiles + " (FileName VARCHAR(128) NOT NULL, ServerID BIGINT NOT NULL DEFAULT 0, Content TEXT, PRIMARY KEY (FileName, ServerID))"); + doUpdate(c, "CREATE TABLE " + tableSchemaVersion + " (level INT PRIMARY KEY NOT NULL)"); + doUpdate(c, "INSERT INTO " + tableSchemaVersion + " (level) VALUES (3)"); + } catch (SQLException x) { + Log.severe("Error creating tables - " + x.getMessage()); + err = true; + return false; + } finally { + releaseConnection(c, err); + c = null; + } + } + else if (version == 1) { + try { + c = getConnection(); + doUpdate(c, "CREATE TABLE " + tableStandaloneFiles + " (FileName VARCHAR(128) NOT NULL, ServerID BIGINT NOT NULL DEFAULT 0, Content TEXT, PRIMARY KEY (FileName, ServerID))"); + doUpdate(c, "ALTER TABLE " + tableMaps + " ADD COLUMN ServerID BIGINT NOT NULL DEFAULT 0 AFTER Variant"); + doUpdate(c, "UPDATE " + tableSchemaVersion + " SET level=3 WHERE level = 1;"); + } catch (SQLException x) { + Log.severe("Error creating tables - " + x.getMessage()); + err = true; + return false; + } finally { + releaseConnection(c, err); + c = null; + } + } + else if (version == 2) { + try { + c = getConnection(); + doUpdate(c, "DELETE FROM " + tableStandaloneFiles + ";"); + doUpdate(c, "ALTER TABLE " + tableStandaloneFiles + " DROP COLUMN Content;"); + doUpdate(c, "ALTER TABLE " + tableStandaloneFiles + " ADD COLUMN Content TEXT;"); + doUpdate(c, "UPDATE " + tableSchemaVersion + " SET level=3 WHERE level = 2;"); + } catch (SQLException x) { + Log.severe("Error creating tables - " + x.getMessage()); + err = true; + return false; + } finally { + releaseConnection(c, err); + c = null; + } + } + // Load maps table - cache results + doLoadMaps(); + + return true; + } + + private Connection getConnection() throws SQLException { + Connection c = null; + synchronized (cpool) { + while (c == null) { + for (int i = 0; i < cpool.length; i++) { // See if available connection + if (cpool[i] != null) { // Found one + c = cpool[i]; + cpool[i] = null; + break; + } + } + if (c == null) { + if (cpoolCount < POOLSIZE) { // Still more we can have + c = DriverManager.getConnection(connectionString, userid, password); + configureConnection(c); + cpoolCount++; + } + else { + try { + cpool.wait(); + } catch (InterruptedException e) { + throw new SQLException("Interruped"); + } + } + } + } + } + return c; + } + private static Connection configureConnection(Connection conn) throws SQLException { + return conn; + } + + private void releaseConnection(Connection c, boolean err) { + if (c == null) return; + synchronized (cpool) { + if (!err) { // Find slot to keep it in pool + for (int i = 0; i < POOLSIZE; i++) { + if (cpool[i] == null) { + cpool[i] = c; + c = null; // Mark it recovered (no close needed + cpool.notifyAll(); + break; + } + } + } + if (c != null) { // If broken, just toss it + try { c.close(); } catch (SQLException x) {} + cpoolCount--; // And reduce count + cpool.notifyAll(); + } + } + } + + @Override + public MapStorageTile getTile(DynmapWorld world, MapType map, int x, int y, + int zoom, ImageVariant var) { + return new StorageTile(world, map, x, y, zoom, var); + } + + @Override + public MapStorageTile getTile(DynmapWorld world, String uri) { + String[] suri = uri.split("/"); + if (suri.length < 2) return null; + String mname = suri[0]; // Map URI - might include variant + MapType mt = null; + ImageVariant imgvar = null; + // Find matching map type and image variant + for (int mti = 0; (mt == null) && (mti < world.maps.size()); mti++) { + MapType type = world.maps.get(mti); + ImageVariant[] var = type.getVariants(); + for (int ivi = 0; (imgvar == null) && (ivi < var.length); ivi++) { + if (mname.equals(type.getPrefix() + var[ivi].variantSuffix)) { + mt = type; + imgvar = var[ivi]; + } + } + } + if (mt == null) { // Not found? + return null; + } + // Now, take the last section and parse out coordinates and zoom + String fname = suri[suri.length-1]; + String[] coord = fname.split("[_\\.]"); + if (coord.length < 3) { // 3 or 4 + return null; + } + int zoom = 0; + int x, y; + try { + if (coord[0].charAt(0) == 'z') { + zoom = coord[0].length(); + x = Integer.parseInt(coord[1]); + y = Integer.parseInt(coord[2]); + } + else { + x = Integer.parseInt(coord[0]); + y = Integer.parseInt(coord[1]); + } + return getTile(world, mt, x, y, zoom, imgvar); + } catch (NumberFormatException nfx) { + return null; + } + } + + @Override + public void enumMapTiles(DynmapWorld world, MapType map, + MapStorageTileEnumCB cb) { + List mtlist; + + if (map != null) { + mtlist = Collections.singletonList(map); + } + else { // Else, add all directories under world directory (for maps) + mtlist = new ArrayList(world.maps); + } + for (MapType mt : mtlist) { + ImageVariant[] vars = mt.getVariants(); + for (ImageVariant var : vars) { + processEnumMapTiles(world, mt, var, cb); + } + } + } + + private void processEnumMapTiles(DynmapWorld world, MapType map, ImageVariant var, MapStorageTileEnumCB cb) { + Connection c = null; + boolean err = false; + Integer mapkey = getMapKey(world, map, var); + if (mapkey == null) return; + try { + c = getConnection(); + // Query tiles for given mapkey + Statement stmt = c.createStatement(); + ResultSet rs = stmt.executeQuery("SELECT x,y,zoom,Format FROM " + tableTiles + " WHERE MapID=" + mapkey + ";"); + while (rs.next()) { + StorageTile st = new StorageTile(world, map, rs.getInt("x"), rs.getInt("y"), rs.getInt("zoom"), var); + cb.tileFound(st, MapType.ImageEncoding.fromOrd(rs.getInt("Format"))); + st.cleanup(); + } + rs.close(); + stmt.close(); + } catch (SQLException x) { + Log.severe("Tile enum error - " + x.getMessage()); + err = true; + } finally { + releaseConnection(c, err); + } + } + + @Override + public void purgeMapTiles(DynmapWorld world, MapType map) { + List mtlist; + + if (map != null) { + mtlist = Collections.singletonList(map); + } + else { // Else, add all directories under world directory (for maps) + mtlist = new ArrayList(world.maps); + } + for (MapType mt : mtlist) { + ImageVariant[] vars = mt.getVariants(); + for (ImageVariant var : vars) { + processPurgeMapTiles(world, mt, var); + } + } + } + + private void processPurgeMapTiles(DynmapWorld world, MapType map, ImageVariant var) { + Connection c = null; + boolean err = false; + Integer mapkey = getMapKey(world, map, var); + if (mapkey == null) return; + try { + c = getConnection(); + // Query tiles for given mapkey + Statement stmt = c.createStatement(); + stmt.executeUpdate("DELETE FROM " + tableTiles + " WHERE MapID=" + mapkey + ";"); + stmt.close(); + } catch (SQLException x) { + Log.severe("Tile purge error - " + x.getMessage()); + err = true; + } finally { + releaseConnection(c, err); + } + } + + @Override + public boolean setPlayerFaceImage(String playername, FaceType facetype, + BufferOutputStream encImage) { + Connection c = null; + boolean err = false; + boolean exists = hasPlayerFaceImage(playername, facetype); + // If delete, and doesn't exist, quit + if ((encImage == null) && (!exists)) return false; + + try { + c = getConnection(); + PreparedStatement stmt; + if (encImage == null) { // If delete + stmt = c.prepareStatement("DELETE FROM " + tableFaces + " WHERE PlayerName=? AND TypeIDx=?;"); + stmt.setString(1, playername); + stmt.setInt(2, facetype.typeID); + } + else if (exists) { + stmt = c.prepareStatement("UPDATE " + tableFaces + " SET Image=? WHERE PlayerName=? AND TypeID=?;"); + stmt.setBinaryStream(1, new BufferInputStream(encImage.buf, encImage.len), encImage.len); + stmt.setString(2, playername); + stmt.setInt(3, facetype.typeID); + } + else { + stmt = c.prepareStatement("INSERT INTO " + tableFaces + " (PlayerName,TypeID,Image) VALUES (?,?,?);"); + stmt.setString(1, playername); + stmt.setInt(2, facetype.typeID); + stmt.setBinaryStream(3, new BufferInputStream(encImage.buf, encImage.len), encImage.len); + } + stmt.executeUpdate(); + stmt.close(); + } catch (SQLException x) { + Log.severe("Face write error - " + x.getMessage()); + err = true; + } finally { + releaseConnection(c, err); + } + return !err; + } + + @Override + public BufferInputStream getPlayerFaceImage(String playername, + FaceType facetype) { + Connection c = null; + boolean err = false; + BufferInputStream image = null; + try { + c = getConnection(); + PreparedStatement stmt = c.prepareStatement("SELECT Image FROM " + tableFaces + " WHERE PlayerName=? AND TypeID=?;"); + stmt.setString(1, playername); + stmt.setInt(2, facetype.typeID); + ResultSet rs = stmt.executeQuery(); + if (rs.next()) { + byte[] img = rs.getBytes("Image"); + image = new BufferInputStream(img); + } + rs.close(); + stmt.close(); + } catch (SQLException x) { + Log.severe("Face read error - " + x.getMessage()); + err = true; + } finally { + releaseConnection(c, err); + } + return image; + } + + @Override + public boolean hasPlayerFaceImage(String playername, FaceType facetype) { + Connection c = null; + boolean err = false; + boolean exists = false; + try { + c = getConnection(); + PreparedStatement stmt = c.prepareStatement("SELECT TypeID FROM " + tableFaces + " WHERE PlayerName=? AND TypeID=?;"); + stmt.setString(1, playername); + stmt.setInt(2, facetype.typeID); + ResultSet rs = stmt.executeQuery(); + if (rs.next()) { + exists = true; + } + rs.close(); + stmt.close(); + } catch (SQLException x) { + Log.severe("Face exists error - " + x.getMessage()); + err = true; + } finally { + releaseConnection(c, err); + } + return exists; + } + + @Override + public boolean setMarkerImage(String markerid, BufferOutputStream encImage) { + Connection c = null; + boolean err = false; + PreparedStatement stmt = null; + ResultSet rs = null; + + try { + c = getConnection(); + boolean exists = false; + stmt = c.prepareStatement("SELECT IconName FROM " + tableMarkerIcons + " WHERE IconName=?;"); + stmt.setString(1, markerid); + rs = stmt.executeQuery(); + if (rs.next()) { + exists = true; + } + rs.close(); + rs = null; + stmt.close(); + stmt = null; + if (encImage == null) { // If delete + // If delete, and doesn't exist, quit + if (!exists) return false; + stmt = c.prepareStatement("DELETE FROM " + tableMarkerIcons + " WHERE IconName=?;"); + stmt.setString(1, markerid); + stmt.executeUpdate(); + } + else if (exists) { + stmt = c.prepareStatement("UPDATE " + tableMarkerIcons + " SET Image=? WHERE IconName=?;"); + stmt.setBinaryStream(1, new BufferInputStream(encImage.buf, encImage.len), encImage.len); + stmt.setString(2, markerid); + } + else { + stmt = c.prepareStatement("INSERT INTO " + tableMarkerIcons + " (IconName,Image) VALUES (?,?);"); + stmt.setString(1, markerid); + stmt.setBinaryStream(2, new BufferInputStream(encImage.buf, encImage.len), encImage.len); + } + stmt.executeUpdate(); + } catch (SQLException x) { + Log.severe("Marker write error - " + x.getMessage()); + err = true; + } finally { + if (rs != null) { try { rs.close(); } catch (SQLException sx) {} } + if (stmt != null) { try { stmt.close(); } catch (SQLException sx) {} } + releaseConnection(c, err); + } + return !err; + } + + @Override + public BufferInputStream getMarkerImage(String markerid) { + Connection c = null; + boolean err = false; + BufferInputStream image = null; + try { + c = getConnection(); + PreparedStatement stmt = c.prepareStatement("SELECT Image FROM " + tableMarkerIcons + " WHERE IconName=?;"); + stmt.setString(1, markerid); + ResultSet rs = stmt.executeQuery(); + if (rs.next()) { + byte[] img = rs.getBytes("Image"); + image = new BufferInputStream(img); + } + rs.close(); + stmt.close(); + } catch (SQLException x) { + Log.severe("Marker read error - " + x.getMessage()); + err = true; + } finally { + releaseConnection(c, err); + } + return image; + } + + @Override + public boolean setMarkerFile(String world, String content) { + Connection c = null; + boolean err = false; + PreparedStatement stmt = null; + ResultSet rs = null; + try { + c = getConnection(); + boolean exists = false; + stmt = c.prepareStatement("SELECT FileName FROM " + tableMarkerFiles + " WHERE FileName=?;"); + stmt.setString(1, world); + rs = stmt.executeQuery(); + if (rs.next()) { + exists = true; + } + rs.close(); + rs = null; + stmt.close(); + stmt = null; + if (content == null) { // If delete + // If delete, and doesn't exist, quit + if (!exists) return false; + stmt = c.prepareStatement("DELETE FROM " + tableMarkerFiles + " WHERE FileName=?;"); + stmt.setString(1, world); + stmt.executeUpdate(); + } + else if (exists) { + stmt = c.prepareStatement("UPDATE " + tableMarkerFiles + " SET Content=? WHERE FileName=?;"); + stmt.setBytes(1, content.getBytes(UTF8)); + stmt.setString(2, world); + } + else { + stmt = c.prepareStatement("INSERT INTO " + tableMarkerFiles + " (FileName,Content) VALUES (?,?);"); + stmt.setString(1, world); + stmt.setBytes(2, content.getBytes(UTF8)); + } + stmt.executeUpdate(); + } catch (SQLException x) { + Log.severe("Marker file write error - " + x.getMessage()); + err = true; + } finally { + if (rs != null) { try { rs.close(); } catch (SQLException sx) {} } + if (stmt != null) { try { stmt.close(); } catch (SQLException sx) {} } + releaseConnection(c, err); + } + return !err; + } + + @Override + public String getMarkerFile(String world) { + Connection c = null; + boolean err = false; + String content = null; + try { + c = getConnection(); + PreparedStatement stmt = c.prepareStatement("SELECT Content FROM " + tableMarkerFiles + " WHERE FileName=?;"); + stmt.setString(1, world); + ResultSet rs = stmt.executeQuery(); + if (rs.next()) { + byte[] img = rs.getBytes("Content"); + content = new String(img, UTF8); + } + rs.close(); + stmt.close(); + } catch (SQLException x) { + Log.severe("Marker file read error - " + x.getMessage()); + err = true; + } finally { + releaseConnection(c, err); + } + return content; + } + + @Override + public String getMarkersURI(boolean login_enabled) { + return "standalone/PostgreSQL_markers.php?marker="; + } + + @Override + public String getTilesURI(boolean login_enabled) { + return "standalone/PostgreSQL_tiles.php?tile="; + } + + @Override + public String getConfigurationJSONURI(boolean login_enabled) { + return "standalone/PostgreSQL_configuration.php"; // ?serverid={serverid}"; + } + + @Override + public String getUpdateJSONURI(boolean login_enabled) { + return "standalone/PostgreSQL_update.php?world={world}&ts={timestamp}"; // &serverid={serverid}"; + } + + @Override + public String getSendMessageURI() { + return "standalone/PostgreSQL_sendmessage.php"; + } + + @Override + public BufferInputStream getStandaloneFile(String fileid) { + Connection c = null; + boolean err = false; + BufferInputStream content = null; + try { + c = getConnection(); + PreparedStatement stmt = c.prepareStatement("SELECT Content FROM " + tableStandaloneFiles + " WHERE FileName=? AND ServerID=?;"); + stmt.setString(1, fileid); + stmt.setLong(2, serverID); + ResultSet rs = stmt.executeQuery(); + if (rs.next()) { + byte[] img = rs.getBytes("Content"); + content = new BufferInputStream(img); + } + rs.close(); + stmt.close(); + } catch (SQLException x) { + Log.severe("Standalone file read error - " + x.getMessage()); + err = true; + } finally { + releaseConnection(c, err); + } + return content; + } + + @Override + public boolean setStandaloneFile(String fileid, BufferOutputStream content) { + Connection c = null; + boolean err = false; + PreparedStatement stmt = null; + ResultSet rs = null; + try { + c = getConnection(); + boolean exists = false; + stmt = c.prepareStatement("SELECT FileName FROM " + tableStandaloneFiles + " WHERE FileName=? AND ServerID=?;"); + stmt.setString(1, fileid); + stmt.setLong(2, serverID); + rs = stmt.executeQuery(); + if (rs.next()) { + exists = true; + } + rs.close(); + rs = null; + stmt.close(); + stmt = null; + if (content == null) { // If delete + // If delete, and doesn't exist, quit + if (!exists) return true; + stmt = c.prepareStatement("DELETE FROM " + tableStandaloneFiles + " WHERE FileName=? AND ServerID=?;"); + stmt.setString(1, fileid); + stmt.setLong(2, serverID); + stmt.executeUpdate(); + } + else if (exists) { + stmt = c.prepareStatement("UPDATE " + tableStandaloneFiles + " SET Content=? WHERE FileName=? AND ServerID=?;"); + stmt.setBinaryStream(1, new BufferInputStream(content.buf, content.len), content.len); + stmt.setString(2, fileid); + stmt.setLong(3, serverID); + } + else { + stmt = c.prepareStatement("INSERT INTO " + tableStandaloneFiles + " (FileName,ServerID,Content) VALUES (?,?,?);"); + stmt.setString(1, fileid); + stmt.setLong(2, serverID); + stmt.setBinaryStream(3, new BufferInputStream(content.buf, content.len), content.len); + } + stmt.executeUpdate(); + } catch (SQLException x) { + Log.severe("Standalone file write error - " + x.getMessage()); + err = true; + } finally { + if (rs != null) { try { rs.close(); } catch (SQLException sx) {} } + if (stmt != null) { try { stmt.close(); } catch (SQLException sx) {} } + releaseConnection(c, err); + } + return !err; + } + @Override + public boolean wrapStandaloneJSON(boolean login_enabled) { + return false; + } + @Override + public boolean wrapStandalonePHP() { + return false; + } + @Override + public String getStandaloneLoginURI() { + return "standalone/PostgreSQL_login.php"; + } + @Override + public String getStandaloneRegisterURI() { + return "standalone/PostgreSQL_register.php"; + } + @Override + public void setLoginEnabled(DynmapCore core) { + writeConfigPHP(core); + } +} From 5fe21ff8c8c1248b8d31d5f387354b984a4406e9 Mon Sep 17 00:00:00 2001 From: baconwaifu Date: Sat, 14 Dec 2019 15:25:56 -0500 Subject: [PATCH 2/2] Change marker column to BYTEA to make markers work again. --- .../org/dynmap/storage/postgresql/PostgreSQLMapStorage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DynmapCore/src/main/java/org/dynmap/storage/postgresql/PostgreSQLMapStorage.java b/DynmapCore/src/main/java/org/dynmap/storage/postgresql/PostgreSQLMapStorage.java index 25b083dc..0d4b0818 100644 --- a/DynmapCore/src/main/java/org/dynmap/storage/postgresql/PostgreSQLMapStorage.java +++ b/DynmapCore/src/main/java/org/dynmap/storage/postgresql/PostgreSQLMapStorage.java @@ -452,7 +452,7 @@ public class PostgreSQLMapStorage extends MapStorage { doUpdate(c, "CREATE TABLE " + tableTiles + " (MapID INT NOT NULL, x INT NOT NULL, y INT NOT NULL, zoom INT NOT NULL, HashCode BIGINT NOT NULL, LastUpdate BIGINT NOT NULL, Format INT NOT NULL, Image BYTEA, PRIMARY KEY(MapID, x, y, zoom))"); doUpdate(c, "CREATE TABLE " + tableFaces + " (PlayerName VARCHAR(64) NOT NULL, TypeID INT NOT NULL, Image BYTEA, PRIMARY KEY(PlayerName, TypeID))"); doUpdate(c, "CREATE TABLE " + tableMarkerIcons + " (IconName VARCHAR(128) PRIMARY KEY NOT NULL, Image BYTEA)"); - doUpdate(c, "CREATE TABLE " + tableMarkerFiles + " (FileName VARCHAR(128) PRIMARY KEY NOT NULL, Content TEXT)"); + doUpdate(c, "CREATE TABLE " + tableMarkerFiles + " (FileName VARCHAR(128) PRIMARY KEY NOT NULL, Content BYTEA)"); doUpdate(c, "CREATE TABLE " + tableStandaloneFiles + " (FileName VARCHAR(128) NOT NULL, ServerID BIGINT NOT NULL DEFAULT 0, Content TEXT, PRIMARY KEY (FileName, ServerID))"); doUpdate(c, "CREATE TABLE " + tableSchemaVersion + " (level INT PRIMARY KEY NOT NULL)"); doUpdate(c, "INSERT INTO " + tableSchemaVersion + " (level) VALUES (3)");