Moved retained storage part into StorageService
This commit is contained in:
@@ -0,0 +1,8 @@
|
|||||||
|
package org.dna.mqtt.moquette.messaging.spi;
|
||||||
|
|
||||||
|
/**
|
||||||
|
*/
|
||||||
|
public interface IMatchingCondition {
|
||||||
|
boolean match(String key);
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
package org.dna.mqtt.moquette.messaging.spi;
|
||||||
|
|
||||||
|
import org.dna.mqtt.moquette.messaging.spi.impl.SimpleMessaging;
|
||||||
|
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
|
||||||
|
import static org.dna.mqtt.moquette.messaging.spi.impl.SimpleMessaging.StoredMessage;
|
||||||
|
|
||||||
|
import java.util.Collection;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Defines the SPI to be implemented by a StorageService that handle persistence of messages and subscriptions.
|
||||||
|
*/
|
||||||
|
public interface IStorageService {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Used to initialize all persistent store structures
|
||||||
|
* */
|
||||||
|
void initStore();
|
||||||
|
|
||||||
|
void storeRetained(String topic, byte[] message, AbstractMessage.QOSType qos);
|
||||||
|
|
||||||
|
Collection<StoredMessage> searchMatching(IMatchingCondition condition);
|
||||||
|
|
||||||
|
}
|
||||||
+72
@@ -0,0 +1,72 @@
|
|||||||
|
package org.dna.mqtt.moquette.messaging.spi.impl;
|
||||||
|
|
||||||
|
import org.dna.mqtt.moquette.messaging.spi.IMatchingCondition;
|
||||||
|
import org.dna.mqtt.moquette.messaging.spi.IStorageService;
|
||||||
|
import org.dna.mqtt.moquette.messaging.spi.impl.events.PublishEvent;
|
||||||
|
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
|
||||||
|
import org.fusesource.hawtbuf.codec.StringCodec;
|
||||||
|
import org.fusesource.hawtdb.api.BTreeIndexFactory;
|
||||||
|
import org.fusesource.hawtdb.api.MultiIndexFactory;
|
||||||
|
import org.fusesource.hawtdb.api.PageFileFactory;
|
||||||
|
import org.fusesource.hawtdb.api.SortedIndex;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import static org.dna.mqtt.moquette.messaging.spi.impl.SimpleMessaging.StoredMessage;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of IStorageService backed by HawtDB
|
||||||
|
*/
|
||||||
|
public class HawtDBStorageService implements IStorageService {
|
||||||
|
|
||||||
|
private static final Logger LOG = LoggerFactory.getLogger(HawtDBStorageService.class);
|
||||||
|
|
||||||
|
private MultiIndexFactory m_multiIndexFactory;
|
||||||
|
private PageFileFactory pageFactory;
|
||||||
|
|
||||||
|
private SortedIndex<String, StoredMessage> m_retainedStore;
|
||||||
|
|
||||||
|
public HawtDBStorageService(MultiIndexFactory multiIndexFactory) {
|
||||||
|
m_multiIndexFactory = multiIndexFactory;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void initStore() {
|
||||||
|
BTreeIndexFactory<String, StoredMessage> indexFactory = new BTreeIndexFactory<String, StoredMessage>();
|
||||||
|
indexFactory.setKeyCodec(StringCodec.INSTANCE);
|
||||||
|
|
||||||
|
m_retainedStore = (SortedIndex<String, StoredMessage>) m_multiIndexFactory.openOrCreate("retained", indexFactory);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public void storeRetained(String topic, byte[] message, AbstractMessage.QOSType qos) {
|
||||||
|
if (message.length == 0) {
|
||||||
|
//clean the message from topic
|
||||||
|
m_retainedStore.remove(topic);
|
||||||
|
} else {
|
||||||
|
//store the message to the topic
|
||||||
|
m_retainedStore.put(topic, new StoredMessage(message, qos));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public Collection<StoredMessage> searchMatching(IMatchingCondition condition) {
|
||||||
|
LOG.debug("searchMatching scanning all retained messages, presents are " + m_retainedStore.size());
|
||||||
|
|
||||||
|
List<StoredMessage> results = new ArrayList<StoredMessage>();
|
||||||
|
|
||||||
|
for (Map.Entry<String, StoredMessage> entry : m_retainedStore) {
|
||||||
|
StoredMessage storedMsg = entry.getValue();
|
||||||
|
if (condition.match(entry.getKey())) {
|
||||||
|
results.add(storedMsg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return results;
|
||||||
|
}
|
||||||
|
}
|
||||||
+27
-27
@@ -5,16 +5,20 @@ import java.io.IOException;
|
|||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.text.ParseException;
|
import java.text.ParseException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.concurrent.BlockingQueue;
|
import java.util.concurrent.BlockingQueue;
|
||||||
import java.util.concurrent.LinkedBlockingQueue;
|
import java.util.concurrent.LinkedBlockingQueue;
|
||||||
import org.apache.mina.core.session.IoSession;
|
import org.apache.mina.core.session.IoSession;
|
||||||
import org.dna.mqtt.moquette.MQTTException;
|
import org.dna.mqtt.moquette.MQTTException;
|
||||||
|
import org.dna.mqtt.moquette.messaging.spi.IMatchingCondition;
|
||||||
import org.dna.mqtt.moquette.messaging.spi.IMessaging;
|
import org.dna.mqtt.moquette.messaging.spi.IMessaging;
|
||||||
import org.dna.mqtt.moquette.messaging.spi.INotifier;
|
import org.dna.mqtt.moquette.messaging.spi.INotifier;
|
||||||
|
import org.dna.mqtt.moquette.messaging.spi.IStorageService;
|
||||||
import org.dna.mqtt.moquette.messaging.spi.impl.SubscriptionsStore.Token;
|
import org.dna.mqtt.moquette.messaging.spi.impl.SubscriptionsStore.Token;
|
||||||
import org.dna.mqtt.moquette.messaging.spi.impl.events.*;
|
import org.dna.mqtt.moquette.messaging.spi.impl.events.*;
|
||||||
|
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
|
||||||
import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType;
|
import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType;
|
||||||
import org.dna.mqtt.moquette.server.Constants;
|
import org.dna.mqtt.moquette.server.Constants;
|
||||||
import org.dna.mqtt.moquette.server.Server;
|
import org.dna.mqtt.moquette.server.Server;
|
||||||
@@ -33,11 +37,12 @@ import org.slf4j.LoggerFactory;
|
|||||||
*/
|
*/
|
||||||
public class SimpleMessaging implements IMessaging, Runnable {
|
public class SimpleMessaging implements IMessaging, Runnable {
|
||||||
|
|
||||||
private static class StoredMessage implements Serializable {
|
//TODO probably move this
|
||||||
|
public static class StoredMessage implements Serializable {
|
||||||
QOSType m_qos;
|
QOSType m_qos;
|
||||||
byte[] m_payload;
|
byte[] m_payload;
|
||||||
|
|
||||||
private StoredMessage(byte[] message, QOSType qos) {
|
StoredMessage(byte[] message, QOSType qos) {
|
||||||
m_qos = qos;
|
m_qos = qos;
|
||||||
m_payload = message;
|
m_payload = message;
|
||||||
}
|
}
|
||||||
@@ -58,13 +63,17 @@ public class SimpleMessaging implements IMessaging, Runnable {
|
|||||||
private BlockingQueue<MessagingEvent> m_inboundQueue = new LinkedBlockingQueue<MessagingEvent>();
|
private BlockingQueue<MessagingEvent> m_inboundQueue = new LinkedBlockingQueue<MessagingEvent>();
|
||||||
|
|
||||||
private INotifier m_notifier;
|
private INotifier m_notifier;
|
||||||
|
|
||||||
|
//TODO remove
|
||||||
private MultiIndexFactory m_multiIndexFactory;
|
private MultiIndexFactory m_multiIndexFactory;
|
||||||
private PageFileFactory pageFactory;
|
private PageFileFactory pageFactory;
|
||||||
private SortedIndex<String, StoredMessage> m_retainedStore;
|
|
||||||
//bind clientID+MsgID -> evt message published
|
//bind clientID+MsgID -> evt message published
|
||||||
private SortedIndex<String, PublishEvent> m_inflightStore;
|
private SortedIndex<String, PublishEvent> m_inflightStore;
|
||||||
//maps clientID to the list of pending messages stored
|
//maps clientID to the list of pending messages stored
|
||||||
private SortedIndex<String, List<PublishEvent>> m_persistentMessageStore;
|
private SortedIndex<String, List<PublishEvent>> m_persistentMessageStore;
|
||||||
|
|
||||||
|
private IStorageService m_storageService;
|
||||||
|
|
||||||
public SimpleMessaging() {
|
public SimpleMessaging() {
|
||||||
String storeFile = Server.STORAGE_FILE_PATH;
|
String storeFile = Server.STORAGE_FILE_PATH;
|
||||||
@@ -84,19 +93,14 @@ public class SimpleMessaging implements IMessaging, Runnable {
|
|||||||
m_multiIndexFactory = new MultiIndexFactory(pageFile);
|
m_multiIndexFactory = new MultiIndexFactory(pageFile);
|
||||||
|
|
||||||
subscriptions.init(m_multiIndexFactory);
|
subscriptions.init(m_multiIndexFactory);
|
||||||
initRetainedMessageStore();
|
|
||||||
initInflightMessageStore();
|
initInflightMessageStore();
|
||||||
//init the message store for QoS 1/2 messages in clean sessions
|
//init the message store for QoS 1/2 messages in clean sessions
|
||||||
initPersistentMessageStore();
|
initPersistentMessageStore();
|
||||||
}
|
|
||||||
|
|
||||||
private void initRetainedMessageStore() {
|
|
||||||
BTreeIndexFactory<String, StoredMessage> indexFactory = new BTreeIndexFactory<String, StoredMessage>();
|
|
||||||
indexFactory.setKeyCodec(StringCodec.INSTANCE);
|
|
||||||
|
|
||||||
// m_persistent = indexFactory.openOrCreate(pageFile);
|
m_storageService = new HawtDBStorageService(m_multiIndexFactory);
|
||||||
m_retainedStore = (SortedIndex<String, StoredMessage>) m_multiIndexFactory.openOrCreate("retained", indexFactory);
|
m_storageService.initStore();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initialize the message store used to handle the temporary storage of QoS 1,2
|
* Initialize the message store used to handle the temporary storage of QoS 1,2
|
||||||
@@ -313,13 +317,7 @@ public class SimpleMessaging implements IMessaging, Runnable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (retain) {
|
if (retain) {
|
||||||
if (message.length == 0) {
|
m_storageService.storeRetained(topic, message, qos);
|
||||||
//clean the message from topic
|
|
||||||
m_retainedStore.remove(topic);
|
|
||||||
} else {
|
|
||||||
//store the message to the topic
|
|
||||||
m_retainedStore.put(topic, new StoredMessage(message, qos));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -327,20 +325,22 @@ public class SimpleMessaging implements IMessaging, Runnable {
|
|||||||
protected void processSubscribe(SubscribeEvent evt) {
|
protected void processSubscribe(SubscribeEvent evt) {
|
||||||
LOG.debug("processSubscribe invoked");
|
LOG.debug("processSubscribe invoked");
|
||||||
Subscription newSubscription = evt.getSubscription();
|
Subscription newSubscription = evt.getSubscription();
|
||||||
String topic = newSubscription.getTopic();
|
final String topic = newSubscription.getTopic();
|
||||||
|
|
||||||
subscriptions.add(newSubscription);
|
subscriptions.add(newSubscription);
|
||||||
|
|
||||||
//scans retained messages to be published to the new subscription
|
//scans retained messages to be published to the new subscription
|
||||||
LOG.debug("Scanning all retained messages, presents are " + m_retainedStore.size());
|
Collection<StoredMessage> messages = m_storageService.searchMatching(new IMatchingCondition() {
|
||||||
for (Map.Entry<String, StoredMessage> entry : m_retainedStore) {
|
public boolean match(String key) {
|
||||||
StoredMessage storedMsg = entry.getValue();
|
return matchTopics(key, topic); //To change body of implemented methods use File | Settings | File Templates.
|
||||||
if (matchTopics(entry.getKey(), topic)) {
|
|
||||||
//fire the as retained the message
|
|
||||||
LOG.debug("Inserting NotifyEvent into outbound for topic " + topic + " entry " + entry.getKey());
|
|
||||||
m_notifier.notify(new NotifyEvent(newSubscription.clientId, topic, storedMsg.getQos(),
|
|
||||||
storedMsg.getPayload(), true));
|
|
||||||
}
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
for (StoredMessage storedMsg : messages) {
|
||||||
|
//fire the as retained the message
|
||||||
|
LOG.debug("Inserting NotifyEvent into outbound for topic " + topic);
|
||||||
|
m_notifier.notify(new NotifyEvent(newSubscription.clientId, topic, storedMsg.getQos(),
|
||||||
|
storedMsg.getPayload(), true));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user