Removed old 'map based queues' to use persistent BlockingQueues from MapDB

broker/src/test/java/io/moquette/spi/impl/MemoryMessagesStore.java

@@ -78,15 +78,6 @@ public class MemoryMessagesStore implements IMessagesStore {
         return guid;
     }
 
-    @Override
-    public List<StoredMessage> listMessagesInSession(Collection<MessageGUID> guids) {
-        List<StoredMessage> ret = new ArrayList<>();
-        for (MessageGUID guid : guids) {
-            ret.add(m_persistentMessageStore.get(guid));
-        }
-        return ret;
-    }
-
     @Override
     public void dropMessagesInSession(String clientID) {
         Map<Integer, MessageGUID> messageGUIDMap = m_messageToGuids.get(clientID);

broker/src/test/java/io/moquette/spi/impl/ProtocolProcessorTest.java

@@ -18,7 +18,6 @@ package io.moquette.spi.impl;
 import io.moquette.parser.proto.messages.*;
 import io.moquette.interception.InterceptHandler;
 import io.moquette.parser.proto.messages.AbstractMessage.QOSType;
-import io.moquette.server.ConnectionDescriptor;
 import io.moquette.server.netty.NettyUtils;
 import io.moquette.spi.*;
 import io.moquette.spi.IMessagesStore.StoredMessage;
@@ -32,6 +31,8 @@ import org.junit.Test;
 
 import java.nio.ByteBuffer;
 import java.util.*;
+import java.util.concurrent.BlockingQueue;
+
 import static io.moquette.spi.impl.NettyChannelAssertions.assertConnAckAccepted;
 import static io.moquette.spi.impl.ProtocolProcessor.lowerQosToTheSubscriptionDesired;
 import static org.junit.Assert.*;
@@ -382,8 +383,8 @@ public class ProtocolProcessorTest {
         m_processor.processConnect(m_channel, connectMessage);
 
         //Verify no messages are still stored
-        Collection<MessageGUID> guids = m_sessionStore.enqueued(FAKE_PUBLISHER_ID);
-        assertTrue(m_messagesStore.listMessagesInSession(guids).isEmpty());
+        BlockingQueue<StoredMessage> messages = m_sessionStore.queue(FAKE_PUBLISHER_ID);
+        assertTrue(messages.isEmpty());
     }
     
     @Test

broker/src/test/java/io/moquette/spi/persistence/MemorySessionStore.java

@@ -15,6 +15,7 @@
  */
 package io.moquette.spi.persistence;
 
+import io.moquette.server.Constants;
 import io.moquette.spi.ClientSession;
 import io.moquette.spi.IMessagesStore;
 import io.moquette.spi.IMessagesStore.StoredMessage;
@@ -27,6 +28,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.*;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
 
 /**
  *
@@ -42,8 +45,8 @@ public class MemorySessionStore implements ISessionsStore {
     //maps clientID->[MessageId -> guid]
     private Map<String, Map<Integer, MessageGUID>> m_inflightStore = new HashMap<>();
 //    private Map<String, Set<Integer>> m_inflightIDs = new HashMap<>();
-    //maps clientID->[guid*]
-    private Map<String, Set<MessageGUID>> m_enqueuedStore = new HashMap<>();
+    //maps clientID->BlockingQueue
+    private Map<String, BlockingQueue<StoredMessage>> queues = new HashMap<>();
     //maps clientID->[MessageId -> guid]
     private Map<String, Map<Integer, MessageGUID>> m_secondPhaseStore = new HashMap<>();
 
@@ -205,22 +208,13 @@ public class MemorySessionStore implements ISessionsStore {
     }
 
     @Override
-    public void bindToDeliver(MessageGUID guid, String clientID) {
-        Set<MessageGUID> guids = Utils.defaultGet(m_enqueuedStore, clientID, new HashSet<MessageGUID>());
-        guids.add(guid);
-        m_enqueuedStore.put(clientID, guids);
+    public BlockingQueue<StoredMessage> queue(String clientID) {
+        return Utils.defaultGet(queues, clientID, new ArrayBlockingQueue<StoredMessage>(Constants.MAX_MESSAGE_QUEUE));
     }
 
     @Override
-    public Collection<MessageGUID> enqueued(String clientID) {
-        return Utils.defaultGet(m_enqueuedStore, clientID, new HashSet<MessageGUID>());
-    }
-
-    @Override
-    public void removeEnqueued(String clientID, MessageGUID guid) {
-        Set<MessageGUID> guids = Utils.defaultGet(m_enqueuedStore, clientID, new HashSet<MessageGUID>());
-        guids.remove(guid);
-        m_enqueuedStore.put(clientID, guids);
+    public void dropQueue(String clientID) {
+        queues.remove(clientID);
     }
 
     @Override