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

Implemented H2 based SubscriptionsRepository

Browse Source
This commit is contained in:
andsel
2018-11-13 22:50:02 +01:00
parent 1ba9eb3613
commit a36d926460
18 changed files with 151 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/io/moquette/broker/ISubscriptionsRepository.java
+2
View File
@@ -24,4 +24,6 @@ public interface ISubscriptionsRepository {
List<Subscription> listAllSubscriptions();
void addNewSubscription(Subscription subscription);
void removeSubscription(String topic, String clientID);
}
broker/src/main/java/io/moquette/broker/Server.java
+10 -7
View File
@@ -18,8 +18,8 @@ package io.moquette.broker;
import io.moquette.BrokerConstants;
import io.moquette.broker.config.*;
import io.moquette.interception.InterceptHandler;
import io.moquette.persistence.MemoryStorageService;
import io.moquette.spi.ISessionsStore;
import io.moquette.persistence.H2Builder;
import io.moquette.persistence.MemorySubscriptionsRepository;
import io.moquette.interception.BrokerInterceptor;
import io.moquette.broker.security.*;
import io.moquette.broker.subscriptions.CTrieSubscriptionDirectory;
@@ -159,11 +159,14 @@ public class Server {
authenticator = initializeAuthenticator(authenticator, config);
authorizatorPolicy = initializeAuthorizatorPolicy(authorizatorPolicy, config);
// TODO user real implementation DBG
MemoryStorageService memStorage = new MemoryStorageService(null, null);
ISessionsStore sessionStore = memStorage.sessionsStore();
ISubscriptionsRepository subscriptionsRepository = new MemorySubscriptionsRepository();
// DBG
final ISubscriptionsRepository subscriptionsRepository;
if (persistencePath != null && !persistencePath.isEmpty()) {
LOG.trace("Configuring H2 subscriptions store to {}", persistencePath);
subscriptionsRepository = new H2Builder(config, scheduler).initStore().subscriptionsRepository();
} else {
LOG.trace("Configuring in-memory subscriptions store");
subscriptionsRepository = new MemorySubscriptionsRepository();
}
ISubscriptionsDirectory subscriptions = new CTrieSubscriptionDirectory();
subscriptions.init(subscriptionsRepository);
broker/src/main/java/io/moquette/broker/subscriptions/CTrieSubscriptionDirectory.java
+17 -8
View File
@@ -28,8 +28,8 @@ public class CTrieSubscriptionDirectory implements ISubscriptionsDirectory {
private static final Token ROOT = new Token("root");
private static final INode NO_PARENT = null;
INode root;
private volatile ISubscriptionsRepository sessionsRepository;
private INode root;
private volatile ISubscriptionsRepository subscriptionsRepository;
interface IVisitor<T> {
@@ -43,23 +43,22 @@ public class CTrieSubscriptionDirectory implements ISubscriptionsDirectory {
}
@Override
public void init(ISubscriptionsRepository sessionsRepository) {
public void init(ISubscriptionsRepository subscriptionsRepository) {
LOG.info("Initializing CTrie");
final CNode mainNode = new CNode();
mainNode.token = ROOT;
this.root = new INode(mainNode);
LOG.info("Initializing subscriptions store...");
this.sessionsRepository = sessionsRepository;
this.subscriptionsRepository = subscriptionsRepository;
// reload any subscriptions persisted
if (LOG.isTraceEnabled()) {
LOG.trace("Reloading all stored subscriptions. SubscriptionTree = {}", dumpTree());
}
for (Subscription subscription : this.sessionsRepository.listAllSubscriptions()) {
LOG.info("Re-subscribing client to topic CId={}, topicFilter={}", subscription.clientId,
subscription.topicFilter);
add(subscription);
for (Subscription subscription : this.subscriptionsRepository.listAllSubscriptions()) {
LOG.debug("Re-subscribing {}", subscription);
addToTree(subscription);
}
if (LOG.isTraceEnabled()) {
LOG.trace("Stored subscriptions have been reloaded. SubscriptionTree = {}", dumpTree());
@@ -160,6 +159,11 @@ public class CTrieSubscriptionDirectory implements ISubscriptionsDirectory {
@Override
public void add(Subscription newSubscription) {
addToTree(newSubscription);
subscriptionsRepository.addNewSubscription(newSubscription);
}
private void addToTree(Subscription newSubscription) {
Action res;
do {
res = insert(newSubscription.topicFilter, this.root, newSubscription);
@@ -230,6 +234,11 @@ public class CTrieSubscriptionDirectory implements ISubscriptionsDirectory {
*/
@Override
public void removeSubscription(Topic topic, String clientID) {
removeFromTree(topic, clientID);
this.subscriptionsRepository.removeSubscription(topic.toString(), clientID);
}
private void removeFromTree(Topic topic, String clientID) {
Action res;
do {
res = remove(clientID, topic, this.root, NO_PARENT);
broker/src/main/java/io/moquette/broker/subscriptions/Subscription.java
+1 -26
View File
@@ -29,33 +29,17 @@ public final class Subscription implements Serializable {
private final MqttQoS requestedQos; // max QoS acceptable
final String clientId;
final Topic topicFilter;
private final boolean active;
public Subscription(String clientId, Topic topicFilter, MqttQoS requestedQos) {
this.requestedQos = requestedQos;
this.clientId = clientId;
this.topicFilter = topicFilter;
this.active = true;
}
public Subscription(Subscription orig) {
this.requestedQos = orig.requestedQos;
this.clientId = orig.clientId;
this.topicFilter = orig.topicFilter;
this.active = orig.active;
}
/**
* Constructor with undefined maximum QoS
*
* @param clientId id of client owning this subscription.
* @param topicFilter the topic to subscribe to.
* */
public Subscription(String clientId, Topic topicFilter) {
this.requestedQos = null;
this.clientId = clientId;
this.topicFilter = topicFilter;
this.active = true;
}
public String getClientId() {
@@ -70,10 +54,6 @@ public final class Subscription implements Serializable {
return topicFilter;
}
public boolean isActive() {
return active;
}
public boolean qosLessThan(Subscription sub) {
return requestedQos.value() < sub.requestedQos.value();
}
@@ -101,12 +81,7 @@ public final class Subscription implements Serializable {
@Override
public String toString() {
return String.format(
"[filter:%s, cliID: %s, qos: %s, active: %s]",
this.topicFilter,
this.clientId,
this.requestedQos,
this.active);
return String.format("[filter:%s, clientID: %s, qos: %s]", topicFilter, clientId, requestedQos);
}
@Override
broker/src/main/java/io/moquette/persistence/H2Builder.java
+51
View File
@@ -0,0 +1,51 @@
package io.moquette.persistence;
import io.moquette.BrokerConstants;
import io.moquette.broker.ISubscriptionsRepository;
import io.moquette.broker.config.IConfig;
import org.h2.mvstore.MVStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
public class H2Builder {
private static final Logger LOG = LoggerFactory.getLogger(H2Builder.class);
private final String storePath;
private final int autosaveInterval; // in seconds
private final ScheduledExecutorService scheduler;
private MVStore mvStore;
public H2Builder(IConfig props, ScheduledExecutorService scheduler) {
this.storePath = props.getProperty(BrokerConstants.PERSISTENT_STORE_PROPERTY_NAME, "");
final String autosaveProp = props.getProperty(BrokerConstants.AUTOSAVE_INTERVAL_PROPERTY_NAME, "30");
this.autosaveInterval = Integer.parseInt(autosaveProp);
this.scheduler = scheduler;
}
@SuppressWarnings("FutureReturnValueIgnored")
public H2Builder initStore() {
LOG.info("Initializing H2 store");
if (storePath == null || storePath.isEmpty()) {
throw new IllegalArgumentException("H2 store path can't be null or empty");
}
mvStore = new MVStore.Builder()
.fileName(storePath)
.autoCommitDisabled()
.open();
LOG.trace("Scheduling H2 commit task");
scheduler.scheduleWithFixedDelay(() -> {
LOG.trace("Committing to H2");
mvStore.commit();
}, autosaveInterval, autosaveInterval, TimeUnit.SECONDS);
return this;
}
public ISubscriptionsRepository subscriptionsRepository() {
return new H2SubscriptionsRepository(mvStore);
}
}
broker/src/main/java/io/moquette/persistence/H2SubscriptionsRepository.java
+48
View File
@@ -0,0 +1,48 @@
package io.moquette.persistence;
import io.moquette.broker.ISubscriptionsRepository;
import io.moquette.broker.subscriptions.Subscription;
import org.h2.mvstore.Cursor;
import org.h2.mvstore.MVMap;
import org.h2.mvstore.MVStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
public class H2SubscriptionsRepository implements ISubscriptionsRepository {
private static final Logger LOG = LoggerFactory.getLogger(H2SubscriptionsRepository.class);
private static final String SUBSCRIPTIONS_MAP = "subscriptions";
private MVMap<String, Subscription> subscriptions;
H2SubscriptionsRepository(MVStore mvStore) {
this.subscriptions = mvStore.openMap(SUBSCRIPTIONS_MAP);
}
@Override
public List<Subscription> listAllSubscriptions() {
LOG.debug("Retrieving existing subscriptions");
List<Subscription> results = new ArrayList<>();
Cursor<String, Subscription> mapCursor = subscriptions.cursor(null);
while (mapCursor.hasNext()) {
String subscriptionStr = mapCursor.next();
results.add(mapCursor.getValue());
}
LOG.debug("Loaded {} subscriptions", results.size());
return results;
}
@Override
public void addNewSubscription(Subscription subscription) {
subscriptions.put(subscription.getTopicFilter() + "-" + subscription.getClientId(), subscription);
}
@Override
public void removeSubscription(String topic, String clientID) {
}
}
broker/src/main/java/io/moquette/persistence/MemoryStorageService.java
+1
View File
@@ -23,6 +23,7 @@ import io.moquette.spi.IStore;
import java.util.concurrent.ScheduledExecutorService;
@Deprecated
public class MemoryStorageService implements IStore {
private MemorySessionStore m_sessionsStore;
broker/src/main/java/io/moquette/broker/MemorySubscriptionsRepository.java → broker/src/main/java/io/moquette/persistence/MemorySubscriptionsRepository.java
+10 -1
View File
@@ -13,8 +13,9 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package io.moquette.broker;
package io.moquette.persistence;
import io.moquette.broker.ISubscriptionsRepository;
import io.moquette.broker.subscriptions.Subscription;
import java.util.ArrayList;
@@ -34,4 +35,12 @@ public class MemorySubscriptionsRepository implements ISubscriptionsRepository {
public void addNewSubscription(Subscription subscription) {
subscriptions.add(subscription);
}
@Override
public void removeSubscription(String topic, String clientID) {
subscriptions.stream()
.filter(s -> s.getTopicFilter().toString().equals(topic) && s.getClientId().equals(clientID))
.findFirst()
.ifPresent(subscriptions::remove);
}
}
broker/src/main/java/io/moquette/spi/IStore.java
+1
View File
@@ -16,6 +16,7 @@
package io.moquette.spi;
@Deprecated
public interface IStore {
void initStore();