Skip to content

LUCENE-10384: Simplify LongHeap small addition #623

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jan 25, 2022
Merged

LUCENE-10384: Simplify LongHeap small addition #623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion lucene/core/src/java/org/apache/lucene/util/hnsw/NeighborQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ int[] nodes() {
int size = size();
int[] nodes = new int[size];
for (int i = 0; i < size; i++) {
nodes[i] = (int) heap.get(i + 1);
nodes[i] = (int) order.apply(heap.get(i + 1));
}
return nodes;
}
Expand Down
4 changes: 2 additions & 2 deletions lucene/core/src/test/org/apache/lucene/util/hnsw/TestHnswGraph.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ public void testSearchWithSkewedAcceptOrds() throws IOException {
CircularVectorValues vectors = new CircularVectorValues(nDoc);
HnswGraphBuilder builder =
new HnswGraphBuilder(
vectors, VectorSimilarityFunction.DOT_PRODUCT, 16, 100, random().nextInt());
vectors, VectorSimilarityFunction.EUCLIDEAN, 16, 100, random().nextInt());
Copy link
Contributor

Choose a reason for hiding this comment

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

can you explain why this test was failing? I'm concerned we somehow dropped support for DOT_PRODUCT now?

Copy link
Contributor

Choose a reason for hiding this comment

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

or ... is the idea that you wanted to change the test so that it would verify the correctness of the ordering, because we didn't have any tests using EUCLIDEAN (ie inverted) scores before?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@msokolov Right, that's correct. Sorry, the modified version of this test would fail without this patch.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

As EUCLIDEAD distance would use reverse ordering of NeighborQueue for results

HnswGraph hnsw = builder.build(vectors);

// Skip over half of the documents that are closest to the query vector
Expand All @@ -215,7 +215,7 @@ public void testSearchWithSkewedAcceptOrds() throws IOException {
10,
10,
vectors.randomAccess(),
VectorSimilarityFunction.DOT_PRODUCT,
VectorSimilarityFunction.EUCLIDEAN,
hnsw,
acceptOrds,
new SplittableRandom(random().nextLong()));
Expand Down