You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2017/07/20 13:12:14 UTC
[2/3] lucene-solr:branch_7x: LUCENE-7892: Add missing "Slow" to
doc-value query factory methods.
LUCENE-7892: Add missing "Slow" to doc-value query factory methods.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c270f780
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c270f780
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c270f780
Branch: refs/heads/branch_7x
Commit: c270f780b1612ede6254aa92ba90cfd4dcc1b92d
Parents: b0f9a76
Author: Adrien Grand <jp...@gmail.com>
Authored: Thu Jul 20 15:10:11 2017 +0200
Committer: Adrien Grand <jp...@gmail.com>
Committed: Thu Jul 20 15:11:03 2017 +0200
----------------------------------------------------------------------
.../lucene/document/SortedDocValuesField.java | 6 ++---
.../document/SortedSetDocValuesField.java | 6 ++---
.../lucene/search/TestDocValuesQueries.java | 28 ++++++++++----------
.../apache/solr/schema/ICUCollationField.java | 2 +-
.../org/apache/solr/schema/CollationField.java | 2 +-
.../java/org/apache/solr/schema/FieldType.java | 2 +-
6 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c270f780/lucene/core/src/java/org/apache/lucene/document/SortedDocValuesField.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/document/SortedDocValuesField.java b/lucene/core/src/java/org/apache/lucene/document/SortedDocValuesField.java
index feb7725..80b4085 100644
--- a/lucene/core/src/java/org/apache/lucene/document/SortedDocValuesField.java
+++ b/lucene/core/src/java/org/apache/lucene/document/SortedDocValuesField.java
@@ -79,7 +79,7 @@ public class SortedDocValuesField extends Field {
* alongside a range query that executes on points, such as
* {@link BinaryPoint#newRangeQuery}.
*/
- public static Query newRangeQuery(String field,
+ public static Query newSlowRangeQuery(String field,
BytesRef lowerValue, BytesRef upperValue,
boolean lowerInclusive, boolean upperInclusive) {
return new SortedSetDocValuesRangeQuery(field, lowerValue, upperValue, lowerInclusive, upperInclusive) {
@@ -98,7 +98,7 @@ public class SortedDocValuesField extends Field {
* alongside a range query that executes on points, such as
* {@link BinaryPoint#newExactQuery}.
*/
- public static Query newExactQuery(String field, BytesRef value) {
- return newRangeQuery(field, value, value, true, true);
+ public static Query newSlowExactQuery(String field, BytesRef value) {
+ return newSlowRangeQuery(field, value, value, true, true);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c270f780/lucene/core/src/java/org/apache/lucene/document/SortedSetDocValuesField.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/document/SortedSetDocValuesField.java b/lucene/core/src/java/org/apache/lucene/document/SortedSetDocValuesField.java
index 26b1907..13bb961 100644
--- a/lucene/core/src/java/org/apache/lucene/document/SortedSetDocValuesField.java
+++ b/lucene/core/src/java/org/apache/lucene/document/SortedSetDocValuesField.java
@@ -79,7 +79,7 @@ public class SortedSetDocValuesField extends Field {
* alongside a range query that executes on points, such as
* {@link BinaryPoint#newRangeQuery}.
*/
- public static Query newRangeQuery(String field,
+ public static Query newSlowRangeQuery(String field,
BytesRef lowerValue, BytesRef upperValue,
boolean lowerInclusive, boolean upperInclusive) {
return new SortedSetDocValuesRangeQuery(field, lowerValue, upperValue, lowerInclusive, upperInclusive) {
@@ -100,7 +100,7 @@ public class SortedSetDocValuesField extends Field {
* alongside a range query that executes on points, such as
* {@link BinaryPoint#newExactQuery}.
*/
- public static Query newExactQuery(String field, BytesRef value) {
- return newRangeQuery(field, value, value, true, true);
+ public static Query newSlowExactQuery(String field, BytesRef value) {
+ return newSlowRangeQuery(field, value, value, true, true);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c270f780/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java
index 0591278..43fae3e 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java
@@ -141,12 +141,12 @@ public class TestDocValuesQueries extends LuceneTestCase {
final Query q1 = LongPoint.newRangeQuery("idx", min, max);
final Query q2;
if (sortedSet) {
- q2 = SortedSetDocValuesField.newRangeQuery("dv",
+ q2 = SortedSetDocValuesField.newSlowRangeQuery("dv",
min == Long.MIN_VALUE && random().nextBoolean() ? null : new BytesRef(encodedMin),
max == Long.MAX_VALUE && random().nextBoolean() ? null : new BytesRef(encodedMax),
includeMin, includeMax);
} else {
- q2 = SortedDocValuesField.newRangeQuery("dv",
+ q2 = SortedDocValuesField.newSlowRangeQuery("dv",
min == Long.MIN_VALUE && random().nextBoolean() ? null : new BytesRef(encodedMin),
max == Long.MAX_VALUE && random().nextBoolean() ? null : new BytesRef(encodedMax),
includeMin, includeMax);
@@ -191,11 +191,11 @@ public class TestDocValuesQueries extends LuceneTestCase {
QueryUtils.checkUnequal(q1, SortedNumericDocValuesField.newSlowRangeQuery("foo", 4, 5));
QueryUtils.checkUnequal(q1, SortedNumericDocValuesField.newSlowRangeQuery("bar", 3, 5));
- Query q2 = SortedSetDocValuesField.newRangeQuery("foo", new BytesRef("bar"), new BytesRef("baz"), true, true);
- QueryUtils.checkEqual(q2, SortedSetDocValuesField.newRangeQuery("foo", new BytesRef("bar"), new BytesRef("baz"), true, true));
- QueryUtils.checkUnequal(q2, SortedSetDocValuesField.newRangeQuery("foo", new BytesRef("baz"), new BytesRef("baz"), true, true));
- QueryUtils.checkUnequal(q2, SortedSetDocValuesField.newRangeQuery("foo", new BytesRef("bar"), new BytesRef("bar"), true, true));
- QueryUtils.checkUnequal(q2, SortedSetDocValuesField.newRangeQuery("quux", new BytesRef("bar"), new BytesRef("baz"), true, true));
+ Query q2 = SortedSetDocValuesField.newSlowRangeQuery("foo", new BytesRef("bar"), new BytesRef("baz"), true, true);
+ QueryUtils.checkEqual(q2, SortedSetDocValuesField.newSlowRangeQuery("foo", new BytesRef("bar"), new BytesRef("baz"), true, true));
+ QueryUtils.checkUnequal(q2, SortedSetDocValuesField.newSlowRangeQuery("foo", new BytesRef("baz"), new BytesRef("baz"), true, true));
+ QueryUtils.checkUnequal(q2, SortedSetDocValuesField.newSlowRangeQuery("foo", new BytesRef("bar"), new BytesRef("bar"), true, true));
+ QueryUtils.checkUnequal(q2, SortedSetDocValuesField.newSlowRangeQuery("quux", new BytesRef("bar"), new BytesRef("baz"), true, true));
}
public void testToString() {
@@ -204,15 +204,15 @@ public class TestDocValuesQueries extends LuceneTestCase {
assertEquals("[3 TO 5]", q1.toString("foo"));
assertEquals("foo:[3 TO 5]", q1.toString("bar"));
- Query q2 = SortedSetDocValuesField.newRangeQuery("foo", new BytesRef("bar"), new BytesRef("baz"), true, true);
+ Query q2 = SortedSetDocValuesField.newSlowRangeQuery("foo", new BytesRef("bar"), new BytesRef("baz"), true, true);
assertEquals("foo:[[62 61 72] TO [62 61 7a]]", q2.toString());
- q2 = SortedSetDocValuesField.newRangeQuery("foo", new BytesRef("bar"), new BytesRef("baz"), false, true);
+ q2 = SortedSetDocValuesField.newSlowRangeQuery("foo", new BytesRef("bar"), new BytesRef("baz"), false, true);
assertEquals("foo:{[62 61 72] TO [62 61 7a]]", q2.toString());
- q2 = SortedSetDocValuesField.newRangeQuery("foo", new BytesRef("bar"), new BytesRef("baz"), false, false);
+ q2 = SortedSetDocValuesField.newSlowRangeQuery("foo", new BytesRef("bar"), new BytesRef("baz"), false, false);
assertEquals("foo:{[62 61 72] TO [62 61 7a]}", q2.toString());
- q2 = SortedSetDocValuesField.newRangeQuery("foo", new BytesRef("bar"), null, true, true);
+ q2 = SortedSetDocValuesField.newSlowRangeQuery("foo", new BytesRef("bar"), null, true, true);
assertEquals("foo:[[62 61 72] TO *}", q2.toString());
- q2 = SortedSetDocValuesField.newRangeQuery("foo", null, new BytesRef("baz"), true, true);
+ q2 = SortedSetDocValuesField.newSlowRangeQuery("foo", null, new BytesRef("baz"), true, true);
assertEquals("foo:{* TO [62 61 7a]]", q2.toString());
assertEquals("{* TO [62 61 7a]]", q2.toString("foo"));
assertEquals("foo:{* TO [62 61 7a]]", q2.toString("bar"));
@@ -228,8 +228,8 @@ public class TestDocValuesQueries extends LuceneTestCase {
for (Query query : Arrays.asList(
NumericDocValuesField.newSlowRangeQuery("foo", 2, 4),
SortedNumericDocValuesField.newSlowRangeQuery("foo", 2, 4),
- SortedDocValuesField.newRangeQuery("foo", new BytesRef("abc"), new BytesRef("bcd"), random().nextBoolean(), random().nextBoolean()),
- SortedSetDocValuesField.newRangeQuery("foo", new BytesRef("abc"), new BytesRef("bcd"), random().nextBoolean(), random().nextBoolean()))) {
+ SortedDocValuesField.newSlowRangeQuery("foo", new BytesRef("abc"), new BytesRef("bcd"), random().nextBoolean(), random().nextBoolean()),
+ SortedSetDocValuesField.newSlowRangeQuery("foo", new BytesRef("abc"), new BytesRef("bcd"), random().nextBoolean(), random().nextBoolean()))) {
Weight w = searcher.createNormalizedWeight(query, random().nextBoolean());
assertNull(w.scorer(searcher.getIndexReader().leaves().get(0)));
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c270f780/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java
----------------------------------------------------------------------
diff --git a/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java b/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java
index 79cb6b3..f723a25 100644
--- a/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java
+++ b/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java
@@ -271,7 +271,7 @@ public class ICUCollationField extends FieldType {
BytesRef low = part1 == null ? null : getCollationKey(f, part1);
BytesRef high = part2 == null ? null : getCollationKey(f, part2);
if (!field.indexed() && field.hasDocValues()) {
- return SortedSetDocValuesField.newRangeQuery(
+ return SortedSetDocValuesField.newSlowRangeQuery(
field.getName(), low, high, minInclusive, maxInclusive);
} else {
return new TermRangeQuery(field.getName(), low, high, minInclusive, maxInclusive);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c270f780/solr/core/src/java/org/apache/solr/schema/CollationField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/CollationField.java b/solr/core/src/java/org/apache/solr/schema/CollationField.java
index c6a4f81..b8285aa 100644
--- a/solr/core/src/java/org/apache/solr/schema/CollationField.java
+++ b/solr/core/src/java/org/apache/solr/schema/CollationField.java
@@ -241,7 +241,7 @@ public class CollationField extends FieldType {
BytesRef low = part1 == null ? null : getCollationKey(f, part1);
BytesRef high = part2 == null ? null : getCollationKey(f, part2);
if (!field.indexed() && field.hasDocValues()) {
- return SortedSetDocValuesField.newRangeQuery(
+ return SortedSetDocValuesField.newSlowRangeQuery(
field.getName(), low, high, minInclusive, maxInclusive);
} else {
return new TermRangeQuery(field.getName(), low, high, minInclusive, maxInclusive);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c270f780/solr/core/src/java/org/apache/solr/schema/FieldType.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/FieldType.java b/solr/core/src/java/org/apache/solr/schema/FieldType.java
index 388b659..26fc657 100644
--- a/solr/core/src/java/org/apache/solr/schema/FieldType.java
+++ b/solr/core/src/java/org/apache/solr/schema/FieldType.java
@@ -720,7 +720,7 @@ public abstract class FieldType extends FieldProperties {
final BytesRef miValue = part1 == null ? null : new BytesRef(toInternal(part1));
final BytesRef maxValue = part2 == null ? null : new BytesRef(toInternal(part2));
if (field.hasDocValues() && !field.indexed()) {
- return SortedSetDocValuesField.newRangeQuery(
+ return SortedSetDocValuesField.newSlowRangeQuery(
field.getName(),
miValue, maxValue,
minInclusive, maxInclusive);