ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #7457 from deathbeam/xp-tracker-do-not-discard

Browse Source 
Do not discard 1 second requests in Xp tracker
This commit is contained in:
Adam
2019-01-22 17:15:51 -05:00
committed by GitHub
parent 950f519efa a39441fff0
commit af32db0f3c
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
http-service/src/main/java/net/runelite/http/service/xp/XpTrackerService.java
View File

@@ -29,6 +29,8 @@ import com.google.common.hash.Funnels;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedDeque;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.http.api.hiscore.HiscoreEndpoint; import net.runelite.http.api.hiscore.HiscoreEndpoint;
@@ -48,6 +50,7 @@ import org.sql2o.Sql2o;
@Slf4j @Slf4j
public class XpTrackerService public class XpTrackerService
{ {
private static final int QUEUE_LIMIT = 100_000;
private static final Duration UPDATE_TIME = Duration.ofMinutes(5); private static final Duration UPDATE_TIME = Duration.ofMinutes(5);
@Autowired @Autowired
@@ -57,8 +60,8 @@ public class XpTrackerService
@Autowired @Autowired
private HiscoreService hiscoreService; private HiscoreService hiscoreService;
private final Queue<String> usernameUpdateQueue = new ConcurrentLinkedDeque<>();
private BloomFilter<String> usernameFilter = createFilter(); private BloomFilter<String> usernameFilter = createFilter();
private String nextUsername;
public void update(String username) throws ExecutionException public void update(String username) throws ExecutionException
{ {
@@ -68,12 +71,18 @@ public class XpTrackerService
public void tryUpdate(String username) public void tryUpdate(String username)
{ {
if (nextUsername != null || usernameFilter.mightContain(username)) if (usernameFilter.mightContain(username))
{ {
return; return;
} }
nextUsername = username; if (usernameUpdateQueue.size() >= QUEUE_LIMIT)
{
log.warn("Username update queue is full ({})", QUEUE_LIMIT);
return;
}
usernameUpdateQueue.add(username);
usernameFilter.put(username); usernameFilter.put(username);
} }
@@ -211,8 +220,7 @@ public class XpTrackerService
@Scheduled(fixedDelay = 1000) @Scheduled(fixedDelay = 1000)
public void update() throws ExecutionException public void update() throws ExecutionException
{ {
String next = nextUsername; String next = usernameUpdateQueue.poll();
nextUsername = null;
if (next == null) if (next == null)
{ {
@@ -223,17 +231,24 @@ public class XpTrackerService
update(next, hiscoreResult); update(next, hiscoreResult);
} }
@Scheduled(fixedDelay = 60 * 60 * 1000) // one hour @Scheduled(fixedDelay = 3 * 60 * 60 * 1000) // 3 hours
public void clearFilter() public void clearFilter()
{ {
usernameFilter = createFilter(); usernameFilter = createFilter();
} }
private static BloomFilter<String> createFilter() private BloomFilter<String> createFilter()
{ {
return BloomFilter.create( final BloomFilter<String> filter = BloomFilter.create(
Funnels.stringFunnel(Charset.defaultCharset()), Funnels.stringFunnel(Charset.defaultCharset()),
100_000 100_000
); );
for (String toUpdate : usernameUpdateQueue)
{
filter.put(toUpdate);
}
return filter;
} }
} }