Apache Solr open-source search software
SOLR-15884: Use a map for backup responses (#549)
Houston Putman97d76fcd9046
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex bf8cd8186a8..f1170f66f4b 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -260,6 +260,8 @@ when told to. The admin UI now tells it to. (Nazerke Seidan, David Smiley)* SOLR-14686: Logs: Removed the "[corename]" prefix of some SolrCore logs that has become redundantwith MDC. (David Smiley)++* SOLR-15884: Backup responses now use a map to return information instead of a list (Houston Putman, Christine Poerschke)Build---------------------diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/BackupCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/BackupCmd.javaindex 9f9c11874c2..3a42a126226 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/BackupCmd.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/BackupCmd.java@@ -30,6 +30,7 @@ import org.apache.solr.common.params.CollectionAdminParams;import org.apache.solr.common.params.CoreAdminParams;import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.util.NamedList;+import org.apache.solr.common.util.SimpleOrderedMap;import org.apache.solr.core.CoreContainer;import org.apache.solr.core.backup.BackupFilePaths;import org.apache.solr.core.backup.BackupManager;@@ -262,7 +263,7 @@ public class BackupCmd implements CollApiCmds.CollectionApiCommand {BackupManager backupManager,BackupProperties backupProps,Collection<Slice> slices) {- NamedList<Object> aggRsp = new NamedList<>();+ NamedList<Object> aggRsp = new SimpleOrderedMap<>();aggRsp.add("collection", collectionName);aggRsp.add("numShards", slices.size());aggRsp.add("backupId", backupManager.getBackupId().id);diff --git a/solr/core/src/java/org/apache/solr/handler/IncrementalShardBackup.java b/solr/core/src/java/org/apache/solr/handler/IncrementalShardBackup.javaindex b9e80fab673..e0b9479f824 100644--- a/solr/core/src/java/org/apache/solr/handler/IncrementalShardBackup.java+++ b/solr/core/src/java/org/apache/solr/handler/IncrementalShardBackup.java@@ -23,6 +23,7 @@ import org.apache.lucene.store.Directory;import org.apache.solr.cloud.CloudDescriptor;import org.apache.solr.common.SolrException;import org.apache.solr.common.util.NamedList;+import org.apache.solr.common.util.SimpleOrderedMap;import org.apache.solr.core.DirectoryFactory;import org.apache.solr.core.IndexDeletionPolicyWrapper;import org.apache.solr.core.SolrCore;@@ -131,7 +132,7 @@ public class IncrementalShardBackup {assert indexCommit != null;URI backupLocation = incBackupFiles.getBackupLocation();log.info("Creating backup snapshot at {} shardBackupMetadataFile:{}", backupLocation, shardBackupId);- NamedList<Object> details = new NamedList<>();+ NamedList<Object> details = new SimpleOrderedMap<>();;details.add("startTime", Instant.now().toString());Collection<String> files = indexCommit.getFileNames();diff --git a/solr/core/src/java/org/apache/solr/handler/SnapShooter.java b/solr/core/src/java/org/apache/solr/handler/SnapShooter.javaindex 2f84ffd071e..443613fad98 100644--- a/solr/core/src/java/org/apache/solr/handler/SnapShooter.java+++ b/solr/core/src/java/org/apache/solr/handler/SnapShooter.java@@ -36,6 +36,7 @@ import org.apache.lucene.store.Directory;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrException.ErrorCode;import org.apache.solr.common.util.NamedList;+import org.apache.solr.common.util.SimpleOrderedMap;import org.apache.solr.core.DirectoryFactory.DirContext;import org.apache.solr.core.IndexDeletionPolicyWrapper;import org.apache.solr.core.SolrCore;@@ -257,7 +258,7 @@ public class SnapShooter {}boolean success = false;try {- NamedList<Object> details = new NamedList<>();+ NamedList<Object> details = new SimpleOrderedMap<>();details.add("startTime", new Date().toString());//bad; should be Instant.now().toString()Collection<String> files = indexCommit.getFileNames();diff --git a/solr/solr-ref-guide/src/major-changes-in-solr-9.adoc b/solr/solr-ref-guide/src/major-changes-in-solr-9.adocindex 034cf1f6f56..a9c9cd28e0e 100644--- a/solr/solr-ref-guide/src/major-changes-in-solr-9.adoc+++ b/solr/solr-ref-guide/src/major-changes-in-solr-9.adoc@@ -143,6 +143,9 @@ Currently this change should only effect compatibility of custom code overriding* SOLR-14510: The `writeStartDocumentList` in `TextResponseWriter` now receives an extra boolean parameter representing the "exactness" of the `numFound` value (exact vs approximation).Any custom response writer extending `TextResponseWriter` will need to implement this abstract method now (instead previous with the same name but without the new boolean parameter).+* SOLR-15884: In Backup request responses, the `response` key now uses a map to return information instead of a list.+This is only applicable for users returning information in JSON format, which is the default behavior.+=== solr.xml maxBooleanClauses now enforced recursivelyLucene 9.0 has additional safety checks over previous versions that impact how the `solr.xml` global `<<configuring-solr-xml#global-maxbooleanclauses,maxBooleanClauses>>` option is enforced.