Update index build information attributes

Tim Middleton · Tim Middleton · commit 8d1c951b211f · 2021-05-27T09:36:38.000+08:00
diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/VisualVMModel.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/VisualVMModel.java
@@ -1325,7 +1325,7 @@ public String[] getMetadata()
         Localization.getLocalText("LBL_locks_pending"), Localization.getLocalText("LBL_listener_reg"),
         Localization.getLocalText("LBL_max_query_millis"), Localization.getLocalText("LBL_max_query_desc"),
         Localization.getLocalText("LBL_non_opt_avge"), Localization.getLocalText("LBL_opt_avge"),
-        Localization.getLocalText("LBL_index_units"), Localization.getLocalText("LBL_index_build_duration")
+        Localization.getLocalText("LBL_index_units"), Localization.getLocalText("LBL_indexing_total_millis")
         };
 
     /**
diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/panel/CoherenceCachePanel.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/panel/CoherenceCachePanel.java
@@ -196,7 +196,7 @@ public CoherenceCachePanel(VisualVMModel model)
                                        new RenderHelper.ToolTipRenderer());
         RenderHelper.setColumnRenderer(f_tableStorage, CacheStorageManagerData.INDEX_TOTAL_UNITS,
                                        new RenderHelper.IntegerRenderer());
-        RenderHelper.setColumnRenderer(f_tableStorage, CacheStorageManagerData.INDEX_BUILD_DURATION,
+        RenderHelper.setColumnRenderer(f_tableStorage, CacheStorageManagerData.INDEXING_TOTAL_MILLIS,
                                        new RenderHelper.IntegerRenderer());
 
         table.setIntercellSpacing(new Dimension(6, 3));
@@ -579,7 +579,7 @@ public void actionPerformed(ActionEvent e)
                for (Map.Entry<Object, Data> entry : m_cacheStorageData)
                    {
                    cCount++;
-                   Object oValue     = entry.getValue().getColumn(CacheStorageManagerData.INDEX_BUILD_DURATION);
+                   Object oValue     = entry.getValue().getColumn(CacheStorageManagerData.INDEXING_TOTAL_MILLIS);
                    long   cUnits     = (Long) entry.getValue().getColumn(CacheStorageManagerData.INDEX_TOTAL_UNITS);
                    long   cMillis    = oValue == null ? 0L : (Long) oValue;
                    fIndexBuildAvailable = oValue != null;
@@ -603,18 +603,22 @@ public void actionPerformed(ActionEvent e)
                if (cCount != 0)
                    {
                    cMillisAverage = cMillisTotal * 1.0f / cCount;
-                   sb.append(getLocalizedText("LBL_index_units_mb"))
+                   sb.append(getLocalizedText("LBL_index_units_bytes"))
+                     .append(": ")
+                     .append(getMemoryFormat(cIndexTotalUnits))
+                     .append('\n')
+                     .append(getLocalizedText("LBL_index_units_mb"))
                      .append(": ")
                      .append(getMemoryFormat(cIndexTotalUnits / GraphHelper.MB))
                      .append('\n');
 
                    if (fIndexBuildAvailable)
                        {
-                       sb.append(getLocalizedText("LBL_average_index_build_duration"))
+                       sb.append(getLocalizedText("LBL_average_indexing_total_millis"))
                           .append(": ")
-                          .append(String.format("%,f", cMillisAverage))
+                          .append(String.format("%,.3f", cMillisAverage))
                           .append('\n')
-                          .append(getLocalizedText("LBL_max_index_build_duration"))
+                          .append(getLocalizedText("LBL_max_indexing_total_millis"))
                           .append(": ")
                           .append(String.format("%,d", cMaxMillis))
                           .append("\n");
diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/CacheStorageManagerData.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/CacheStorageManagerData.java
@@ -63,7 +63,7 @@ public class CacheStorageManagerData
      */
     public CacheStorageManagerData()
         {
-        super(INDEX_BUILD_DURATION + 1);
+        super(INDEXING_TOTAL_MILLIS + 1);
         }
 
     // ----- DataRetriever methods ------------------------------------------
@@ -119,8 +119,8 @@ public List<Map.Entry<Object, Data>> getJMXData(RequestSender requestSender, Vis
                                 Long.parseLong(requestSender.getAttribute(objName, "OptimizedQueryAverageMillis")));
                         data.setColumn(CacheStorageManagerData.INDEX_TOTAL_UNITS,
                                 Long.parseLong(requestSender.getAttribute(objName, "IndexTotalUnits")));
-                        data.setColumn(CacheStorageManagerData.INDEX_BUILD_DURATION,
-                                Long.parseLong(requestSender.getAttribute(objName, "IndexBuildDurationMillis")));
+                        data.setColumn(CacheStorageManagerData.INDEXING_TOTAL_MILLIS,
+                                Long.parseLong(requestSender.getAttribute(objName, "IndexingTotalMillis")));
                         }
                     catch (Exception eIgnore)
                        {
@@ -212,7 +212,7 @@ public Data processReporterData(Object[] aoColumns, VisualVMModel model)
             {
             data.setColumn(CacheStorageManagerData.INDEX_TOTAL_UNITS,
                        Long.valueOf(getNumberValue(aoColumns[10].toString())));
-            data.setColumn(CacheStorageManagerData.INDEX_BUILD_DURATION,
+            data.setColumn(CacheStorageManagerData.INDEXING_TOTAL_MILLIS,
                        Long.valueOf(getNumberValue(aoColumns[11].toString())));
             }
         catch (Exception e)
@@ -281,7 +281,7 @@ public SortedMap<Object, Data> getAggregatedDataFromHttpQuerying(VisualVMModel
                 try
                     {
                     data.setColumn(CacheStorageManagerData.INDEX_TOTAL_UNITS,nodeCacheStorage.get("indexTotalUnits").asLong());
-                    data.setColumn(CacheStorageManagerData.INDEX_TOTAL_UNITS,nodeCacheStorage.get("indexBuildDurationMillis").asLong());
+                    data.setColumn(CacheStorageManagerData.INDEXING_TOTAL_MILLIS,nodeCacheStorage.get("IndexingTotalMillis").asLong());
                     }
                 catch (Exception ignore)
                     {
@@ -344,9 +344,9 @@ public SortedMap<Object, Data> getAggregatedDataFromHttpQuerying(VisualVMModel
     public static final int INDEX_TOTAL_UNITS = 8;
     
     /**
-     * Array index for index build duration millis.
+     * Array index for indexing total millis.
      */
-    public static final int INDEX_BUILD_DURATION = 9;
+    public static final int INDEXING_TOTAL_MILLIS = 9;
 
     /**
      * The logger object to use.
diff --git a/coherence-visualvm-plugin/src/main/resources/com/oracle/coherence/plugin/visualvm/Bundle.properties b/coherence-visualvm-plugin/src/main/resources/com/oracle/coherence/plugin/visualvm/Bundle.properties
@@ -324,10 +324,11 @@ LBL_listener_reg=Listener Registrations
 LBL_non_opt_avge=Non Opt Query Avg (ms)
 LBL_opt_avge=Optimized Query Avg (ms)
 LBL_index_units=Index Total Units (bytes)
+LBL_index_units_bytes=Index total units across all members (bytes)
 LBL_index_units_mb=Index total units across all members (MB)
-LBL_index_build_duration=Index Build Duration (ms)
-LBL_average_index_build_duration=Average index build duration (ms)
-LBL_max_index_build_duration=Max index build duration (ms)
+LBL_indexing_total_millis=Indexing Total Millis (ms)
+LBL_average_indexing_total_millis=Average indexing total millis across all members
+LBL_max_indexing_total_millis=Maximum indexing total millis across all members
 LBL_unicast_address=Unicast Address
 LBL_port=Port
 LBL_role=Role
diff --git a/coherence-visualvm-plugin/src/main/resources/reports/visualvm/cache-storage-manager-stats.xml b/coherence-visualvm-plugin/src/main/resources/reports/visualvm/cache-storage-manager-stats.xml
@@ -90,8 +90,8 @@
                 <name>IndexTotalUnits</name>
             </column>
 
-            <column id="IndexBuildDurationMillis">
-                <name>IndexBuildDurationMillis</name>
+            <column id="IndexingTotalMillis">
+                <name>IndexingTotalMillis</name>
             </column>
         </row>
     </report>

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public class CacheStorageManagerData`
`63`	`63`	`*/`
`64`	`64`	`public CacheStorageManagerData()`
`65`	`65`	`{`
`66`		`- super(INDEX_BUILD_DURATION + 1);`
	`66`	`+ super(INDEXING_TOTAL_MILLIS + 1);`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`// ----- DataRetriever methods ------------------------------------------`
`@@ -119,8 +119,8 @@ public List<Map.Entry<Object, Data>> getJMXData(RequestSender requestSender, Vis`
`119`	`119`	`Long.parseLong(requestSender.getAttribute(objName, "OptimizedQueryAverageMillis")));`
`120`	`120`	`data.setColumn(CacheStorageManagerData.INDEX_TOTAL_UNITS,`
`121`	`121`	`Long.parseLong(requestSender.getAttribute(objName, "IndexTotalUnits")));`
`122`		`- data.setColumn(CacheStorageManagerData.INDEX_BUILD_DURATION,`
`123`		`- Long.parseLong(requestSender.getAttribute(objName, "IndexBuildDurationMillis")));`
	`122`	`+ data.setColumn(CacheStorageManagerData.INDEXING_TOTAL_MILLIS,`
	`123`	`+ Long.parseLong(requestSender.getAttribute(objName, "IndexingTotalMillis")));`
`124`	`124`	`}`
`125`	`125`	`catch (Exception eIgnore)`
`126`	`126`	`{`
`@@ -212,7 +212,7 @@ public Data processReporterData(Object[] aoColumns, VisualVMModel model)`
`212`	`212`	`{`
`213`	`213`	`data.setColumn(CacheStorageManagerData.INDEX_TOTAL_UNITS,`
`214`	`214`	`Long.valueOf(getNumberValue(aoColumns[10].toString())));`
`215`		`- data.setColumn(CacheStorageManagerData.INDEX_BUILD_DURATION,`
	`215`	`+ data.setColumn(CacheStorageManagerData.INDEXING_TOTAL_MILLIS,`
`216`	`216`	`Long.valueOf(getNumberValue(aoColumns[11].toString())));`
`217`	`217`	`}`
`218`	`218`	`catch (Exception e)`
`@@ -281,7 +281,7 @@ public SortedMap<Object, Data> getAggregatedDataFromHttpQuerying(VisualVMModel`
`281`	`281`	`try`
`282`	`282`	`{`
`283`	`283`	`data.setColumn(CacheStorageManagerData.INDEX_TOTAL_UNITS,nodeCacheStorage.get("indexTotalUnits").asLong());`
`284`		`- data.setColumn(CacheStorageManagerData.INDEX_TOTAL_UNITS,nodeCacheStorage.get("indexBuildDurationMillis").asLong());`
	`284`	`+ data.setColumn(CacheStorageManagerData.INDEXING_TOTAL_MILLIS,nodeCacheStorage.get("IndexingTotalMillis").asLong());`
`285`	`285`	`}`
`286`	`286`	`catch (Exception ignore)`
`287`	`287`	`{`
`@@ -344,9 +344,9 @@ public SortedMap<Object, Data> getAggregatedDataFromHttpQuerying(VisualVMModel`
`344`	`344`	`public static final int INDEX_TOTAL_UNITS = 8;`
`345`	`345`
`346`	`346`	`/**`
`347`		`- * Array index for index build duration millis.`
	`347`	`+ * Array index for indexing total millis.`
`348`	`348`	`*/`
`349`		`- public static final int INDEX_BUILD_DURATION = 9;`
	`349`	`+ public static final int INDEXING_TOTAL_MILLIS = 9;`
`350`	`350`
`351`	`351`	`/**`
`352`	`352`	`* The logger object to use.`