fix frame recycle misfunc : index frame size init updated : getframes methods optimized : improve stream mechanism

Author: yuriy-glotanov

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

@@ -57,6 +57,7 @@ public interface DataObject {
     void setFileLast (int fileLast);
     void setFrameLast (long frameLast);
     void setFrameAmount(long frameAmount);
+    long getFrameOrder(Session s, LLT llt) throws Exception;
     long getIdValue(Session s, LLT llt) throws Exception;
     long getIncValue(Session s, LLT llt) throws Exception;
     void incFrameAmount ();

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

@@ -0,0 +1,45 @@
+/**
+ The MIT License (MIT)
+
+ Copyright (c) 2010-2019 head systems, ltd
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy of
+ this software and associated documentation files (the "Software"), to deal in
+ the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ the Software, and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ */
+
+package su.interference.core;
+
+import su.interference.sql.FrameApi;
+
+import java.util.Comparator;
+
+/**
+ * @author Yuriy Glotanov
+ * @since 1.0
+ */
+
+public class FrameOrderComparator implements Comparator<FrameApi> {
+    public int compare(FrameApi f1, FrameApi f2) {
+        if (f1.getFrameOrder() < f2.getFrameOrder()) {
+            return -1;
+        } else if (f1.getFrameOrder() > f2.getFrameOrder()) {
+            return 1;
+        }
+        return 0;
+    }
+}

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

@@ -62,7 +62,7 @@ public class Instance implements Interference {
     private static final int MAX_NODE_ID = 32;
     public static final int SESSION_EXPIRE = 7200000; //in ms
 
-    public static final int SYSTEM_VERSION = 20193;
+    public static final int SYSTEM_VERSION = 20200524;
 
     public static final int SYSTEM_STATE_ONLINE = 1;
     public static final int SYSTEM_STATE_UP = 2;

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

@@ -475,7 +475,7 @@ private synchronized IndexList bootstrapFrameLoad() throws IOException, ClassNot
         for (DataFile df : Storage.getStorage().getInitDataFiles()) {
             long start = Instance.getInstance().getFrameSize(); //first data frame
             while (true) {
-                final FrameData bb = new FrameData(df.getFileId(), start, Instance.getInstance().getFrameSize(), t);
+                final FrameData bb = new FrameData(df.getFileId(), start, df.getType() == Storage.INDXFILE_TYPEID ? Instance.getInstance().getFrameSize2() : Instance.getInstance().getFrameSize(), t);
                 DataFrame db = null;
                 try {
                     db = bb.getDataFrame();

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

@@ -98,7 +98,7 @@ int auth (int user, int pass, Session s) throws NoSuchMethodException, Invocatio
         return 0;
     }
 
-    SystemData getSystemData() {
+    public SystemData getSystemData() {
         for (Chunk c : data.getChunks()) {
             final DataChunk dc = (DataChunk)c;
             return (SystemData)dc.getEntity();

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

@@ -179,10 +179,10 @@ public static Table createInitialFrames(boolean initStorage, int nodeType, Sessi
                     int ufsCntr = 0;
                     for (int x=1; x<dfs.length; x++) {
                         DataFile f = dfs[x];
-                        if (f.getType()==DataFile.DATA_TYPE) {
+                        if (f.getType() == Storage.DATAFILE_TYPEID) {
                             FrameData frame = f.allocateFrame(t, s, null);
                             frame.markAsCurrent();
-                            if (f.getFileId()==df.getFileId()) {
+                            if (f.getFileId() == df.getFileId()) {
                                 t.setFrameStart(frame.getPtr());
                                 t.setFrameLast(frame.getPtr());
                             }
@@ -201,7 +201,7 @@ public static Table createInitialFrames(boolean initStorage, int nodeType, Sessi
                                 DataChunk dc = new DataChunk(f, s);
                                 ret[framesCntr].insertChunk(dc, s, true, null);
                                 for (int y=1; y<dfs.length; y++) {
-                                    if (dfs[y].getType()!=DataFile.DATA_TYPE) {
+                                    if (dfs[y].getType() != Storage.DATAFILE_TYPEID) {
                                         int p = Config.getConfig().FILES_AMOUNT*(dfs[y].getType()-1);
                                         if (f.getFileId()==(dfs[y].getFileId()-p)) {
                                             dc = new DataChunk(dfs[y], s);

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

@@ -49,14 +49,6 @@ this software and associated documentation files (the "Software"), to deal in
 @Entity
 @SystemEntity
 public class DataFile implements Serializable {
-    @Transient
-    public static final int DATA_TYPE = 1;
-    @Transient
-    public static final int INDX_TYPE = 2;
-    @Transient
-    public static final int UNDO_TYPE = 3;
-    @Transient
-    public static final int TEMP_TYPE = 4;
 
     @Column
     @Id
@@ -334,6 +326,8 @@ public synchronized RandomAccessFile openFile(String mode) {
                     this.file.seek(0);
                     this.file.read(b,0,SYSTEM_FRAME_SIZE);
                     this.sframe = new SystemFrame(b,this.getFileId(),0);
+                    final SystemData sd = this.sframe.getSystemData();
+                    logger.info("open " + this.fileName + " file completed successfully (ver." + sd.getVersion() + ")");
                 } catch (Exception e) {
                     logger.error("open " + this.fileName + " file throws " + e.getMessage());
                 }
@@ -375,7 +369,7 @@ public synchronized void createFile(Session s, LLT llt) throws IOException, Invo
     }
 
     private synchronized void createHeaderFrame(Session s, LLT llt) throws IOException, InvocationTargetException, NoSuchMethodException, InternalException, ClassNotFoundException, InstantiationException, IllegalAccessException {
-        this.sframe = new SystemFrame(this.getFileId(), 0, Instance.getInstance().getFrameSize());
+        this.sframe = new SystemFrame(this.getFileId(), 0, type == Storage.INDXFILE_TYPEID ? Instance.getInstance().getFrameSize2() : Instance.getInstance().getFrameSize());
         this.sframe.insertSU(s, llt);
 //        Storage.getStorage().writeFrame(this.sframe);
         this.writeFrame(0, this.sframe.getFrame());
@@ -388,6 +382,8 @@ public synchronized FrameData allocateFrame(DataObject t, Session s, LLT llt) th
             final FreeFrame fframe = getReallocFreeFrame(size);
             if (fframe != null) {
                 final FrameData bd = new FrameData(fframe.getFile(), fframe.getPtr(), fframe.getSize(), t);
+                // t should be updated mandatory during createFrame
+                bd.setFrameOrder(t.getFrameOrder(s, llt));
                 s.delete(fframe, llt);
                 Metrics.get("reallocateFrame").stop();
                 return bd;
@@ -406,6 +402,8 @@ public synchronized FrameData allocateFrame(DataObject t, Session s, LLT llt) th
 //        Storage.getStorage().writeFrame(this.sframe);
         this.writeFrame(0, this.sframe.getFrame());
         final FrameData bd = new FrameData(this.getFileId(), ptr, size, t);
+        // t should be updated mandatory during createFrame
+        bd.setFrameOrder(t.getFrameOrder(s, llt));
         Metrics.get("allocateFrame").stop();
         return bd;
     }

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

@@ -100,6 +100,8 @@ public class FrameData implements Serializable, Comparable, FrameApi, FilePartit
     private AtomicInteger current;
     @Column
     private volatile int started;
+    @Column
+    private volatile long frameOrder;
     @Id
     @MapColumn
     @Transient
@@ -222,10 +224,6 @@ public long getNextFrameId() {
         return this.nextFile+this.nextFrame;
     }
 
-    protected int getFrameSize() throws ClassNotFoundException, InternalException, IllegalAccessException, InstantiationException {
-        return Instance.getInstance().getFrameSize();
-    }
-
     //real current transactional value
     //skip negative differences for prevent frame oversize when many transactions change data
     public int getFrameUsed() {
@@ -245,7 +243,7 @@ public int getCUsed() {
     }
 
     public int getFrameFree() throws ClassNotFoundException, InternalException, InstantiationException, IllegalAccessException {
-        return getFrameSize() - Frame.FRAME_HEADER_SIZE - getFrameUsed();
+        return size - Frame.FRAME_HEADER_SIZE - getFrameUsed();
     }
 
     public FrameData() {
@@ -468,4 +466,12 @@ public int getStarted() {
     public void setStarted(int started) {
         this.started = started;
     }
+
+    public long getFrameOrder() {
+        return frameOrder;
+    }
+
+    public void setFrameOrder(long frameOrder) {
+        this.frameOrder = frameOrder;
+    }
 }

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

@@ -204,16 +204,8 @@ public Table registerTable (String n, Session s, List<SQLColumn> cols, java.lang
         final Class proxy = cols==null&&flds==null?ppf.register(n):flds==null?rpf.register(cols,n,ixflag):ipf.register(flds,n,pt.getName());
         final String sname = proxy==null?null:proxy.getName();
 
-        w = (Table)t.newInstance(new Object[]{n, proxy==null?new String("x"):proxy});
-//        w.setName(n);
-        w.setFrameSize(Instance.getInstance().getFrameSize());
-//        w.setFileStart(cols==null?dataf:tmpdf);
-//        w.setFileLast(cols==null?dataf:tmpdf);
-        w.setParentId(pt==null?0:pt.getObjectId());
-        s.persist(w); //ident
-
         boolean setlbs = true;
-
+        int framesize = Instance.getInstance().getFrameSize();
         DataFile[] datafs = Storage.getStorage().getInitDataFiles();
 
         if (cols!=null) {
@@ -222,9 +214,15 @@ public Table registerTable (String n, Session s, List<SQLColumn> cols, java.lang
 
         if (flds!=null&&pt!=null) {
             datafs = Storage.getStorage().getIndexFiles();
+            framesize = Instance.getInstance().getFrameSize2();
             setlbs = false;
         }
 
+        w = (Table)t.newInstance(new Object[]{n, proxy==null?new String("x"):proxy});
+        w.setFrameSize(framesize);
+        w.setParentId(pt==null?0:pt.getObjectId());
+        s.persist(w); //ident
+
         final LLT llt = LLT.getLLT();
 
         for (DataFile df : datafs) {
@@ -344,15 +342,16 @@ public void run() {
     }
 
     @Deprecated
-    public Object nfind (Class c, long id) throws InternalException, NoSuchMethodException, InvocationTargetException, IOException, InvalidFrameHeader, InvalidFrame, EmptyFrameHeaderFound, IncorrectUndoChunkFound, ClassNotFoundException, InstantiationException, IllegalAccessException {
+    public Object nfind (Class c, long id)
+            throws InternalException, NoSuchMethodException, InvocationTargetException, IOException, InterruptedException, ClassNotFoundException, InstantiationException, IllegalAccessException {
         final Table t = Instance.getInstance().getTableByName(c.getName());
         if (t != null) {
             return t.getChunkById(id, this).getEntity();
         }
         return null;
     }
 
-    public void lock (Object o) throws Exception, InterruptedException, InvocationTargetException, NoSuchMethodException, InternalException, InvalidFrame, EmptyFrameHeaderFound, IncorrectUndoChunkFound, ClassNotFoundException, InstantiationException, IllegalAccessException, InvalidParameter, CannotAccessToDeletedRecord, CannotAccessToLockedRecord, NotEnoughFrameSpace {
+    public void lock (Object o) throws Exception {
         ((EntityContainer)o).getDataChunk().lock(this, null);
     }
 
@@ -382,7 +381,15 @@ public ResultSet execute(String sql) throws Exception {
     public void delete (Object o, LLT llt) throws Exception {
         final Table t = Instance.getInstance().getTableByName(o.getClass().getName());
         if (t != null) {
-            t.delete(o, this, llt);
+            t.delete(o, this, llt, false);
+        }
+        o = null;
+    }
+
+    public void purge (Object o, LLT llt) throws Exception {
+        final Table t = Instance.getInstance().getTableByName(o.getClass().getName());
+        if (t != null) {
+            t.delete(o, this, llt, true);
         }
         o = null;
     }