PandacubeFr/PandaLib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small improvement in PlayerFinder

Browse Source
This commit is contained in:
Marc Baloup 2021-08-20 01:47:52 +02:00
parent 799cb78450
commit 3dd2af7814
Signed by: marcbal
GPG Key ID: BBC0FE3ABC30B893
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Core/src/main/java/fr/pandacube/lib/core/players/PlayerFinder.java
View File

@ -212,16 +212,7 @@ public class PlayerFinder {
return DIFF_CHAR_DISTANCE; return DIFF_CHAR_DISTANCE;
}; };
// record NamesCacheResult(String name, UUID id) { } // Java 16 record NamesCacheResult(String name, String lowercaseName, UUID id) { } // Java 16
static class NamesCacheResult {
private final String name;
private final UUID id;
public NamesCacheResult(String name, UUID id) {
this.name = name; this.id = id;
}
public String name() { return name; }
public UUID id() { return id; }
}
private static LoadingCache<String, List<NamesCacheResult>> namesCache = CacheBuilder.newBuilder() private static LoadingCache<String, List<NamesCacheResult>> namesCache = CacheBuilder.newBuilder()
.expireAfterWrite(2, TimeUnit.MINUTES) .expireAfterWrite(2, TimeUnit.MINUTES)
@ -230,7 +221,8 @@ public class PlayerFinder {
List<NamesCacheResult> cached = new ArrayList<>(); List<NamesCacheResult> cached = new ArrayList<>();
try { try {
DB.forEach(SQLPlayerNameHistory.class, el -> { DB.forEach(SQLPlayerNameHistory.class, el -> {
cached.add(new NamesCacheResult(el.get(SQLPlayerNameHistory.playerName), el.get(SQLPlayerNameHistory.playerId))); String name = el.get(SQLPlayerNameHistory.playerName);
cached.add(new NamesCacheResult(name, name.toLowerCase(), el.get(SQLPlayerNameHistory.playerId)));
}); });
} catch (DBException e) { } catch (DBException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
@ -245,13 +237,12 @@ public class PlayerFinder {
List<FoundName> foundNames = new ArrayList<>(); List<FoundName> foundNames = new ArrayList<>();
try { try {
namesCache.get("").forEach(el -> { namesCache.get("").forEach(el -> {
String name = el.name(); int dist = new LevenshteinDistance(el.lowercaseName(), query, SURPLUS_CHAR_DISTANCE, MISSING_CHAR_DISTANCE, CHAR_DISTANCE).getCurrentDistance();
int dist = new LevenshteinDistance(name.toLowerCase(), query, SURPLUS_CHAR_DISTANCE, MISSING_CHAR_DISTANCE, CHAR_DISTANCE).getCurrentDistance();
if (dist <= SEARCH_MAX_DISTANCE) { if (dist <= SEARCH_MAX_DISTANCE) {
FoundName n = new FoundName(); FoundName n = new FoundName();
n.dist = dist; n.dist = dist;
n.id = el.id(); n.id = el.id();
n.name = name; n.name = el.name();
foundNames.add(n); foundNames.add(n);
} }
}); });