Skip to content
This repository has been archived by the owner on Jun 1, 2024. It is now read-only.

[Do not merge] Fetch comments concurrently in a thread pool #2502

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+50 −26
Open

[Do not merge] Fetch comments concurrently in a thread pool #2502

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 50 additions & 26 deletions app/src/main/java/me/ccrama/redditslide/CommentCacheAsync.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,13 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;

import me.ccrama.redditslide.Activities.CommentsScreenSingle;
import me.ccrama.redditslide.Autocache.AutoCacheScheduler;
Expand Down Expand Up @@ -301,7 +306,7 @@ public Void doInBackground(Object[] params) {
for (final String fSub : subs) {
final String sub;
final String name = fSub;
CommentSort sortType = SettingValues.getCommentSorting(name);
final CommentSort sortType = SettingValues.getCommentSorting(name);

if (multiNameToSubsMap.containsKey(fSub)) {
sub = multiNameToSubsMap.get(fSub);
Expand Down Expand Up @@ -340,57 +345,77 @@ public Void doInBackground(Object[] params) {
}
}

int commentDepth = Integer.valueOf(
final int commentDepth = Integer.valueOf(
SettingValues.prefs.getString(SettingValues.COMMENT_DEPTH, "5"));
int commentCount = Integer.valueOf(
final int commentCount = Integer.valueOf(
SettingValues.prefs.getString(SettingValues.COMMENT_COUNT, "50"));

Log.v("CommentCacheAsync", "comment count " + commentCount);
int random = (int) (Math.random() * 100);

for (final Submission s : submissions) {
// Fetch all posts' comments concurrently in a thread pool
final BlockingQueue<Submission> submissionsFetched = new ArrayBlockingQueue<Submission>(200);
final ConcurrentHashMap<Submission, JsonNode> commentFetchResults = new ConcurrentHashMap<>();
final ThreadPoolExecutor commentFetchPool = new ThreadPoolExecutor(20, 50, 50,
TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(200));
for(final Submission s: submissions) {
commentFetchPool.execute(new Runnable() {
@Override
public void run() {
final JsonNode n = getSubmission(new SubmissionRequest.Builder(s.getId()).limit(commentCount)
.depth(commentDepth)
.sort(sortType)
.build());
commentFetchResults.put(s, n);
try {
submissionsFetched.put(s);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
});
}

while(true) {
try {
JsonNode n = getSubmission(
new SubmissionRequest.Builder(s.getId()).limit(commentCount)
.depth(commentDepth)
.sort(sortType)
.build());
final Submission s = submissionsFetched.poll(2, TimeUnit.SECONDS);
if (s == null) {
break;
}
final JsonNode n = commentFetchResults.get(s);
Submission s2 =
SubmissionSerializer.withComments(n, CommentSort.CONFIDENCE);
OfflineSubreddit.writeSubmission(n, s2, context);
newFullnames.add(s2.getFullName());
if (!SettingValues.noImages) loadPhotos(s, context);
switch (ContentType.getContentType(s)) {
case GIF:
if (otherChoices[0]) {
if (context instanceof Activity) {
((Activity) context).runOnUiThread(new Runnable() {
@Override
public void run() {
ExecutorService service =
Executors.newSingleThreadExecutor();
new GifUtils.AsyncLoadGif().executeOnExecutor(
service, s.getUrl());
}
});
}
if (otherChoices != null && otherChoices[0] && context instanceof Activity) {
((Activity) context).runOnUiThread(new Runnable() {
@Override
public void run() {
ExecutorService service =
Executors.newSingleThreadExecutor();
new GifUtils.AsyncLoadGif().executeOnExecutor(service, s.getUrl());
}
});
}
break;
case ALBUM:
if (otherChoices[1])
if (otherChoices != null && otherChoices[1])
//todo this AlbumUtils.saveAlbumToCache(context, s.getUrl());
{
break;
}
}
} catch (Exception ignored) {
} catch (InterruptedException e) {
e.printStackTrace();
}
count = count + 1;
if (mBuilder != null) {
mBuilder.setProgress(submissions.size(), count, false);
mNotifyManager.notify(random, mBuilder.build());
}

}

OfflineSubreddit.newSubreddit(sub).writeToMemory(newFullnames);
Expand All @@ -407,7 +432,6 @@ public void run() {
mBuilder.setOngoing(false);
mNotifyManager.notify(2001, mBuilder.build());
}

return null;
}

Expand All @@ -431,7 +455,7 @@ public JsonNode getSubmission(SubmissionRequest request) throws NetworkException
args.put("sort", sort.name().toLowerCase());

try {

// TODO: Remove whatever locks are causing this function to run serially
RestResponse response = Authentication.reddit.execute(Authentication.reddit.request()
.path(String.format("/comments/%s", request.getId()))
.query(args)
Expand Down