X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryDatabase.java;h=c9dd543765ab092df5068d1f8efa7fcb044698a7;hb=01540cbd527e955dac1e41c2e6855a89ab12605c;hp=61eb9be8ba9b0ffdeff3da61b1f7ef591832dde8;hpb=84c51832a2d10656e85c2d6eeb45998c34998da4;p=Sone.git
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 61eb9be..c9dd543 100644
--- a/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
+++ b/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
@@ -19,18 +19,21 @@ 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.base.Predicates.not;
+import static com.google.common.collect.FluentIterable.from;
+import static java.util.Collections.unmodifiableCollection;
+import static net.pterodactylus.sone.data.Reply.TIME_COMPARATOR;
+import static net.pterodactylus.sone.data.Sone.LOCAL_SONE_FILTER;
+import static net.pterodactylus.sone.data.Sone.toAllAlbums;
+import static net.pterodactylus.sone.data.Sone.toAllImages;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
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 +41,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,18 +56,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 David âBombeâ Roden
*/
+@Singleton
public class MemoryDatabase extends AbstractService implements Database {
/** The lock. */
@@ -77,15 +82,14 @@ public class MemoryDatabase extends AbstractService implements Database {
/** The configuration. */
private final Configuration configuration;
+ private final Map allSones = new HashMap();
+
/** All posts by their ID. */
private final Map allPosts = new HashMap();
/** All posts by their Sones. */
private final Multimap sonePosts = HashMultimap.create();
- /** All posts by their recipient. */
- private final Map> recipientPosts = new HashMap>();
-
/** Whether posts are known. */
private final Set knownPosts = new HashSet();
@@ -99,17 +103,16 @@ public class MemoryDatabase extends AbstractService implements Database {
public int compare(String leftString, String rightString) {
return leftString.compareTo(rightString);
}
- }, PostReply.TIME_COMPARATOR);
-
- /** Replies by post. */
- private final Map> postReplies = new HashMap>();
+ }, TIME_COMPARATOR);
/** Whether post replies are known. */
private final Set knownPostReplies = new HashSet();
private final Map allAlbums = new HashMap();
+ private final Multimap soneAlbums = HashMultimap.create();
private final Map allImages = new HashMap();
+ private final Multimap soneImages = HashMultimap.create();
/**
* Creates a new memory database.
@@ -164,6 +167,93 @@ public class MemoryDatabase extends AbstractService implements Database {
}
}
+ @Override
+ public void storeSone(Sone sone) {
+ lock.writeLock().lock();
+ try {
+ Collection removedPosts = sonePosts.removeAll(sone.getId());
+ for (Post removedPost : removedPosts) {
+ allPosts.remove(removedPost.getId());
+ }
+ Collection removedPostReplies =
+ sonePostReplies.removeAll(sone.getId());
+ for (PostReply removedPostReply : removedPostReplies) {
+ allPostReplies.remove(removedPostReply.getId());
+ }
+ Collection removedAlbums =
+ soneAlbums.removeAll(sone.getId());
+ for (Album removedAlbum : removedAlbums) {
+ allAlbums.remove(removedAlbum.getId());
+ }
+ Collection removedImages =
+ soneImages.removeAll(sone.getId());
+ for (Image removedImage : removedImages) {
+ allImages.remove(removedImage.getId());
+ }
+
+ allSones.put(sone.getId(), sone);
+ sonePosts.putAll(sone.getId(), sone.getPosts());
+ for (Post post : sone.getPosts()) {
+ allPosts.put(post.getId(), post);
+ }
+ sonePostReplies.putAll(sone.getId(), sone.getReplies());
+ for (PostReply postReply : sone.getReplies()) {
+ allPostReplies.put(postReply.getId(), postReply);
+ }
+ soneAlbums.putAll(sone.getId(), toAllAlbums.apply(sone));
+ for (Album album : toAllAlbums.apply(sone)) {
+ allAlbums.put(album.getId(), album);
+ }
+ soneImages.putAll(sone.getId(), toAllImages.apply(sone));
+ for (Image image : toAllImages.apply(sone)) {
+ allImages.put(image.getId(), image);
+ }
+ } finally {
+ lock.writeLock().unlock();
+ }
+ }
+
+ @Override
+ public Optional getSone(String soneId) {
+ lock.readLock().lock();
+ try {
+ return fromNullable(allSones.get(soneId));
+ } finally {
+ lock.readLock().unlock();
+ }
+ }
+
+ @Override
+ public Collection getSones() {
+ lock.readLock().lock();
+ try {
+ return unmodifiableCollection(allSones.values());
+ } finally {
+ lock.readLock().unlock();
+ }
+ }
+
+ @Override
+ public Collection getLocalSones() {
+ lock.readLock().lock();
+ try {
+ return from(allSones.values()).filter(LOCAL_SONE_FILTER).toSet();
+ } finally {
+ lock.readLock().unlock();
+ }
+ }
+
+ @Override
+ public Collection getRemoteSones() {
+ lock.readLock().lock();
+ try {
+ return from(allSones.values())
+ .filter(not(LOCAL_SONE_FILTER)) .toSet();
+ } finally {
+ lock.readLock().unlock();
+ }
+ }
+
//
// POSTPROVIDER METHODS
//
@@ -187,11 +277,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();
}
@@ -219,9 +313,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();
}
@@ -235,9 +326,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();
@@ -258,21 +346,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 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();
@@ -289,9 +371,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();
@@ -315,13 +394,16 @@ public class MemoryDatabase extends AbstractService implements Database {
/** {@inheritDocs} */
@Override
- public List getReplies(String postId) {
+ public List getReplies(final String postId) {
lock.readLock().lock();
try {
- if (!postReplies.containsKey(postId)) {
- return Collections.emptyList();
- }
- return new ArrayList(postReplies.get(postId));
+ return from(allPostReplies.values())
+ .filter(new Predicate() {
+ @Override
+ public boolean apply(PostReply postReply) {
+ return postReply.getPostId().equals(postId);
+ }
+ }).toSortedList(TIME_COMPARATOR);
} finally {
lock.readLock().unlock();
}
@@ -347,13 +429,6 @@ 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 replies = new TreeSet(Reply.TIME_COMPARATOR);
- replies.add(postReply);
- postReplies.put(postReply.getPostId(), replies);
- }
} finally {
lock.writeLock().unlock();
}
@@ -379,13 +454,6 @@ 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 replies = new TreeSet(Reply.TIME_COMPARATOR);
- replies.add(postReply);
- this.postReplies.put(postReply.getPostId(), replies);
- }
}
} finally {
lock.writeLock().unlock();
@@ -398,12 +466,6 @@ public class MemoryDatabase extends AbstractService implements Database {
lock.writeLock().lock();
try {
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();
}
@@ -456,6 +518,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();
}
@@ -466,6 +529,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();
}
@@ -503,6 +567,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();
}
@@ -513,6 +578,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();
}
@@ -618,37 +684,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) {
- Collection posts = null;
- lock.readLock().lock();
- try {
- posts = recipientPosts.get(recipientId);
- } finally {
- lock.readLock().unlock();
- }
- if (posts != null) {
- return posts;
- }
-
- posts = new HashSet();
- lock.writeLock().lock();
- try {
- recipientPosts.put(recipientId, posts);
- } finally {
- lock.writeLock().unlock();
- }
-
- return posts;
- }
-
/** Loads the known posts. */
private void loadKnownPosts() {
lock.writeLock().lock();
@@ -697,10 +732,7 @@ public class MemoryDatabase extends AbstractService implements Database {
private Collection 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();
}