Improve heatmap switch performance:

Michael Schroeder · Michael Schroeder · commit e6822b83b3ce · 2016-02-05T17:19:02.000+01:00
- Force System.gc() only once per switch
    - Do not detach topLayer()
diff --git a/org.gitools.api/src/main/java/org/gitools/api/matrix/IMatrix.java b/org.gitools.api/src/main/java/org/gitools/api/matrix/IMatrix.java
@@ -47,8 +47,9 @@ public interface IMatrix extends IResource {
      * This method is called when the matrix is not in use.
      * <p/>
      * It's a good practice to free all the caching memory usage.
+     * @param topLayer
      */
-    void detach();
+    void detach(IMatrixLayer topLayer);
 
     <T> void setMetadata(IKey<T> key, T value);
 
diff --git a/org.gitools.heatmap/src/main/java/org/gitools/heatmap/Heatmap.java b/org.gitools.heatmap/src/main/java/org/gitools/heatmap/Heatmap.java
@@ -133,21 +133,17 @@ public void setColumns(HeatmapDimension columns) {
         firePropertyChange(PROPERTY_COLUMNS, old, columns);
     }
 
-    public void detach() {
+    public void detach(IMatrixLayer topLayer) {
         if (data != null && data.isLoaded()) {
-            data.get().detach();
+            data.get().detach(topLayer);
         }
 
-        // Detach heatmap cache
-        //this.cache = null;
-
         // Detach layers cache
         for (HeatmapLayer layer : layers) {
-            layer.detach();
+            if (layer != topLayer) {
+                layer.detach();
+            }
         }
-
-        // Force garbage collection
-        System.gc();
     }
 
     public void init() {
diff --git a/org.gitools.matrix/src/main/java/org/gitools/matrix/model/AbstractMatrix.java b/org.gitools.matrix/src/main/java/org/gitools/matrix/model/AbstractMatrix.java
@@ -98,10 +98,13 @@ public MD getColumns() {
     }
 
     @Override
-    public void detach() {
+    public void detach(IMatrixLayer topLayer) {
         this.cache = null;
 
         for (IMatrixLayer layer : layers) {
+            if (topLayer == layer) {
+                continue;
+            }
             layer.detach();
         }
     }
diff --git a/org.gitools.matrix/src/main/java/org/gitools/matrix/model/MatrixWrapper.java b/org.gitools.matrix/src/main/java/org/gitools/matrix/model/MatrixWrapper.java
@@ -79,8 +79,8 @@ public IMatrix subset(IMatrixDimension... dimensionSubsets) {
     }
 
     @Override
-    public void detach() {
-        wrapMatrix.detach();
+    public void detach(IMatrixLayer topLayer) {
+        wrapMatrix.detach(topLayer);
     }
 
     @Override
diff --git a/org.gitools.matrix/src/main/java/org/gitools/matrix/model/compressmatrix/CompressMatrix.java b/org.gitools.matrix/src/main/java/org/gitools/matrix/model/compressmatrix/CompressMatrix.java
@@ -188,7 +188,7 @@ private synchronized double[][] uncompress(CompressRow compressRow) {
         }
     }
 
-    public void detach() {
+    public void detach(IMatrixLayer topLayer) {
         this.rowsCache.invalidateAll();
     }
 
diff --git a/org.gitools.matrix/src/main/java/org/gitools/matrix/model/mtabixmatrix/MTabixMatrix.java b/org.gitools.matrix/src/main/java/org/gitools/matrix/model/mtabixmatrix/MTabixMatrix.java
@@ -102,11 +102,13 @@ public <T> void set(IMatrixLayer<T> layer, T value, String... identifiers) {
         super.set(layer, value, identifiers);
     }
 
-    public void detach() {
+    public void detach(IMatrixLayer topLayer) {
 
         //TODO improve evict policy
-        for (LoadingCache<Long, MTabixBlockValues> cache : indexedCache.values()) {
-            cache.invalidateAll();
+        for (String layerKey : indexedCache.keySet()) {
+            if (topLayer != null && !layerKey.equals(topLayer.getId())) {
+                indexedCache.get(layerKey).invalidateAll();
+            }
         }
 
     }
diff --git a/org.gitools.ui.app/src/main/java/org/gitools/ui/app/heatmap/editor/HeatmapEditor.java b/org.gitools.ui.app/src/main/java/org/gitools/ui/app/heatmap/editor/HeatmapEditor.java
@@ -452,7 +452,7 @@ public void run(IProgressMonitor monitor) {
         timer.cancel();
         timer.purge();
 
-        heatmap.detach();
+        heatmap.detach(null);
 
         if (heatmap.getData().getLocator() != null) {
             heatmap.getData().unload();
@@ -481,7 +481,7 @@ void mouseClicked(int row, int col, MouseEvent e) {
 
     @Override
     public void detach() {
-        this.heatmap.detach();
+        this.heatmap.detach(heatmap.getLayers().getTopLayer());
     }
 
     @Override
diff --git a/org.gitools.ui.app/src/main/java/org/gitools/ui/app/heatmap/panel/details/boxes/HeatmapInfoBox.java b/org.gitools.ui.app/src/main/java/org/gitools/ui/app/heatmap/panel/details/boxes/HeatmapInfoBox.java
@@ -97,7 +97,6 @@ public void update() {
         }
 
         Heatmap heatmap = getHeatmap();
-        this.setTitle(heatmap.getTitle());
 
 
         List<DetailsDecoration> details = new ArrayList<>();
@@ -119,19 +118,26 @@ public void update() {
         }
 
         int rows = heatmap.getRows().size();
-        int visibleRows = heatmap.getContents().getRows().size();
+        int allRows = heatmap.getContents().getRows().size();
         int columns = heatmap.getColumns().size();
-        int visibleColumns = heatmap.getContents().getColumns().size();
+        int allColumns = heatmap.getContents().getColumns().size();
 
-        boolean showShownData = (rows != visibleRows || columns != visibleColumns);
+        boolean showShownData = (rows != allRows || columns != allColumns);
 
-        DetailsDecoration alldata = new DetailsDecoration("Size (all data)", visibleRows + " x " + visibleColumns);
+        DetailsDecoration alldata = new DetailsDecoration("Size (all data)", allRows + " x " + allColumns);
+
+        int rowsPct = (int) Math.round(((double) rows) / ((double) allRows) * 100.0);
+        int colsPct = (int) Math.round(((double) columns) / ((double) allColumns) * 100.0);
 
         if (showShownData) {
+            this.setTitle("<html>" + heatmap.getTitle() + " ("
+                    + rowsPct + "% x "
+                    + colsPct + "%)</html>");
             DetailsDecoration shown = new DetailsDecoration("Size (shown)", rows + " x " + columns);
             shown.setSelected(true);
             details.add(shown);
         } else {
+            this.setTitle("<html>" + heatmap.getTitle() + "</html>");
             alldata.setSelected(true);
         }
 
diff --git a/org.gitools.ui.core/src/main/java/org/gitools/ui/core/components/editor/EditorsPanel.java b/org.gitools.ui.core/src/main/java/org/gitools/ui/core/components/editor/EditorsPanel.java
@@ -72,6 +72,13 @@ public void stateChanged(ChangeEvent evt) {
                 }
 
                 refreshActions();
+
+                SwingUtilities.invokeLater(new Runnable() {
+                    @Override
+                    public void run() {
+                        System.gc();
+                    }
+                });
             }
         });
     }

Original file line number	Diff line number	Diff line change
`@@ -133,21 +133,17 @@ public void setColumns(HeatmapDimension columns) {`
`133`	`133`	`firePropertyChange(PROPERTY_COLUMNS, old, columns);`
`134`	`134`	`}`
`135`	`135`
`136`		`- public void detach() {`
	`136`	`+ public void detach(IMatrixLayer topLayer) {`
`137`	`137`	`if (data != null && data.isLoaded()) {`
`138`		`- data.get().detach();`
	`138`	`+ data.get().detach(topLayer);`
`139`	`139`	`}`
`140`	`140`
`141`		`- // Detach heatmap cache`
`142`		`- //this.cache = null;`
`143`		`-`
`144`	`141`	`// Detach layers cache`
`145`	`142`	`for (HeatmapLayer layer : layers) {`
`146`		`- layer.detach();`
	`143`	`+ if (layer != topLayer) {`
	`144`	`+ layer.detach();`
	`145`	`+ }`
`147`	`146`	`}`
`148`		`-`
`149`		`- // Force garbage collection`
`150`		`- System.gc();`
`151`	`147`	`}`
`152`	`148`
`153`	`149`	`public void init() {`
Original file line number	Diff line number	Diff line change
`@@ -98,10 +98,13 @@ public MD getColumns() {`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`@Override`
`101`		`- public void detach() {`
	`101`	`+ public void detach(IMatrixLayer topLayer) {`
`102`	`102`	`this.cache = null;`
`103`	`103`
`104`	`104`	`for (IMatrixLayer layer : layers) {`
	`105`	`+ if (topLayer == layer) {`
	`106`	`+ continue;`
	`107`	`+ }`
`105`	`108`	`layer.detach();`
`106`	`109`	`}`
`107`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,8 +79,8 @@ public IMatrix subset(IMatrixDimension... dimensionSubsets) {`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`@Override`
`82`		`- public void detach() {`
`83`		`- wrapMatrix.detach();`
	`82`	`+ public void detach(IMatrixLayer topLayer) {`
	`83`	`+ wrapMatrix.detach(topLayer);`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ private synchronized double[][] uncompress(CompressRow compressRow) {`
`188`	`188`	`}`
`189`	`189`	`}`
`190`	`190`
`191`		`- public void detach() {`
	`191`	`+ public void detach(IMatrixLayer topLayer) {`
`192`	`192`	`this.rowsCache.invalidateAll();`
`193`	`193`	`}`
`194`	`194`
Original file line number	Diff line number	Diff line change
`@@ -102,11 +102,13 @@ public <T> void set(IMatrixLayer<T> layer, T value, String... identifiers) {`
`102`	`102`	`super.set(layer, value, identifiers);`
`103`	`103`	`}`
`104`	`104`
`105`		`- public void detach() {`
	`105`	`+ public void detach(IMatrixLayer topLayer) {`
`106`	`106`
`107`	`107`	`//TODO improve evict policy`
`108`		`- for (LoadingCache<Long, MTabixBlockValues> cache : indexedCache.values()) {`
`109`		`- cache.invalidateAll();`
	`108`	`+ for (String layerKey : indexedCache.keySet()) {`
	`109`	`+ if (topLayer != null && !layerKey.equals(topLayer.getId())) {`
	`110`	`+ indexedCache.get(layerKey).invalidateAll();`
	`111`	`+ }`
`110`	`112`	`}`
`111`	`113`
`112`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,13 @@ public void stateChanged(ChangeEvent evt) {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`refreshActions();`
	`75`	`+`
	`76`	`+ SwingUtilities.invokeLater(new Runnable() {`
	`77`	`+ @Override`
	`78`	`+ public void run() {`
	`79`	`+ System.gc();`
	`80`	`+ }`
	`81`	`+ });`
`75`	`82`	`}`
`76`	`83`	`});`
`77`	`84`	`}`