Skip to content

⚡ Move periodic SQL update to async task #3

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

⚡ Move periodic SQL update to async task #3

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
4 changes: 2 additions & 2 deletions modules/GuildManager/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<groupId>com.github.PlaceholderAPI</groupId>
<artifactId>PlaceholderAPI</artifactId>
<version>2.11.1</version>
<scope>provided</scope>
</dependency>
Expand Down
41 changes: 33 additions & 8 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 @@ -4,6 +4,8 @@
import com.mcatk.guildmanager.models.Guild;
import com.mcatk.guildmanager.models.Member;

import org.bukkit.Bukkit;

import java.sql.*;
import java.util.ArrayList;
import java.util.HashMap;
Expand All @@ -23,17 +25,21 @@ private SQLManager() {
guilds = getAllGuildsFromSQL();
}

private void connectMySQL() {
private Connection createConnection() throws SQLException {
String ip = GuildManager.getPlugin().getConfig().getString("mysql.ip");
String databaseName = GuildManager.getPlugin().getConfig().getString("mysql.databasename");
String userName = GuildManager.getPlugin().getConfig().getString("mysql.username");
String userPassword = GuildManager.getPlugin().getConfig().getString("mysql.password");
int port = GuildManager.getPlugin().getConfig().getInt("mysql.port");
return DriverManager.getConnection(
"jdbc:mysql://" + ip + ":" + port + "/" + databaseName + "?autoReconnect=true&useSSL=false",
userName, userPassword
);
}

private void connectMySQL() {
try {
connection = DriverManager.getConnection(
"jdbc:mysql://" + ip + ":" + port + "/" + databaseName + "?autoReconnect=true&useSSL=false",
userName, userPassword
);
connection = createConnection();
} catch (SQLException e) {
e.printStackTrace();
}
Expand Down Expand Up @@ -165,8 +171,12 @@ public HashMap<String, Guild> getGuilds() {
}

private HashMap<String, Guild> getAllGuildsFromSQL() {
return getAllGuildsFromSQL(this.connection);
}

private HashMap<String, Guild> getAllGuildsFromSQL(Connection conn) {
HashMap<String, Guild> guilds = new HashMap<>();
try (PreparedStatement ps = connection.prepareStatement(SQLCommand.GET_ALL_GUILDS.toString())){
try (PreparedStatement ps = conn.prepareStatement(SQLCommand.GET_ALL_GUILDS.toString())){
ResultSet rs = ps.executeQuery();
while (rs.next()) {
Guild g = new Guild();
Expand All @@ -180,7 +190,7 @@ private HashMap<String, Guild> getAllGuildsFromSQL() {
g.setCash(rs.getInt("guild_cash"));
g.setResidenceFLag(rs.getBoolean("guild_has_residence"));
g.setHasChangedName(rs.getBoolean("guild_has_changed_name"));
g.setMembers(getMembersFromSQL(g.getId()));
g.setMembers(getMembersFromSQL(g.getId(), conn));
guilds.put(g.getId(), g);
}
} catch (SQLException e) {
Expand All @@ -190,8 +200,12 @@ private HashMap<String, Guild> getAllGuildsFromSQL() {
}

private ArrayList<Member> getMembersFromSQL(String guildID) {
return getMembersFromSQL(guildID, this.connection);
}

private ArrayList<Member> getMembersFromSQL(String guildID, Connection conn) {
ArrayList<Member> list = new ArrayList<>();
try (PreparedStatement ps = connection.prepareStatement("SELECT * FROM `player_guild` WHERE guild_id = ?")){
try (PreparedStatement ps = conn.prepareStatement("SELECT * FROM `player_guild` WHERE guild_id = ?")){
ps.setString(1, guildID);
ResultSet rs = ps.executeQuery();
while (rs.next()) {
Expand All @@ -217,5 +231,16 @@ public void update() {
guilds = getAllGuildsFromSQL();
}

public void updateAsync() {
try (Connection conn = createConnection()) {
HashMap<String, Guild> guilds = getAllGuildsFromSQL(conn);
Bukkit.getScheduler().runTask(GuildManager.getPlugin(), () -> {
this.guilds = guilds;
});
} catch (SQLException e) {
e.printStackTrace();
}
}


}
2 changes: 1 addition & 1 deletion modules/GuildManager/src/main/java/com/mcatk/guildmanager/sql/SQLUpdater.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@

public class SQLUpdater {
public void run() {
Bukkit.getScheduler().runTaskTimer(GuildManager.getPlugin(), () -> SQLManager.getInstance().update(), 20L * 60L, 20L * 60L);
Bukkit.getScheduler().runTaskTimerAsynchronously(GuildManager.getPlugin(), () -> SQLManager.getInstance().updateAsync(), 20L * 60L, 20L * 60L);
}
}