Apache Solr open-source search software
SOLR-13209: Fix NPE when no grouping query specified
cabanda2fa1e50d17fc
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 964db61212b..4b723e913e5 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -429,6 +429,8 @@ Bug Fixes* SOLR-8889: Fixed various problems in Solr and SolrJ that could cause deleteById commands with "_route_" information to processedby the wrong shard, and/or fail when forwarded to replicas from the shard leader. (Dan Fox, Yuki Yano, hossman)+* SOLR-13209: Fix NPE when no grouping query specified (Collins Abanda via Mike Drob)+Other Changes---------------------* SOLR-15566: Clarify ref guide documentation about SQL queries with `SELECT *` requiring a `LIMIT` clause (Timothy Potter)diff --git a/solr/core/src/java/org/apache/solr/search/Grouping.java b/solr/core/src/java/org/apache/solr/search/Grouping.javaindex f59c68f8a11..9d2da0f34b3 100644--- a/solr/core/src/java/org/apache/solr/search/Grouping.java+++ b/solr/core/src/java/org/apache/solr/search/Grouping.java@@ -36,6 +36,7 @@ import org.apache.lucene.queries.function.ValueSource;import org.apache.lucene.queries.function.valuesource.QueryValueSource;import org.apache.lucene.search.CachingCollector;import org.apache.lucene.search.Collector;+import org.apache.lucene.search.MatchNoDocsQuery;import org.apache.lucene.search.MultiCollector;import org.apache.lucene.search.Query;import org.apache.lucene.search.ScoreDoc;@@ -222,6 +223,11 @@ public class Grouping {public void addQueryCommand(String groupByStr, SolrQueryRequest request) throws SyntaxError {QParser parser = QParser.getParser(groupByStr, request);Query gq = parser.getQuery();++ if (gq == null) {+ // normalize a null query to a query that matches nothing+ gq = new MatchNoDocsQuery();+ }Grouping.CommandQuery gc = new CommandQuery();gc.query = gq;gc.withinGroupSort = withinGroupSort;@@ -243,7 +249,6 @@ public class Grouping {gc.docsPerGroup = gc.numGroups; // doesn't make sense to limit to onegc.groupOffset = gc.offset;}-commands.add(gc);}diff --git a/solr/core/src/test/org/apache/solr/TestGroupingSearch.java b/solr/core/src/test/org/apache/solr/TestGroupingSearch.javaindex 54e983bb9b7..d32ba1a18cc 100644--- a/solr/core/src/test/org/apache/solr/TestGroupingSearch.java+++ b/solr/core/src/test/org/apache/solr/TestGroupingSearch.java@@ -213,7 +213,6 @@ public class TestGroupingSearch extends SolrTestCaseJ4 {);}-@Testpublic void testGroupingGroupSortingWeight() {assertU(add(doc("id", "1","name", "author1", "weight", "12.1")));@@ -236,6 +235,16 @@ public class TestGroupingSearch extends SolrTestCaseJ4 {);}+ @Test+ public void testGroupingNoQuery() {+ assertU(add(doc("id", "1","name", "author1", "weight", "12.1")));+ assertU(commit());++ assertQ(req( "group", "true", "group.query", "")+ ,"//lst[2]/lst[@name='']/result[@numFound='0']"+ );+ }+@Testpublic void testGroupingSimpleFormatArrayIndexOutOfBoundsException() throws Exception {assertU(add(doc("id", "1")));