You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by tf...@apache.org on 2016/10/21 06:54:22 UTC
[1/4] lucene-solr:jira/solr-8396: Disable Facet methods other than
FCS for PointFields
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-8396 f4c68cddb -> e2fe6fbfd
Disable Facet methods other than FCS for PointFields
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a5c3212a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a5c3212a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a5c3212a
Branch: refs/heads/jira/solr-8396
Commit: a5c3212a215edb1f14bca68ec61df32053e68f02
Parents: f4c68cd
Author: Tomas Fernandez Lobbe <tf...@apache.org>
Authored: Thu Oct 20 22:54:22 2016 -0700
Committer: Tomas Fernandez Lobbe <tf...@apache.org>
Committed: Thu Oct 20 22:54:22 2016 -0700
----------------------------------------------------------------------
.../src/java/org/apache/solr/request/SimpleFacets.java | 12 +++++++++---
.../test/org/apache/solr/request/TestFacetMethods.java | 12 ++++++++++++
2 files changed, 21 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a5c3212a/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/request/SimpleFacets.java b/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
index 538735e..17b5fd2 100644
--- a/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
+++ b/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
@@ -582,6 +582,10 @@ public class SimpleFacets {
static FacetMethod selectFacetMethod(SchemaField field, FacetMethod method, Integer mincount) {
FieldType type = field.getType();
+ if (type.isPointField()) {
+ // Only FCS is supported for PointFields for now
+ return FacetMethod.FCS;
+ }
/*The user did not specify any preference*/
if (method == null) {
@@ -845,7 +849,7 @@ public class SimpleFacets {
public NamedList<Integer> getFacetTermEnumCounts(SolrIndexSearcher searcher, DocSet docs, String field, int offset, int limit, int mincount, boolean missing,
String sort, String prefix, String contains, boolean ignoreCase, boolean intersectsCheck)
throws IOException {
-
+
/* :TODO: potential optimization...
* cache the Terms with the highest docFreq and try them first
* don't enum if we get our max from them
@@ -861,10 +865,12 @@ public class SimpleFacets {
fastForRandomSet = new HashDocSet(sset.getDocs(), 0, sset.size());
}
-
IndexSchema schema = searcher.getSchema();
- LeafReader r = searcher.getSlowAtomicReader();
FieldType ft = schema.getFieldType(field);
+ assert !ft.isPointField(): "Point Fields don't support enum method";
+
+ LeafReader r = searcher.getSlowAtomicReader();
+
boolean sortByCount = sort.equals("count") || sort.equals("true");
final int maxsize = limit>=0 ? offset+limit : Integer.MAX_VALUE-1;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a5c3212a/solr/core/src/test/org/apache/solr/request/TestFacetMethods.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/request/TestFacetMethods.java b/solr/core/src/test/org/apache/solr/request/TestFacetMethods.java
index 1da41f5..ea7c001 100644
--- a/solr/core/src/test/org/apache/solr/request/TestFacetMethods.java
+++ b/solr/core/src/test/org/apache/solr/request/TestFacetMethods.java
@@ -17,7 +17,9 @@
package org.apache.solr.request;
+import org.apache.solr.request.SimpleFacets.FacetMethod;
import org.apache.solr.schema.BoolField;
+import org.apache.solr.schema.IntPointField;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.schema.StrField;
import org.apache.solr.schema.TrieIntField;
@@ -203,5 +205,15 @@ public class TestFacetMethods {
assertEquals(SimpleFacets.FacetMethod.ENUM, SimpleFacets.selectFacetMethod(field, null, 1));
}
+
+ @Test
+ public void testPointFields() {
+ // Methods other than FCS are not currently supported for PointFields
+ SchemaField field = new SchemaField("foo", new IntPointField());
+ assertEquals(SimpleFacets.FacetMethod.FCS, SimpleFacets.selectFacetMethod(field, null, 0));
+ assertEquals(SimpleFacets.FacetMethod.FCS, SimpleFacets.selectFacetMethod(field, FacetMethod.ENUM, 0));
+ assertEquals(SimpleFacets.FacetMethod.FCS, SimpleFacets.selectFacetMethod(field, FacetMethod.FC, 0));
+ assertEquals(SimpleFacets.FacetMethod.FCS, SimpleFacets.selectFacetMethod(field, FacetMethod.FCS, 0));
+ }
}
[3/4] lucene-solr:jira/solr-8396: Add support for TermQParser and
TermsQParser
Posted by tf...@apache.org.
Add support for TermQParser and TermsQParser
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ebc1054b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ebc1054b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ebc1054b
Branch: refs/heads/jira/solr-8396
Commit: ebc1054bfa2178daef66bd1b155922de828f3743
Parents: cec0362
Author: Tomas Fernandez Lobbe <tf...@apache.org>
Authored: Thu Oct 20 22:55:15 2016 -0700
Committer: Tomas Fernandez Lobbe <tf...@apache.org>
Committed: Thu Oct 20 22:55:15 2016 -0700
----------------------------------------------------------------------
.../apache/solr/schema/DoublePointField.java | 10 +++
.../org/apache/solr/schema/FloatPointField.java | 10 +++
.../org/apache/solr/schema/IntPointField.java | 11 +++
.../org/apache/solr/schema/LongPointField.java | 10 +++
.../java/org/apache/solr/schema/PointField.java | 2 +
.../apache/solr/search/TermQParserPlugin.java | 10 ++-
.../apache/solr/search/TermsQParserPlugin.java | 9 +++
.../test/org/apache/solr/TestPointFields.java | 71 ++++++++++++++++++--
8 files changed, 125 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ebc1054b/solr/core/src/java/org/apache/solr/schema/DoublePointField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/DoublePointField.java b/solr/core/src/java/org/apache/solr/schema/DoublePointField.java
index 7729d03..b9f54ae 100644
--- a/solr/core/src/java/org/apache/solr/schema/DoublePointField.java
+++ b/solr/core/src/java/org/apache/solr/schema/DoublePointField.java
@@ -101,6 +101,16 @@ public class DoublePointField extends PointField implements DoubleValueFieldType
// TODO: better handling of string->int conversion
return DoublePoint.newExactQuery(field.getName(), Double.parseDouble(externalVal));
}
+
+ @Override
+ public Query getSetQuery(SchemaField field, String[] externalVal) {
+ assert externalVal.length > 0;
+ double[] values = new double[externalVal.length];
+ for (int i = 0; i < externalVal.length; i++) {
+ values[i] = Double.parseDouble(externalVal[i]);
+ }
+ return DoublePoint.newSetQuery(field.getName(), values);
+ }
@Override
protected String indexedToReadable(BytesRef indexedForm) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ebc1054b/solr/core/src/java/org/apache/solr/schema/FloatPointField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/FloatPointField.java b/solr/core/src/java/org/apache/solr/schema/FloatPointField.java
index 2098e37..94a5dda 100644
--- a/solr/core/src/java/org/apache/solr/schema/FloatPointField.java
+++ b/solr/core/src/java/org/apache/solr/schema/FloatPointField.java
@@ -100,6 +100,16 @@ public class FloatPointField extends PointField implements FloatValueFieldType {
protected Query getExactQuery(QParser parser, SchemaField field, String externalVal) {
return FloatPoint.newExactQuery(field.getName(), Float.parseFloat(externalVal));
}
+
+ @Override
+ public Query getSetQuery(SchemaField field, String[] externalVal) {
+ assert externalVal.length > 0;
+ float[] values = new float[externalVal.length];
+ for (int i = 0; i < externalVal.length; i++) {
+ values[i] = Float.parseFloat(externalVal[i]);
+ }
+ return FloatPoint.newSetQuery(field.getName(), values);
+ }
@Override
protected String indexedToReadable(BytesRef indexedForm) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ebc1054b/solr/core/src/java/org/apache/solr/schema/IntPointField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/IntPointField.java b/solr/core/src/java/org/apache/solr/schema/IntPointField.java
index ba3d735..89f40c1 100644
--- a/solr/core/src/java/org/apache/solr/schema/IntPointField.java
+++ b/solr/core/src/java/org/apache/solr/schema/IntPointField.java
@@ -69,6 +69,7 @@ public class IntPointField extends PointField implements IntValueFieldType {
return super.toNativeType(val);
}
+ @Override
public Query getRangeQuery(QParser parser, SchemaField field, String min, String max, boolean minInclusive,
boolean maxInclusive) {
int actualMin, actualMax;
@@ -111,6 +112,16 @@ public class IntPointField extends PointField implements IntValueFieldType {
// TODO: better handling of string->int conversion
return IntPoint.newExactQuery(field.getName(), Integer.parseInt(externalVal));
}
+
+ @Override
+ public Query getSetQuery(SchemaField field, String[] externalVal) {
+ assert externalVal.length > 0;
+ int[] values = new int[externalVal.length];
+ for (int i = 0; i < externalVal.length; i++) {
+ values[i] = Integer.parseInt(externalVal[i]);
+ }
+ return IntPoint.newSetQuery(field.getName(), values);
+ }
@Override
protected String indexedToReadable(BytesRef indexedForm) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ebc1054b/solr/core/src/java/org/apache/solr/schema/LongPointField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/LongPointField.java b/solr/core/src/java/org/apache/solr/schema/LongPointField.java
index 29d0ea2..c414ab5 100644
--- a/solr/core/src/java/org/apache/solr/schema/LongPointField.java
+++ b/solr/core/src/java/org/apache/solr/schema/LongPointField.java
@@ -100,6 +100,16 @@ public class LongPointField extends PointField implements LongValueFieldType {
protected Query getExactQuery(QParser parser, SchemaField field, String externalVal) {
return LongPoint.newExactQuery(field.getName(), Long.parseLong(externalVal));
}
+
+ @Override
+ public Query getSetQuery(SchemaField field, String[] externalVal) {
+ assert externalVal.length > 0;
+ long[] values = new long[externalVal.length];
+ for (int i = 0; i < externalVal.length; i++) {
+ values[i] = Long.parseLong(externalVal[i]);
+ }
+ return LongPoint.newSetQuery(field.getName(), values);
+ }
@Override
protected String indexedToReadable(BytesRef indexedForm) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ebc1054b/solr/core/src/java/org/apache/solr/schema/PointField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/PointField.java b/solr/core/src/java/org/apache/solr/schema/PointField.java
index e496cf0..161e0ac 100644
--- a/solr/core/src/java/org/apache/solr/schema/PointField.java
+++ b/solr/core/src/java/org/apache/solr/schema/PointField.java
@@ -128,6 +128,8 @@ public abstract class PointField extends PrimitiveFieldType {
return type;
}
+ public abstract Query getSetQuery(SchemaField field, String[] externalVal);
+
@Override
public Query getFieldQuery(QParser parser, SchemaField field, String externalVal) {
if (!field.indexed() && field.hasDocValues()) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ebc1054b/solr/core/src/java/org/apache/solr/search/TermQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/TermQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/TermQParserPlugin.java
index 99ef4c4..89b3d28 100644
--- a/solr/core/src/java/org/apache/solr/search/TermQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/TermQParserPlugin.java
@@ -50,10 +50,16 @@ public class TermQParserPlugin extends QParserPlugin {
String fname = localParams.get(QueryParsing.F);
FieldType ft = req.getSchema().getFieldTypeNoEx(fname);
String val = localParams.get(QueryParsing.V);
- BytesRefBuilder term = new BytesRefBuilder();
+ BytesRefBuilder term;
if (ft != null) {
- ft.readableToIndexed(val, term);
+ if (ft.isPointField()) {
+ return ft.getFieldQuery(this, req.getSchema().getField(fname), val);
+ } else {
+ term = new BytesRefBuilder();
+ ft.readableToIndexed(val, term);
+ }
} else {
+ term = new BytesRefBuilder();
term.copyChars(val);
}
return new TermQuery(new Term(fname, term.get()));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ebc1054b/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java
index d53dcbf..69691aa 100644
--- a/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java
@@ -35,6 +35,7 @@ import org.apache.lucene.util.automaton.Automaton;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.schema.FieldType;
+import org.apache.solr.schema.PointField;
/**
* Finds documents whose specified field has any of the specified values. It's like
@@ -110,6 +111,14 @@ public class TermsQParserPlugin extends QParserPlugin {
return new MatchNoDocsQuery();
final String[] splitVals = sepIsSpace ? qstr.split("\\s+") : qstr.split(Pattern.quote(separator), -1);
assert splitVals.length > 0;
+
+ if (ft.isPointField()) {
+ if (localParams.get(METHOD) != null) {
+ throw new IllegalArgumentException(
+ String.format("Method '%s' not supported in TermsQParser when using PointFields", localParams.get(METHOD)));
+ }
+ return ((PointField)ft).getSetQuery(req.getSchema().getField(fname), splitVals);
+ }
BytesRef[] bytesRefs = new BytesRef[splitVals.length];
BytesRefBuilder term = new BytesRefBuilder();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ebc1054b/solr/core/src/test/org/apache/solr/TestPointFields.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/TestPointFields.java b/solr/core/src/test/org/apache/solr/TestPointFields.java
index d39a303..cf063ca 100644
--- a/solr/core/src/test/org/apache/solr/TestPointFields.java
+++ b/solr/core/src/test/org/apache/solr/TestPointFields.java
@@ -244,6 +244,13 @@ public class TestPointFields extends SolrTestCaseJ4 {
testIntPointFieldsAtomicUpdates("number_p_i_dv_ns", "int");
}
+ @Test
+ public void testIntPointSetQuery() throws Exception {
+ doTestSetQueries("number_p_i", getRandomStringArrayWithInts(10, false), false);
+ doTestSetQueries("number_p_i_mv", getRandomStringArrayWithInts(10, false), true);
+ doTestSetQueries("number_p_i_ni_dv", getRandomStringArrayWithInts(10, false), false);
+ }
+
// DoublePointField
@Test
@@ -458,6 +465,13 @@ public class TestPointFields extends SolrTestCaseJ4 {
"//result/doc[1]/" + type + "[@name='" + field + "'][.<'4.15']");
}
+ @Test
+ public void testDoublePointSetQuery() throws Exception {
+ doTestSetQueries("number_p_d", getRandomStringArrayWithDoubles(10, false), false);
+ doTestSetQueries("number_p_d_mv", getRandomStringArrayWithDoubles(10, false), true);
+ doTestSetQueries("number_p_d_ni_dv", getRandomStringArrayWithDoubles(10, false), false);
+ }
+
// Float
@@ -545,6 +559,14 @@ public class TestPointFields extends SolrTestCaseJ4 {
doTestFloatPointFieldsAtomicUpdates("number_p_f_dv_ns", "float");
}
+
+ @Test
+ public void testFloatPointSetQuery() throws Exception {
+ doTestSetQueries("number_p_f", getRandomStringArrayWithFloats(10, false), false);
+ doTestSetQueries("number_p_f_mv", getRandomStringArrayWithFloats(10, false), true);
+ doTestSetQueries("number_p_f_ni_dv", getRandomStringArrayWithFloats(10, false), false);
+ }
+
// Long
@Test
@@ -624,6 +646,13 @@ public class TestPointFields extends SolrTestCaseJ4 {
testIntPointFieldsAtomicUpdates("number_p_l_dv_ns", "long");
}
+ @Test
+ public void testLongPointSetQuery() throws Exception {
+ doTestSetQueries("number_p_l", getRandomStringArrayWithLongs(10, false), false);
+ doTestSetQueries("number_p_l_mv", getRandomStringArrayWithLongs(10, false), true);
+ doTestSetQueries("number_p_l_ni_dv", getRandomStringArrayWithLongs(10, false), false);
+ }
+
// Helper methods
private String[] getRandomStringArrayWithDoubles(int length, boolean sorted) {
@@ -872,12 +901,6 @@ public class TestPointFields extends SolrTestCaseJ4 {
"//lst[@name='facet_counts']/lst[@name='facet_fields']/lst[@name='" + docValuesField +"']/int[@name='" + numbers[2] + "'][.='1']",
"//lst[@name='facet_counts']/lst[@name='facet_fields']/lst[@name='" + docValuesField +"']/int[@name='" + numbers[3] + "'][.='1']");
- assertQ(req("q", "*:*", "fl", "id, " + docValuesField, "facet", "true", "facet.field", docValuesField, "facet.method", "enum"),
- "//*[@numFound='10']",
- "//lst[@name='facet_counts']/lst[@name='facet_fields']/lst[@name='" + docValuesField +"']/int[@name='" + numbers[1] + "'][.='1']",
- "//lst[@name='facet_counts']/lst[@name='facet_fields']/lst[@name='" + docValuesField +"']/int[@name='" + numbers[2] + "'][.='1']",
- "//lst[@name='facet_counts']/lst[@name='facet_fields']/lst[@name='" + docValuesField +"']/int[@name='" + numbers[3] + "'][.='1']");
-
assertU(adoc("id", "10", docValuesField, numbers[1], nonDocValuesField, numbers[1]));
assertU(commit());
@@ -1433,4 +1456,40 @@ public class TestPointFields extends SolrTestCaseJ4 {
req("q", "*:*", "fl", "id, " + nonDvFieldName, "sort", "product(-1," + nonDvFieldName + ") asc"),
SolrException.ErrorCode.BAD_REQUEST);
}
+
+ private void doTestSetQueries(String fieldName, String[] values, boolean multiValued) {
+ for (int i = 0; i < values.length; i++) {
+ assertU(adoc("id", String.valueOf(i), fieldName, values[i]));
+ }
+ assertU(commit());
+ assertTrue(h.getCore().getLatestSchema().getField(fieldName).getType() instanceof PointField);
+
+ for (int i = 0; i < values.length; i++) {
+ assertQ(req("q", "{!term f='" + fieldName + "'}" + values[i], "fl", "id," + fieldName),
+ "//*[@numFound='1']");
+ }
+
+ for (int i = 0; i < values.length; i++) {
+ assertQ(req("q", "{!terms f='" + fieldName + "'}" + values[i] + "," + values[(i + 1)%values.length], "fl", "id," + fieldName),
+ "//*[@numFound='2']");
+ }
+
+ if (multiValued) {
+ clearIndex();
+ assertU(commit());
+ for (int i = 0; i < values.length; i++) {
+ assertU(adoc("id", String.valueOf(i), fieldName, values[i], fieldName, values[(i+1)%values.length]));
+ }
+ assertU(commit());
+ for (int i = 0; i < values.length; i++) {
+ assertQ(req("q", "{!term f='" + fieldName + "'}" + values[i], "fl", "id," + fieldName),
+ "//*[@numFound='2']");
+ }
+
+ for (int i = 0; i < values.length; i++) {
+ assertQ(req("q", "{!terms f='" + fieldName + "'}" + values[i] + "," + values[(i + 1)%values.length], "fl", "id," + fieldName),
+ "//*[@numFound='3']");
+ }
+ }
+ }
}
[2/4] lucene-solr:jira/solr-8396: Pivot faceting not currently
supported with PointFields
Posted by tf...@apache.org.
Pivot faceting not currently supported with PointFields
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/cec03629
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/cec03629
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/cec03629
Branch: refs/heads/jira/solr-8396
Commit: cec036290002f89ddfc5e42ad7795f7a333efc92
Parents: a5c3212
Author: Tomas Fernandez Lobbe <tf...@apache.org>
Authored: Thu Oct 20 22:54:44 2016 -0700
Committer: Tomas Fernandez Lobbe <tf...@apache.org>
Committed: Thu Oct 20 22:54:44 2016 -0700
----------------------------------------------------------------------
solr/core/src/test/org/apache/solr/cloud/TestCloudPivotFacet.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cec03629/solr/core/src/test/org/apache/solr/cloud/TestCloudPivotFacet.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudPivotFacet.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudPivotFacet.java
index 460c501..b13cb78 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudPivotFacet.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudPivotFacet.java
@@ -29,6 +29,7 @@ import java.util.Set;
import org.apache.commons.lang.StringUtils;
import org.apache.lucene.util.TestUtil;
import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
+import org.apache.solr.SolrTestCaseJ4.SuppressPointFields;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.response.FieldStatsInfo;
import org.apache.solr.client.solrj.response.PivotField;
@@ -78,6 +79,7 @@ import static org.apache.solr.common.params.FacetParams.FACET_DISTRIB_MCO;
*
*/
@SuppressSSL // Too Slow
+@SuppressPointFields
public class TestCloudPivotFacet extends AbstractFullDistribZkTestBase {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
[4/4] lucene-solr:jira/solr-8396: Fixed test
Posted by tf...@apache.org.
Fixed test
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e2fe6fbf
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e2fe6fbf
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e2fe6fbf
Branch: refs/heads/jira/solr-8396
Commit: e2fe6fbfd99106d7724aeff5d616d189e796b490
Parents: ebc1054
Author: Tomas Fernandez Lobbe <tf...@apache.org>
Authored: Thu Oct 20 23:01:14 2016 -0700
Committer: Tomas Fernandez Lobbe <tf...@apache.org>
Committed: Thu Oct 20 23:01:14 2016 -0700
----------------------------------------------------------------------
.../src/test/org/apache/solr/search/TestMaxScoreQueryParser.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e2fe6fbf/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java b/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java
index 6059528..610e998 100644
--- a/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java
+++ b/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java
@@ -46,7 +46,7 @@ public class TestMaxScoreQueryParser extends AbstractSolrTestCase {
assertEquals(new BoostQuery(new TermQuery(new Term("text", "foo")), 3f), q);
q = parse("price:[0 TO 10]");
- assertTrue(q instanceof LegacyNumericRangeQuery);
+ assertTrue(q instanceof LegacyNumericRangeQuery || q instanceof PointRangeQuery);
}
@Test