速度向上？

Author: kanasaki15

build.gradle

@@ -3,7 +3,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 apply plugin: 'java'
 
 group = 'xyz.n7mn.dev.yululi'
-version = '3.0.7-beta3'
+version = '3.0.7-rc1'
 
 sourceCompatibility = '1.8'
 targetCompatibility = '1.8'

src/main/java/xyz/n7mn/dev/yululi/itemframeprotectionplugin/IFPCommand.java

@@ -107,9 +107,10 @@ public void run() {
 
                         if (args[0].toLowerCase().equals("admin") && player.hasPermission("ifp.op")){
 
-                            List<FrameData> list = api.getListByFrameData(false);
+
                             sender.sendMessage("---- ItemFrameProtectPlugin Ver " + plugin.getDescription().getVersion() + " ----");
-                            sender.sendMessage(ChatColor.GREEN + "保護件数 : " + list.size() + " 件");
+                            sender.sendMessage(ChatColor.GREEN + "保護件数 : " + api.getCountByItemFrame() + " 件");
+                            List<FrameData> list = api.getListByFrameData(false);
 
                             for (FrameData data : list){
 

src/main/java/xyz/n7mn/dev/yululi/itemframeprotectionplugin/ItemFrameListener.java

@@ -149,7 +149,6 @@ public void BlockBreakEvent (HangingBreakEvent e){
 
         // 額縁壊されるとき
         ItemFrame frame = (ItemFrame) e.getEntity();
-        List<FrameData> list = api.getListByFrameData(true);
 
         FrameData itemFrame = api.getItemFrame(frame.getUniqueId());
         if (itemFrame != null){

src/main/java/xyz/n7mn/dev/yululi/itemframeprotectionplugin/data/DataAPI.java

@@ -64,6 +64,10 @@ public FrameData getItemFrame(UUID itemFrameUUID){
 
     }
 
+    public DropItemData getDropItemData(UUID dropItemUUID) {
+        return drop.getDropItemData(dropItemUUID);
+    }
+
     public void addItemFrame(FrameData data){
 
         item.addFrameData(data);
@@ -100,6 +104,14 @@ public void deleteTableByItem(UUID ItemUUID){
 
     }
 
+    public long getCountByItemFrame(){
+        return item.getCount();
+    }
+
+    public long getCountByDropItem(){
+        return drop.getCount();
+    }
+
     public void cacheClearByFrame(){
 
         item.forceCacheToSQL();
@@ -121,4 +133,5 @@ public String getCacheCount(){
         return "Item : " + item.getCacheCount() +" Drop : " + drop.getDropCacheCount();
     }
 
+
 }

src/main/java/xyz/n7mn/dev/yululi/itemframeprotectionplugin/data/DropItemList.java

@@ -213,6 +213,43 @@ public List<DropItemData> getDropItemDataList() {
         }
     }
 
+    public DropItemData getDropItemData(UUID dropItemUUID){
+        try {
+            PreparedStatement statement = con.prepareStatement("SELECT * FROM ItemFrameTable2 WHERE DropItemUUID = ?");
+            statement.setString(1, dropItemUUID.toString());
+            ResultSet set = statement.executeQuery();
+            if (set.next()){
+
+                DropItemData data = new DropItemData();
+                data.setDropItemUUID(UUID.fromString(set.getString("DropItemUUID")));
+                data.setWorldUUID(UUID.fromString(set.getString("WorldUUID")));
+                data.setDropUser(UUID.fromString(set.getString("DropUser")));
+                data.setDropDate(new Date(set.getTimestamp("DropDate").getTime()));
+
+                set.close();
+                statement.close();
+                return data;
+            }
+
+            synchronized (dropItemDataList){
+
+                for (DropItemData data : dropItemDataList){
+                    if (data.getDropItemUUID().equals(dropItemUUID)){
+                        return data;
+                    }
+                }
+
+            }
+        } catch (Exception e){
+            if (plugin.getConfig().getBoolean("errorPrint")){
+                plugin.getLogger().info(ChatColor.RED + "エラーを検知しました。");
+                e.printStackTrace();
+            }
+        }
+
+        return null;
+    }
+
 
     public void addDropItemDataList(DropItemData data){
 
@@ -274,4 +311,32 @@ public int getDropCacheCount(){
         }
     }
 
+
+    public long getCount(){
+
+        long count = 0;
+
+        synchronized (dropItemDataList){
+            count = count + dropItemDataList.size();
+        }
+
+        try {
+            PreparedStatement statement = con.prepareStatement("SELECT COUNT(*) FROM ItemFrameTable2;");
+            ResultSet set = statement.executeQuery();
+            if (set.next()){
+
+                count = count + set.getLong("COUNT(*)");
+
+                set.close();
+                statement.close();
+                return count;
+            }
+
+        } catch (SQLException e){
+            return count;
+        }
+
+        return count;
+    }
+
 }

src/main/java/xyz/n7mn/dev/yululi/itemframeprotectionplugin/data/ItemFrameList.java

@@ -152,7 +152,7 @@ public void forceCacheToSQL(){
     }
 
     public List<FrameData> getFrameDataList(){
-        List<FrameData> dataList = new ArrayList<>();
+        List<FrameData> dataList = new ArrayList<>(Math.toIntExact(this.getCount()));
 
         synchronized (frameDataList){
             if (frameDataList.size() != 0){
@@ -191,7 +191,7 @@ public List<FrameData> getFrameDataList(){
 
     public List<FrameData> getFrameDataListByActive() {
 
-        List<FrameData> dataList = new ArrayList<>();
+        List<FrameData> dataList = new ArrayList<>(Math.toIntExact(this.getCount()));
 
         try {
             PreparedStatement statement = con.prepareStatement("SELECT * FROM ItemFrameTable1 WHERE Active = 1");
@@ -291,7 +291,17 @@ public void addFrameData(FrameData data){
 
     public void deleteFrameData(UUID itemFrameUUID){
 
-        this.forceCacheToSQL();
+        synchronized (frameDataList){
+            for (FrameData data : frameDataList){
+
+                if (data.getItemFrameUUID().equals(itemFrameUUID)){
+
+                    frameDataList.remove(data);
+                    return;
+                }
+
+            }
+        }
 
         try {
 
@@ -308,4 +318,31 @@ public void deleteFrameData(UUID itemFrameUUID){
         }
 
     }
+
+    public long getCount(){
+
+        long count = 0;
+
+        synchronized (frameDataList){
+            count = count + frameDataList.size();
+        }
+
+        try {
+            PreparedStatement statement = con.prepareStatement("SELECT COUNT(*) FROM ItemFrameTable1;");
+            ResultSet set = statement.executeQuery();
+            if (set.next()){
+
+                count = count + set.getLong("COUNT(*)");
+
+                set.close();
+                statement.close();
+                return count;
+            }
+
+        } catch (SQLException e){
+            return count;
+        }
+
+        return count;
+    }
 }