SOLR-8394: /admin/luke didn't computeindexHeapUsageBytes (#1497)

Needed to call FilterLeafReader.unwrap.

Co-authored-by: igiguere <igiguere@opentext.com>

solr/CHANGES.txt

@@ -177,6 +177,9 @@ Bug Fixes
 * SOLR-14471: Fix bug in shards.preference behavior, base replica selection strategy not applied to the last group of
   equivalent replicas. (Michael Gibney via Tomás Fernández Löbbe)
 
+* SOLR-8394: /admin/luke was always showing 0 for indexHeapUsageBytes. It should work now.
+  (Steve Molloy, Isabelle Giguere, David Smiley)
+
 Other Changes
 ---------------------
 * SOLR-14197: SolrResourceLoader: marked many methods as deprecated, and in some cases rerouted exiting logic to avoid

solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java

@@ -17,8 +17,8 @@
 package org.apache.solr.handler.admin;
 
 import java.io.IOException;
-import java.nio.file.NoSuchFileException;
 import java.lang.invoke.MethodHandles;
+import java.nio.file.NoSuchFileException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -39,6 +39,7 @@ import org.apache.lucene.document.Field;
 import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.DocValuesType;
 import org.apache.lucene.index.FieldInfo;
+import org.apache.lucene.index.FilterLeafReader;
 import org.apache.lucene.index.IndexCommit;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.index.IndexReader;
@@ -47,7 +48,6 @@ import org.apache.lucene.index.LeafReader;
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.MultiTerms;
 import org.apache.lucene.index.PostingsEnum;
-import org.apache.lucene.index.SegmentReader;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.index.Terms;
 import org.apache.lucene.index.TermsEnum;
@@ -55,6 +55,7 @@ import org.apache.lucene.search.DocIdSetIterator;
 import org.apache.lucene.search.similarities.Similarity;
 import org.apache.lucene.store.AlreadyClosedException;
 import org.apache.lucene.store.Directory;
+import org.apache.lucene.util.Accountable;
 import org.apache.lucene.util.Bits;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.CharsRefBuilder;
@@ -634,17 +635,19 @@ public class LukeRequestHandler extends RequestHandlerBase
 
   /** Returns the sum of RAM bytes used by each segment */
   private static long getIndexHeapUsed(DirectoryReader reader) {
-    long indexHeapRamBytesUsed = 0;
-    for(LeafReaderContext leafReaderContext : reader.leaves()) {
-      LeafReader leafReader = leafReaderContext.reader();
-      if (leafReader instanceof SegmentReader) {
-        indexHeapRamBytesUsed += ((SegmentReader) leafReader).ramBytesUsed();
-      } else {
-        // Not supported for any reader that is not a SegmentReader
-        return -1;
-      }
-    }
-    return indexHeapRamBytesUsed;
+    return reader.leaves().stream()
+        .map(LeafReaderContext::reader)
+        .map(FilterLeafReader::unwrap)
+        .map(leafReader -> {
+          if (leafReader instanceof Accountable) {
+            return ((Accountable) leafReader).ramBytesUsed();
+          } else {
+            return -1L; // unsupported
+          }
+        })
+        .mapToLong(Long::longValue)
+        .reduce(0, (left, right) -> left == -1 || right == -1 ? -1 : left + right);
+    // if any leaves are unsupported (-1), we ultimately return -1.
   }
 
   // Get terribly detailed information about a particular field. This is a very expensive call, use it with caution

solr/core/src/java/org/apache/solr/handler/admin/SegmentsInfoRequestHandler.java

@@ -238,10 +238,7 @@ public class SegmentsInfoRequestHandler extends RequestHandlerBase {
     SegmentReader seg = null;
     for (LeafReaderContext lrc : leafContexts) {
       LeafReader leafReader = lrc.reader();
-      // unwrap
-      while (leafReader instanceof FilterLeafReader) {
-        leafReader = ((FilterLeafReader)leafReader).getDelegate();
-      }
+      leafReader = FilterLeafReader.unwrap(leafReader);
       if (leafReader instanceof SegmentReader) {
         SegmentReader sr = (SegmentReader)leafReader;
         if (sr.getSegmentInfo().info.equals(segmentCommitInfo.info)) {

solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java

@@ -19,12 +19,15 @@ package org.apache.solr.handler.admin;
 import java.util.Arrays;
 import java.util.EnumSet;
 
+import javax.xml.xpath.XPathConstants;
+
 import org.apache.solr.common.luke.FieldFlag;
 import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.schema.CustomAnalyzerStrField; // jdoc
 import org.apache.solr.schema.IndexSchema;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.util.TestHarness;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -142,6 +145,18 @@ public class LukeRequestHandlerTest extends SolrTestCaseJ4 {
   private static String dynfield(String field) {
     return "//lst[@name='dynamicFields']/lst[@name='"+field+"']/";
   }
+  
+  @Test
+  public void testIndexHeapUsageBytes() throws Exception {
+    try (SolrQueryRequest req = req("qt", "/admin/luke")) {
+      String response = h.query(req);
+      String xpath = "//long[@name='indexHeapUsageBytes']";
+      Double num = (Double) TestHarness.evaluateXPath(response, xpath, XPathConstants.NUMBER);
+      //with docs in the index, indexHeapUsageBytes should be greater than 0
+      Assert.assertTrue("indexHeapUsageBytes should be > 0, but was " + num.intValue(), num.intValue() > 0);
+    }
+  }
+
   @Test
   public void testFlParam() {
     SolrQueryRequest req = req("qt", "/admin/luke", "fl", "solr_t solr_s", "show", "all");