Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-03-11 14:20:54 +01:00
Code Issues Projects Releases Wiki Activity

Remove some of processStatus calls

Browse Source
This commit is contained in:
Rsl1122 2017-08-17 09:50:56 +03:00
parent 40c5834a8e
commit e3ab0ae1c3
2 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Plan/src/main/java/com/djrapitops/plan/data/handling/importing/Importer.java
View File

@ -2,7 +2,6 @@ package main.java.com.djrapitops.plan.data.handling.importing;
import com.djrapitops.plugin.utilities.player.Fetch;
import com.djrapitops.plugin.utilities.player.IOfflinePlayer;
import com.djrapitops.plugin.utilities.status.ProcessStatus;
import main.java.com.djrapitops.plan.Log;
import main.java.com.djrapitops.plan.Plan;
import main.java.com.djrapitops.plan.data.UserData;
@ -49,23 +48,15 @@ public abstract class Importer {
public boolean importData(Collection<UUID> uuids, String... args) {
Plan plan = Plan.getInstance();
plan.getAnalysisCache().disableAnalysisTemporarily();
String processName = "Import, " + getClass().getSimpleName();
try {
String processName = "Import, " + getClass().getSimpleName();
ProcessStatus<Plan> processStatus = plan.processStatus();
DataCacheHandler handler = plan.getHandler();
Database db = plan.getDB();
processStatus.startExecution(processName);
Benchmark.start(processName);
Set<UUID> saved;
try {
saved = db.getSavedUUIDs();
} catch (SQLException ex) {
Log.toLog(this.getClass().getName(), ex);
return false;
}
saved = db.getSavedUUIDs();
List<UUID> unSaved = new ArrayList<>(uuids);
unSaved.removeAll(saved);
@ -73,7 +64,7 @@ public abstract class Importer {
int amount = unSaved.size();
String createUserObjects = "Creating " + amount + " new UserData objects";
processStatus.setStatus(processName, createUserObjects);
Log.debug(processName, createUserObjects);
Map<UUID, IOfflinePlayer> offlinePlayers = Fetch.getIOfflinePlayers().stream().collect(Collectors.toMap(IOfflinePlayer::getUuid, Function.identity()));
@ -101,26 +92,24 @@ public abstract class Importer {
newPlayer.setLastPlayed(newPlayer.getRegistered());
newUsers.add(newPlayer);
if (milestones.contains(currentUser.incrementAndGet())) {
processStatus.setStatus(processName, "Creating new UserData objects: " + currentPercent.addAndGet(5) + "%");
Log.debug(processName, "Creating new UserData objects: " + currentPercent.addAndGet(5) + "%");
}
});
Benchmark.stop(createUserObjects);
processStatus.setStatus(processName, "Save new UserData objects (" + amount + ")");
Benchmark.stop(processName, createUserObjects);
Log.debug(processName, "Save new UserData objects (" + amount + ")");
try {
plan.getDB().saveMultipleUserData(newUsers);
} catch (SQLException ex) {
Log.toLog(this.getClass().getName(), ex);
}
plan.getDB().saveMultipleUserData(newUsers);
for (UUID uuid : uuids) {
handler.addToPool(importData(uuid, args));
}
processStatus.finishExecution(processName);
} catch (SQLException ex) {
Log.toLog(this.getClass().getName(), ex);
return false;
} finally {
plan.getAnalysisCache().enableAnalysis();
Log.logDebug(processName, Benchmark.stop(processName, processName));
}
return true;
}

10
Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java
View File

@ -160,7 +160,7 @@ public abstract class SQLDB extends Database {
/**
* Creates the tables that contain data.
*
* <p>
* Updates table columns to latest schema.
*
* @return true if successful.
@ -202,7 +202,6 @@ public abstract class SQLDB extends Database {
Log.debug("Database", "No conversion necessary.");
return;
}
setStatus("Bukkit Data Conversion");
Log.info("Beginning Bukkit Data -> DB Conversion for " + uuids.size() + " players");
int id = plugin.getBootAnalysisTaskID();
if (id != -1) {
@ -256,8 +255,8 @@ public abstract class SQLDB extends Database {
if (connection != null) {
connection.close();
}
Log.logDebug("Database"); // Log remaining Debug info if present
setStatus("Closed");
Log.logDebug("Database"); // Log remaining Debug info if present
}
/**
@ -287,7 +286,6 @@ public abstract class SQLDB extends Database {
if (uuid == null) {
return false;
}
setStatus("User exist check");
try {
return usersTable.getUserId(uuid.toString()) != -1;
} catch (SQLException e) {
@ -309,7 +307,6 @@ public abstract class SQLDB extends Database {
return false;
}
try {
setStatus("Remove account " + uuid);
Benchmark.start("Remove Account");
Log.debug("Database", "Removing Account: " + uuid);
try {
@ -628,11 +625,10 @@ public abstract class SQLDB extends Database {
}
private void setStatus(String status) {
plugin.processStatus().setStatus("DB-" + getName(), status);
Log.debug("Database", status);
}
public void setAvailable() {
setStatus("Running");
Log.logDebug("Database");
}