Merge pull request #71 from yuriy-glotanov/2025.1

RELEASE 2025.1

Author: interference-project

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

@@ -622,15 +622,12 @@ public Map getFramesMap () {
         return ixf.getMap();
     }
 
-    public List<FrameData> getSortedDataFrames (Map<Integer, DataFile> dfsmap, int type) {
+    public List<FrameData> getSortedDataFrames (int fileId) {
         final MapField ixf = tFrameData.getMapFieldByColumn("frameId");
         final ArrayList<FrameData> r = new ArrayList<>();
-        //ixf.getMap().values().stream().map(o -> ((DataChunk) o).getEntity()).filter(o -> dfsmap.get(((FrameData) o).getAllocFile()).getType() == type).sorted().forEach(o -> r.add((FrameData) o));
         for (Object o : ixf.getMap().values()) {
             FrameData fd = (FrameData) ((DataChunk) o).getEntity();
-            int fileId = (int) fd.getFile();
-            System.out.println(fileId);
-            if (dfsmap.get(fileId).getType() == type) {
+            if (fd.getFile() == fileId) {
                 r.add(fd);
             }
         }

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

@@ -74,7 +74,7 @@ private void cleanUp() {
         try {
             for (Transaction t : Instance.getInstance().getTransactions()) {
                 ArrayList<Long> fptr = new ArrayList<>();
-                if (t.getTransType() == Transaction.TRAN_THR && t.getCid() > 0) {
+                if ((t.getTransType() == Transaction.TRAN_THR || t.getTransType() == Transaction.TRAN_RBC) && t.getCid() > 0) {
                     int i = 0;
                     for (TransFrame tf : Instance.getInstance().getTransFramesByTransId(t.getTransId())) {
                         if (t.isLocal()) {
@@ -104,7 +104,11 @@ private void cleanUp() {
                         session.delete(tf);
                         i++;
                     }
-                    t.setTransType(Transaction.TRAN_LEGACY);
+                    if (t.getTransType() == Transaction.TRAN_THR) {
+                        t.setTransType(Transaction.TRAN_LEGACY);
+                    } else if (t.getTransType() == Transaction.TRAN_RBC) {
+                        t.setTransType(Transaction.TRAN_LEGACY_RBC);
+                    }
                     session.persist(t);
                     logger.info(i+" transaction frames removed for transaction id = "+t.getTransId());
                 }

src/main/java/su/interference/mgmt/MgmtContainer.java

@@ -36,14 +36,16 @@ this software and associated documentation files (the "Software"), to deal in
 public class MgmtContainer {
     MgmtColumn mgmtColumn;
     MgmtAction mgmtAction;
+    MgmtLink   mgmtLink;
     Field field;
     Method method;
     Class c;
     Field idField;
 
-    public MgmtContainer(MgmtColumn mgmtColumn, MgmtAction mgmtAction, Field field, Method method, Class c, Field idField) {
+    public MgmtContainer(MgmtColumn mgmtColumn, MgmtAction mgmtAction, MgmtLink mgmtLink, Field field, Method method, Class c, Field idField) {
         this.mgmtColumn = mgmtColumn;
         this.mgmtAction = mgmtAction;
+        this.mgmtLink = mgmtLink;
         this.field = field;
         this.method = method;
         this.c = c;
@@ -82,14 +84,18 @@ public String getHeader() {
         }
     }
 
-    public String getValue(Object o) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
+    public String getValue(Object o, String objectId, String sessionId, int pageId) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
         if (this.mgmtColumn == null || this.field == null) {
             return null;
         } else {
             String getName  = "get" + this.field.getName().substring(0,1).toUpperCase() + this.field.getName().substring(1);
             Method m = this.c.getMethod(getName, null);
             Object result = m.invoke(o, null);
-            return String.valueOf(result);
+            if (this.mgmtLink != null) {
+                return "<a href=\"?showtable="+objectId+"&session_id="+sessionId+"&page_id=10\">"+result+"</a>";
+            } else {
+                return String.valueOf(result);
+            }
         }
     }
 

src/main/java/su/interference/mgmt/MgmtLink.java

@@ -0,0 +1,10 @@
+package su.interference.mgmt;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface MgmtLink {
+    String type();
+    String retrieveMethod();
+}

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

@@ -63,7 +63,6 @@ public class FrameData implements Serializable, Comparable, FrameApi, FilePartit
 
     @Column
     @IndexColumn
-    @MgmtColumn(name="Frame Id",width=20)
     private volatile int objectId;
     @Column
     @MgmtColumn(name="File Id",width=10)
@@ -104,6 +103,7 @@ public class FrameData implements Serializable, Comparable, FrameApi, FilePartit
     @Id
     @MapColumn
     @Transient
+    @MgmtColumn(name="Frame Id",width=20)
     private long frameId; //virtual Id field
     @Transient
     private final Map<Long, Map<Long, TransFrame>> tcounter = new ConcurrentHashMap<>();