Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Honor topvalue while determining isMissingvalueCompetitive in case bottom is not set #12520

Merged
merged 4 commits into from
Sep 4, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
2 changes: 2 additions & 0 deletions lucene/CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ Bug Fixes

* GITHUB#12220: Hunspell: disallow hidden title-case entries from compound middle/end

* LUCENE-12521: Sort After returning in-correct result when missing values are competitive
gashutos marked this conversation as resolved.
Show resolved Hide resolved

Other
---------------------

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,13 @@ public void copy(int slot, int doc) throws IOException {
}

@Override
protected boolean isMissingValueCompetitive() {
int result = Double.compare(missingValue, bottom);
return reverse ? (result >= 0) : (result <= 0);
protected int compareMissingValueWithBottomValue() {
return Double.compare(missingValue, bottom);
}

@Override
protected int compareMissingValueWithTopValue() {
return Double.compare(missingValue, topValue);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,13 @@ public void copy(int slot, int doc) throws IOException {
}

@Override
protected boolean isMissingValueCompetitive() {
int result = Float.compare(missingValue, bottom);
return reverse ? (result >= 0) : (result <= 0);
protected int compareMissingValueWithBottomValue() {
return Float.compare(missingValue, bottom);
}

@Override
protected int compareMissingValueWithTopValue() {
return Float.compare(missingValue, topValue);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,13 @@ public void copy(int slot, int doc) throws IOException {
}

@Override
protected boolean isMissingValueCompetitive() {
int result = Integer.compare(missingValue, bottom);
// in reverse (desc) sort missingValue is competitive when it's greater or equal to bottom,
// in asc sort missingValue is competitive when it's smaller or equal to bottom
return reverse ? (result >= 0) : (result <= 0);
protected int compareMissingValueWithBottomValue() {
return Integer.compare(missingValue, bottom);
}

@Override
protected int compareMissingValueWithTopValue() {
return Integer.compare(missingValue, topValue);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,13 @@ public void copy(int slot, int doc) throws IOException {
}

@Override
protected boolean isMissingValueCompetitive() {
int result = Long.compare(missingValue, bottom);
// in reverse (desc) sort missingValue is competitive when it's greater or equal to bottom,
// in asc sort missingValue is competitive when it's smaller or equal to bottom
return reverse ? (result >= 0) : (result <= 0);
protected int compareMissingValueWithBottomValue() {
return Long.compare(missingValue, bottom);
}

@Override
protected int compareMissingValueWithTopValue() {
return Long.compare(missingValue, topValue);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,26 @@ private void updateSkipInterval(boolean success) {
}
}

private boolean isMissingValueCompetitive() {
// if queue is full, always compare with bottom,
// if not, check if we can compare with topValue
if (queueFull) {
int result = compareMissingValueWithBottomValue();
// in reverse (desc) sort missingValue is competitive when it's greater or equal to bottom,
// in asc sort missingValue is competitive when it's smaller or equal to bottom
return reverse ? (result >= 0) : (result <= 0);
} else if (topValueSet) {
int result = compareMissingValueWithTopValue();
// in reverse (desc) sort missingValue is competitive when it's smaller or equal to
// topValue,
// in asc sort missingValue is competitive when it's greater or equal to topValue
return reverse ? (result <= 0) : (result >= 0);
} else {
// by default competitive
return true;
}
}

@Override
public DocIdSetIterator competitiveIterator() {
if (enableSkipping == false) return null;
Expand Down Expand Up @@ -337,7 +357,9 @@ public int advance(int target) throws IOException {
};
}

protected abstract boolean isMissingValueCompetitive();
protected abstract int compareMissingValueWithTopValue();

protected abstract int compareMissingValueWithBottomValue();

protected abstract void encodeBottom(byte[] packedValue);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,23 @@ public void testSortOptimizationWithMissingValues() throws IOException {
assertNonCompetitiveHitsAreSkipped(topDocs.totalHits.value, numDocs);
}

{ // test that optimization is not run when missing value setting of SortField is competitive
// with after
final long afterValue = Long.MAX_VALUE;
final int afterDocID = 10 + random().nextInt(1000);
FieldDoc after = new FieldDoc(afterDocID, Float.NaN, new Long[] {afterValue});
final SortField sortField = new SortField("my_field", SortField.Type.LONG);
sortField.setMissingValue(Long.MAX_VALUE); // set a NON competitive missing value
final Sort sort = new Sort(sortField);
CollectorManager<TopFieldCollector, TopFieldDocs> manager =
TopFieldCollector.createSharedManager(sort, numHits, after, totalHitsThreshold);
TopDocs topDocs = searcher.search(new MatchAllDocsQuery(), manager);
assertEquals(topDocs.scoreDocs.length, numHits);
assertEquals(
topDocs.totalHits.value,
numDocs); // assert that all documents were collected => optimization was not run
}

reader.close();
dir.close();
}
Expand Down