Merge pull request #28 from yuriy-glotanov/2020.1beta

optimize performance & improve stability

Author: yuriy-glotanov

README.md

@@ -70,6 +70,12 @@ Next, specify the necessary set of keys in the project
 -Dcom.sun.management.jmxremote.local.only=false 
 -Dcom.sun.management.jmxremote.authenticate=false 
 -Dcom.sun.management.jmxremote.ssl=false
+-Xms256g
+-Xmn512m
+-Xmx4g
+-XX:MaxMetaspaceSize=256m
+-XX:ParallelGCThreads=8
+-XX:ConcGCThreads=4
 ```
 
 To run a single local interference node, you can use the standard 
@@ -100,5 +106,11 @@ java -cp interference.jar
 -Dcom.sun.management.jmxremote.local.only=false 
 -Dcom.sun.management.jmxremote.authenticate=false 
 -Dcom.sun.management.jmxremote.ssl=false 
+-Xms256g
+-Xmn512m
+-Xmx4g
+-XX:MaxMetaspaceSize=256m
+-XX:ParallelGCThreads=8
+-XX:ConcGCThreads=4
 su.interference.standalone.Start
 ```

doc/InterferenceManual.pdf

@@ -1 +1 @@
-dda5a3ba8ed161e2bbab852457b37b5d *interference-2020.1.jar
+9d28e75b094559c9bb7ceb1fcc145b7f *interference-2020.1.jar

interference-2020.1.jar

@@ -28,6 +28,7 @@ this software and associated documentation files (the "Software"), to deal in
 import su.interference.persistent.Session;
 import su.interference.persistent.UndoChunk;
 
+import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.net.MalformedURLException;
 
@@ -41,9 +42,8 @@ public interface Chunk extends Comparable {
     Header getHeader();
     void setHeader(Header header);
     byte[] getChunk();
-    void setChunk(byte[] chunk);
     int getBytesAmount();
-    Comparable getId (Session s) throws InvocationTargetException, NoSuchMethodException, IllegalAccessException;
+    Comparable getId (Field idfield, Session s) throws InvocationTargetException, NoSuchMethodException, IllegalAccessException;
     ValueSet getDcs();
     boolean isTerminate();
     void setTerminate(boolean terminate);

interference-2020.1.jar.md5

@@ -41,7 +41,7 @@ public ChunkIdComparator(Session s) {
 
     public int compare(Chunk c1, Chunk c2) {
         try {
-            return c1.getId(s).compareTo(c2.getId(s));
+            return c1.getId(null, s).compareTo(c2.getId(null, s));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }

src/main/java/su/interference/core/Chunk.java

@@ -37,72 +37,80 @@ public class ChunkMap {
     private final ConcurrentHashMap<Integer, Chunk> hmap;
     private final ConcurrentHashMap<ValueSet, Chunk> imap;
     private final List<Chunk> list;
+    private final Frame frame;
     private volatile boolean sorted;
 
-    public ChunkMap() {
+    public ChunkMap(Frame frame) {
         hmap = new ConcurrentHashMap<>();
         imap = new ConcurrentHashMap<>();
         list = new CopyOnWriteArrayList<>();
+        this.frame = frame;
     }
 
-    public void sort() {
+    public synchronized void sort() {
         Collections.sort(list);
         sorted = true;
     }
 
-    public void add(Chunk c) {
+    public synchronized void add(Chunk c) {
         hmap.put(c.getHeader().getPtr(), c);
-        imap.put(c.getDcs(), c);
+        if (frame instanceof IndexFrame) {
+            imap.put(c.getDcs(), c);
+        }
         list.add(c);
         sorted = false;
     }
 
-    public List<Chunk> getChunks() {
+    public synchronized List<Chunk> getChunks() {
         return list;
     }
 
-    public Chunk getByPtr(int i) {
+    public synchronized Chunk getByPtr(int i) {
         return hmap.get(i);
     }
 
-    public Chunk get(int i) {
+    public synchronized Chunk get(int i) {
         return list.get(i);
     }
 
-    public Chunk getByKey(ValueSet key) {
+    public synchronized Chunk getByKey(ValueSet key) {
         return imap.get(key);
     }
 
-    public void removeByPtr(int i) {
+    public synchronized void removeByPtr(int i) {
         final boolean x = list.remove(hmap.get(i));
         final Chunk c = (Chunk)hmap.remove(i);
-        imap.remove(c.getDcs());
+        if (frame instanceof IndexFrame) {
+            imap.remove(c.getDcs());
+        }
         sorted = false;
         if (!x || c == null) {
             throw new RuntimeException("Internal error during remove object from frame");
         }
     }
 
-    public void remove(int i) {
+    public synchronized void remove(int i) {
         final Chunk c = list.get(i);
         list.remove(i);
         hmap.remove(c.getHeader().getPtr());
-        imap.remove(c.getDcs());
+        if (frame instanceof IndexFrame) {
+            imap.remove(c.getDcs());
+        }
         sorted = false;
     }
 
-    public int size() {
+    public synchronized int size() {
         return list.size();
     }
 
-    public void clear() {
+    public synchronized void clear() {
         hmap.clear();
         list.clear();
         imap.clear();
         sorted = false;
     }
 
-    public boolean isSorted() {
+    public synchronized boolean isSorted() {
         return sorted;
     }
 }