Moved all HawtDB stuff into HawtDBStorageService
This commit is contained in:
@@ -38,4 +38,6 @@ public interface IStorageService {
|
|||||||
void removeAllSubscriptions(String clientID);
|
void removeAllSubscriptions(String clientID);
|
||||||
|
|
||||||
List<Subscription> retrieveAllSubscriptions();
|
List<Subscription> retrieveAllSubscriptions();
|
||||||
|
|
||||||
|
void close();
|
||||||
}
|
}
|
||||||
|
|||||||
+31
-11
@@ -1,27 +1,25 @@
|
|||||||
package org.dna.mqtt.moquette.messaging.spi.impl;
|
package org.dna.mqtt.moquette.messaging.spi.impl;
|
||||||
|
|
||||||
|
import org.dna.mqtt.moquette.MQTTException;
|
||||||
import org.dna.mqtt.moquette.messaging.spi.IMatchingCondition;
|
import org.dna.mqtt.moquette.messaging.spi.IMatchingCondition;
|
||||||
import org.dna.mqtt.moquette.messaging.spi.IStorageService;
|
import org.dna.mqtt.moquette.messaging.spi.IStorageService;
|
||||||
import org.dna.mqtt.moquette.messaging.spi.impl.events.CleanInFlightEvent;
|
|
||||||
import org.dna.mqtt.moquette.messaging.spi.impl.events.PublishEvent;
|
import org.dna.mqtt.moquette.messaging.spi.impl.events.PublishEvent;
|
||||||
import org.dna.mqtt.moquette.messaging.spi.impl.events.RemoveAllSubscriptionsEvent;
|
|
||||||
import org.dna.mqtt.moquette.messaging.spi.impl.events.RepublishEvent;
|
|
||||||
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
|
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
|
||||||
|
import org.dna.mqtt.moquette.server.Server;
|
||||||
import org.fusesource.hawtbuf.codec.StringCodec;
|
import org.fusesource.hawtbuf.codec.StringCodec;
|
||||||
import org.fusesource.hawtdb.api.BTreeIndexFactory;
|
import org.fusesource.hawtdb.api.*;
|
||||||
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.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import static org.dna.mqtt.moquette.messaging.spi.impl.SimpleMessaging.StoredMessage;
|
import java.io.File;
|
||||||
|
import java.io.IOException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
import static org.dna.mqtt.moquette.messaging.spi.impl.SimpleMessaging.StoredMessage;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Implementation of IStorageService backed by HawtDB
|
* Implementation of IStorageService backed by HawtDB
|
||||||
@@ -43,8 +41,22 @@ public class HawtDBStorageService implements IStorageService {
|
|||||||
//TODO rename into persistentSubscriptions
|
//TODO rename into persistentSubscriptions
|
||||||
private SortedIndex<String, List<Subscription>> m_persistent;
|
private SortedIndex<String, List<Subscription>> m_persistent;
|
||||||
|
|
||||||
public HawtDBStorageService(MultiIndexFactory multiIndexFactory) {
|
public HawtDBStorageService() {
|
||||||
m_multiIndexFactory = multiIndexFactory;
|
String storeFile = Server.STORAGE_FILE_PATH;
|
||||||
|
|
||||||
|
pageFactory = new PageFileFactory();
|
||||||
|
File tmpFile;
|
||||||
|
try {
|
||||||
|
tmpFile = new File(storeFile);
|
||||||
|
tmpFile.createNewFile();
|
||||||
|
} catch (IOException ex) {
|
||||||
|
LOG.error(null, ex);
|
||||||
|
throw new MQTTException("Can't create temp file for subscriptions storage [" + storeFile + "]", ex);
|
||||||
|
}
|
||||||
|
pageFactory.setFile(tmpFile);
|
||||||
|
pageFactory.open();
|
||||||
|
PageFile pageFile = pageFactory.getPageFile();
|
||||||
|
m_multiIndexFactory = new MultiIndexFactory(pageFile);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -165,4 +177,12 @@ public class HawtDBStorageService implements IStorageService {
|
|||||||
}
|
}
|
||||||
return allSubscriptions;
|
return allSubscriptions;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void close() {
|
||||||
|
try {
|
||||||
|
pageFactory.close();
|
||||||
|
} catch (IOException ex) {
|
||||||
|
LOG.error(null, ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -59,31 +59,10 @@ public class SimpleMessaging implements IMessaging, Runnable {
|
|||||||
|
|
||||||
private INotifier m_notifier;
|
private INotifier m_notifier;
|
||||||
|
|
||||||
//TODO remove
|
|
||||||
private MultiIndexFactory m_multiIndexFactory;
|
|
||||||
private PageFileFactory pageFactory;
|
|
||||||
|
|
||||||
private IStorageService m_storageService;
|
private IStorageService m_storageService;
|
||||||
|
|
||||||
public SimpleMessaging() {
|
public SimpleMessaging() {
|
||||||
String storeFile = Server.STORAGE_FILE_PATH;
|
m_storageService = new HawtDBStorageService();
|
||||||
|
|
||||||
pageFactory = new PageFileFactory();
|
|
||||||
File tmpFile;
|
|
||||||
try {
|
|
||||||
tmpFile = new File(storeFile);
|
|
||||||
tmpFile.createNewFile();
|
|
||||||
} catch (IOException ex) {
|
|
||||||
LOG.error(null, ex);
|
|
||||||
throw new MQTTException("Can't create temp file for subscriptions storage [" + storeFile + "]", ex);
|
|
||||||
}
|
|
||||||
pageFactory.setFile(tmpFile);
|
|
||||||
pageFactory.open();
|
|
||||||
PageFile pageFile = pageFactory.getPageFile();
|
|
||||||
m_multiIndexFactory = new MultiIndexFactory(pageFile);
|
|
||||||
|
|
||||||
|
|
||||||
m_storageService = new HawtDBStorageService(m_multiIndexFactory);
|
|
||||||
m_storageService.initStore();
|
m_storageService.initStore();
|
||||||
|
|
||||||
subscriptions.init(m_storageService);
|
subscriptions.init(m_storageService);
|
||||||
@@ -329,11 +308,7 @@ public class SimpleMessaging implements IMessaging, Runnable {
|
|||||||
|
|
||||||
private void processClose() {
|
private void processClose() {
|
||||||
LOG.debug("processClose invoked");
|
LOG.debug("processClose invoked");
|
||||||
try {
|
m_storageService.close();
|
||||||
pageFactory.close();
|
|
||||||
} catch (IOException ex) {
|
|
||||||
LOG.error(null, ex);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void processRepublish(RepublishEvent evt) throws InterruptedException {
|
private void processRepublish(RepublishEvent evt) throws InterruptedException {
|
||||||
|
|||||||
@@ -55,4 +55,8 @@ public class DummyStorageService implements IStorageService {
|
|||||||
public List<Subscription> retrieveAllSubscriptions() {
|
public List<Subscription> retrieveAllSubscriptions() {
|
||||||
return Collections.EMPTY_LIST;
|
return Collections.EMPTY_LIST;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void close() {
|
||||||
|
//To change body of implemented methods use File | Settings | File Templates.
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user