Add runnable and test for this

LionZXY · LionZXY · commit ac612763983f · 2018-01-24T20:31:44.000+03:00
diff --git a/src/main/java/ru/lionzxy/fastlogblock/FastLogBlock.java b/src/main/java/ru/lionzxy/fastlogblock/FastLogBlock.java
@@ -8,26 +8,24 @@
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import ru.lionzxy.fastlogblock.config.LogConfig;
-import ru.lionzxy.fastlogblock.io.WriteRunnable;
 import ru.lionzxy.fastlogblock.models.BlockChangeEventModel;
 
 import java.io.File;
 import java.io.IOException;
 
 @Mod(modid = FastLogBlock.MODID, version = FastLogBlock.VERSION)
 public class FastLogBlock {
-    @Mod.Instance
-    public static FastLogBlock fastLogBlock;
     public static final File rootMinecraftPath = new File("./");
-    public File logFolderFile;
     public static final String MODID = "fastlogblock";
     public static final String VERSION = "1.0";
+    @Mod.Instance
+    public static FastLogBlock fastLogBlock;
+    public File logFolderFile;
 
     @EventHandler
     public void init(final FMLInitializationEvent event) throws IOException {
         logFolderFile = new File(rootMinecraftPath, LogConfig.logFolderPath);
         FMLLog.log.info("FullPath: " + logFolderFile.getAbsolutePath());
-        final WriteRunnable writeRunnable = new WriteRunnable();
         MinecraftForge.EVENT_BUS.register(this);
     }
 
diff --git a/src/main/java/ru/lionzxy/fastlogblock/config/LogConfig.java b/src/main/java/ru/lionzxy/fastlogblock/config/LogConfig.java
@@ -14,24 +14,18 @@
 public class LogConfig {
     @Config.Comment("Filepath from minecraft root folder to block log path")
     public static final String logFolderPath = "./blocklog/";
-
+    @Config.Comment("Path to mapper file from logFolderPath")
+    public static final String nickToIntFilePath = "nicktoid.prop";
+    public static final HashConfig HASH_CONFIG = new HashConfig();
     @Config.Comment("File splitter type. SINGLE for single-file strategy, BLOCKHASH for file=HASH(BlockPos) strategy")
     public static FileSplitterEnum fileSplitterType = FileSplitterEnum.BLOCKHASH;
-
     @Config.Comment("Utils information for migration")
     public static int logSchemeVersion = 1;
-
-    @Config.Comment("Path to mapper file from logFolderPath")
-    public static final String nickToIntFilePath = "nicktoid.prop";
-
     @Config.Comment("Path to mapper file from logFolderPath")
     public static String blockToIntFilePath = "blocktoid.prop";
-
     @Config.Comment("Regular expression for block change event ignore")
     public static String[] ignoreBlockNamesRegExp = new String[]{"<minecraft:tallgrass:*>"};
 
-    public static final HashConfig HASH_CONFIG = new HashConfig();
-
     public static class HashConfig {
         @Config.Comment("Max logfile count")
         public final int fileCount = 16;
diff --git a/src/main/java/ru/lionzxy/fastlogblock/io/ReadRunnable.java b/src/main/java/ru/lionzxy/fastlogblock/io/ReadRunnable.java
@@ -0,0 +1,53 @@
+package ru.lionzxy.fastlogblock.io;
+
+import ru.lionzxy.fastlogblock.io.filesplitter.IFileSplitter;
+import ru.lionzxy.fastlogblock.io.log.LogReader;
+import ru.lionzxy.fastlogblock.io.mappers.BlockMapper;
+import ru.lionzxy.fastlogblock.io.mappers.NickMapper;
+import ru.lionzxy.fastlogblock.models.BlockChangeEventModel;
+import ru.lionzxy.fastlogblock.models.FindTask;
+
+import java.io.File;
+import java.util.List;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class ReadRunnable implements Runnable {
+    private final BlockingQueue<FindTask> findTasks = new LinkedBlockingQueue<>();
+    private final NickMapper nickMapper;
+    private final BlockMapper blockMapper;
+    private final IFileSplitter fileSplitter;
+    private final AtomicBoolean withoutWork = new AtomicBoolean(true);
+
+    public ReadRunnable(final IFileSplitter fileSplitter, final NickMapper nickMapper, final BlockMapper blockMapper) {
+        this.nickMapper = nickMapper;
+        this.blockMapper = blockMapper;
+        this.fileSplitter = fileSplitter;
+    }
+
+    @Override
+    public void run() {
+        while (!Thread.currentThread().isInterrupted()) {
+            try {
+                final FindTask findTask = findTasks.take();
+                withoutWork.set(false);
+                final File file = fileSplitter.getFileByPos(findTask.getBlockPos());
+                final LogReader logReader = new LogReader(file, blockMapper, nickMapper);
+                final List<BlockChangeEventModel> blockChangeEventModels = logReader.readEventByPos(findTask.getBlockPos());
+                findTask.getFindListener().onResultAsync(blockChangeEventModels);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            withoutWork.set(true);
+        }
+    }
+
+    public void addTaskForSearch(FindTask findTask) {
+        findTasks.add(findTask);
+    }
+
+    public boolean isEmpty() {
+        return findTasks.isEmpty() && withoutWork.get();
+    }
+}
diff --git a/src/main/java/ru/lionzxy/fastlogblock/io/WriteRunnable.java b/src/main/java/ru/lionzxy/fastlogblock/io/WriteRunnable.java
@@ -1,23 +1,68 @@
 package ru.lionzxy.fastlogblock.io;
 
-import ru.lionzxy.fastlogblock.FastLogBlock;
-import ru.lionzxy.fastlogblock.config.LogConfig;
+import ru.lionzxy.fastlogblock.io.filesplitter.IFileSplitter;
+import ru.lionzxy.fastlogblock.io.log.LogWritter;
+import ru.lionzxy.fastlogblock.io.mappers.BlockMapper;
 import ru.lionzxy.fastlogblock.io.mappers.NickMapper;
+import ru.lionzxy.fastlogblock.models.BlockChangeEventModel;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public class WriteRunnable implements Runnable {
+    private final BlockingQueue<BlockChangeEventModel> eventQueue = new LinkedBlockingQueue<>();
+    private final Map<File, LogWritter> writterMap = new HashMap<>();
+    private final NickMapper nickMapper;
+    private final BlockMapper blockMapper;
+    private final IFileSplitter fileSplitter;
+    private final AtomicBoolean withoutWork = new AtomicBoolean(true);
 
-    public WriteRunnable() throws IOException {
-        NickMapper nickMapper = new NickMapper(new File(FastLogBlock.fastLogBlock.logFolderFile,
-                LogConfig.nickToIntFilePath));
-        //nickMapper.putNewUser(new ASCIString("LionZXY"));
-        nickMapper.sync();
+    public WriteRunnable(final IFileSplitter fileSplitter, final NickMapper nickMapper, final BlockMapper blockMapper) {
+        this.nickMapper = nickMapper;
+        this.blockMapper = blockMapper;
+        this.fileSplitter = fileSplitter;
     }
 
     @Override
     public void run() {
+        while (!Thread.currentThread().isInterrupted()) {
+            try {
+                do {
+                    final BlockChangeEventModel event = eventQueue.take();
+                    withoutWork.set(false);
+                    final File file = fileSplitter.getFileByPos(event.getBlockPos());
+                    LogWritter writter = writterMap.get(file);
+                    if (writter == null) {
+                        writter = new LogWritter(file, blockMapper, nickMapper);
+                        writterMap.put(file, writter);
+                    }
+                    writter.putEvent(event);
+                } while (!eventQueue.isEmpty());
 
+                writterMap.values().forEach(it -> {
+                    try {
+                        it.sync();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                });
+                withoutWork.set(true);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    public void putEvent(BlockChangeEventModel blockChangeEventModel) {
+        eventQueue.add(blockChangeEventModel);
+    }
+
+    public boolean isEmpty() {
+        return eventQueue.isEmpty() && withoutWork.get();
     }
 }
diff --git a/src/main/java/ru/lionzxy/fastlogblock/io/filesplitter/impl/BlockHashFileSplitter.java b/src/main/java/ru/lionzxy/fastlogblock/io/filesplitter/impl/BlockHashFileSplitter.java
@@ -15,6 +15,14 @@ public BlockHashFileSplitter(final File modFolder) {
         super(modFolder);
     }
 
+    private static int hashByBlock(final BlockPos blockPos) {
+        final int signedHash = ((blockPos.getX() * MAGIC_HASH_NUMBER +
+                blockPos.getY()) * MAGIC_HASH_NUMBER +
+                blockPos.getZ()) * MAGIC_HASH_NUMBER;
+        final int hash = Math.abs(signedHash) % LogConfig.HASH_CONFIG.fileCount;
+        return hash < 0 ? 0 : hash;
+    }
+
     @Override
     public File[] getAllLogFile() {
         final List<File> fileList = new ArrayList<>(LogConfig.HASH_CONFIG.fileCount);
@@ -31,13 +39,5 @@ public File getFileByPos(final BlockPos blockPos) {
         return new File(String.format(LogConfig.HASH_CONFIG.fileNamePattern, hashByBlock(blockPos)));
     }
 
-    private static int hashByBlock(final BlockPos blockPos) {
-        final int signedHash = ((blockPos.getX() * MAGIC_HASH_NUMBER +
-                blockPos.getY()) * MAGIC_HASH_NUMBER +
-                blockPos.getZ()) * MAGIC_HASH_NUMBER;
-        final int hash = Math.abs(signedHash) % LogConfig.HASH_CONFIG.fileCount;
-        return hash < 0 ? 0 : hash;
-    }
-
 
 }
diff --git a/src/main/java/ru/lionzxy/fastlogblock/io/log/LogReader.java b/src/main/java/ru/lionzxy/fastlogblock/io/log/LogReader.java
@@ -14,6 +14,7 @@
 import ru.lionzxy.fastlogblock.io.mappers.NickMapper;
 import ru.lionzxy.fastlogblock.models.ASCIString;
 import ru.lionzxy.fastlogblock.models.BlockChangeEventModel;
+import ru.lionzxy.fastlogblock.models.BlockChangeType;
 import ru.lionzxy.fastlogblock.models.PrepareReadBlockChangeEvent;
 import ru.lionzxy.fastlogblock.utils.CollectionUtils;
 import ru.lionzxy.fastlogblock.utils.Constants;
@@ -38,7 +39,8 @@ public LogReader(final File file, final BlockMapper blockMapper, final NickMappe
 
 
     public List<BlockChangeEventModel> readEventByPos(final BlockPos blockPos) throws IOException {
-        FMLLog.log.warn("readEventByPos() has very long execution time!");
+        FMLLog.log.info("readEventByPos() for has very long execution time! Start measuring...");
+        long time = System.currentTimeMillis();
 
         final int needPosX = blockPos.getX();
         final int needPosY = blockPos.getY();
@@ -63,6 +65,7 @@ public List<BlockChangeEventModel> readEventByPos(final BlockPos blockPos) throw
         final TIntObjectMap<ASCIString> idToNick = CollectionUtils.toHashMap(needNickName, id -> nickMapper.getById(id));
         final TLongObjectMap<ASCIString> idToBlock = blockMapper.idsToNames(needBlockName);
 
+        FMLLog.log.info("readEventByPos(): " + (System.currentTimeMillis() - time) + "ms");
         return prepareEvents.stream().map(pE -> pE.toBlockChangeEventModel(idToNick, idToBlock)).collect(Collectors.toList());
     }
 
diff --git a/src/main/java/ru/lionzxy/fastlogblock/io/log/LogWritter.java b/src/main/java/ru/lionzxy/fastlogblock/io/log/LogWritter.java
@@ -13,10 +13,10 @@
 import java.nio.ByteBuffer;
 
 public class LogWritter {
-    private BufferedOutputStream os;
     private final BlockMapper blockMapper;
     private final NickMapper nickMapper;
     private final File file;
+    private BufferedOutputStream os;
 
     public LogWritter(final File file, final BlockMapper blockMapper, final NickMapper nickMapper) throws IOException {
         this.file = file;
diff --git a/src/main/java/ru/lionzxy/fastlogblock/io/mappers/BlockMapper.java b/src/main/java/ru/lionzxy/fastlogblock/io/mappers/BlockMapper.java
@@ -108,7 +108,7 @@ public TLongObjectMap<ASCIString> idsToNames(final TLongSet longSet) {
         try {
             readWriteLock.readLock().lock();
             blockToId.forEachEntry((blockname, id) -> {
-                if(!longSet.contains(id)){
+                if (!longSet.contains(id)) {
                     return true;
                 }
                 toReturn.put(id, (ASCIString) blockname);
diff --git a/src/main/java/ru/lionzxy/fastlogblock/models/ASCIString.java b/src/main/java/ru/lionzxy/fastlogblock/models/ASCIString.java
@@ -3,9 +3,9 @@
 import java.nio.charset.Charset;
 
 public class ASCIString implements CharSequence {
+    private final static Charset asci = Charset.forName("ASCII");
     private final byte[] shortString;
     private int hashcode = -1;
-    private final static Charset asci = Charset.forName("ASCII");
 
     public ASCIString(final byte[] fatString) {
         shortString = fatString;
diff --git a/src/main/java/ru/lionzxy/fastlogblock/models/BlockChangeEventModel.java b/src/main/java/ru/lionzxy/fastlogblock/models/BlockChangeEventModel.java
@@ -4,7 +4,6 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.event.world.BlockEvent;
-import ru.lionzxy.fastlogblock.io.log.BlockChangeType;
 
 import java.sql.Timestamp;
 
@@ -75,6 +74,10 @@ public int getPosZ() {
         return posZ;
     }
 
+    public BlockPos getBlockPos() {
+        return new BlockPos(posX, posY, posZ);
+    }
+
     public ASCIString getNameblock() {
         return nameblock;
     }
diff --git a/src/main/java/ru/lionzxy/fastlogblock/models/BlockChangeType.java b/src/main/java/ru/lionzxy/fastlogblock/models/BlockChangeType.java
@@ -1,4 +1,4 @@
-package ru.lionzxy.fastlogblock.io.log;
+package ru.lionzxy.fastlogblock.models;
 
 public enum BlockChangeType {
     INSERT(0),
@@ -11,10 +11,6 @@ public enum BlockChangeType {
         this.typeId = (byte) typeid;
     }
 
-    public byte getTypeId() {
-        return typeId;
-    }
-
     public static BlockChangeType valueOf(final byte typeId) {
         for (final BlockChangeType blockChangeType : BlockChangeType.values()) {
             if (blockChangeType.getTypeId() == typeId) {
@@ -23,4 +19,8 @@ public static BlockChangeType valueOf(final byte typeId) {
         }
         return null;
     }
+
+    public byte getTypeId() {
+        return typeId;
+    }
 }
diff --git a/src/main/java/ru/lionzxy/fastlogblock/models/FindTask.java b/src/main/java/ru/lionzxy/fastlogblock/models/FindTask.java
@@ -0,0 +1,21 @@
+package ru.lionzxy.fastlogblock.models;
+
+import net.minecraft.util.math.BlockPos;
+
+public class FindTask {
+    private final BlockPos blockPos;
+    private final IFindResultListener findListener;
+
+    public FindTask(BlockPos blockPos, IFindResultListener findListener) {
+        this.blockPos = blockPos;
+        this.findListener = findListener;
+    }
+
+    public BlockPos getBlockPos() {
+        return blockPos;
+    }
+
+    public IFindResultListener getFindListener() {
+        return findListener;
+    }
+}
diff --git a/src/main/java/ru/lionzxy/fastlogblock/models/FindTaskResult.java b/src/main/java/ru/lionzxy/fastlogblock/models/FindTaskResult.java
@@ -0,0 +1,4 @@
+package ru.lionzxy.fastlogblock.models;
+
+public class FindTaskResult {
+}
diff --git a/src/main/java/ru/lionzxy/fastlogblock/models/IFindResultListener.java b/src/main/java/ru/lionzxy/fastlogblock/models/IFindResultListener.java
@@ -0,0 +1,7 @@
+package ru.lionzxy.fastlogblock.models;
+
+import java.util.List;
+
+public interface IFindResultListener {
+    void onResultAsync(List<BlockChangeEventModel> blockChangeEventModels);
+}
diff --git a/src/main/java/ru/lionzxy/fastlogblock/models/PrepareReadBlockChangeEvent.java b/src/main/java/ru/lionzxy/fastlogblock/models/PrepareReadBlockChangeEvent.java
@@ -3,7 +3,6 @@
 import gnu.trove.map.TIntObjectMap;
 import gnu.trove.map.TLongObjectMap;
 import net.minecraft.util.math.BlockPos;
-import ru.lionzxy.fastlogblock.io.log.BlockChangeType;
 
 import java.sql.Timestamp;
 
diff --git a/src/test/java/ru/lionzxy/fastlogblock/io/LogTest.java b/src/test/java/ru/lionzxy/fastlogblock/io/LogTest.java
@@ -2,12 +2,13 @@
 
 import junit.framework.TestCase;
 import net.minecraft.util.math.BlockPos;
-import ru.lionzxy.fastlogblock.io.log.BlockChangeType;
+import ru.lionzxy.fastlogblock.models.BlockChangeType;
 import ru.lionzxy.fastlogblock.io.log.LogReader;
 import ru.lionzxy.fastlogblock.io.log.LogWritter;
 import ru.lionzxy.fastlogblock.io.mappers.BlockMapper;
 import ru.lionzxy.fastlogblock.io.mappers.NickMapper;
 import ru.lionzxy.fastlogblock.models.BlockChangeEventModel;
+import ru.lionzxy.fastlogblock.utils.TestUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -22,6 +23,7 @@ public class LogTest extends TestCase {
 
 
     private void before() throws IOException {
+        TestUtils.removeByteLog();
         new File("blockmap.bytelog").delete();
         new File("nickmap.bytelog").delete();
         logFile.delete();
@@ -79,6 +81,7 @@ private void after() throws IOException {
         new File("blockmap.bytelog").delete();
         new File("nickmap.bytelog").delete();
         logFile.delete();
+        TestUtils.removeByteLog();
     }
 
 }
diff --git a/src/test/java/ru/lionzxy/fastlogblock/io/WriteReadRunnableTest.java b/src/test/java/ru/lionzxy/fastlogblock/io/WriteReadRunnableTest.java
diff --git a/src/test/java/ru/lionzxy/fastlogblock/utils/TestUtils.java b/src/test/java/ru/lionzxy/fastlogblock/utils/TestUtils.java

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public TLongObjectMap<ASCIString> idsToNames(final TLongSet longSet) {`
`108`	`108`	`try {`
`109`	`109`	`readWriteLock.readLock().lock();`
`110`	`110`	`blockToId.forEachEntry((blockname, id) -> {`
`111`		`- if(!longSet.contains(id)){`
	`111`	`+ if (!longSet.contains(id)) {`
`112`	`112`	`return true;`
`113`	`113`	`}`
`114`	`114`	`toReturn.put(id, (ASCIString) blockname);`