pre-release 2020.2 unstable

Author: yuriy-glotanov

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

@@ -47,9 +47,9 @@ public interface Chunk extends Comparable {
     ValueSet getDcs();
     boolean isTerminate();
     void setTerminate(boolean terminate);
-    Object getEntity() throws ClassNotFoundException, InstantiationException, IllegalAccessException, NoSuchMethodException, InvocationTargetException;
-    Object getUndoEntity() throws ClassNotFoundException, InstantiationException, IllegalAccessException, NoSuchMethodException, InvocationTargetException;
-    void updateEntity(Object o) throws InternalException, ClassNotFoundException, InstantiationException, IllegalAccessException, NoSuchMethodException, InvocationTargetException, MalformedURLException;
+    Object getEntity();
+    Object getUndoEntity();
+    void updateEntity(Object o) throws InternalException, IllegalAccessException;
     UndoChunk getUndoChunk();
     String getHexByChunk();
 

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

@@ -35,7 +35,7 @@ this software and associated documentation files (the "Software"), to deal in
 
 public class ChunkMap {
     private final ConcurrentHashMap<Integer, Chunk> hmap;
-    private final ConcurrentHashMap<ValueSet, Chunk> imap;
+    private final ConcurrentHashMap<ValueSet, List<Chunk>> imap;
     private final List<Chunk> list;
     private final Frame frame;
     private volatile boolean sorted;
@@ -55,7 +55,10 @@ public synchronized void sort() {
     public synchronized void add(Chunk c) {
         hmap.put(c.getHeader().getPtr(), c);
         if (frame instanceof IndexFrame) {
-            imap.put(c.getDcs(), c);
+            if (imap.get(c.getDcs()) == null) {
+                imap.put(c.getDcs(), new ArrayList<>());
+            }
+            imap.get(c.getDcs()).add(c);
         }
         list.add(c);
         sorted = false;
@@ -73,15 +76,22 @@ public synchronized Chunk get(int i) {
         return list.get(i);
     }
 
-    public synchronized Chunk getByKey(ValueSet key) {
+    //for unique indexes
+    public synchronized List<Chunk> getByKey(ValueSet key) {
         return imap.get(key);
     }
 
     public synchronized void removeByPtr(int i) {
         final boolean x = list.remove(hmap.get(i));
         final Chunk c = (Chunk)hmap.remove(i);
         if (frame instanceof IndexFrame) {
-            imap.remove(c.getDcs());
+            int i_ = 0;
+            for (int i__ = 0; i__ <  imap.get(c.getDcs()).size(); i__++) {
+                if (imap.get(c.getDcs()).get(i__).getHeader().getPtr() == c.getHeader().getPtr()) {
+                    i_ = i__;
+                }
+            }
+            imap.get(c.getDcs()).remove(i_);
         }
         sorted = false;
         if (!x || c == null) {
@@ -94,7 +104,13 @@ public synchronized void remove(int i) {
         list.remove(i);
         hmap.remove(c.getHeader().getPtr());
         if (frame instanceof IndexFrame) {
-            imap.remove(c.getDcs());
+            int i_ = 0;
+            for (int i__ = 0; i__ <  imap.get(c.getDcs()).size(); i__++) {
+                if (imap.get(c.getDcs()).get(i__).getHeader().getPtr() == c.getHeader().getPtr()) {
+                    i_ = i__;
+                }
+            }
+            imap.get(c.getDcs()).remove(i_);
         }
         sorted = false;
     }

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

@@ -35,12 +35,12 @@ this software and associated documentation files (the "Software"), to deal in
 
 import javax.persistence.*;
 import java.io.UnsupportedEncodingException;
-import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.lang.reflect.*;
-import java.net.MalformedURLException;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -63,8 +63,10 @@ public class DataChunk implements Chunk {
     private byte[] serializedId;
     private Object entity;
     private Object undoentity;
+    private Map<Integer, DataChunk> ics = new HashMap<>();
     private DataChunk source;
     private UndoChunk uc;
+    private FrameData uframe;
     private boolean terminate;
     private final CustomSerializer sr = new CustomSerializer();
 
@@ -175,6 +177,10 @@ public Table getT() {
         return t;
     }
 
+    protected void setT(Table t) {
+        this.t = t;
+    }
+
     public Comparable getId (Field idfield, Session s) throws InvocationTargetException, NoSuchMethodException, IllegalAccessException {
         if (serializedId==null) {
             if (entity==null) {
@@ -275,7 +281,7 @@ public DataChunk () {
     }
 
     //for index implementation
-    public DataChunk (ValueSet vs, Session s, RowId r, Table t) throws ClassNotFoundException, IllegalAccessException, UnsupportedEncodingException, InternalException, MalformedURLException, InstantiationException {
+    public DataChunk (ValueSet vs, Session s, RowId r, Table t) throws ClassNotFoundException, IllegalAccessException, UnsupportedEncodingException, InternalException, InstantiationException {
         this.state = INIT_STATE;
         this.t = t;
         final ByteString res = new ByteString();
@@ -325,18 +331,18 @@ public DataChunk (ValueSet vs, Session s, Table t) {
     }
 
     //serializer INSERT ONLY!!! (with generate Id value)
-    public DataChunk (Object o, Session s) throws IOException, InvocationTargetException, NoSuchMethodException, InternalException, ClassNotFoundException, InstantiationException, IllegalAccessException {
+    public DataChunk (Object o, Session s) {
         this(o, s, null);
     }
 
     //serializer INSERT ONLY!!! (with generate Id value) - rowid for index chunk
-    public DataChunk (Object o, Session s, RowId r) throws IOException, InvocationTargetException, NoSuchMethodException, InternalException, ClassNotFoundException, InstantiationException, IllegalAccessException {
+    public DataChunk (Object o, Session s, RowId r) {
         this.entity = o;
         this.state = NORMAL_STATE;
         this.header = new RowHeader(r, null, getChunk().length, false);
     }
 
-    public DataChunk (byte[] b, int file, long frame, int hsize, Table t, Class c) throws ClassNotFoundException, InstantiationException, IllegalAccessException, InternalException, MalformedURLException {
+    public DataChunk (byte[] b, int file, long frame, int hsize, Table t, Class c)  {
         final ByteString bs = new ByteString(b);
         this.t = t;
         this.class_= c;
@@ -347,7 +353,7 @@ public DataChunk (byte[] b, int file, long frame, int hsize, Table t, Class c) t
     }
 
     //constructor for clone method - de-serialize chunk only without header 
-    public DataChunk (byte[] b, Table t, RowHeader h, DataChunk source) throws ClassNotFoundException, InstantiationException, IllegalAccessException, InternalException, MalformedURLException {
+    public DataChunk (byte[] b, Table t, RowHeader h, DataChunk source) {
         this.chunk  = b;
         this.header = h;
         this.state = INIT_STATE;
@@ -484,6 +490,7 @@ public Object getEntity () {
                 if (t.isIndex()) {
                     final ResultSetEntity rsa = (ResultSetEntity) ((Table) this.t).getTableClass().getAnnotation(ResultSetEntity.class);
                     final DataChunk dc = rsa == null ? (DataChunk) Instance.getInstance().getChunkByPointer(this.getHeader().getFramePtr(), this.getHeader().getFramePtrRowId().getRowPointer()) : this;
+                    dc.setIc(this);
                     ((IndexChunk)o).setDataChunk(dc);
                     if (dc == null) {
 // todo during rframe.IndexFrame.init system directory not yet contains replicated FrameData objects
@@ -553,7 +560,8 @@ public void setFrameData(FrameData b) {
         entity = b;
     }
 
-    public Object getUndoEntity () { //throws ClassNotFoundException, InstantiationException, IllegalAccessException, NoSuchMethodException, InvocationTargetException {
+    @Deprecated
+    public Object getUndoEntity () {
         if (undoentity==null) {
             try {
                 final ClassLoader cl = this.getClass().getClassLoader();
@@ -575,7 +583,7 @@ public Object getUndoEntity () { //throws ClassNotFoundException, InstantiationE
         return undoentity;
     }
 
-    public void updateEntity(Object o) throws InternalException, ClassNotFoundException, InstantiationException, IllegalAccessException, NoSuchMethodException, InvocationTargetException, MalformedURLException {
+    public void updateEntity(Object o) throws InternalException, IllegalAccessException {
         final Object oo = this.getEntity();
         if (!oo.getClass().getName().equals(o.getClass().getName())) {
             throw new InternalException(); //classes of object do not match
@@ -610,9 +618,15 @@ protected void setNormalState() {
     }
 
     //for UNDO processing
-    public DataChunk cloneEntity(Session s) throws IOException, InvocationTargetException, NoSuchMethodException, InternalException, ClassNotFoundException, InstantiationException, IllegalAccessException {
+    public DataChunk cloneEntity(Session s) throws InternalException {
         final byte[] b = this.getChunk();
-        return new DataChunk(b, this.t, new RowHeader(this.getHeader()), this);
+        final DataChunk dc_ = new DataChunk(b, this.t, new RowHeader(this.getHeader()), this);
+        final Object entity_ = this.getEntity();
+        if (this.t == null) {
+            dc_.t = Instance.getInstance().getTableByName(entity_.getClass().getName());
+        }
+        dc_.class_ = entity_.getClass();
+        return dc_;
     }
 
     public DataChunk restore(Frame b, Session s) throws Exception {
@@ -622,13 +636,11 @@ public DataChunk restore(Frame b, Session s) throws Exception {
         if (!(this.getHeader().getRowID().getFileId() == source.getHeader().getRowID().getFileId() && this.getHeader().getRowID().getFramePointer() == source.getHeader().getRowID().getFramePointer())) {
             final long srcFrameId = source.getHeader().getRowID().getFileId() + source.getHeader().getRowID().getFramePointer();
             final Frame srcFrame = Instance.getInstance().getFrameById(srcFrameId).getFrame();
-            //final LLT llt = LLT.getLLT();
-            // not need for use llt here
-            srcFrame.removeChunk(source.getHeader().getRowID().getRowPointer(), null, true);
-            //llt.commit();
+            //todo ???
+            srcFrame.removeChunk(source.getHeader().getRowID().getRowPointer(), null, false);
         }
         source.setHeader(this.getHeader());
-        source.setEntity(this.getEntity(), false);
+        source.updateEntity(this.getEntity());
         return source;
     }
 
@@ -668,13 +680,15 @@ private synchronized DataChunk insertUC (FrameData cb, UndoChunk uc, Session s,
         final DataChunk dc = new DataChunk(uc, s);
         final int p = ub.getDataFrame().insertChunk(dc, s, true, llt);
         if (p == 0) {
-            final Table t = Instance.getInstance().getTableByName("su.interference.persistent.UndoChunk");
+            final Table t = Instance.getInstance().getTableByName(UndoChunk.class.getName());
             final FrameData nb = t.createNewFrame(ub, ub.getFile(), 0, 0, false, false, false, s, llt);
             s.getTransaction().setNewLB(ub, nb, false);
             nb.getDataFrame().insertChunk(dc, s, true, llt);
-            s.getTransaction().storeFrame(cb, nb, 0, s, llt);
+            dc.uframe = nb;
+            //s.getTransaction().storeFrame(cb, nb, 0, s, llt);
         } else {
-            s.getTransaction().storeFrame(cb, ub, 0, s, llt);
+            dc.uframe = ub;
+            //s.getTransaction().storeFrame(cb, ub, 0, s, llt);
         }
         ubw.release();
         return dc;
@@ -746,6 +760,10 @@ protected synchronized void undo(Session s, LLT llt) throws Exception {
         }
     }
 
+    public FrameData getUframe() {
+        return uframe;
+    }
+
     public boolean isTerminate() {
         return terminate;
     }
@@ -754,6 +772,15 @@ public void setTerminate(boolean terminate) {
         this.terminate = terminate;
     }
 
+    public void setIc(DataChunk ic) {
+        final Table t_ = ic.t == null ? Instance.getInstance().getTableByName(ic.getEntity().getClass().getName()) : ic.t;
+        this.ics.put(t_.getObjectId(), ic);
+    }
+
+    public Map<Integer, DataChunk> getIcs() {
+        return this.ics;
+    }
+
     private byte[] getBytesFromHexString(String s) {
         byte b[] = new byte[s.length()/2];
         for (int i=0; i<s.length(); i+=2) {

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

@@ -32,7 +32,6 @@ this software and associated documentation files (the "Software"), to deal in
 import su.interference.serialize.ByteString;
 
 import java.util.*;
-import java.io.IOException;
 
 /**
  * @author Yuriy Glotanov
@@ -49,7 +48,7 @@ public DataFrame(FrameData bd, Table t) throws InternalException {
         super (bd, t);
     }
 
-    public DataFrame(int file, long pointer, int size, FrameData bd, Table t, Class c) throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException, InternalException {
+    public DataFrame(int file, long pointer, int size, FrameData bd, Table t, Class c) throws Exception {
         super(null, file, pointer, size, bd, t, c);
 
         int ptr = FRAME_HEADER_SIZE;