Alex/KittyBot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Alex
2019-06-03 00:33:51 -04:00
parent ac3d55e4cc 0338472d87
commit 13c41799c7
16 changed files with 280 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/DatabaseDriver.java → src/core/DatabaseDriverKeyValue.java
+15 -13
View File
@@ -13,19 +13,21 @@ import utils.LogFilter;
// This is where we put everything and swap out the moving parts,
// ie MySQL, PostgreSQL, SQLite, etc...
//
// Right now this can be messed up with SQL injection stuff if users
// are allowed to directly touch data. Leaving it like this temporarily,
// and is for prototyping only!
public class DatabaseDriver
// This isn't overly flexible though,
public class DatabaseDriverKeyValue
{
// Config and local varaibles
private JDBCDriver driver;
private final String globalTableName = "kitty_globals";
private final String globalKeyName = "GlobalKey";
private final String globalValueName = "GlobalValue";
private final String tableName; // Table name
private final String keyColumnName; // Column name for the key
private final String valueColumnName; // Column name for the value
public DatabaseDriver()
public DatabaseDriverKeyValue(String tableName, String keyColumnName, String valueColumnName)
{
this.tableName = tableName;
this.keyColumnName = keyColumnName;
this.valueColumnName = valueColumnName;
driver = null;
}
@@ -47,7 +49,7 @@ public class DatabaseDriver
}
// Verify tables we want to use exist
EnsureTableExists(globalTableName, globalKeyName, globalValueName); // General table. Do not remove.
EnsureTableExists(tableName, keyColumnName, valueColumnName); // General table. Do not remove.
return true;
}
@@ -87,7 +89,7 @@ public class DatabaseDriver
// Prototype formatting for key updating
private void UpdateKey(String key, String value)
{
String command = "UPDATE " + globalTableName + " SET " + globalValueName + " = ? WHERE " + globalKeyName + " = ?";
String command = "UPDATE " + tableName + " SET " + valueColumnName + " = ? WHERE " + keyColumnName + " = ?";
boolean status = driver.ExecuteStatement(JDBCStatementType.Update, command, new String[] { value, key });
GlobalLog.Log(LogFilter.Database, "UpdateKey status: " + status);
}
@@ -95,7 +97,7 @@ public class DatabaseDriver
// Protoype updating for seeing if a key exists
private boolean HasKey(String key)
{
String command = "SELECT COUNT(1) as count FROM " + globalTableName + " WHERE " + globalKeyName + " = ?";
String command = "SELECT COUNT(1) as count FROM " + tableName + " WHERE " + keyColumnName + " = ?";
ResultSet set = driver.ExecuteReturningStatement(JDBCStatementType.Select, command, new String[] { key });
String out = ResultAsString(set, "count");
return out.charAt(0) == '1';
@@ -104,7 +106,7 @@ public class DatabaseDriver
// Prototype for getting a key
private String GetKey(String key)
{
String command = "SELECT " + globalValueName + " as searchedKey FROM " + globalTableName +" WHERE " + globalKeyName + " = ?";
String command = "SELECT " + valueColumnName + " as searchedKey FROM " + tableName +" WHERE " + keyColumnName + " = ?";
ResultSet set = driver.ExecuteReturningStatement(JDBCStatementType.Select, command, new String[] { key });
return ResultAsString(set, "searchedKey");
}
@@ -112,7 +114,7 @@ public class DatabaseDriver
// Prototype for creating a key
private void CreateKey(String key, String value)
{
String command = "INSERT INTO " + globalTableName + " (GlobalKey, GlobalValue) VALUES (?, ?)";
String command = "INSERT INTO " + tableName + " (GlobalKey, GlobalValue) VALUES (?, ?)";
boolean status = driver.ExecuteStatement(JDBCStatementType.Insert, command, new String[] { key, value });
GlobalLog.Log(LogFilter.Database, "CreateKey status: " + status);
}
src/core/DatabaseManager.java
+124 -25
View File
@@ -5,16 +5,33 @@ import java.util.Vector;
import utils.GlobalLog;
import utils.LogFilter;
// This wrangles all of the differentiated storage systems. Internally, these may be tables,
// different databases, etc -- the goal is that it's abstracted away.
//
// TODO: Implement intermediate structure on account of duplicate patterns showing up.
public class DatabaseManager
{
// Singleton accessor
public static DatabaseManager instance = null;
// Database names and configs
private final String globalTableName = "kitty_globals"; // Table name
private final String globalKeyColumnName = "GlobalKey"; // Column name for the key
private final String globalValueColumnName = "GlobalValue"; // Column name for the value
private final String characterTableName = "kitty_characters"; // Table name
private final String characterKeyColumnName = "CharacterKey"; // Column name for the key
private final String characterValueColumnName = "CharacterValue"; // Column name for the value
// Private internal variables
private Vector<DatabaseTrackedObject> trackedObjects;
private DatabaseDriver driver;
private Vector<DatabaseTrackedObject> globalDataTrackedObjects;
private Vector<DatabaseTrackedObject> characterDataTrackedObjects;
private DatabaseDriverKeyValue globalDataDriver;
private DatabaseDriverKeyValue characterDataDriver;
private Date lastUpkeep;
// Constructor to enforce singleton.
public DatabaseManager()
{
GlobalLog.Log(LogFilter.Database, "Creating database manager");
@@ -29,75 +46,157 @@ public class DatabaseManager
return;
}
// Initialize variables
lastUpkeep = new Date();
trackedObjects = new Vector<DatabaseTrackedObject>();
driver = new DatabaseDriver();
globalDataTrackedObjects = new Vector<DatabaseTrackedObject>();
characterDataTrackedObjects = new Vector<DatabaseTrackedObject>();
if(driver.Connect() == false)
// Initialize data sets
globalDataDriver = new DatabaseDriverKeyValue(globalTableName, globalKeyColumnName, globalValueColumnName);
characterDataDriver = new DatabaseDriverKeyValue(characterTableName, characterKeyColumnName, characterValueColumnName);
// Connect data sets
if(globalDataDriver.Connect() == false)
{
GlobalLog.Error("Database failed to connect. Currently, without the DB, this bot can not run.");
GlobalLog.Error("Global database failed to connect. Without this DB, this bot can not run.");
System.exit(1);
}
if(characterDataDriver.Connect() == false)
{
GlobalLog.Error("Character database failed to connect. Without this DB, this bot can not run.");
System.exit(1);
}
}
// Thumbs through registered objects and syncs them with the database.
// Consider moving this operation to a separate thread.
public int Upkeep()
public int upkeep()
{
synchronized(trackedObjects)
int total = 0;
total += globalDataUpkeep();
total += characterDataUpkeep();
lastUpkeep = new Date();
return total;
}
// Global data management and updating, returns how many items were updated.
private int globalDataUpkeep()
{
synchronized(globalDataTrackedObjects)
{
int numUpdated = 0;
for(int i = 0 ; i < trackedObjects.size(); ++i)
for(int i = 0; i < globalDataTrackedObjects.size(); ++i)
{
DatabaseTrackedObject dto = trackedObjects.get(i);
DatabaseTrackedObject dto = globalDataTrackedObjects.get(i);
if(dto.IsDirty())
{
SetRemoteValue(dto.identifier, dto.Serialize());
globalSetRemoteValue(dto.identifier, dto.Serialize());
dto.Resolve();
++numUpdated;
}
}
lastUpkeep = new Date();
return numUpdated;
}
}
// Character data management and updating, returns how many items were updated.
private int characterDataUpkeep()
{
synchronized(characterDataTrackedObjects)
{
int numUpdated = 0;
for(int i = 0; i < characterDataTrackedObjects.size(); ++i)
{
DatabaseTrackedObject dto = characterDataTrackedObjects.get(i);
if(dto.IsDirty())
{
characterSetRemoteValue(dto.identifier, dto.Serialize());
dto.Resolve();
++numUpdated;
}
}
return numUpdated;
}
}
public void Register(DatabaseTrackedObject tracked)
/////////////////
// Global Data //
/////////////////
public void globalRegister(DatabaseTrackedObject tracked)
{
synchronized(trackedObjects)
synchronized(globalDataTrackedObjects)
{
trackedObjects.add(tracked);
tracked.DeSerialzie(GetRemoteValue(tracked.identifier));
globalDataTrackedObjects.add(tracked);
tracked.DeSerialzie(globalGetRemoteValue(tracked.identifier));
}
}
public String GetRemoteValue(String key)
private String globalGetRemoteValue(String key)
{
synchronized(driver)
synchronized(globalDataDriver)
{
return driver.CreateGetKey(key);
return globalDataDriver.CreateGetKey(key);
}
}
public void SetRemoteValue(String key, String value)
private void globalSetRemoteValue(String key, String value)
{
synchronized(driver)
synchronized(globalDataDriver)
{
driver.CreateSetKey(key, value);
globalDataDriver.CreateSetKey(key, value);
}
}
public Date GetLastUpkeep()
////////////////////
// Character Data //
////////////////////
public void characterRegister(DatabaseTrackedObject tracked)
{
synchronized(characterDataTrackedObjects)
{
characterDataTrackedObjects.add(tracked);
tracked.DeSerialzie(characterGetRemoteValue(tracked.identifier));
}
}
private String characterGetRemoteValue(String key)
{
synchronized(characterDataDriver)
{
return characterDataDriver.CreateGetKey(key);
}
}
private void characterSetRemoteValue(String key, String value)
{
synchronized(characterDataDriver)
{
characterDataDriver.CreateSetKey(key, value);
}
}
///////////////////////
// Utility functions //
///////////////////////
public Date getLastUpkeep()
{
return lastUpkeep;
}
public int GetTrackedObjectsSize()
public int getTrackedObjectsSize()
{
return trackedObjects.size();
return globalDataTrackedObjects.size();
}
}
src/core/DatabaseTrackedObject.java
+13 -4
View File
@@ -4,7 +4,7 @@ package core;
// have their data populated from database entries.
public abstract class DatabaseTrackedObject
{
private boolean isDirty;
private Boolean isDirty;
public final String identifier;
public DatabaseTrackedObject(String identifier)
@@ -15,17 +15,26 @@ public abstract class DatabaseTrackedObject
public final boolean IsDirty()
{
return isDirty;
synchronized(isDirty)
{
return isDirty;
}
}
public final void MarkDirty()
{
isDirty = true;
synchronized(isDirty)
{
isDirty = true;
}
}
public final void Resolve()
{
isDirty = false;
synchronized(isDirty)
{
isDirty = false;
}
}
// Consider an object factory instead of dedicated serialization methods
src/core/ObjectBuilderFactory.java
+3 -3
View File
@@ -131,7 +131,7 @@ public class ObjectBuilderFactory
{
// Construct a new guild with defaults
guild = new KittyGuild(uid, new AdminControl(event.getGuild()), emotesString);
DatabaseManager.instance.Register(guild);
DatabaseManager.instance.globalRegister(guild);
guildCache.put(uid, guild);
}
}
@@ -241,7 +241,7 @@ public class ObjectBuilderFactory
String discordID = event.getMember().getUser().getId();
String avatarID = event.getAuthor().getAvatarUrl();
user = new KittyUser(name, guild, role, uid, avatarID, discordID);
DatabaseManager.instance.Register(user);
DatabaseManager.instance.globalRegister(user);
userCache.put(uid, user);
}
}
@@ -285,7 +285,7 @@ public class ObjectBuilderFactory
KittyRole role = KittyRole.General;
KittyGuild guild = guildCache.get(guildID);
user = new KittyUser(name, guild, role, uid, avatarID, discordID);
DatabaseManager.instance.Register(user);
DatabaseManager.instance.globalRegister(user);
userCache.put(uid, user);
}
}