Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove useless abstractions in DocValues-based queries (#12127) 

There's no need to make things abstract: DocValues does the right thing
Optimizing for where no docs for the field in the segment exist is easy, simple null check (replacing the existing one!)
This commit is contained in:
Robert Muir 2023-02-06 11:49:25 -05:00 committed by GitHub
parent 684f31ef06
commit a6bceb7cf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 18 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lucene/core/src/java/org/apache/lucene/document/NumericDocValuesField.java
View File

@ -16,12 +16,7 @@
*/
package org.apache.lucene.document;
import java.io.IOException;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.DocValuesType;
import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.index.SortedNumericDocValues;
import org.apache.lucene.search.IndexOrDocValuesQuery;
import org.apache.lucene.search.Query;
@ -90,16 +85,7 @@ public class NumericDocValuesField extends Field {
* @see DoubleField#newRangeQuery
*/
public static Query newSlowRangeQuery(String field, long lowerValue, long upperValue) {
return new SortedNumericDocValuesRangeQuery(field, lowerValue, upperValue) {
@Override
SortedNumericDocValues getValues(LeafReader reader, String field) throws IOException {
NumericDocValues values = reader.getNumericDocValues(field);
if (values == null) {
return null;
}
return DocValues.singleton(values);
}
};
return new SortedNumericDocValuesRangeQuery(field, lowerValue, upperValue);
}
/**
@ -116,16 +102,7 @@ public class NumericDocValuesField extends Field {
* @see DoubleField#newSetQuery
*/
public static Query newSlowSetQuery(String field, long... values) {
return new SortedNumericDocValuesSetQuery(field, values.clone()) {
@Override
SortedNumericDocValues getValues(LeafReader reader, String field) throws IOException {
NumericDocValues values = reader.getNumericDocValues(field);
if (values == null) {
return null;
}
return DocValues.singleton(values);
}
};
return new SortedNumericDocValuesSetQuery(field, values.clone());
}
/**

11
lucene/core/src/java/org/apache/lucene/document/SortedDocValuesField.java
View File

@ -16,11 +16,7 @@
*/
package org.apache.lucene.document;
import java.io.IOException;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.DocValuesType;
import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.SortedSetDocValues;
import org.apache.lucene.search.IndexOrDocValuesQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.util.BytesRef;
@ -78,12 +74,7 @@ public class SortedDocValuesField extends Field {
boolean lowerInclusive,
boolean upperInclusive) {
return new SortedSetDocValuesRangeQuery(
field, lowerValue, upperValue, lowerInclusive, upperInclusive) {
@Override
SortedSetDocValues getValues(LeafReader reader, String field) throws IOException {
return DocValues.singleton(DocValues.getSorted(reader, field));
}
};
field, lowerValue, upperValue, lowerInclusive, upperInclusive);
}
/**

31
lucene/core/src/java/org/apache/lucene/document/SortedNumericDocValuesField.java
View File

@ -16,12 +16,7 @@
*/
package org.apache.lucene.document;
import java.io.IOException;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.DocValuesType;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.SortedNumericDocValues;
import org.apache.lucene.search.IndexOrDocValuesQuery;
import org.apache.lucene.search.Query;
@ -88,18 +83,7 @@ public class SortedNumericDocValuesField extends Field {
* @see DoubleField#newRangeQuery
*/
public static Query newSlowRangeQuery(String field, long lowerValue, long upperValue) {
return new SortedNumericDocValuesRangeQuery(field, lowerValue, upperValue) {
@Override
SortedNumericDocValues getValues(LeafReader reader, String field) throws IOException {
FieldInfo info = reader.getFieldInfos().fieldInfo(field);
if (info == null) {
// Queries have some optimizations when one sub scorer returns null rather
// than a scorer that does not match any documents
return null;
}
return DocValues.getSortedNumeric(reader, field);
}
};
return new SortedNumericDocValuesRangeQuery(field, lowerValue, upperValue);
}
/**
@ -116,18 +100,7 @@ public class SortedNumericDocValuesField extends Field {
* @see DoubleField#newSetQuery
*/
public static Query newSlowSetQuery(String field, long... values) {
return new SortedNumericDocValuesSetQuery(field, values.clone()) {
@Override
SortedNumericDocValues getValues(LeafReader reader, String field) throws IOException {
FieldInfo info = reader.getFieldInfos().fieldInfo(field);
if (info == null) {
// Queries have some optimizations when one sub scorer returns null rather
// than a scorer that does not match any documents
return null;
}
return DocValues.getSortedNumeric(reader, field);
}
};
return new SortedNumericDocValuesSetQuery(field, values.clone());
}
/**

15
lucene/core/src/java/org/apache/lucene/document/SortedNumericDocValuesRangeQuery.java
View File

@ -19,7 +19,6 @@ package org.apache.lucene.document;
import java.io.IOException;
import java.util.Objects;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.index.SortedNumericDocValues;
@ -34,7 +33,7 @@ import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.TwoPhaseIterator;
import org.apache.lucene.search.Weight;
abstract class SortedNumericDocValuesRangeQuery extends Query {
final class SortedNumericDocValuesRangeQuery extends Query {
private final String field;
private final long lowerValue;
@ -59,11 +58,7 @@ abstract class SortedNumericDocValuesRangeQuery extends Query {
@Override
public int hashCode() {
int h = classHash();
h = 31 * h + field.hashCode();
h = 31 * h + Long.hashCode(lowerValue);
h = 31 * h + Long.hashCode(upperValue);
return h;
return Objects.hash(classHash(), field, lowerValue, upperValue);
}
@Override
@ -95,8 +90,6 @@ abstract class SortedNumericDocValuesRangeQuery extends Query {
return super.rewrite(indexSearcher);
}
abstract SortedNumericDocValues getValues(LeafReader reader, String field) throws IOException;
@Override
public Weight createWeight(IndexSearcher searcher, ScoreMode scoreMode, float boost)
throws IOException {
@ -109,10 +102,10 @@ abstract class SortedNumericDocValuesRangeQuery extends Query {
@Override
public Scorer scorer(LeafReaderContext context) throws IOException {
SortedNumericDocValues values = getValues(context.reader(), field);
if (values == null) {
if (context.reader().getFieldInfos().fieldInfo(field) == null) {
return null;
}
SortedNumericDocValues values = DocValues.getSortedNumeric(context.reader(), field);
final NumericDocValues singleton = DocValues.unwrapSingleton(values);
final TwoPhaseIterator iterator;
if (singleton != null) {

11
lucene/core/src/java/org/apache/lucene/document/SortedNumericDocValuesSetQuery.java
View File

@ -19,7 +19,6 @@ package org.apache.lucene.document;
import java.io.IOException;
import java.util.Objects;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.index.SortedNumericDocValues;
@ -37,7 +36,7 @@ import org.apache.lucene.util.Accountable;
import org.apache.lucene.util.RamUsageEstimator;
/** Similar to SortedNumericDocValuesRangeQuery but for a set */
abstract class SortedNumericDocValuesSetQuery extends Query implements Accountable {
final class SortedNumericDocValuesSetQuery extends Query implements Accountable {
private static final long BASE_RAM_BYTES =
RamUsageEstimator.shallowSizeOfInstance(SortedNumericDocValuesSetQuery.class);
@ -60,7 +59,7 @@ abstract class SortedNumericDocValuesSetQuery extends Query implements Accountab
@Override
public int hashCode() {
return 31 * classHash() + Objects.hash(field, numbers);
return Objects.hash(classHash(), field, numbers);
}
@Override
@ -90,8 +89,6 @@ abstract class SortedNumericDocValuesSetQuery extends Query implements Accountab
return super.rewrite(indexSearcher);
}
abstract SortedNumericDocValues getValues(LeafReader reader, String field) throws IOException;
@Override
public Weight createWeight(IndexSearcher searcher, ScoreMode scoreMode, float boost)
throws IOException {
@ -104,10 +101,10 @@ abstract class SortedNumericDocValuesSetQuery extends Query implements Accountab
@Override
public Scorer scorer(LeafReaderContext context) throws IOException {
SortedNumericDocValues values = getValues(context.reader(), field);
if (values == null) {
if (context.reader().getFieldInfos().fieldInfo(field) == null) {
return null;
}
SortedNumericDocValues values = DocValues.getSortedNumeric(context.reader(), field);
final NumericDocValues singleton = DocValues.unwrapSingleton(values);
final TwoPhaseIterator iterator;
if (singleton != null) {

11
lucene/core/src/java/org/apache/lucene/document/SortedSetDocValuesField.java
View File

@ -16,11 +16,7 @@
*/
package org.apache.lucene.document;
import java.io.IOException;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.DocValuesType;
import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.SortedSetDocValues;
import org.apache.lucene.search.IndexOrDocValuesQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.util.BytesRef;
@ -78,12 +74,7 @@ public class SortedSetDocValuesField extends Field {
boolean lowerInclusive,
boolean upperInclusive) {
return new SortedSetDocValuesRangeQuery(
field, lowerValue, upperValue, lowerInclusive, upperInclusive) {
@Override
SortedSetDocValues getValues(LeafReader reader, String field) throws IOException {
return DocValues.getSortedSet(reader, field);
}
};
field, lowerValue, upperValue, lowerInclusive, upperInclusive);
}
/**

17
lucene/core/src/java/org/apache/lucene/document/SortedSetDocValuesRangeQuery.java
View File

@ -19,7 +19,6 @@ package org.apache.lucene.document;
import java.io.IOException;
import java.util.Objects;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.SortedDocValues;
import org.apache.lucene.index.SortedSetDocValues;
@ -35,7 +34,7 @@ import org.apache.lucene.search.TwoPhaseIterator;
import org.apache.lucene.search.Weight;
import org.apache.lucene.util.BytesRef;
abstract class SortedSetDocValuesRangeQuery extends Query {
final class SortedSetDocValuesRangeQuery extends Query {
private final String field;
private final BytesRef lowerValue;
@ -71,13 +70,7 @@ abstract class SortedSetDocValuesRangeQuery extends Query {
@Override
public int hashCode() {
int h = classHash();
h = 31 * h + field.hashCode();
h = 31 * h + Objects.hashCode(lowerValue);
h = 31 * h + Objects.hashCode(upperValue);
h = 31 * h + Boolean.hashCode(lowerInclusive);
h = 31 * h + Boolean.hashCode(upperInclusive);
return h;
return Objects.hash(classHash(), field, lowerValue, upperValue, lowerInclusive, upperInclusive);
}
@Override
@ -109,18 +102,16 @@ abstract class SortedSetDocValuesRangeQuery extends Query {
return super.rewrite(indexSearcher);
}
abstract SortedSetDocValues getValues(LeafReader reader, String field) throws IOException;
@Override
public Weight createWeight(IndexSearcher searcher, ScoreMode scoreMode, float boost)
throws IOException {
return new ConstantScoreWeight(this, boost) {
@Override
public Scorer scorer(LeafReaderContext context) throws IOException {
SortedSetDocValues values = getValues(context.reader(), field);
if (values == null) {
if (context.reader().getFieldInfos().fieldInfo(field) == null) {
return null;
}
SortedSetDocValues values = DocValues.getSortedSet(context.reader(), field);
final long minOrd;
if (lowerValue == null) {