Skip to content

Commit 2de2b7f

Browse files
committed
Revert "SOLR-17625 NamedList.findRecursive-> _get"
This reverts commit 81eed8a. Changes made with help inline method feature.The methods were over loaded with 1 , 2 ,3 and 4 arguments with String type Updated StatusTool.java SplitShardCmd.java doesnt require update
1 parent 7469971 commit 2de2b7f

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

solr/core/src/java/org/apache/solr/cli/StatusTool.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,11 +315,11 @@ public static Map<String, Object> reportStatus(NamedList<Object> info, SolrClien
315315
String solrHome = (String) info.get("solr_home");
316316
status.put("solr_home", solrHome != null ? solrHome : "?");
317317
status.put("version", info._getStr(List.of("lucene", "solr-impl-version"), null));
318-
status.put("startTime", info._getStr(List.of("jvm", "jmx", "startTime"), null).toString());
318+
status.put("startTime", info._getStr(List.of("jvm", "jmx", "startTime"), null));
319319
status.put("uptime", SolrCLI.uptime((Long) info._get(List.of("jvm", "jmx", "upTimeMS"), null)));
320320

321321
String usedMemory = info._getStr(List.of("jvm", "memory", "used"), null);
322-
String totalMemory = info._getStr(List.of("jvm", "memory", "total"), null);
322+
String totalMemory = info._getStr(List.of("jvm", "memory", "total"), null);
323323
status.put("memory", usedMemory + " of " + totalMemory);
324324

325325
// if this is a Solr in solrcloud mode, gather some basic cluster info

solr/core/src/java/org/apache/solr/cloud/api/collections/SplitShardCmd.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -862,16 +862,15 @@ public static void checkDiskSpace(
862862
SolrRequest.METHOD.GET, "/admin/metrics", SolrRequest.SolrRequestType.ADMIN, params)
863863
.process(cloudManager.getSolrClient());
864864

865-
NamedList<Object> entries1 = rsp.getResponse();
866-
Number size = (Number) entries1._get(List.of("metrics", indexSizeMetricName), null);
865+
Number size = (Number) rsp.getResponse()._get(List.of("metrics", indexSizeMetricName), null);
867866
if (size == null) {
868867
log.warn("cannot verify information for parent shard leader");
869868
return;
870869
}
871870
double indexSize = size.doubleValue();
872871

873-
NamedList<Object> entries = rsp.getResponse();
874-
Number freeSize = (Number) entries._get(List.of("metrics", freeDiskSpaceMetricName), null);
872+
Number freeSize =
873+
(Number) rsp.getResponse()._get(List.of("metrics", freeDiskSpaceMetricName), null);
875874
if (freeSize == null) {
876875
log.warn("missing node disk space information for parent shard leader");
877876
return;

0 commit comments

Comments
 (0)