Skip to content

⚡ Optimize Guild Member Lookups to Reduce Allocations #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
google-labs-jules wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

⚡ Optimize Guild Member Lookups to Reduce Allocations #2

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion modules/GuildManager/src/main/java/com/mcatk/guildmanager/LoginListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public void onAuth(LoginEvent e) {
} else {
// 非会长 会内公告
for (Player p : Bukkit.getOnlinePlayers()) {
if (SQLManager.getInstance().getGuildMembers(guild.getId()).contains(p.getName())) {
if (SQLManager.getInstance().isGuildMember(guild.getId(), p.getName())) {
p.sendMessage(
Msg.INFO + "§6" + guild.getGuildName() + " §7成员 §e" + player.getName() + " §7已上线"
);
Expand Down
8 changes: 4 additions & 4 deletions modules/GuildManager/src/main/java/com/mcatk/guildmanager/command/GuildCommandS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@ private void onCommandChairman() throws ParaLengthException {
warp();
break;
case "setvice1":
if (SQLManager.getInstance().getGuildMembers(guild.getId()).contains(args[1])) {
if (SQLManager.getInstance().isGuildMember(guild.getId(), args[1])) {
guild.setViceChairman1(args[1]);
}
break;
case "setvice2":
if (SQLManager.getInstance().getGuildMembers(guild.getId()).contains(args[1])) {
if (SQLManager.getInstance().isGuildMember(guild.getId(), args[1])) {
guild.setViceChairman2(args[1]);
}
break;
Expand Down Expand Up @@ -188,7 +188,7 @@ private void advance() throws ParaLengthException {
String playerName = args[2];
if (operate.equalsIgnoreCase("add")) {
if (SQLManager.getInstance().getGuildAdvancedMembers(guild.getId()).size() < GuildBasicInfo.getMaxAdvancedPlayer(guild.getLevel())) {
if (SQLManager.getInstance().getGuildMembers(guild.getId()).contains(playerName)) {
if (SQLManager.getInstance().isGuildMember(guild.getId(), playerName)) {
Member member = SQLManager.getInstance().getMember(playerName);
member.setAdvanced(true);
SQLManager.getInstance().saveMember(member);
Expand All @@ -201,7 +201,7 @@ private void advance() throws ParaLengthException {
sender.sendMessage(Msg.ERROR + "已达到公会广场名单最大成员数");
}
} else if (operate.equalsIgnoreCase("remove")) {
if (SQLManager.getInstance().getGuildMembers(guild.getId()).contains(playerName)) {
if (SQLManager.getInstance().isGuildMember(guild.getId(), playerName)) {
Member member = SQLManager.getInstance().getMember(playerName);
member.setAdvanced(false);
SQLManager.getInstance().saveMember(member);
Expand Down
2 changes: 1 addition & 1 deletion modules/GuildManager/src/main/java/com/mcatk/guildmanager/gui/GuildsGUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ private ItemStack getAnGuildButton(Guild guild) {
ArrayList<String> des = new ArrayList<>();
des.add("§b公会ID: §a" + guild.getId());
des.add("§b会长: §a" + guild.getChairman());
des.add("§b成员: §a" + SQLManager.getInstance().getGuildMembers(guild.getId()).size() + "§7/§2" + GuildBasicInfo.getMaxPlayer(guild.getLevel()));
des.add("§b成员: §a" + SQLManager.getInstance().getGuildMemberCount(guild.getId()) + "§7/§2" + GuildBasicInfo.getMaxPlayer(guild.getLevel()));
des.add("§b高级成员: §a" + GuildBasicInfo.getMaxAdvancedPlayer(guild.getLevel()));
des.add("§b等级: §a" + guild.getLevel());
des.add("§b积分: §a" + guild.getPoints());
Expand Down
2 changes: 1 addition & 1 deletion modules/GuildManager/src/main/java/com/mcatk/guildmanager/papi/GuildPapi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public String onRequest(OfflinePlayer player, @NotNull String identifier) {
return Integer.toString(guild.getLevel());
}
if (identifier.equals("num_player")) {
return Integer.toString(SQLManager.getInstance().getGuildMembers(guild.getId()).size());
return Integer.toString(SQLManager.getInstance().getGuildMemberCount(guild.getId()));
}
if (identifier.equals("max_player")) {
return Integer.toString(GuildBasicInfo.getMaxPlayer(guild.getLevel()));
Expand Down
18 changes: 16 additions & 2 deletions modules/GuildManager/src/main/java/com/mcatk/guildmanager/sql/SQLManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,27 @@ public void removeMember(String playerID, String guildID) {
}

public ArrayList<String> getGuildMembers(String id) {
ArrayList<String> list = new ArrayList<>();
for (Member m : guilds.get(id).getMembers()) {
ArrayList<Member> members = guilds.get(id).getMembers();
ArrayList<String> list = new ArrayList<>(members.size());
for (Member m : members) {
list.add(m.getId());
}
return list;
}

public int getGuildMemberCount(String id) {
return guilds.get(id).getMembers().size();
}

public boolean isGuildMember(String guildId, String memberId) {
for (Member m : guilds.get(guildId).getMembers()) {
if (m.getId().equals(memberId)) {
return true;
}
}
return false;
}

public ArrayList<String> getGuildAdvancedMembers(String id) {
ArrayList<String> list = new ArrayList<>();
for (Member m : guilds.get(id).getMembers()) {
Expand Down