feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

Don't try to process row if actors could not be inserted

Browse Source
This commit is contained in:
Brokkonaut
2018-09-13 02:29:21 +02:00
parent faaab7c4f6
commit 421f16784f
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/de/diddiz/LogBlock/Consumer.java
View File

@@ -51,7 +51,6 @@ import de.diddiz.util.Utils;
public class Consumer extends Thread { public class Consumer extends Thread {
private final Deque<Row> queue = new ArrayDeque<Row>(); private final Deque<Row> queue = new ArrayDeque<Row>();
private final Set<Actor> failedPlayers = new HashSet<Actor>();
private final LogBlock logblock; private final LogBlock logblock;
private final Map<Actor, Integer> playerIds = new HashMap<Actor, Integer>(); private final Map<Actor, Integer> playerIds = new HashMap<Actor, Integer>();
private final Map<Actor, Integer> uncommitedPlayerIds = new HashMap<Actor, Integer>(); private final Map<Actor, Integer> uncommitedPlayerIds = new HashMap<Actor, Integer>();
@@ -474,17 +473,15 @@ public class Consumer extends Thread {
for (final Actor actor : r.getActors()) { for (final Actor actor : r.getActors()) {
if (playerIDAsIntIncludeUncommited(actor) == null) { if (playerIDAsIntIncludeUncommited(actor) == null) {
if (!addPlayer(conn, actor)) { if (!addPlayer(conn, actor)) {
if (failedPlayers.add(actor)) { logblock.getLogger().warning("[Consumer] Failed to add player " + actor.getName());
logblock.getLogger().warning("[Consumer] Failed to add player " + actor.getName());
}
failOnActors = true; // skip this row failOnActors = true; // skip this row
} }
} }
} }
if (!failOnActors) { if (!failOnActors) {
currentRows.add(r); currentRows.add(r);
r.process(conn, batchHelper);
} }
r.process(conn, batchHelper);
} }
if (currentRows.size() >= (processBatch ? 1 : (Config.forceToProcessAtLeast * 10))) { if (currentRows.size() >= (processBatch ? 1 : (Config.forceToProcessAtLeast * 10))) {
batchHelper.processStatements(conn); batchHelper.processStatements(conn);