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
broker/src/main/java/io/moquette/spi/ClientSession.java
+3 -3
View File
@@ -23,8 +23,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.HashSet;
import java.util.Queue;
import java.util.Set;
import java.util.concurrent.BlockingQueue;
/**
* Model a Session like describe on page 25 of MQTT 3.1.1 specification:
@@ -108,8 +108,8 @@ public class ClientSession {
*
* @return the list of messages to be delivered for client related to the session.
*/
public BlockingQueue<IMessagesStore.StoredMessage> queue() {
LOG.info("Retrieving enqueued messages. ClientId={}", clientID);
public Queue<IMessagesStore.StoredMessage> queue() {
LOG.info("Retrieving enqueued messages. CId={}", clientID);
return this.m_sessionsStore.queue(clientID);
}
broker/src/main/java/io/moquette/spi/ISessionsStore.java
+4 -4
View File
@@ -19,7 +19,7 @@ package io.moquette.spi;
import io.moquette.spi.IMessagesStore.StoredMessage;
import java.util.Collection;
import java.util.concurrent.BlockingQueue;
import java.util.Queue;
/**
* Store used to handle the persistence of the subscriptions tree.
@@ -79,13 +79,13 @@ public interface ISessionsStore {
int nextPacketID(String clientID);
/**
* List the guids for retained messages for the session
* List the published retained messages for the session
*
* @param clientID
* the client ID owning the queue.
* @return the list of queue message UUIDs.
* @return the queue of messages.
*/
BlockingQueue<StoredMessage> queue(String clientID);
Queue<StoredMessage> queue(String clientID);
void dropQueue(String clientID);
broker/src/main/java/io/moquette/spi/impl/InternalRepublisher.java
+5 -8
View File
@@ -22,10 +22,9 @@ import io.netty.buffer.ByteBuf;
import io.netty.handler.codec.mqtt.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.BlockingQueue;
import java.util.Queue;
class InternalRepublisher {
@@ -54,11 +53,9 @@ class InternalRepublisher {
}
}
void publishStored(ClientSession clientSession, BlockingQueue<IMessagesStore.StoredMessage> publishedEvents) {
List<IMessagesStore.StoredMessage> storedPublishes = new ArrayList<>();
publishedEvents.drainTo(storedPublishes);
for (IMessagesStore.StoredMessage pubEvt : storedPublishes) {
void publishStored(ClientSession clientSession, Queue<IMessagesStore.StoredMessage> publishedEvents) {
IMessagesStore.StoredMessage pubEvt;
while ((pubEvt = publishedEvents.poll()) != null) {
// put in flight zone
LOG.debug("Adding message ot inflight zone. ClientId={}, guid={}, topic={}", clientSession.clientID,
pubEvt.getGuid(), pubEvt.getTopic());
broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java
+3 -6
View File
@@ -36,10 +36,7 @@ import io.netty.handler.timeout.IdleStateHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.UUID;
import java.util.*;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -452,9 +449,9 @@ public class ProtocolProcessor {
*/
private void republishStoredInSession(ClientSession clientSession) {
LOG.info("Republishing stored publish events. CId={}", clientSession.clientID);
BlockingQueue<StoredMessage> publishedEvents = clientSession.queue();
Queue<StoredMessage> publishedEvents = clientSession.queue();
if (publishedEvents.isEmpty()) {
LOG.info("There are no stored publish events to ClientId={}", clientSession.clientID);
LOG.info("There are no stored publish events to CId={}", clientSession.clientID);
return;
}