mirror/Plan
2
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-12-15 05:41:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Catch window function SQL syntax error

Browse Source 
Affects issues:
- Fixed #2143
This commit is contained in:
Risto Lahtela 2021-10-31 08:57:35 +02:00
parent 5468a22c50
commit 79fbf245d9
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Plan/common/src/main/java/com/djrapitops/plan/gathering/ServerUptimeCalculator.java
View File

@ -17,6 +17,7 @@
package com.djrapitops.plan.gathering;
import com.djrapitops.plan.PlanSystem;
import com.djrapitops.plan.exceptions.database.DBOpException;
import com.djrapitops.plan.gathering.domain.TPS;
import com.djrapitops.plan.identification.ServerInfo;
import com.djrapitops.plan.identification.ServerUUID;
@ -46,21 +47,33 @@ public class ServerUptimeCalculator {
if (serverUUID.equals(serverInfo.getServerUUID())) {
return Optional.of(System.currentTimeMillis() - PlanSystem.getServerEnableTime());
} else {
long dataGapThreshold = TimeUnit.MINUTES.toMillis(3);
Database database = dbSystem.getDatabase();
Optional<Long> latestDataDate = database.query(TPSQueries.fetchLatestTPSEntryForServer(serverUUID)).map(TPS::getDate);
Optional<Long> dataBlockStartDate = database.query(TPSQueries.fetchLatestServerStartTime(serverUUID, dataGapThreshold));
if (!latestDataDate.isPresent() || !dataBlockStartDate.isPresent()) {
return Optional.empty();
}
if (System.currentTimeMillis() - latestDataDate.get() > dataGapThreshold) {
return Optional.empty();
}
return Optional.of(System.currentTimeMillis() - dataBlockStartDate.get());
return getServerUptimeMillisFromDatabase(serverUUID);
}
}
private Optional<Long> getServerUptimeMillisFromDatabase(ServerUUID serverUUID) {
try {
return tryToGetServerUptimeMillisFromDatabase(serverUUID);
} catch (DBOpException windowFunctionsNotSupported) {
return Optional.empty();
}
}
private Optional<Long> tryToGetServerUptimeMillisFromDatabase(ServerUUID serverUUID) {
long dataGapThreshold = TimeUnit.MINUTES.toMillis(3);
Database database = dbSystem.getDatabase();
Optional<Long> latestDataDate = database.query(TPSQueries.fetchLatestTPSEntryForServer(serverUUID)).map(TPS::getDate);
Optional<Long> dataBlockStartDate = database.query(TPSQueries.fetchLatestServerStartTime(serverUUID, dataGapThreshold));
if (!latestDataDate.isPresent() || !dataBlockStartDate.isPresent()) {
return Optional.empty();
}
if (System.currentTimeMillis() - latestDataDate.get() > dataGapThreshold) {
return Optional.empty();
}
return Optional.of(System.currentTimeMillis() - dataBlockStartDate.get());
}
}