Apache Solr open-source search software
SOLR-15273: Distributed Group Query supports rename unique key field name (#35)
limingnihao3a533aa2dfbe
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 511cea02543..ff928bd1f86 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -304,6 +304,9 @@ Bug Fixes* SOLR-15191: Fix JSON Faceting on EnumFieldType if allBuckets, numBuckets or missing is set.(Thomas Wöckinger, David Smiley)+* SOLR-15273: Fix NullPointerException in StoredFieldsShardResponseProcessor that happened when a field name alias is+ used for the unique key field in searches with distributed result grouping. (limingnihao via Christine Poerschke)+Other Changes---------------------* SOLR-15118: Deprecate CollectionAdminRequest.getV2Request(). (Jason Gerlowski)diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/StoredFieldsShardResponseProcessor.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/StoredFieldsShardResponseProcessor.javaindex 734a0e09033..019aca1958f 100644--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/StoredFieldsShardResponseProcessor.java+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/StoredFieldsShardResponseProcessor.java@@ -38,6 +38,10 @@ public class StoredFieldsShardResponseProcessor implements ShardResponseProcessoSolrDocumentList docs = (SolrDocumentList)srsp.getSolrResponse().getResponse().get("response");String uniqueIdFieldName = rb.req.getSchema().getUniqueKeyField().getName();+ if (rb.rsp.getReturnFields().getFieldRenames().get(uniqueIdFieldName) != null) {+ // if id was renamed we need to use the new name+ uniqueIdFieldName = rb.rsp.getReturnFields().getFieldRenames().get(uniqueIdFieldName);+ }for (SolrDocument doc : docs) {Object id = doc.getFieldValue(uniqueIdFieldName).toString();ShardDoc shardDoc = rb.resultIds.get(id);diff --git a/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java b/solr/core/src/test/org/apache/solr/TestDistributedGrouping.javaindex 11220e43333..0ed36fdd9ba 100644--- a/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java+++ b/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java@@ -286,6 +286,9 @@ public class TestDistributedGrouping extends BaseDistributedSearchTestCase {query("q", "*:*", "fq", s1 + ":a", "fl", "id," + i1, "group", "true", "group.field", i1, "sort", i1 + " asc, id asc", "group.ngroups", "true");query("q", "*:*", "fq", s1 + ":a", "rows", 0, "fl", "id," + i1, "group", "true", "group.field", i1, "sort", i1 + " asc, id asc", "group.ngroups", "true");+ // SOLR-15273: if id was renamed we need to use the new name+ query("q", "*:*", "rows", 100, "fl", "aliasId:id," + i1, "group", "true", "group.field", i1, "group.limit", -1, "sort", i1 + " asc, id asc");+// SOLR-3960 - include a postfilterfor (String facet : new String[] { "false", "true"}) {for (String fcache : new String[] { "", " cache=false cost=200"}) {