mirror of
https://github.com/mcMMO-Dev/mcMMO.git
synced 2024-11-22 21:26:46 +01:00
Merge pull request #88 from krinsdeath/master
Fixed Database handler being ridiculously inefficient
This commit is contained in:
nossr50
commit
49b1e4ac45
@ -8,147 +8,95 @@ import java.util.HashMap;
|
||||
import java.util.ArrayList;
|
||||
import java.sql.PreparedStatement;
|
||||
|
||||
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import com.avaje.ebeaninternal.server.lib.sql.DataSourceException;
|
||||
import com.gmail.nossr50.config.LoadProperties;
|
||||
|
||||
|
||||
public class Database {
|
||||
|
||||
private Connection conn;
|
||||
private mcMMO plugin;
|
||||
private String connectionString;
|
||||
|
||||
public Database(mcMMO instance)
|
||||
{
|
||||
plugin = instance;
|
||||
public Database(mcMMO instance) {
|
||||
this.plugin = instance;
|
||||
this.connectionString = "jdbc:mysql://" + LoadProperties.MySQLserverName + ":" + LoadProperties.MySQLport + "/" + LoadProperties.MySQLdbName + "?user=" + LoadProperties.MySQLuserName + "&password=" + LoadProperties.MySQLdbPass;
|
||||
// Load the driver instance
|
||||
try {
|
||||
Class.forName("com.mysql.jdbc.Driver").newInstance();
|
||||
} catch (Exception ex) {
|
||||
throw new DataSourceException("Failed to initialize JDBC driver");
|
||||
}
|
||||
|
||||
// make the connection
|
||||
try {
|
||||
conn = DriverManager.getConnection("jdbc:mysql://" + LoadProperties.MySQLserverName + ":" + LoadProperties.MySQLport + "/" + LoadProperties.MySQLdbName + "?user=" + LoadProperties.MySQLuserName + "&password=" + LoadProperties.MySQLdbPass);
|
||||
} catch (SQLException ex) {
|
||||
// handle any errors
|
||||
System.out.println("SQLException: " + ex.getMessage());
|
||||
System.out.println("SQLState: " + ex.getSQLState());
|
||||
System.out.println("VendorError: " + ex.getErrorCode());
|
||||
Class.forName("com.mysql.jdbc.Driver");
|
||||
DriverManager.getConnection(connectionString);
|
||||
} catch (ClassNotFoundException e) {
|
||||
plugin.getServer().getLogger().warning(e.getLocalizedMessage());
|
||||
} catch (SQLException e) {
|
||||
plugin.getServer().getLogger().warning(e.getLocalizedMessage());
|
||||
System.out.println("SQLException: " + e.getMessage());
|
||||
System.out.println("SQLState: " + e.getSQLState());
|
||||
System.out.println("VendorError: " + e.getErrorCode());
|
||||
}
|
||||
}
|
||||
//Create the DB structure
|
||||
|
||||
public void createStructure() {
|
||||
Write("CREATE TABLE IF NOT EXISTS `"+LoadProperties.MySQLtablePrefix+"huds` (`user_id` int(10) unsigned NOT NULL," +
|
||||
"`hudtype` varchar(50) NOT NULL DEFAULT ''," +
|
||||
"PRIMARY KEY (`user_id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
|
||||
Write("CREATE TABLE IF NOT EXISTS `"+LoadProperties.MySQLtablePrefix+"users` (`id` int(10) unsigned NOT NULL AUTO_INCREMENT," +
|
||||
"`user` varchar(40) NOT NULL," +
|
||||
"`lastlogin` int(32) unsigned NOT NULL," +
|
||||
"`party` varchar(100) NOT NULL DEFAULT ''," +
|
||||
"PRIMARY KEY (`id`)," +
|
||||
"UNIQUE KEY `user` (`user`)) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;");
|
||||
Write("CREATE TABLE IF NOT EXISTS `"+LoadProperties.MySQLtablePrefix+"cooldowns` (`user_id` int(10) unsigned NOT NULL," +
|
||||
"`taming` int(32) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`mining` int(32) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`woodcutting` int(32) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`repair` int(32) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`unarmed` int(32) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`herbalism` int(32) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`excavation` int(32) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`archery` int(32) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`swords` int(32) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`axes` int(32) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`acrobatics` int(32) unsigned NOT NULL DEFAULT '0'," +
|
||||
"PRIMARY KEY (`user_id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
|
||||
Write("CREATE TABLE IF NOT EXISTS `"+LoadProperties.MySQLtablePrefix+"skills` (`user_id` int(10) unsigned NOT NULL," +
|
||||
"`taming` int(10) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`mining` int(10) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`woodcutting` int(10) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`repair` int(10) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`unarmed` int(10) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`herbalism` int(10) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`excavation` int(10) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`archery` int(10) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`swords` int(10) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`axes` int(10) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`acrobatics` int(10) unsigned NOT NULL DEFAULT '0'," +
|
||||
"PRIMARY KEY (`user_id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
|
||||
Write("CREATE TABLE IF NOT EXISTS `"+LoadProperties.MySQLtablePrefix+"experience` (`user_id` int(10) unsigned NOT NULL," +
|
||||
"`taming` int(10) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`mining` int(10) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`woodcutting` int(10) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`repair` int(10) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`unarmed` int(10) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`herbalism` int(10) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`excavation` int(10) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`archery` int(10) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`swords` int(10) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`axes` int(10) unsigned NOT NULL DEFAULT '0'," +
|
||||
"`acrobatics` int(10) unsigned NOT NULL DEFAULT '0'," +
|
||||
"PRIMARY KEY (`user_id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
|
||||
Write("CREATE TABLE IF NOT EXISTS `"+LoadProperties.MySQLtablePrefix+"spawn` (`user_id` int(10) NOT NULL," +
|
||||
"`x` int(64) NOT NULL DEFAULT '0'," +
|
||||
"`y` int(64) NOT NULL DEFAULT '0'," +
|
||||
"`z` int(64) NOT NULL DEFAULT '0'," +
|
||||
"`world` varchar(50) NOT NULL DEFAULT ''," +
|
||||
"PRIMARY KEY (`user_id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
|
||||
}
|
||||
// check if its closed
|
||||
private void reconnect()
|
||||
{
|
||||
System.out.println("[mcMMO] Reconnecting to MySQL...");
|
||||
try
|
||||
{
|
||||
conn = DriverManager.getConnection("jdbc:mysql://" + LoadProperties.MySQLserverName + ":" + LoadProperties.MySQLport + "/" + LoadProperties.MySQLdbName + "?user=" + LoadProperties.MySQLuserName + "&password=" + LoadProperties.MySQLdbPass);
|
||||
|
||||
System.out.println("[mcMMO] Connection success!");
|
||||
} catch (SQLException ex)
|
||||
{
|
||||
System.out.println("[mcMMO] Connection to MySQL failed! Check status of MySQL server!");
|
||||
System.out.println("SQLException: " + ex.getMessage());
|
||||
System.out.println("SQLState: " + ex.getSQLState());
|
||||
System.out.println("VendorError: " + ex.getErrorCode());
|
||||
Write("CREATE TABLE IF NOT EXISTS `" + LoadProperties.MySQLtablePrefix + "huds` (`user_id` int(10) unsigned NOT NULL,"
|
||||
+ "`hudtype` varchar(50) NOT NULL DEFAULT '',"
|
||||
+ "PRIMARY KEY (`user_id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
|
||||
Write("CREATE TABLE IF NOT EXISTS `" + LoadProperties.MySQLtablePrefix + "users` (`id` int(10) unsigned NOT NULL AUTO_INCREMENT,"
|
||||
+ "`user` varchar(40) NOT NULL,"
|
||||
+ "`lastlogin` int(32) unsigned NOT NULL,"
|
||||
+ "`party` varchar(100) NOT NULL DEFAULT '',"
|
||||
+ "PRIMARY KEY (`id`),"
|
||||
+ "UNIQUE KEY `user` (`user`)) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;");
|
||||
Write("CREATE TABLE IF NOT EXISTS `" + LoadProperties.MySQLtablePrefix + "cooldowns` (`user_id` int(10) unsigned NOT NULL,"
|
||||
+ "`taming` int(32) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`mining` int(32) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`woodcutting` int(32) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`repair` int(32) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`unarmed` int(32) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`herbalism` int(32) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`excavation` int(32) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`archery` int(32) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`swords` int(32) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`axes` int(32) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`acrobatics` int(32) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "PRIMARY KEY (`user_id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
|
||||
Write("CREATE TABLE IF NOT EXISTS `" + LoadProperties.MySQLtablePrefix + "skills` (`user_id` int(10) unsigned NOT NULL,"
|
||||
+ "`taming` int(10) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`mining` int(10) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`woodcutting` int(10) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`repair` int(10) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`unarmed` int(10) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`herbalism` int(10) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`excavation` int(10) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`archery` int(10) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`swords` int(10) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`axes` int(10) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`acrobatics` int(10) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "PRIMARY KEY (`user_id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
|
||||
Write("CREATE TABLE IF NOT EXISTS `" + LoadProperties.MySQLtablePrefix + "experience` (`user_id` int(10) unsigned NOT NULL,"
|
||||
+ "`taming` int(10) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`mining` int(10) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`woodcutting` int(10) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`repair` int(10) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`unarmed` int(10) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`herbalism` int(10) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`excavation` int(10) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`archery` int(10) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`swords` int(10) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`axes` int(10) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "`acrobatics` int(10) unsigned NOT NULL DEFAULT '0',"
|
||||
+ "PRIMARY KEY (`user_id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
|
||||
Write("CREATE TABLE IF NOT EXISTS `" + LoadProperties.MySQLtablePrefix + "spawn` (`user_id` int(10) NOT NULL,"
|
||||
+ "`x` int(64) NOT NULL DEFAULT '0',"
|
||||
+ "`y` int(64) NOT NULL DEFAULT '0',"
|
||||
+ "`z` int(64) NOT NULL DEFAULT '0',"
|
||||
+ "`world` varchar(50) NOT NULL DEFAULT '',"
|
||||
+ "PRIMARY KEY (`user_id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
|
||||
}
|
||||
|
||||
try {
|
||||
if(conn.isValid(5)){
|
||||
Users.clearUsers();
|
||||
|
||||
for(Player x : plugin.getServer().getOnlinePlayers())
|
||||
{
|
||||
Users.addUser(x);
|
||||
}
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
//Herp
|
||||
}
|
||||
}
|
||||
// write query
|
||||
public boolean Write(String sql)
|
||||
{
|
||||
/*
|
||||
* Double check connection to MySQL
|
||||
*/
|
||||
try
|
||||
{
|
||||
if(!conn.isValid(5))
|
||||
{
|
||||
reconnect();
|
||||
}
|
||||
} catch (SQLException e)
|
||||
{
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
PreparedStatement stmt = null;
|
||||
stmt = this.conn.prepareStatement(sql);
|
||||
public boolean Write(String sql) {
|
||||
try {
|
||||
Connection conn = DriverManager.getConnection(connectionString);
|
||||
PreparedStatement stmt = conn.prepareStatement(sql);
|
||||
stmt.executeUpdate();
|
||||
conn.close();
|
||||
return true;
|
||||
} catch (SQLException ex) {
|
||||
System.out.println("SQLException: " + ex.getMessage());
|
||||
@ -161,36 +109,23 @@ public class Database {
|
||||
// Get Int
|
||||
// only return first row / first field
|
||||
public Integer GetInt(String sql) {
|
||||
PreparedStatement stmt = null;
|
||||
ResultSet rs = null;
|
||||
Integer result = 0;
|
||||
|
||||
/*
|
||||
* Double check connection to MySQL
|
||||
*/
|
||||
try
|
||||
{
|
||||
if(!conn.isValid(5))
|
||||
{
|
||||
reconnect();
|
||||
}
|
||||
} catch (SQLException e)
|
||||
{
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
try {
|
||||
stmt = this.conn.prepareStatement(sql);
|
||||
Connection conn = DriverManager.getConnection(connectionString);
|
||||
PreparedStatement stmt = conn.prepareStatement(sql);
|
||||
stmt = conn.prepareStatement(sql);
|
||||
if (stmt.executeQuery() != null) {
|
||||
stmt.executeQuery();
|
||||
rs = stmt.getResultSet();
|
||||
if (rs.next()) {
|
||||
result = rs.getInt(1);
|
||||
}
|
||||
else { result = 0; }
|
||||
} else {
|
||||
result = 0;
|
||||
}
|
||||
}
|
||||
catch (SQLException ex) {
|
||||
conn.close();
|
||||
} catch (SQLException ex) {
|
||||
System.out.println("SQLException: " + ex.getMessage());
|
||||
System.out.println("SQLState: " + ex.getSQLState());
|
||||
System.out.println("VendorError: " + ex.getErrorCode());
|
||||
@ -201,26 +136,11 @@ public class Database {
|
||||
|
||||
// read query
|
||||
public HashMap<Integer, ArrayList<String>> Read(String sql) {
|
||||
/*
|
||||
* Double check connection to MySQL
|
||||
*/
|
||||
try
|
||||
{
|
||||
if(!conn.isValid(5))
|
||||
{
|
||||
reconnect();
|
||||
}
|
||||
} catch (SQLException e)
|
||||
{
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
PreparedStatement stmt = null;
|
||||
ResultSet rs = null;
|
||||
HashMap<Integer, ArrayList<String>> Rows = new HashMap<Integer, ArrayList<String>>();
|
||||
|
||||
try {
|
||||
stmt = this.conn.prepareStatement(sql);
|
||||
Connection conn = DriverManager.getConnection(connectionString);
|
||||
PreparedStatement stmt = conn.prepareStatement(sql);
|
||||
if (stmt.executeQuery() != null) {
|
||||
stmt.executeQuery();
|
||||
rs = stmt.getResultSet();
|
||||
@ -232,28 +152,12 @@ public class Database {
|
||||
Rows.put(rs.getRow(), Col);
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (SQLException ex) {
|
||||
conn.close();
|
||||
} catch (SQLException ex) {
|
||||
System.out.println("SQLException: " + ex.getMessage());
|
||||
System.out.println("SQLState: " + ex.getSQLState());
|
||||
System.out.println("VendorError: " + ex.getErrorCode());
|
||||
}
|
||||
|
||||
// release dataset
|
||||
if (rs != null) {
|
||||
try {
|
||||
rs.close();
|
||||
} catch (SQLException sqlEx) { } // ignore
|
||||
rs = null;
|
||||
}
|
||||
if (stmt != null) {
|
||||
try {
|
||||
stmt.close();
|
||||
} catch (SQLException sqlEx) { } // ignore
|
||||
stmt = null;
|
||||
}
|
||||
|
||||
return Rows;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user