From b1057c2e5f77a74a3d64c5ad9ff6b0c5894c4a73 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Wed, 17 Sep 2014 22:02:19 +0200 Subject: [PATCH] =?utf8?q?Don=E2=80=99t=20store=20posts=20by=20recipient,?= =?utf8?q?=20generate=20them=20on=20the=20fly.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Yes, this will result in worse performance of these methods as long as there is no real database behind it. But there will be a database behind all this. Some day. --- .../sone/database/memory/MemoryDatabase.java | 47 +++++----------------- .../sone/database/memory/MemoryDatabaseTest.java | 27 +++++++++++++ 2 files changed, 36 insertions(+), 38 deletions(-) diff --git a/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java b/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java index cd3be84..0b2c5a2 100644 --- a/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java +++ b/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java @@ -19,6 +19,7 @@ package net.pterodactylus.sone.database.memory; import static com.google.common.base.Optional.fromNullable; import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.collect.FluentIterable.from; import static net.pterodactylus.sone.data.Reply.TIME_COMPARATOR; import java.util.ArrayList; @@ -52,6 +53,7 @@ import net.pterodactylus.util.config.Configuration; import net.pterodactylus.util.config.ConfigurationException; import com.google.common.base.Optional; +import com.google.common.base.Predicate; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import com.google.common.collect.SortedSetMultimap; @@ -83,9 +85,6 @@ public class MemoryDatabase extends AbstractService implements Database { /** All posts by their Sones. */ private final Multimap sonePosts = HashMultimap.create(); - /** All posts by their recipient. */ - private final Multimap recipientPosts = HashMultimap.create(); - /** Whether posts are known. */ private final Set knownPosts = new HashSet(); @@ -195,11 +194,15 @@ public class MemoryDatabase extends AbstractService implements Database { /** {@inheritDocs} */ @Override - public Collection getDirectedPosts(String recipientId) { + public Collection getDirectedPosts(final String recipientId) { lock.readLock().lock(); try { - Collection posts = recipientPosts.get(recipientId); - return (posts == null) ? Collections.emptySet() : new HashSet(posts); + return from(sonePosts.values()).filter(new Predicate() { + @Override + public boolean apply(Post post) { + return post.getRecipientId().asSet().contains(recipientId); + } + }).toSet(); } finally { lock.readLock().unlock(); } @@ -227,9 +230,6 @@ public class MemoryDatabase extends AbstractService implements Database { try { allPosts.put(post.getId(), post); getPostsFrom(post.getSone().getId()).add(post); - if (post.getRecipientId().isPresent()) { - getPostsTo(post.getRecipientId().get()).add(post); - } } finally { lock.writeLock().unlock(); } @@ -243,9 +243,6 @@ public class MemoryDatabase extends AbstractService implements Database { try { allPosts.remove(post.getId()); getPostsFrom(post.getSone().getId()).remove(post); - if (post.getRecipientId().isPresent()) { - getPostsTo(post.getRecipientId().get()).remove(post); - } post.getSone().removePost(post); } finally { lock.writeLock().unlock(); @@ -269,18 +266,12 @@ public class MemoryDatabase extends AbstractService implements Database { Collection oldPosts = getPostsFrom(sone.getId()); for (Post post : oldPosts) { allPosts.remove(post.getId()); - if (post.getRecipientId().isPresent()) { - getPostsTo(post.getRecipientId().get()).remove(post); - } } /* add new posts. */ getPostsFrom(sone.getId()).addAll(posts); for (Post post : posts) { allPosts.put(post.getId(), post); - if (post.getRecipientId().isPresent()) { - getPostsTo(post.getRecipientId().get()).add(post); - } } } finally { lock.writeLock().unlock(); @@ -297,9 +288,6 @@ public class MemoryDatabase extends AbstractService implements Database { getPostsFrom(sone.getId()).clear(); for (Post post : sone.getPosts()) { allPosts.remove(post.getId()); - if (post.getRecipientId().isPresent()) { - getPostsTo(post.getRecipientId().get()).remove(post); - } } } finally { lock.writeLock().unlock(); @@ -615,23 +603,6 @@ public class MemoryDatabase extends AbstractService implements Database { } } - /** - * Gets all posts that are directed the given Sone, creating a new collection - * if there is none yet. - * - * @param recipientId - * The ID of the Sone to get the posts for - * @return All posts - */ - private Collection getPostsTo(String recipientId) { - lock.readLock().lock(); - try { - return recipientPosts.get(recipientId); - } finally { - lock.readLock().unlock(); - } - } - /** Loads the known posts. */ private void loadKnownPosts() { lock.writeLock().lock(); diff --git a/src/test/java/net/pterodactylus/sone/database/memory/MemoryDatabaseTest.java b/src/test/java/net/pterodactylus/sone/database/memory/MemoryDatabaseTest.java index 74c58ca..cad0a23 100644 --- a/src/test/java/net/pterodactylus/sone/database/memory/MemoryDatabaseTest.java +++ b/src/test/java/net/pterodactylus/sone/database/memory/MemoryDatabaseTest.java @@ -20,13 +20,17 @@ package net.pterodactylus.sone.database.memory; import static com.google.common.base.Optional.of; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; import net.pterodactylus.sone.data.Album; import net.pterodactylus.sone.data.AlbumImpl; +import net.pterodactylus.sone.data.Post; import net.pterodactylus.sone.data.Sone; import com.google.common.base.Optional; +import org.junit.Before; import org.junit.Test; /** @@ -36,7 +40,30 @@ import org.junit.Test; */ public class MemoryDatabaseTest { + private static final String SONE_ID = "sone"; + private static final String RECIPIENT_ID = "recipient"; private final MemoryDatabase memoryDatabase = new MemoryDatabase(null, null); + private final Sone sone = mock(Sone.class); + + @Before + public void setupSone() { + when(sone.getId()).thenReturn(SONE_ID); + } + + @Test + public void postRecipientsAreDetectedCorrectly() { + Post postWithRecipient = mock(Post.class); + when(postWithRecipient.getSone()).thenReturn(sone); + when(postWithRecipient.getRecipientId()).thenReturn(of(RECIPIENT_ID)); + memoryDatabase.storePost(postWithRecipient); + Post postWithoutRecipient = mock(Post.class); + when(postWithoutRecipient.getSone()).thenReturn(sone); + when(postWithoutRecipient.getRecipientId()).thenReturn( + Optional.absent()); + memoryDatabase.storePost(postWithoutRecipient); + assertThat(memoryDatabase.getDirectedPosts(RECIPIENT_ID), + contains(postWithRecipient)); + } @Test public void testBasicAlbumFunctionality() { -- 2.7.4