Altitude/AlttdGriefPrevention
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Faster database mode boot.

Browse Source 
Reduced # of DB queries.
This commit is contained in:
ryanhamshire 2014-10-13 13:22:55 -07:00
parent 74e70dd21a
commit c71ce6ff92
1 changed files with 23 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/me/ryanhamshire/GriefPrevention/DatabaseDataStore.java
View File

@ -211,6 +211,7 @@ public class DatabaseDataStore extends DataStore
results = statement.executeQuery("SELECT * FROM griefprevention_claimdata;"); results = statement.executeQuery("SELECT * FROM griefprevention_claimdata;");
ArrayList<Claim> claimsToRemove = new ArrayList<Claim>(); ArrayList<Claim> claimsToRemove = new ArrayList<Claim>();
ArrayList<Claim> subdivisionsToLoad = new ArrayList<Claim>();
while(results.next()) while(results.next())
{ {
@ -218,7 +219,6 @@ public class DatabaseDataStore extends DataStore
{ {
//skip subdivisions //skip subdivisions
long parentId = results.getLong("parentid"); long parentId = results.getLong("parentid");
if(parentId != -1) continue;
long claimID = results.getLong("id"); long claimID = results.getLong("id");
@ -294,44 +294,17 @@ public class DatabaseDataStore extends DataStore
String [] managerNames = managersString.split(";"); String [] managerNames = managersString.split(";");
managerNames = this.convertNameListToUUIDList(managerNames); managerNames = this.convertNameListToUUIDList(managerNames);
Claim topLevelClaim = new Claim(lesserBoundaryCorner, greaterBoundaryCorner, ownerID, builderNames, containerNames, accessorNames, managerNames, claimID); Claim claim = new Claim(lesserBoundaryCorner, greaterBoundaryCorner, ownerID, builderNames, containerNames, accessorNames, managerNames, claimID);
this.addClaim(topLevelClaim, false); if(parentId == -1)
{
//look for any subdivisions for this claim //top level claim
Statement statement2 = this.databaseConnection.createStatement(); this.addClaim(claim, false);
ResultSet childResults = statement2.executeQuery("SELECT * FROM griefprevention_claimdata WHERE parentid=" + topLevelClaim.id + ";"); }
else
while(childResults.next()) {
{ //subdivision
String lesserCornerString = childResults.getString("lessercorner"); subdivisionsToLoad.add(claim);
lesserBoundaryCorner = this.locationFromString(lesserCornerString);
String greaterCornerString = childResults.getString("greatercorner");
greaterBoundaryCorner = this.locationFromString(greaterCornerString);
buildersString = childResults.getString("builders");
builderNames = buildersString.split(";");
builderNames = this.convertNameListToUUIDList(builderNames);
containersString = childResults.getString("containers");
containerNames = containersString.split(";");
containerNames = this.convertNameListToUUIDList(containerNames);
accessorsString = childResults.getString("accessors");
accessorNames = accessorsString.split(";");
accessorNames = this.convertNameListToUUIDList(accessorNames);
managersString = childResults.getString("managers");
managerNames = managersString.split(";");
managerNames = this.convertNameListToUUIDList(managerNames);
Claim childClaim = new Claim(lesserBoundaryCorner, greaterBoundaryCorner, null, builderNames, containerNames, accessorNames, managerNames, null);
//add this claim to the list of children of the current top level claim
childClaim.parent = topLevelClaim;
topLevelClaim.children.add(childClaim);
childClaim.inDataStore = true;
} }
} }
catch(SQLException e) catch(SQLException e)
@ -339,6 +312,18 @@ public class DatabaseDataStore extends DataStore
GriefPrevention.AddLogEntry("Unable to load a claim. Details: " + e.getMessage() + " ... " + results.toString()); GriefPrevention.AddLogEntry("Unable to load a claim. Details: " + e.getMessage() + " ... " + results.toString());
e.printStackTrace(); e.printStackTrace();
} }
//add subdivisions to their parent claims
for(Claim childClaim : subdivisionsToLoad)
{
//find top level claim parent
Claim topLevelClaim = this.getClaimAt(childClaim.getLesserBoundaryCorner(), true, null);
//add this claim to the list of children of the current top level claim
childClaim.parent = topLevelClaim;
topLevelClaim.children.add(childClaim);
childClaim.inDataStore = true;
}
} }
for(int i = 0; i < claimsToRemove.size(); i++) for(int i = 0; i < claimsToRemove.size(); i++)