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

Retry when failing to store join address in storeAllSessionsWithKillAndWorldData

Browse Source 
Another transaction may have run before this transaction that stored the same join address.

Affects issues:
- Possibly fixed #2601
This commit is contained in:
Aurora Lahtela 2022-09-12 07:55:34 +03:00
parent 3de1de82fe
commit 1e1687d83c
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/LargeStoreQueries.java
View File

@ -31,6 +31,7 @@ import com.djrapitops.plan.storage.database.transactions.ExecBatchStatement;
import com.djrapitops.plan.storage.database.transactions.Executable;
import org.apache.commons.lang3.StringUtils;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.sql.Types;
@ -299,8 +300,7 @@ public class LargeStoreQueries {
public static Executable storeAllSessionsWithKillAndWorldData(Collection<FinishedSession> sessions) {
return connection -> {
Set<World> existingWorlds = WorldTimesQueries.fetchWorlds().executeWithConnection(connection);
List<String> existingJoinAddresses = JoinAddressQueries.allJoinAddresses().executeWithConnection(connection);
storeAllJoinAddresses(sessions, existingJoinAddresses).execute(connection);
tryStoreAllJoinAddresses(sessions, connection, 0);
storeAllWorldNames(sessions, existingWorlds).execute(connection);
storeAllSessionsWithoutKillOrWorldData(sessions).execute(connection);
storeSessionKillData(sessions).execute(connection);
@ -308,6 +308,19 @@ public class LargeStoreQueries {
};
}
private static void tryStoreAllJoinAddresses(Collection<FinishedSession> sessions, Connection connection, int attempt) {
try {
List<String> existingJoinAddresses = JoinAddressQueries.allJoinAddresses().executeWithConnection(connection);
storeAllJoinAddresses(sessions, existingJoinAddresses).execute(connection);
} catch (DBOpException e) {
if (e.getMessage().contains("Duplicate entry") && attempt < 3) {
tryStoreAllJoinAddresses(sessions, connection, attempt + 1);
} else {
throw e;
}
}
}
private static Executable storeAllJoinAddresses(Collection<FinishedSession> sessions, List<String> existingJoinAddresses) {
return new ExecBatchStatement(JoinAddressTable.INSERT_STATEMENT) {
@Override
@ -318,8 +331,8 @@ public class LargeStoreQueries {
.filter(Optional::isPresent)
.map(Optional::get)
.map(JoinAddress::getAddress)
.filter(address -> !existingJoinAddresses.contains(address))
.distinct()
.filter(address -> !existingJoinAddresses.contains(address))
.forEach(address -> {
try {
statement.setString(1, address);