Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lucene/CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@ New Features
* GITHUB#14565: Add ParentsChildrenBlockJoinQuery that supports parent and child filter in the same query
along with limiting number of child documents to retrieve per parent. (Jinny Wang)

* GITHUB#14776: Add a Rescorer that uses values from provided DoubleValuesSource to re-score
first pass hits. (Vigya Sharma)

Improvements
---------------------
* GITHUB#14458: Add an IndexDeletion policy that retains the last N commits. (Owais Kazi)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.lucene.search;

import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.util.ArrayUtil;

/** A {@link Rescorer} that uses provided DoubleValuesSource to rescore first pass hits. */
public abstract class DoubleValuesSourceRescorer extends Rescorer {

private final DoubleValuesSource valuesSource;

public DoubleValuesSourceRescorer(DoubleValuesSource valuesSource) {
this.valuesSource = valuesSource;
}

/**
* Implement this in a subclass to combine the first pass scores with values from the
* DoubleValuesSource
*
* @param firstPassScore Score from firstPassTopDocs
* @param valuePresent true if DoubleValuesSource has a value for the hit from first pass
* @param sourceValue Value returned from DoubleValuesSource
*/
protected abstract float combine(float firstPassScore, boolean valuePresent, double sourceValue);

@Override
public TopDocs rescore(IndexSearcher searcher, TopDocs firstPassTopDocs, int topN)
throws IOException {
DoubleValuesSource source = valuesSource.rewrite(searcher);
// this will still alter scores, we clone to retain hits ordering in firstPassTopDocs
ScoreDoc[] hits = firstPassTopDocs.scoreDocs.clone();
Arrays.sort(hits, (a, b) -> a.doc - b.doc);

List<LeafReaderContext> leaves = searcher.getIndexReader().leaves();
LeafReaderContext ctx = leaves.getFirst();
int currLeaf = 0;
int leafEnd = ctx.docBase + ctx.reader().maxDoc();

// find leaf holding this doc
for (ScoreDoc hit : hits) {
while (hit.doc >= leafEnd) {
if (currLeaf == leaves.size() - 1) {
throw new IllegalStateException(
"hit docId="
+ hit.doc
+ "greater than last searcher leaf maxDoc="
+ leafEnd
+ " Ensure firstPassTopDocs were produced by the searcher provided to rescore.");
}
ctx = leaves.get(++currLeaf);
leafEnd = ctx.docBase + ctx.reader().maxDoc();
}

int targetDoc = hit.doc - ctx.docBase;
DoubleValues values = source.getValues(ctx, null);
boolean scorePresent = values.advanceExact(targetDoc);
double secondPassScore = scorePresent ? values.doubleValue() : 0.0f;
hit.score = combine(hit.score, scorePresent, secondPassScore);
}

if (topN < hits.length) {
ArrayUtil.select(hits, 0, hits.length, topN, ScoreDoc.COMPARATOR);
ScoreDoc[] subset = new ScoreDoc[topN];
System.arraycopy(hits, 0, subset, 0, topN);
hits = subset;
}
Arrays.sort(hits, ScoreDoc.COMPARATOR);

return new TopDocs(firstPassTopDocs.totalHits, hits);
}

@Override
public Explanation explain(IndexSearcher searcher, Explanation firstPassExplanation, int docID)
throws IOException {
Explanation first =
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe it should be moved to when it is needed, such as L120?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My flow was to produce first pass explanation, then second explanation, then combined score and final explanation.

Explanation.match(
firstPassExplanation.getValue(), "first pass score", firstPassExplanation);

LeafReaderContext leafWithDoc = null;
for (LeafReaderContext ctx : searcher.getIndexReader().leaves()) {
if (docID >= ctx.docBase && docID < (ctx.docBase + ctx.reader().maxDoc())) {
leafWithDoc = ctx;
break;
}
}
if (leafWithDoc == null) {
throw new IllegalArgumentException(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why we are throwing exception here instead of Explanation.noMatch?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, this is a tricky one. Since this explain API can take any docId, I can see the argument of surfacing a "noMatch" here. However, my thinking is that Rescorer#explain API is meant to explain how the Rescorer would score this docId for given searcher, when rescore() is called.

If we hit null here, it means that the docId was not matched by the provided searcher in the first-pass itself. This is likely because a different searcher was passed than the one that produced provided docId, which is an error that we should surface.

Suppose we say noMatch for first pass, and the docId does have a value in DoubleValuesSource. Then the explain API will return a score for the docId, However, the actual rescore API will never return a score for this (searcher, docId) combination because they don't match.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotcha, thanks for the explanation. Maybe we can add some nuance you mentioned above to the error message, if the only possible case is a different IndexSearcher was passed? Anyhow, no strong opinion here.

"docId=" + docID + " not found in any leaf in provided searcher");
}

DoubleValuesSource source = valuesSource.rewrite(searcher);
Explanation doubleValuesMatch =
source.explain(
leafWithDoc,
docID - leafWithDoc.docBase,
Explanation.noMatch("DoubleValuesSource was not initialized with query scores"));
Explanation second =
doubleValuesMatch.isMatch()
? Explanation.match(
doubleValuesMatch.getValue(), "value from DoubleValuesSource", doubleValuesMatch)
: Explanation.noMatch("no value in DoubleValuesSource");

float score =
combine(
first.getValue().floatValue(),
doubleValuesMatch.isMatch(),
doubleValuesMatch.getValue().doubleValue());
String desc =
"combined score from firstPass and DoubleValuesSource="
+ source.getClass()
+ " using "
+ getClass();
return Explanation.match(score, desc, first, second);
}
}
13 changes: 13 additions & 0 deletions lucene/core/src/java/org/apache/lucene/search/ScoreDoc.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package org.apache.lucene.search;

import java.util.Comparator;
import org.apache.lucene.index.StoredFields;

/** Holds one hit in {@link TopDocs}. */
Expand Down Expand Up @@ -51,4 +52,16 @@ public ScoreDoc(int doc, float score, int shardIndex) {
public String toString() {
return "doc=" + doc + " score=" + score + " shardIndex=" + shardIndex;
}

/** Utility comparator that sorts by score descending, then by docId ascending */
public static final Comparator<ScoreDoc> COMPARATOR =
(a, b) -> {
if (a.score > b.score) {
return -1;
} else if (a.score < b.score) {
return 1;
} else {
return a.doc - b.doc;
}
};
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.lucene.search;

import java.util.Arrays;
import java.util.List;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
import org.apache.lucene.tests.index.RandomIndexWriter;
import org.apache.lucene.tests.util.LuceneTestCase;

public class TestDoubleValuesSourceRescorer extends LuceneTestCase {

private static final String ID_FIELD = "id";
private static final String DOC_VAL_FIELD = "docVal";
private static final String DOC_VAL_STORED_FIELD = "storedDocVal";

private final DoubleValuesSource doubleValuesSource =
DoubleValuesSource.fromIntField(DOC_VAL_FIELD);

private final DoubleValuesSourceRescorer rescorer =
new DoubleValuesSourceRescorer(doubleValuesSource) {
@Override
protected float combine(float firstPassScore, boolean valuePresent, double sourceValue) {
return valuePresent ? (float) sourceValue : 0f;
}
};

private static final List<String> dictionary =
Arrays.asList(
"river", "quick", "brown", "fox", "jumped", "lazy", "fence", "wizard", "of", "a", "an",
"the", "cookie", "golf", "golden", "tennis", "boy", "plays", "likes", "wants");

String randomSentence() {
final int length = random().nextInt(3, 10);
StringBuilder sentence = new StringBuilder();
for (int i = 0; i < length; i++) {
sentence.append(dictionary.get(random().nextInt(dictionary.size() - 1)) + " ");
}
return sentence.toString();
}

private void publishDocs(int numDocs, String fieldName, boolean indexDocValues, Directory dir)
throws Exception {
RandomIndexWriter w = new RandomIndexWriter(random(), dir, newIndexWriterConfig());
for (int i = 0; i < numDocs; i++) {
Document d = new Document();
d.add(newStringField(ID_FIELD, Integer.toString(i), Field.Store.YES));
d.add(newTextField(fieldName, randomSentence(), Field.Store.NO));
if (indexDocValues) {
int val = i + 100;
d.add(new NumericDocValuesField(DOC_VAL_FIELD, val));
d.add(newStringField(DOC_VAL_STORED_FIELD, Integer.toString(val), Field.Store.YES));
}
w.addDocument(d);
}
w.close();
}

public void testBasic() throws Exception {
try (Directory dir = newDirectory()) {
publishDocs(random().nextInt(100), "title", true, dir);
try (IndexReader r = DirectoryReader.open(dir)) {
IndexSearcher s = new IndexSearcher(r);
TermQuery query =
new TermQuery(
new Term("title", dictionary.get(random().nextInt(dictionary.size() - 1))));
TopDocs queryHits = s.search(query, 50);
TopDocs rescoredHits = rescorer.rescore(s, queryHits, 15);
assertTrue(rescoredHits.scoreDocs.length <= 15);
assertEquals(queryHits.totalHits, rescoredHits.totalHits);
for (int i = 1; i < rescoredHits.scoreDocs.length; i++) {
assertTrue(rescoredHits.scoreDocs[i - 1].score > rescoredHits.scoreDocs[i].score);
}
for (ScoreDoc hit : rescoredHits.scoreDocs) {
assertEquals(
s.storedFields().document(hit.doc).get(DOC_VAL_STORED_FIELD),
Integer.toString((int) hit.score));
}
int doc = rescoredHits.scoreDocs[0].doc;
Explanation e = rescorer.explain(s, s.explain(query, doc), doc);
String msg = e.toString();
assertTrue(msg.contains("combined score from firstPass and DoubleValuesSource"));
assertTrue(msg.contains(getClass().toString()));
assertTrue(msg.contains("first pass score"));
assertTrue(msg.contains("value from DoubleValuesSource"));
}
}
}

public void testSubsetAndIdempotency() throws Exception {
try (Directory dir = newDirectory()) {
publishDocs(random().nextInt(60, 200), "title", true, dir);
try (IndexReader r = DirectoryReader.open(dir)) {
IndexSearcher s = new IndexSearcher(r);
TermQuery query =
new TermQuery(
new Term("title", dictionary.get(random().nextInt(dictionary.size() - 1))));
TopDocs queryHits = s.search(query, 50);
TopDocs rescoredHits1 = rescorer.rescore(s, queryHits, 15);

int hits1Len = rescoredHits1.scoreDocs.length;
int hit2N = Math.max(hits1Len / 2, 1);
TopDocs rescoredHits2 = rescorer.rescore(s, queryHits, hit2N);
assertEquals(hit2N, rescoredHits2.scoreDocs.length);
for (int i = 0; i < hit2N; i++) {
assertEquals(rescoredHits1.scoreDocs[i].doc, rescoredHits2.scoreDocs[i].doc);
assertEquals(rescoredHits1.scoreDocs[i].score, rescoredHits2.scoreDocs[i].score, 1e-5);
}
}
}
}

public void testMissingValues() throws Exception {
try (Directory dir = newDirectory()) {
publishDocs(random().nextInt(60, 200), "title", false, dir);
try (IndexReader r = DirectoryReader.open(dir)) {
IndexSearcher s = new IndexSearcher(r);
TermQuery query =
new TermQuery(
new Term("title", dictionary.get(random().nextInt(dictionary.size() - 1))));
TopDocs queryHits = s.search(query, 50);
TopDocs rescoredHits = rescorer.rescore(s, queryHits, 15);
assertTrue(rescoredHits.scoreDocs.length <= 15);
assertEquals(queryHits.totalHits, rescoredHits.totalHits);
for (int i = 0; i < rescoredHits.scoreDocs.length; i++) {
assertEquals(rescoredHits.scoreDocs[i].score, 0f, 1e-5);
if (i > 0) {
assertTrue(rescoredHits.scoreDocs[i - 1].doc < rescoredHits.scoreDocs[i].doc);
}
}
int doc = rescoredHits.scoreDocs[0].doc;
Explanation e = rescorer.explain(s, s.explain(query, doc), doc);
String msg = e.toString();
assertTrue(msg.contains("combined score from firstPass and DoubleValuesSource"));
assertTrue(msg.contains(getClass().toString()));
assertTrue(msg.contains("first pass score"));
assertTrue(msg.contains("no value in DoubleValuesSource"));
}
}
}
}