-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improve performance of friend search & manually cache player profiles
The plugin now keeps a sqlite database for every UUID and Username pair. The friend search function now fully runs on a separate thread, and there is now also a "Loading..." screen until the first results are available, especially useful for larger servers. This also switches from the zeroed UUID for representing the "public" to an invalid UUID, since more recent versions of Minecraft don't allow the zeroed UUID anymore. This is therefore a breaking change.
- Loading branch information
Showing
21 changed files
with
460 additions
and
168 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
151 changes: 151 additions & 0 deletions
151
spigot/src/main/java/de/sean/blockprot/bukkit/CachedProfileService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,151 @@ | ||
| package de.sean.blockprot.bukkit; | ||
|
|
||
| import com.google.common.collect.ImmutableList; | ||
| import com.google.common.collect.ImmutableMap; | ||
| import com.google.common.collect.Lists; | ||
| import org.enginehub.squirrelid.Profile; | ||
| import org.enginehub.squirrelid.cache.ProfileCache; | ||
| import org.enginehub.squirrelid.resolver.*; | ||
| import org.jetbrains.annotations.Nullable; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.ArrayList; | ||
| import java.util.Objects; | ||
| import java.util.UUID; | ||
| import java.util.function.Predicate; | ||
|
|
||
| public class CachedProfileService implements ProfileService, ProfileCache { | ||
| private final ProfileService resolver; | ||
| private final ProfileCache cache; | ||
|
|
||
| public CachedProfileService(ProfileCache cache) { | ||
| // We try to use our server's cache first for lookups, and only later fallback to the | ||
| // Mojang endpoint. | ||
| final var services = Lists.newArrayList( | ||
| BukkitPlayerService.getInstance(), | ||
| PaperPlayerService.getInstance(), | ||
| HttpRepositoryService.forMinecraft()); | ||
| services.removeIf(Objects::isNull); | ||
| this.resolver = new CombinedProfileService(services); | ||
| this.cache = cache; | ||
| } | ||
|
|
||
| @Override | ||
| public int getIdealRequestLimit() { | ||
| return this.resolver.getIdealRequestLimit(); | ||
| } | ||
|
|
||
| @Nullable | ||
| @Override | ||
| public Profile findByName(String name) throws IOException, InterruptedException { | ||
| final var profile = this.resolver.findByName(name); | ||
| if (profile != null) { | ||
| put(profile); | ||
| } | ||
| return profile; | ||
| } | ||
|
|
||
| @Override | ||
| public ImmutableList<Profile> findAllByName(Iterable<String> names) throws IOException, InterruptedException { | ||
| final var profiles = this.resolver.findAllByName(names); | ||
| putAll(profiles); | ||
| return profiles; | ||
| } | ||
|
|
||
| @Override | ||
| public void findAllByName(Iterable<String> names, Predicate<Profile> predicate) throws IOException, InterruptedException { | ||
| this.resolver.findAllByName(names, (input) -> { | ||
| put(input); | ||
| return predicate.test(input); | ||
| }); | ||
| } | ||
|
|
||
| @Nullable | ||
| @Override | ||
| public Profile findByUuid(UUID uuid) { | ||
| var profile = getIfPresent(uuid); | ||
| if (profile == null) { | ||
| try { | ||
| profile = this.resolver.findByUuid(uuid); | ||
| if (profile != null) { | ||
| put(profile); | ||
| } | ||
| } catch (Exception e) { | ||
| return profile; | ||
| } | ||
| } | ||
| return profile; | ||
| } | ||
|
|
||
| @Override | ||
| public ImmutableList<Profile> findAllByUuid(Iterable<UUID> uuids) { | ||
| final var map = getAllPresent(uuids); | ||
|
|
||
| if (map.isEmpty()) { | ||
| final var profiles = new ArrayList<Profile>(); | ||
| for (final var uuid : uuids) { | ||
| try { | ||
| final var profile = this.resolver.findByUuid(uuid); | ||
| put(profile); | ||
| profiles.add(profile); | ||
| } catch (Exception e) { | ||
| return ImmutableList.copyOf(profiles); | ||
| } | ||
| } | ||
| return ImmutableList.copyOf(profiles); | ||
| } | ||
|
|
||
| // The returned map doesn't include the UUIDs which were not found in the cache. | ||
| final var lookup = new ArrayList<UUID>(); | ||
| for (final var uuid : uuids) { | ||
| if (!map.containsKey(uuid) || map.get(uuid) == null) { | ||
| lookup.add(uuid); | ||
| } | ||
| } | ||
|
|
||
| if (!lookup.isEmpty()) { | ||
| final var profiles = new ArrayList<>(map.values()); | ||
| for (final var uuid : lookup) { | ||
| try { | ||
| final var profile = this.resolver.findByUuid(uuid); | ||
| put(profile); | ||
| profiles.add(profile); | ||
| } catch (Exception e) { | ||
| return ImmutableList.copyOf(profiles); | ||
| } | ||
| } | ||
| return ImmutableList.copyOf(profiles); | ||
| } | ||
|
|
||
| return map.values().asList(); | ||
| } | ||
|
|
||
| @Override | ||
| public void findAllByUuid(Iterable<UUID> uuids, Predicate<Profile> predicate) throws IOException, InterruptedException { | ||
| this.resolver.findAllByUuid(uuids, (input) -> { | ||
| put(input); | ||
| return predicate.test(input); | ||
| }); | ||
| } | ||
|
|
||
| @Override | ||
| public void put(Profile profile) { | ||
| this.cache.put(profile); | ||
| } | ||
|
|
||
| @Override | ||
| public void putAll(Iterable<Profile> iterable) { | ||
| this.cache.putAll(iterable); | ||
| } | ||
|
|
||
| @Nullable | ||
| @Override | ||
| public Profile getIfPresent(UUID uuid) { | ||
| return this.cache.getIfPresent(uuid); | ||
| } | ||
|
|
||
| @Override | ||
| public ImmutableMap<UUID, Profile> getAllPresent(Iterable<UUID> iterable) { | ||
| return this.cache.getAllPresent(iterable); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.