Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-15341: Lucene has removed CodecReader#ramBytesUsed, so this is n… (#77)

Jan Høydahlc83f983e47d9
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 13e487d8919..e8555429ed0 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -255,6 +255,9 @@ Other Changes
alternative implementations of where ConfigSets come from.
(Nazerke Seidan, David Smiley)
+* SOLR-15341: Lucene has removed CodecReader#ramBytesUsed in LUCENE-9387, so ramBytesUsed will no longer be reported
+ in SegmentsInfo handler (janhoy)
+
Bug Fixes
---------------------
* SOLR-14546: Fix for a relatively hard to hit issue in OverseerTaskProcessor that could lead to out of order execution
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/SegmentsInfoRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/SegmentsInfoRequestHandler.java
index cbc7ed4c7e1..a5da9f17394 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/SegmentsInfoRequestHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/SegmentsInfoRequestHandler.java
@@ -16,36 +16,10 @@
*/
package org.apache.solr.handler.admin;
-import java.io.IOException;
-import java.lang.invoke.MethodHandles;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.function.BiConsumer;
-import java.util.stream.Collectors;
-
-import org.apache.lucene.index.DocValuesType;
-import org.apache.lucene.index.FieldInfo;
-import org.apache.lucene.index.FieldInfos;
-import org.apache.lucene.index.FilterLeafReader;
-import org.apache.lucene.index.IndexOptions;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.LeafMetaData;
-import org.apache.lucene.index.LeafReader;
-import org.apache.lucene.index.LeafReaderContext;
-import org.apache.lucene.index.MergePolicy;
+import org.apache.lucene.index.*;
import org.apache.lucene.index.MergePolicy.MergeSpecification;
import org.apache.lucene.index.MergePolicy.OneMerge;
-import org.apache.lucene.index.MergeTrigger;
-import org.apache.lucene.index.SegmentCommitInfo;
-import org.apache.lucene.index.SegmentInfos;
-import org.apache.lucene.index.SegmentReader;
-import org.apache.lucene.index.Terms;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.util.Accountable;
import org.apache.lucene.util.RamUsageEstimator;
import org.apache.lucene.util.Version;
import org.apache.solr.common.luke.FieldFlag;
@@ -63,9 +37,15 @@ import org.apache.solr.util.RefCounted;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.lucene.index.IndexOptions.DOCS;
-import static org.apache.lucene.index.IndexOptions.DOCS_AND_FREQS;
-import static org.apache.lucene.index.IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS;
+import java.io.IOException;
+import java.lang.invoke.MethodHandles;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.apache.lucene.index.IndexOptions.*;
import static org.apache.solr.common.params.CommonParams.NAME;
/**
@@ -169,7 +149,7 @@ public class SegmentsInfoRequestHandler extends RequestHandlerBase {
}
}
}
- SimpleOrderedMap<Object> segmentInfo = null;
+ SimpleOrderedMap<Object> segmentInfo;
List<SegmentCommitInfo> sortable = new ArrayList<>(infos.asList());
// Order by the number of live docs. The display is logarithmic so it is a little jumbled visually
sortable.sort((s1, s2) ->
@@ -291,14 +271,6 @@ public class SegmentsInfoRequestHandler extends RequestHandlerBase {
segmentInfoMap.add("largestFiles", topFiles);
}
}
- if (seg != null && withSizeInfo) {
- SimpleOrderedMap<Object> ram = new SimpleOrderedMap<>();
- ram.add("total", seg.ramBytesUsed());
- for (Accountable ac : seg.getChildResources()) {
- accountableToMap(ac, ram::add);
- }
- segmentInfoMap.add("ramBytesUsed", ram);
- }
if (withFieldInfos) {
if (seg == null) {
log.debug("Skipping segment info - not available as a SegmentReader: {}", segmentCommitInfo);
@@ -315,20 +287,6 @@ public class SegmentsInfoRequestHandler extends RequestHandlerBase {
return segmentInfoMap;
}
- private void accountableToMap(Accountable accountable, BiConsumer<String, Object> consumer) {
- Collection<Accountable> children = accountable.getChildResources();
- if (children != null && !children.isEmpty()) {
- LinkedHashMap<String, Object> map = new LinkedHashMap<>();
- map.put("total", accountable.ramBytesUsed());
- for (Accountable child : children) {
- accountableToMap(child, map::put);
- }
- consumer.accept(accountable.toString(), map);
- } else {
- consumer.accept(accountable.toString(), accountable.ramBytesUsed());
- }
- }
-
private SimpleOrderedMap<Object> getFieldInfo(SegmentReader reader, FieldInfo fi, IndexSchema schema) {
SimpleOrderedMap<Object> fieldFlags = new SimpleOrderedMap<>();
StringBuilder flags = new StringBuilder();
diff --git a/solr/core/src/java/org/apache/solr/handler/component/TaskManagementHandler.java b/solr/core/src/java/org/apache/solr/handler/component/TaskManagementHandler.java
index 8d935731946..f6790078825 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/TaskManagementHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/TaskManagementHandler.java
@@ -30,7 +30,6 @@ import org.apache.solr.util.plugin.SolrCoreAware;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
diff --git a/solr/core/src/java/org/apache/solr/index/UninvertDocValuesMergePolicyFactory.java b/solr/core/src/java/org/apache/solr/index/UninvertDocValuesMergePolicyFactory.java
index 46f03d39cd7..65394ccb9ea 100644
--- a/solr/core/src/java/org/apache/solr/index/UninvertDocValuesMergePolicyFactory.java
+++ b/solr/core/src/java/org/apache/solr/index/UninvertDocValuesMergePolicyFactory.java
@@ -179,11 +179,6 @@ public class UninvertDocValuesMergePolicyFactory extends WrapperMergePolicyFacto
@Override
public void close() throws IOException {
}
-
- @Override
- public long ramBytesUsed() {
- return 0;
- }
};
}
diff --git a/solr/solr-ref-guide/src/collection-management.adoc b/solr/solr-ref-guide/src/collection-management.adoc
index d7dcde3845f..1712fba74dc 100644
--- a/solr/solr-ref-guide/src/collection-management.adoc
+++ b/solr/solr-ref-guide/src/collection-management.adoc
@@ -1250,32 +1250,7 @@ http://localhost:8983/solr/admin/collections?action=COLSTATUS&collection=getting
"_i_Lucene50_0.pos": "11.1 MB",
"_i_Lucene50_0.doc": "10 MB",
"_i_Lucene50_0.tim": "4.3 MB"
- },
- "ramBytesUsed": {
- "total": 49153,
- "postings [PerFieldPostings(segment=_i formats=1)]": {
- "total": 31023,
- "fields": {
- "dc": {
- "flags": "I-----------",
- "schemaType": "text_general"
- },
- "dc_str": {
- "flags": "-Dsrs-------",
- "schemaType": "strings"
- },
- "dc.title": {
- "flags": "I-----------",
- "docCount": 70958,
- "sumDocFreq": 646756,
- "sumTotalTermFreq": 671817,
- "schemaType": "text_general"
- },
- "dc.date": {
- "flags": "-Dsrn-------:1:1:8",
- "schemaType": "pdates"
- }
- }}}}}}}}}}}
+ }}}}}}}}}
----
Example of using the raw index data analysis tool: