anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed the constraint on client queues to be BlockingQueue but simple Queue

Browse Source
This commit is contained in:
andsel
2017-06-20 21:55:59 +02:00
parent 1f3d39f4b1
commit 53ec8e5b60
10 changed files with 38 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mapdb_storage/src/main/java/io/moquette/persistence/mapdb/MapDBPersistentStore.java
+2 -1
View File
@@ -25,6 +25,7 @@ import org.mapdb.DB;
import org.mapdb.DBMaker;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import java.util.concurrent.ScheduledExecutorService;
@@ -108,7 +109,7 @@ public class MapDBPersistentStore implements IStore {
this.m_db.close();
LOG.info("Stopping MapDB commit tasks");
//TODO th scheduler must be stopped by the owning (the instance of Server)
//TODO the scheduler must be stopped by the owning (the instance of Server)
//invalidate the added task
this.m_scheduler.shutdown();
try {
mapdb_storage/src/main/java/io/moquette/persistence/mapdb/MapDBSessionsStore.java
+4 -5
View File
@@ -28,7 +28,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.*;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -235,20 +234,20 @@ class MapDBSessionsStore implements ISessionsStore, ISubscriptionsStore {
}
@Override
public BlockingQueue<StoredMessage> queue(String clientID) {
LOG.info("Queuing pending message. ClientId={}, guid={}", clientID);
public Queue<StoredMessage> queue(String clientID) {
LOG.info("Queuing pending message. CId={}, guid={}", clientID);
return this.m_db.getQueue(clientID);
}
@Override
public void dropQueue(String clientID) {
LOG.info("Removing pending messages. ClientId={}", clientID);
LOG.info("Removing pending messages. CId={}", clientID);
this.m_db.delete(clientID);
}
@Override
public void moveInFlightToSecondPhaseAckWaiting(String clientID, int messageID, StoredMessage msg) {
LOG.debug("Moving inflight message to 2nd phase ack state. ClientId={}, messageID={}", clientID, messageID);
LOG.debug("Moving inflight message to 2nd phase ack state. CId={}, messageID={}", clientID, messageID);
ConcurrentMap<Integer, StoredMessage> m = this.m_secondPhaseStore.get(clientID);
if (m == null) {
String error = String.format("Can't find the inFlight record for client <%s> during the second phase of " +