Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

Minor IntRangeField fixes

Jason Gerlowski570b198185d6
diff --git a/solr/core/src/java/org/apache/solr/schema/numericrange/IntRangeField.java b/solr/core/src/java/org/apache/solr/schema/numericrange/IntRangeField.java
index e0a143da144..0dd63b366bb 100644
--- a/solr/core/src/java/org/apache/solr/schema/numericrange/IntRangeField.java
+++ b/solr/core/src/java/org/apache/solr/schema/numericrange/IntRangeField.java
@@ -17,6 +17,7 @@
package org.apache.solr.schema.numericrange;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
@@ -142,7 +143,7 @@ public class IntRangeField extends PrimitiveFieldType {
@Override
public List<IndexableField> createFields(SchemaField field, Object value) {
IndexableField indexedField = createField(field, value);
- List<IndexableField> fields = new java.util.ArrayList<>();
+ List<IndexableField> fields = new ArrayList<>();
if (indexedField != null) {
fields.add(indexedField);
@@ -375,7 +376,7 @@ public class IntRangeField extends PrimitiveFieldType {
if (numDimensions == 1) {
mins[0] = min;
maxs[0] = max;
- return IntRange.newIntersectsQuery(field.getName(), mins, maxs);
+ return IntRange.newContainsQuery(field.getName(), mins, maxs);
} else {
throw new SolrException(
ErrorCode.BAD_REQUEST,
diff --git a/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java b/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java
index a991827d80e..4264d85e360 100644
--- a/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java
+++ b/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java
@@ -28,6 +28,7 @@ import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrRequestInfo;
import org.apache.solr.response.SolrQueryResponse;
+import org.apache.solr.search.numericrange.IntRangeQParserPlugin;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -55,7 +56,10 @@ public class QueryEqualityTest extends SolrTestCaseJ4 {
public static void afterClassParserCoverageTest() {
if (!doAssertParserCoverage) return;
- for (String name : QParserPlugin.standardPlugins.keySet()) {
+
+ final var qParsersToTest = new HashSet<>(QParserPlugin.standardPlugins.keySet());
+ qParsersToTest.remove(IntRangeQParserPlugin.NAME); // Tested in IntRangeQParserPluginTest
+ for (String name : qParsersToTest) {
assertTrue(
"testParserCoverage was run w/o any other method explicitly testing qparser: " + name,
qParsersTested.contains(name));