X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryDatabase.java;h=df3951110ea5e2a9f89a1fbab36ce831bc6fa852;hp=704509fc996f89708849f6374e7fcfe75a8505fb;hb=90d8e2eacb9888735865d8f890d105885959ca65;hpb=cb7aebca2a351028dd4fdd00dcd637c6aafac79b 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 704509f..df39511 100644 --- a/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java +++ b/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java @@ -33,8 +33,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; @@ -42,19 +40,24 @@ 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.DefaultSoneBuilder; import net.pterodactylus.sone.database.Database; import net.pterodactylus.sone.database.DatabaseException; import net.pterodactylus.sone.database.PostDatabase; import net.pterodactylus.sone.database.SoneBuilder; +import net.pterodactylus.sone.freenet.wot.Identity; import net.pterodactylus.util.config.Configuration; import net.pterodactylus.util.config.ConfigurationException; import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.HashMultimap; import com.google.common.collect.ListMultimap; +import com.google.common.collect.Maps; +import com.google.common.collect.Multimap; +import com.google.common.collect.SetMultimap; import com.google.common.collect.SortedSetMultimap; import com.google.common.collect.TreeMultimap; import com.google.common.util.concurrent.AbstractService; @@ -73,22 +76,27 @@ public class MemoryDatabase extends AbstractService implements Database { /** The configuration. */ private final Configuration configuration; + private final Map identities = Maps.newHashMap(); private final Map sones = new HashMap(); /** All posts by their ID. */ private final Map allPosts = new HashMap(); /** All posts by their Sones. */ - private final Map> sonePosts = new HashMap>(); + private final Multimap sonePosts = HashMultimap.create(); + private final SetMultimap likedPostsBySone = HashMultimap.create(); + private final SetMultimap postLikingSones = HashMultimap.create(); /** All posts by their recipient. */ - private final Map> recipientPosts = new HashMap>(); + private final Multimap recipientPosts = HashMultimap.create(); /** Whether posts are known. */ private final Set knownPosts = new HashSet(); /** All post replies by their ID. */ private final Map allPostReplies = new HashMap(); + private final SetMultimap likedPostRepliesBySone = HashMultimap.create(); + private final SetMultimap postReplyLikingSones = HashMultimap.create(); /** Replies sorted by Sone. */ private final SortedSetMultimap sonePostReplies = TreeMultimap.create(new Comparator() { @@ -100,7 +108,13 @@ public class MemoryDatabase extends AbstractService implements Database { }, PostReply.TIME_COMPARATOR); /** Replies by post. */ - private final Map> postReplies = new HashMap>(); + private final SortedSetMultimap postReplies = TreeMultimap.create(new Comparator() { + + @Override + public int compare(String leftString, String rightString) { + return leftString.compareTo(rightString); + } + }, PostReply.TIME_COMPARATOR); /** Whether post replies are known. */ private final Set knownPostReplies = new HashSet(); @@ -154,6 +168,36 @@ public class MemoryDatabase extends AbstractService implements Database { } @Override + public Optional getIdentity(String identityId) { + lock.readLock().lock(); + try { + return fromNullable(identities.get(identityId)); + } finally { + lock.readLock().unlock(); + } + } + + @Override + public void storeIdentity(Identity identitiy) { + lock.writeLock().lock(); + try { + identities.put(identitiy.getId(), identitiy); + } finally { + lock.writeLock().unlock(); + } + } + + @Override + public Function> getSone() { + return new Function>() { + @Override + public Optional apply(String soneId) { + return (soneId == null) ? Optional.absent() : getSone(soneId); + } + }; + } + + @Override public Optional getSone(String soneId) { lock.readLock().lock(); try { @@ -195,7 +239,19 @@ public class MemoryDatabase extends AbstractService implements Database { @Override public SoneBuilder newSoneBuilder() { - return null; + return new DefaultSoneBuilder(this) { + @Override + public Sone build(Optional soneCreated) throws IllegalStateException { + Sone sone = super.build(soneCreated); + lock.writeLock().lock(); + try { + sones.put(sone.getId(), sone); + } finally { + lock.writeLock().unlock(); + } + return sone; + } + }; } // @@ -203,6 +259,16 @@ public class MemoryDatabase extends AbstractService implements Database { // @Override + public Function> getPost() { + return new Function>() { + @Override + public Optional apply(String postId) { + return (postId == null) ? Optional.absent() : getPost(postId); + } + }; + } + + @Override public Optional getPost(String postId) { lock.readLock().lock(); try { @@ -214,7 +280,12 @@ public class MemoryDatabase extends AbstractService implements Database { @Override public Collection getPosts(String soneId) { - return new HashSet(getPostsFrom(soneId)); + lock.readLock().lock(); + try { + return new HashSet(sonePosts.get(soneId)); + } finally { + lock.readLock().unlock(); + } } @Override @@ -228,6 +299,47 @@ public class MemoryDatabase extends AbstractService implements Database { } } + @Override + public void likePost(Post post, Sone localSone) { + lock.writeLock().lock(); + try { + likedPostsBySone.put(localSone.getId(), post.getId()); + postLikingSones.put(post.getId(), localSone.getId()); + } finally { + lock.writeLock().unlock(); + } + } + + @Override + public void unlikePost(Post post, Sone localSone) { + lock.writeLock().lock(); + try { + likedPostsBySone.remove(localSone.getId(), post.getId()); + postLikingSones.remove(post.getId(), localSone.getId()); + } finally { + lock.writeLock().unlock(); + } + } + + public boolean isLiked(Post post, Sone sone) { + lock.readLock().lock(); + try { + return likedPostsBySone.containsEntry(sone.getId(), post.getId()); + } finally { + lock.readLock().unlock(); + } + } + + @Override + public Set getLikes(Post post) { + lock.readLock().lock(); + try { + return from(postLikingSones.get(post.getId())).transform(getSone()).transformAndConcat(this.unwrap()).toSet(); + } finally { + lock.readLock().unlock(); + } + } + // // POSTSTORE METHODS // @@ -238,9 +350,9 @@ public class MemoryDatabase extends AbstractService implements Database { lock.writeLock().lock(); try { allPosts.put(post.getId(), post); - getPostsFrom(post.getSone().getId()).add(post); + sonePosts.put(post.getSone().getId(), post); if (post.getRecipientId().isPresent()) { - getPostsTo(post.getRecipientId().get()).add(post); + recipientPosts.put(post.getRecipientId().get(), post); } } finally { lock.writeLock().unlock(); @@ -253,9 +365,9 @@ public class MemoryDatabase extends AbstractService implements Database { lock.writeLock().lock(); try { allPosts.remove(post.getId()); - getPostsFrom(post.getSone().getId()).remove(post); + sonePosts.remove(post.getSone().getId(), post); if (post.getRecipientId().isPresent()) { - getPostsTo(post.getRecipientId().get()).remove(post); + recipientPosts.remove(post.getRecipientId().get(), post); } post.getSone().removePost(post); } finally { @@ -276,20 +388,20 @@ public class MemoryDatabase extends AbstractService implements Database { lock.writeLock().lock(); try { /* remove all posts by the Sone. */ - getPostsFrom(sone.getId()).clear(); + sonePosts.removeAll(sone.getId()); for (Post post : posts) { allPosts.remove(post.getId()); if (post.getRecipientId().isPresent()) { - getPostsTo(post.getRecipientId().get()).remove(post); + recipientPosts.remove(post.getRecipientId().get(), post); } } /* add new posts. */ - getPostsFrom(sone.getId()).addAll(posts); + sonePosts.putAll(sone.getId(), posts); for (Post post : posts) { allPosts.put(post.getId(), post); if (post.getRecipientId().isPresent()) { - getPostsTo(post.getRecipientId().get()).add(post); + recipientPosts.put(post.getRecipientId().get(), post); } } } finally { @@ -303,11 +415,11 @@ public class MemoryDatabase extends AbstractService implements Database { lock.writeLock().lock(); try { /* remove all posts by the Sone. */ - getPostsFrom(sone.getId()).clear(); + sonePosts.removeAll(sone.getId()); for (Post post : sone.getPosts()) { allPosts.remove(post.getId()); if (post.getRecipientId().isPresent()) { - getPostsTo(post.getRecipientId().get()).remove(post); + recipientPosts.remove(post.getRecipientId().get(), post); } } } finally { @@ -342,22 +454,85 @@ public class MemoryDatabase extends AbstractService implements Database { } } + @Override + public void likePostReply(PostReply postReply, Sone localSone) { + lock.writeLock().lock(); + try { + likedPostRepliesBySone.put(localSone.getId(), postReply.getId()); + postReplyLikingSones.put(postReply.getId(), localSone.getId()); + } finally { + lock.writeLock().unlock(); + } + } + + @Override + public void unlikePostReply(PostReply postReply, Sone localSone) { + lock.writeLock().lock(); + try { + likedPostRepliesBySone.remove(localSone.getId(), postReply.getId()); + postReplyLikingSones.remove(postReply.getId(), localSone.getId()); + } finally { + lock.writeLock().unlock(); + } + } + + @Override + public boolean isLiked(PostReply postReply, Sone sone) { + lock.readLock().lock(); + try { + return postReplyLikingSones.containsEntry(postReply.getId(), sone.getId()); + } finally { + lock.readLock().unlock(); + } + } + + @Override + public Set getLikes(PostReply postReply) { + lock.readLock().lock(); + try { + return from(postReplyLikingSones.get(postReply.getId())).transform(getSone()).transformAndConcat(this.unwrap()).toSet(); + } finally { + lock.readLock().unlock(); + } + } + // // POSTREPLYSTORE METHODS // + /** + * Returns whether the given post reply is known. + * + * @param postReply + * The post reply + * @return {@code true} if the given post reply is known, {@code false} + * otherwise + */ + public boolean isPostReplyKnown(PostReply postReply) { + lock.readLock().lock(); + try { + return knownPostReplies.contains(postReply.getId()); + } finally { + lock.readLock().unlock(); + } + } + + @Override + public void setPostReplyKnown(PostReply postReply) { + lock.writeLock().lock(); + try { + knownPostReplies.add(postReply.getId()); + } finally { + lock.writeLock().unlock(); + } + } + @Override public void storePostReply(PostReply postReply) { 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); - } + postReplies.put(postReply.getPostId(), postReply); } finally { lock.writeLock().unlock(); } @@ -382,13 +557,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 replies = new TreeSet(Reply.TIME_COMPARATOR); - replies.add(postReply); - this.postReplies.put(postReply.getPostId(), replies); - } + this.postReplies.put(postReply.getPostId(), postReply); } } finally { lock.writeLock().unlock(); @@ -400,12 +569,7 @@ 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()); - } - } + postReplies.remove(postReply.getPostId(), postReply); } finally { lock.writeLock().unlock(); } @@ -490,7 +654,9 @@ public class MemoryDatabase extends AbstractService implements Database { lock.writeLock().lock(); try { allAlbums.put(album.getId(), album); - albumChildren.put(album.getParent().getId(), album.getId()); + if (!album.isRoot()) { + albumChildren.put(album.getParent().getId(), album.getId()); + } } finally { lock.writeLock().unlock(); } @@ -630,110 +796,10 @@ public class MemoryDatabase extends AbstractService implements Database { } } - /** - * Returns whether the given post reply is known. - * - * @param postReply - * The post reply - * @return {@code true} if the given post reply is known, {@code false} - * otherwise - */ - boolean isPostReplyKnown(PostReply postReply) { - lock.readLock().lock(); - try { - return knownPostReplies.contains(postReply.getId()); - } finally { - lock.readLock().unlock(); - } - } - - /** - * Sets whether the given post reply is known. - * - * @param postReply - * The post reply - * @param known - * {@code true} if the post reply is known, {@code false} otherwise - */ - void setPostReplyKnown(PostReply postReply, boolean known) { - lock.writeLock().lock(); - try { - if (known) { - knownPostReplies.add(postReply.getId()); - } else { - knownPostReplies.remove(postReply.getId()); - } - } finally { - lock.writeLock().unlock(); - } - } - // // PRIVATE METHODS // - /** - * Gets all posts for the given Sone, creating a new collection if there is - * none yet. - * - * @param soneId - * The ID of the Sone to get the posts for - * @return All posts - */ - private Collection getPostsFrom(String soneId) { - Collection posts = null; - lock.readLock().lock(); - try { - posts = sonePosts.get(soneId); - } finally { - lock.readLock().unlock(); - } - if (posts != null) { - return posts; - } - - posts = new HashSet(); - 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 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(); @@ -847,4 +913,13 @@ public class MemoryDatabase extends AbstractService implements Database { }; } + private static Function, Iterable> unwrap() { + return new Function, Iterable>() { + @Override + public Iterable apply(Optional input) { + return (input == null) ? Collections.emptyList() : input.asSet(); + } + }; + } + }