Upstream/Minepacks
1
0
Fork 0
mirror of https://github.com/GeorgH93/Minepacks.git synced 2024-11-14 10:45:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Performance upgrade for UUID updater

Browse Source
This commit is contained in:
GeorgH93 2016-03-21 00:59:25 +01:00
parent 1520c8a788
commit ee30e1d2dd
3 changed files with 42 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -45,7 +45,7 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.9-SNAPSHOT</version>
<version>LATEST</version>
<scope>provided</scope>
</dependency>
<dependency>

1
src/at/pcgamingfreaks/MinePacks/Database/Language.java
View File

@ -28,6 +28,7 @@ public Language(JavaPlugin plugin)
super(plugin, LANG_VERSION);
}
@SuppressWarnings("SpellCheckingInspection")
@Override
protected void doUpdate()
{

59
src/at/pcgamingfreaks/MinePacks/Database/SQL.java
View File

@ -29,12 +29,8 @@
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import java.sql.*;
import java.util.*;
public abstract class SQL extends Database
{
@ -109,37 +105,54 @@ public UpdateData(String name, String uuid, int id)
this.uuid = uuid;
}
}
try
try(Connection connection = getConnection())
{
Map<String, UpdateData> toConvert = new HashMap<>();
List<UpdateData> toUpdate = new LinkedList<>();
try(Statement stmt = connection.createStatement(); ResultSet res = stmt.executeQuery(Query_GetUnsetOrInvalidUUIDs))
{
List<UpdateData> converter = new ArrayList<>();
PreparedStatement ps = getConnection().prepareStatement(Query_FixUUIDs);
ResultSet res = getConnection().createStatement().executeQuery(Query_GetUnsetOrInvalidUUIDs);
while(res.next())
{
if(res.isFirst())
{
plugin.log.info(plugin.lang.get("Console.UpdateUUIDs"));
}
converter.add(new UpdateData(res.getString(2), res.getString(3), res.getInt(1)));
}
res.close();
if(converter.size() > 0)
String uuid = res.getString(Field_UUID);
if(uuid == null)
{
for(UpdateData data : converter)
{
if(data.uuid == null)
{
ps.setString(1, UUIDConverter.getUUIDFromName(data.name, true, useUUIDSeparators, false));
toConvert.put(res.getString(Field_Name) ,new UpdateData(res.getString(Field_Name), null, res.getInt(Field_PlayerID)));
}
else
{
ps.setString(1, (useUUIDSeparators) ? data.uuid.replaceAll("(\\w{8})(\\w{4})(\\w{4})(\\w{4})(\\w{12})", "$1-$2-$3-$4-$5") : data.uuid.replaceAll("-", ""));
uuid = (useUUIDSeparators) ? uuid.replaceAll("(\\w{8})(\\w{4})(\\w{4})(\\w{4})(\\w{12})", "$1-$2-$3-$4-$5") : uuid.replaceAll("-", "");
toUpdate.add(new UpdateData(res.getString(Field_Name), uuid, res.getInt(Field_PlayerID)));
}
ps.setInt(2, data.id);
}
plugin.log.info(String.format(plugin.lang.get("Console.UpdatedUUIDs"), converter.size()));
}
ps.close();
if(toConvert.size() > 0 || toUpdate.size() > 0)
{
if(toConvert.size() > 0)
{
Map<String, String> newUUIDs = UUIDConverter.getUUIDsFromNames(toConvert.keySet(), true, useUUIDSeparators);
for(Map.Entry<String, String> entry : newUUIDs.entrySet())
{
UpdateData updateData = toConvert.get(entry.getKey());
updateData.uuid = entry.getValue();
toUpdate.add(updateData);
}
}
try(PreparedStatement ps = connection.prepareStatement(Query_FixUUIDs))
{
for(UpdateData updateData : toUpdate)
{
ps.setString(1, updateData.uuid);
ps.setInt(2, updateData.id);
ps.addBatch();
ps.executeBatch();
}
}
plugin.log.info(String.format(plugin.lang.get("Console.UpdatedUUIDs"), toUpdate.size()));
}
}
catch(SQLException e)
{