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

Fixed drop messages in clean session phase, introduced ref counter

Browse Source
This commit is contained in:
andsel
2016-09-23 09:45:47 +02:00
parent 5efad350d8
commit 4d637a349b
6 changed files with 99 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/test/java/io/moquette/spi/impl/MemoryMessagesStore.java
+14
View File
@@ -100,4 +100,18 @@ public class MemoryMessagesStore implements IMessagesStore {
public void cleanRetained(String topic) {
m_retainedStore.remove(topic);
}
@Override
public void incUsageCounter(String guid) {
IMessagesStore.StoredMessage storedMessage = m_persistentMessageStore.get(guid);
storedMessage.incReferenceCounter();
m_persistentMessageStore.replace(guid, storedMessage);
}
@Override
public void decUsageCounter(String guid) {
IMessagesStore.StoredMessage storedMessage = m_persistentMessageStore.get(guid);
storedMessage.decReferenceCounter();
m_persistentMessageStore.replace(guid, storedMessage);
}
}
broker/src/test/java/io/moquette/spi/persistence/MapDBPersistentStoreTest.java
+40 -3
View File
@@ -41,6 +41,7 @@ import static org.junit.Assert.*;
*/
public class MapDBPersistentStoreTest {
public static final String TEST_CLIENT = "TestClient";
MapDBPersistentStore m_storageService;
ISessionsStore m_sessionsStore;
IMessagesStore m_messagesStore;
@@ -75,14 +76,14 @@ public class MapDBPersistentStoreTest {
session1.subscribe(oldSubscription);
// Subscribe on /topic again that overrides the previous subscription.
Subscription overrindingSubscription = new Subscription(session1.clientID, "/topic", AbstractMessage.QOSType.EXACTLY_ONCE);
session1.subscribe(overrindingSubscription);
Subscription overridingSubscription = new Subscription(session1.clientID, "/topic", AbstractMessage.QOSType.EXACTLY_ONCE);
session1.subscribe(overridingSubscription);
//Verify
List<ClientTopicCouple> subscriptions = m_sessionsStore.listAllSubscriptions();
assertEquals(1, subscriptions.size());
Subscription sub = m_sessionsStore.getSubscription(subscriptions.get(0));
assertEquals(overrindingSubscription.getRequestedQos(), sub.getRequestedQos());
assertEquals(overridingSubscription.getRequestedQos(), sub.getRequestedQos());
}
@Test
@@ -127,4 +128,40 @@ public class MapDBPersistentStoreTest {
m_storageService.m_scheduler.awaitTermination(3, TimeUnit.SECONDS));
assertTrue(m_storageService.m_scheduler.isTerminated());
}
@Test
public void testDropMessagesInSessionCleanAllNotRetainedStoredMessages() {
m_sessionsStore.createNewSession("TestClient", true);
IMessagesStore.StoredMessage publishToStore = new IMessagesStore.StoredMessage("Hello".getBytes(),
AbstractMessage.QOSType.EXACTLY_ONCE, "/topic");
publishToStore.setClientID(TEST_CLIENT);
publishToStore.setMessageID(1);
publishToStore.setRetained(false);
String guid = m_messagesStore.storePublishForFuture(publishToStore);
//Exercise
m_messagesStore.dropMessagesInSession("TestClient");
//Verify the message store for session is empty.
IMessagesStore.StoredMessage storedPublish = m_messagesStore.getMessageByGuid(guid);
assertNull("The stored message must'n be present anymore", storedPublish);
}
@Test
public void testDropMessagesInSessionDoesntCleanAnyRetainedStoredMessages() {
m_sessionsStore.createNewSession("TestClient", true);
IMessagesStore.StoredMessage publishToStore = new IMessagesStore.StoredMessage("Hello".getBytes(),
AbstractMessage.QOSType.EXACTLY_ONCE, "/topic");
publishToStore.setClientID(TEST_CLIENT);
publishToStore.setMessageID(1);
publishToStore.setRetained(true);
String guid = m_messagesStore.storePublishForFuture(publishToStore);
//Exercise
m_messagesStore.dropMessagesInSession("TestClient");
//Verify the message store for session is empty.
IMessagesStore.StoredMessage storedPublish = m_messagesStore.getMessageByGuid(guid);
assertNotNull("The stored retained message must be present after client's session drop", storedPublish);
}
}