improve overall performance & stability

Author: yuriy-glotanov

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

@@ -466,6 +466,10 @@ public int getChunkLen () {
         return 0;
     }
 
+    public Object getExistingEntity() {
+        return this.entity;
+    }
+
     public Object getEntity () {
         if (entity==null) {
             try {

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

@@ -574,7 +574,7 @@ public synchronized void rollbackTransaction(Transaction tran, ArrayList<FrameDa
         for (Chunk c : data.getChunks()) {
             if (c.getHeader().getTran().getTransId() == tran.getTransId()) {
                 ((DataChunk) c).setUndoChunk(null);
-                // todo ((DataChunk) c).cleanUpIcs();
+                ((DataChunk) c).cleanUpIcs();
                 r.add(c.getHeader().getPtr());
             }
         }
@@ -591,7 +591,11 @@ public synchronized void rollbackTransaction(Transaction tran, ArrayList<FrameDa
                         final int ucfile = uc.getDataChunk().getHeader().getRowID().getFileId();
                         final long frameptr = uc.getDataChunk().getHeader().getRowID().getFramePointer();
                         if (uc.getTransId() == tran.getTransId() && ucfile == this.file && frameptr == this.pointer) {
-                            data.add(uc.getDataChunk().restore(uc));
+                            final DataChunk rc = uc.getDataChunk().restore(uc);
+                            if (this instanceof IndexFrame && rc.getExistingEntity() != null) {
+                                ((IndexChunk) rc.getExistingEntity()).setDataChunk(null);
+                            }
+                            data.add(rc);
                         }
                     }
                 }

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

@@ -127,6 +127,15 @@ public IndexFrame(byte[] b, int file, long pointer, Map<Long, Long> imap, Map<Lo
         this.b = null; //throw bytes to GC
     }
 
+    public void cleanICEntities() {
+        for (Chunk c : this.data.getChunks()) {
+            final Object e = ((DataChunk) c).getExistingEntity();
+            if (e != null) {
+                ((IndexChunk) e).setDataChunk(null);
+            }
+        }
+    }
+
     public IndexFrame add (DataChunk e, Table t, Session s, LLT llt) throws Exception {
         if (this.isFill(e)) {
 

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

@@ -45,7 +45,7 @@ public class SystemCleanUp implements Runnable, ManagedProcess {
     public static final int DATA_RETRIEVED_PRIORITY = 6;
     public static final int INDEX_RETRIEVED_PRIORITY = 9;
     private static final int CLEANUP_PROTECTION_THR = 1000;
-    private static final int IX_CLEANUP_PROTECTION_THR = 20000;
+    private static final int IX_CLEANUP_PROTECTION_THR = 5000;
 
     public void run () {
         Thread.currentThread().setName("interference-cleanup-thread");
@@ -139,4 +139,11 @@ private void cleanUpFrames() {
         Metrics.get("systemCleanUp").stop();
 
     }
+
+    public static void forceCleanUp() {
+        for (Object entry : Instance.getInstance().getFramesMap().entrySet()) {
+            final FrameData f = (FrameData) ((DataChunk) ((Map.Entry) entry).getValue()).getEntity();
+            f.clearFrame();
+        }
+    }
 }

src/main/java/su/interference/metrics/Call.java

@@ -0,0 +1,15 @@
+package su.interference.metrics;
+
+import su.interference.core.SystemCleanUp;
+
+public class Call extends Meter implements CallMBean {
+
+    public Call(String name) {
+        super(name);
+    }
+
+    public void forceCleanUp() {
+        SystemCleanUp.forceCleanUp();
+    }
+
+}

src/main/java/su/interference/metrics/CallMBean.java

@@ -0,0 +1,5 @@
+package su.interference.metrics;
+
+public interface CallMBean {
+    void forceCleanUp();
+}

src/main/java/su/interference/metrics/Metrics.java

@@ -24,10 +24,11 @@ this software and associated documentation files (the "Software"), to deal in
 
 package su.interference.metrics;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 import java.lang.management.ManagementFactory;
-import java.util.HashMap;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -40,15 +41,26 @@ public class Metrics {
     public static final int COUNTER = 1;
     public static final int HISTOGRAM = 2;
     public static final int TIMER = 3;
+    public static final int CALL = 4;
     public static final int METER = 10;
     private static final ConcurrentHashMap<String, Meter> metrics = new ConcurrentHashMap<String, Meter>();
     private static final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+    private final static Logger logger = LoggerFactory.getLogger(Metrics.class);
+
+    static {
+        try {
+            register(CALL, "systemCalls");
+        } catch (Exception e) {
+            logger.error("Exception in metrics static intializer", e);
+        }
+    }
 
     public static void register(int type, String name) throws Exception {
         if (type == COUNTER) { metrics.put(name, new Counter(name)); }
         if (type == HISTOGRAM) { metrics.put(name, new Histogram(name)); }
         if (type == TIMER) { metrics.put(name, new Timer(name)); }
         if (type == METER) { metrics.put(name, new Meter(name)); }
+        if (type == CALL) { metrics.put(name, new Call(name)); }
 
         ObjectName obj = new ObjectName("su.interference:type="+name+metrics.get(name).getClass().getSimpleName());
         mbs.registerMBean(metrics.get(name), obj);

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

@@ -355,6 +355,12 @@ public synchronized void rollback (Session s, boolean remote) {
                         frame_.rollbackTransaction(this, ubs, s);
                     }
                 }
+                for (FrameData ub : ubd2) {
+                    final Frame frame_ = ub.getFrame();
+                    if (frame_ instanceof IndexFrame) {
+                        ((IndexFrame) frame_).cleanICEntities();
+                    }
+                }
 
                 for (TransFrame tb : tframes) {
                     boolean hasfb = false;