Merge pull request #4 from okocraft/Debug

メモリリークに対処
okocraft · Jun 1, 2019 · 75f4eb8 · 75f4eb8
2 parents 7ab8a74 + 4301c9b
commit 75f4eb8
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 38 deletions.
diff --git a/src/main/java/net/okocraft/box/Box.java b/src/main/java/net/okocraft/box/Box.java
@@ -14,7 +14,6 @@
 import org.bukkit.Bukkit;
 import org.bukkit.event.HandlerList;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.scheduler.BukkitRunnable;
 
 /**
  * @author OKOCRAFT
@@ -80,16 +79,6 @@ public void onEnable() {
         new Commands(database);
         new BoxTabCompleter(database);
 
-        new BukkitRunnable(){
-
-            @Override
-            public void run() {
-                Bukkit.broadcastMessage("§8[§6Box§8] §7データベースをリフレッシュしています...");
-                database.resetConnection();
-                Bukkit.broadcastMessage("§8[§6Box§8] §7データベースのリフレッシュが完了しました。");
-            }
-        }.runTaskTimer(this, 20*60*60*2, 20*60*60*2);
-
         log.info("Box has been enabled!");
     }
 

diff --git a/src/main/java/net/okocraft/box/database/Database.java b/src/main/java/net/okocraft/box/database/Database.java
@@ -135,10 +135,11 @@ public boolean connect(String url) {
         }
 
         // create table for Box plugin
-        boolean isTableCreated = connection.map(connection -> {
-            try {
-                connection.createStatement().execute("CREATE TABLE IF NOT EXISTS " + table
-                        + " (uuid TEXT PRIMARY KEY NOT NULL, player TEXT NOT NULL)");
+        val statement = prepare(
+                "CREATE TABLE IF NOT EXISTS " + table + " (uuid TEXT PRIMARY KEY NOT NULL, player TEXT NOT NULL)");
+        boolean isTableCreated = statement.map(resource -> {
+            try (PreparedStatement stmt = resource) {
+                stmt.execute();
 
                 return true;
             } catch (SQLException e) {
@@ -353,8 +354,8 @@ public String get(String column, String entry) {
 
         val statement = prepare("SELECT " + column + " FROM " + table + " WHERE " + entryType + " = ?");
 
-        Optional<String> result = statement.map(stmt -> {
-            try {
+        Optional<String> result = statement.map(resource -> {
+            try (PreparedStatement stmt = resource) {
                 stmt.setString(1, entry);
                 ResultSet rs = stmt.executeQuery();
                 return rs.getString(column);
@@ -439,7 +440,7 @@ public boolean dropColumn(String column) {
         });
         String columnsExcludeType = colmunsBuilderExcludeType.toString().replaceAll(", $", "");
 
-        Statement statement;
+        Statement statement = null;
 
         try {
             statement = connection.get().createStatement();
@@ -462,8 +463,7 @@ public boolean dropColumn(String column) {
     }
 
     /**
-     * エントリーの複数のカラムの値を一気に取得する。
-     * マップはLinkedHashMapで、引数のListの順番を引き継ぐ。
+     * エントリーの複数のカラムの値を一気に取得する。 マップはLinkedHashMapで、引数のListの順番を引き継ぐ。
      *
      * @author LazyGon
      * @since 1.0.0-SNAPSHOT
@@ -483,8 +483,8 @@ public Map<String, String> getMultiValue(List<String> columns, @NonNull String e
 
         val statement = prepare("SELECT " + multipleColumnName + " FROM " + table + " WHERE " + entryType + " = ?");
 
-        return statement.map(stmt -> {
-            try {
+        return statement.map(resource -> {
+            try (PreparedStatement stmt = resource) {
                 stmt.setString(1, entry);
                 ResultSet rs = stmt.executeQuery();
 
@@ -521,10 +521,11 @@ public boolean setMultiValue(Map<String, String> columnValueMap, @NonNull String
             sb.append(columnName + " = '" + columnValue + "', ");
         });
 
-        val statement = prepare("UPDATE " + table + " SET " + sb.substring(0, sb.length() - 2) + " WHERE " + entryType + " = ?");
+        val statement = prepare(
+                "UPDATE " + table + " SET " + sb.substring(0, sb.length() - 2) + " WHERE " + entryType + " = ?");
 
-        return statement.map(stmt -> {
-            try {
+        return statement.map(resource -> {
+            try (PreparedStatement stmt = resource) {
                 stmt.setString(1, entry);
                 stmt.executeUpdate();
                 return true;
@@ -550,8 +551,8 @@ public Map<String, String> getColumnMap() {
 
         val statement = prepare("SELECT * FROM " + table + " WHERE 0=1");
 
-        return statement.map(stmt -> {
-            try {
+        return statement.map(resource -> {
+            try (PreparedStatement stmt = resource) {
                 ResultSetMetaData rsmd = stmt.executeQuery().getMetaData();
 
                 for (int i = 1; i <= rsmd.getColumnCount(); i++) {
@@ -580,8 +581,8 @@ public Map<String, String> getPlayersMap() {
 
         val statement = prepare("SELECT uuid, player FROM " + table);
 
-        statement.ifPresent(stmt -> {
-            try {
+        statement.ifPresent(resource -> {
+            try (PreparedStatement stmt = resource) {
                 ResultSet rs = stmt.executeQuery();
                 while (rs.next())
                     playersMap.put(rs.getString("uuid"), rs.getString("player"));
@@ -623,8 +624,8 @@ public boolean removeValue(String column, String entry) {
 
         val statement = prepare("UPDATE " + table + " SET " + column + " = NULL WHERE " + entryType + " = ?");
 
-        return statement.map(stmt -> {
-            try {
+        return statement.map(resource -> {
+            try (PreparedStatement stmt = resource) {
                 stmt.setString(1, entry);
                 stmt.executeUpdate();
                 return true;

diff --git a/src/main/java/net/okocraft/box/database/StatementRunner.java b/src/main/java/net/okocraft/box/database/StatementRunner.java
@@ -16,16 +16,10 @@ public StatementRunner(Statement statement) {
 
     @Override
     public void run() {
-        try {
+        try (Statement stmt = statement) {
             statement.executeBatch();
         } catch (SQLException exception) {
             exception.printStackTrace();
-        } finally {
-            try {
-                statement.close();
-            } catch (SQLException exception) {
-                exception.printStackTrace();
-            }
         }
     }