Merge pull request #12 from yuriy-glotanov/master

performance optimize

Author: interference-project

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

@@ -571,9 +571,9 @@ public Table getFrameDataTable() {
 
     public FrameData getFrameById (long id) {
         final Table t = getTableByName("su.interference.persistent.FrameData");
-        final IndexField ixf = t.getIndexFieldByColumn("frameId");
-        final IndexList ixl = ixf.getIndex();
-        final DataChunk dc = (DataChunk)ixl.getObjectByKey(id);
+        final MapField ixf = t.getMapFieldByColumn("frameId");
+        final Map ixl = ixf.getMap();
+        final DataChunk dc = (DataChunk)ixl.get(id);
         if (dc != null) {
             return (FrameData)dc.getEntity();
         }
@@ -582,9 +582,9 @@ public FrameData getFrameById (long id) {
 
     public FrameData getFrameByAllocId (long id) {
         final Table t = getTableByName("su.interference.persistent.FrameData");
-        final IndexField ixf = t.getIndexFieldByColumn("allocId");
-        final IndexList ixl = ixf.getIndex();
-        final DataChunk dc = (DataChunk)ixl.getObjectByKey(id);
+        final MapField ixf = t.getMapFieldByColumn("allocId");
+        final Map ixl = ixf.getMap();
+        final DataChunk dc = (DataChunk)ixl.get(id);
         if (dc!=null) {
             return (FrameData)dc.getEntity();
         }
@@ -593,9 +593,9 @@ public FrameData getFrameByAllocId (long id) {
 
     public Chunk getChunkByPointer (long frameId, int ptr) throws ClassNotFoundException, InstantiationException, IllegalAccessException, InternalException, IOException {
         final Table t = getTableByName("su.interference.persistent.FrameData");
-        final IndexField ixf = t.getIndexFieldByColumn("frameId");
-        final IndexList ixl = ixf.getIndex();
-        final DataChunk dc = (DataChunk)ixl.getObjectByKey(frameId);
+        final MapField ixf = t.getMapFieldByColumn("frameId");
+        final Map ixl = ixf.getMap();
+        final DataChunk dc = (DataChunk)ixl.get(frameId);
         if (dc!=null) {
             return ((FrameData)dc.getEntity()).getFrame().data.getByPtr(ptr);
         }

src/main/java/su/interference/persistent/FrameData.java

@@ -88,7 +88,7 @@ public class FrameData implements Serializable, Comparable, FrameApi, FilePartit
     @MgmtColumn(width=10, show=true, form=false, edit=false)
     private volatile long nextFrame;
     @Column
-    @IndexColumn
+    @MapColumn
     @MgmtColumn(width=10, show=true, form=false, edit=false)
     private volatile long allocId; //virtual Id field
     @Column
@@ -102,7 +102,7 @@ public class FrameData implements Serializable, Comparable, FrameApi, FilePartit
     @IndexColumn
     private AtomicInteger allocated;
     @Id
-    @IndexColumn
+    @MapColumn
     @Transient
     private long frameId; //virtual Id field
     @Transient

src/main/java/su/interference/persistent/Table.java

@@ -661,16 +661,16 @@ public Table (DataChunk chunk, IndexList ixl) throws IllegalAccessException, Cla
 
         if (this.name.equals("su.interference.persistent.FrameData")) {
             getIndexFieldByColumn("objectId").setIndex(ixl);
-            final IndexList ixlb = new IndexList();
-            final IndexList ixla = new IndexList();
+            final Map<Long, Object> ixlb = new HashMap();
+            final Map<Long, Object> ixla = new HashMap();
             final IndexList ixls = new IndexList();
             for (Object o : ixl.getContent()) {
-                ixlb.add(((FrameData) ((DataChunk) o).getEntity()).getFrameId(), o);
-                ixla.add(((FrameData) ((DataChunk) o).getEntity()).getAllocId(), o);
+                ixlb.put(((FrameData) ((DataChunk) o).getEntity()).getFrameId(), o);
+                ixla.put(((FrameData) ((DataChunk) o).getEntity()).getAllocId(), o);
                 ixls.add(((FrameData) ((DataChunk) o).getEntity()).getStarted(), o);
             }
-            getIndexFieldByColumn("frameId").setIndex(ixlb);
-            getIndexFieldByColumn("allocId").setIndex(ixla);
+            getMapFieldByColumn("frameId").setMap(ixlb);
+            getMapFieldByColumn("allocId").setMap(ixla);
             getIndexFieldByColumn("started").setIndex(ixls);
         } else if (this.name.equals("su.interference.persistent.UndoChunk")) {
             //none

src/main/java/su/interference/persistent/TransFrame.java

@@ -24,17 +24,11 @@ this software and associated documentation files (the "Software"), to deal in
 
 package su.interference.persistent;
 
-import su.interference.core.DisableSync;
-import su.interference.core.SystemEntity;
-import su.interference.core.DataChunk;
-import su.interference.core.IndexColumn;
+import su.interference.core.*;
 import su.interference.mgmt.MgmtColumn;
 import su.interference.exception.InternalException;
 
-import javax.persistence.Entity;
-import javax.persistence.Column;
-import javax.persistence.Id;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.io.Serializable;
 import java.lang.reflect.Modifier;
 import java.net.MalformedURLException;
@@ -68,7 +62,7 @@ public class TransFrame implements Comparable, FilePartitioned, Serializable {
     @MgmtColumn(width=10, show=true, form=false, edit=false)
     private int diff;
     @Id
-    @IndexColumn
+    @MapColumn
     @MgmtColumn(width=10, show=true, form=false, edit=false)
     @Transient
     private transient String frameId;
@@ -83,7 +77,7 @@ public static int getCLASS_ID() {
     }
 
     public String getFrameId() {
-        return getHexByLong(transId)+getHexByLong(cframeId)+getHexByLong(uframeId);
+        return transId + "-" + cframeId + "-" + uframeId;
     }
 
     public TransFrame() {
@@ -170,23 +164,4 @@ public void setDiff(int diff) {
         this.diff = diff;
     }
 
-    public String getHexByInt (int val) {
-       String s = Integer.toHexString(val);
-       String p = new String();
-       for (int i=0; i < 8-s.length(); i++) {
-           p = p + "0";
-       }
-       return p + s;
-    }
-
-    public String getHexByLong (long val) {
-       String s = Long.toHexString(val);          
-       String p = new String();
-       for (int i=0; i < 16-s.length(); i++) {
-           p = p + "0";
-       }
-       return p + s;
-    }
-
-
 }