Don’t store posts by recipient, generate them on the fly.
[Sone.git] / src / main / java / net / pterodactylus / sone / database / memory / MemoryDatabase.java
index 8b25954..0b2c5a2 100644 (file)
@@ -19,6 +19,8 @@ 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;
 import java.util.Collection;
@@ -29,8 +31,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
@@ -38,7 +38,6 @@ import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.PostReply;
-import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.impl.AlbumBuilderImpl;
 import net.pterodactylus.sone.data.impl.ImageBuilderImpl;
@@ -54,16 +53,21 @@ 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;
 import com.google.common.collect.TreeMultimap;
 import com.google.common.util.concurrent.AbstractService;
 import com.google.inject.Inject;
+import com.google.inject.Singleton;
 
 /**
  * Memory-based {@link PostDatabase} implementation.
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
+@Singleton
 public class MemoryDatabase extends AbstractService implements Database {
 
        /** The lock. */
@@ -79,10 +83,7 @@ public class MemoryDatabase extends AbstractService implements Database {
        private final Map<String, Post> allPosts = new HashMap<String, Post>();
 
        /** All posts by their Sones. */
-       private final Map<String, Collection<Post>> sonePosts = new HashMap<String, Collection<Post>>();
-
-       /** All posts by their recipient. */
-       private final Map<String, Collection<Post>> recipientPosts = new HashMap<String, Collection<Post>>();
+       private final Multimap<String, Post> sonePosts = HashMultimap.create();
 
        /** Whether posts are known. */
        private final Set<String> knownPosts = new HashSet<String>();
@@ -97,17 +98,25 @@ public class MemoryDatabase extends AbstractService implements Database {
                public int compare(String leftString, String rightString) {
                        return leftString.compareTo(rightString);
                }
-       }, PostReply.TIME_COMPARATOR);
+       }, TIME_COMPARATOR);
 
        /** Replies by post. */
-       private final Map<String, SortedSet<PostReply>> postReplies = new HashMap<String, SortedSet<PostReply>>();
+       private final SortedSetMultimap<String, PostReply> postReplies = TreeMultimap.create(new Comparator<String>() {
+
+               @Override
+               public int compare(String leftString, String rightString) {
+                       return leftString.compareTo(rightString);
+               }
+       }, TIME_COMPARATOR);
 
        /** Whether post replies are known. */
        private final Set<String> knownPostReplies = new HashSet<String>();
 
        private final Map<String, Album> allAlbums = new HashMap<String, Album>();
+       private final Multimap<String, Album> soneAlbums = HashMultimap.create();
 
        private final Map<String, Image> allImages = new HashMap<String, Image>();
+       private final Multimap<String, Image> soneImages = HashMultimap.create();
 
        /**
         * Creates a new memory database.
@@ -185,11 +194,15 @@ public class MemoryDatabase extends AbstractService implements Database {
 
        /** {@inheritDocs} */
        @Override
-       public Collection<Post> getDirectedPosts(String recipientId) {
+       public Collection<Post> getDirectedPosts(final String recipientId) {
                lock.readLock().lock();
                try {
-                       Collection<Post> posts = recipientPosts.get(recipientId);
-                       return (posts == null) ? Collections.<Post>emptySet() : new HashSet<Post>(posts);
+                       return from(sonePosts.values()).filter(new Predicate<Post>() {
+                               @Override
+                               public boolean apply(Post post) {
+                                       return post.getRecipientId().asSet().contains(recipientId);
+                               }
+                       }).toSet();
                } finally {
                        lock.readLock().unlock();
                }
@@ -217,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();
                }
@@ -233,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();
@@ -256,21 +263,15 @@ public class MemoryDatabase extends AbstractService implements Database {
                lock.writeLock().lock();
                try {
                        /* remove all posts by the Sone. */
-                       getPostsFrom(sone.getId()).clear();
-                       for (Post post : posts) {
+                       Collection<Post> 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();
@@ -287,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();
@@ -345,13 +343,7 @@ public class MemoryDatabase extends AbstractService implements Database {
                lock.writeLock().lock();
                try {
                        allPostReplies.put(postReply.getId(), postReply);
-                       if (postReplies.containsKey(postReply.getPostId())) {
-                               postReplies.get(postReply.getPostId()).add(postReply);
-                       } else {
-                               TreeSet<PostReply> replies = new TreeSet<PostReply>(Reply.TIME_COMPARATOR);
-                               replies.add(postReply);
-                               postReplies.put(postReply.getPostId(), replies);
-                       }
+                       postReplies.put(postReply.getPostId(), postReply);
                } finally {
                        lock.writeLock().unlock();
                }
@@ -377,13 +369,7 @@ public class MemoryDatabase extends AbstractService implements Database {
                        for (PostReply postReply : postReplies) {
                                allPostReplies.put(postReply.getId(), postReply);
                                sonePostReplies.put(postReply.getSone().getId(), postReply);
-                               if (this.postReplies.containsKey(postReply.getPostId())) {
-                                       this.postReplies.get(postReply.getPostId()).add(postReply);
-                               } else {
-                                       TreeSet<PostReply> replies = new TreeSet<PostReply>(Reply.TIME_COMPARATOR);
-                                       replies.add(postReply);
-                                       this.postReplies.put(postReply.getPostId(), replies);
-                               }
+                               this.postReplies.put(postReply.getPostId(), postReply);
                        }
                } finally {
                        lock.writeLock().unlock();
@@ -398,9 +384,6 @@ public class MemoryDatabase extends AbstractService implements Database {
                        allPostReplies.remove(postReply.getId());
                        if (postReplies.containsKey(postReply.getPostId())) {
                                postReplies.get(postReply.getPostId()).remove(postReply);
-                               if (postReplies.get(postReply.getPostId()).isEmpty()) {
-                                       postReplies.remove(postReply.getPostId());
-                               }
                        }
                } finally {
                        lock.writeLock().unlock();
@@ -454,6 +437,7 @@ public class MemoryDatabase extends AbstractService implements Database {
                lock.writeLock().lock();
                try {
                        allAlbums.put(album.getId(), album);
+                       soneAlbums.put(album.getSone().getId(), album);
                } finally {
                        lock.writeLock().unlock();
                }
@@ -464,6 +448,7 @@ public class MemoryDatabase extends AbstractService implements Database {
                lock.writeLock().lock();
                try {
                        allAlbums.remove(album.getId());
+                       soneAlbums.remove(album.getSone().getId(), album);
                } finally {
                        lock.writeLock().unlock();
                }
@@ -501,6 +486,7 @@ public class MemoryDatabase extends AbstractService implements Database {
                lock.writeLock().lock();
                try {
                        allImages.put(image.getId(), image);
+                       soneImages.put(image.getSone().getId(), image);
                } finally {
                        lock.writeLock().unlock();
                }
@@ -511,6 +497,7 @@ public class MemoryDatabase extends AbstractService implements Database {
                lock.writeLock().lock();
                try {
                        allImages.remove(image.getId());
+                       soneImages.remove(image.getSone().getId(), image);
                } finally {
                        lock.writeLock().unlock();
                }
@@ -608,57 +595,12 @@ public class MemoryDatabase extends AbstractService implements Database {
         * @return All posts
         */
        private Collection<Post> getPostsFrom(String soneId) {
-               Collection<Post> posts = null;
-               lock.readLock().lock();
-               try {
-                       posts = sonePosts.get(soneId);
-               } finally {
-                       lock.readLock().unlock();
-               }
-               if (posts != null) {
-                       return posts;
-               }
-
-               posts = new HashSet<Post>();
-               lock.writeLock().lock();
-               try {
-                       sonePosts.put(soneId, posts);
-               } finally {
-                       lock.writeLock().unlock();
-               }
-
-               return posts;
-       }
-
-       /**
-        * 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<Post> getPostsTo(String recipientId) {
-               Collection<Post> posts = null;
                lock.readLock().lock();
                try {
-                       posts = recipientPosts.get(recipientId);
+                       return sonePosts.get(soneId);
                } finally {
                        lock.readLock().unlock();
                }
-               if (posts != null) {
-                       return posts;
-               }
-
-               posts = new HashSet<Post>();
-               lock.writeLock().lock();
-               try {
-                       recipientPosts.put(recipientId, posts);
-               } finally {
-                       lock.writeLock().unlock();
-               }
-
-               return posts;
        }
 
        /** Loads the known posts. */
@@ -709,10 +651,7 @@ public class MemoryDatabase extends AbstractService implements Database {
        private Collection<PostReply> getRepliesFrom(String id) {
                lock.readLock().lock();
                try {
-                       if (sonePostReplies.containsKey(id)) {
-                               return Collections.unmodifiableCollection(sonePostReplies.get(id));
-                       }
-                       return Collections.emptySet();
+                       return Collections.unmodifiableCollection(sonePostReplies.get(id));
                } finally {
                        lock.readLock().unlock();
                }