-
Notifications
You must be signed in to change notification settings - Fork 190
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Backport 2.x] Add support for approximate k-NN queries (#559)
* Add support for approximate k-NN queries (#548) * Add Knn query type Signed-off-by: Thomas Farr <tsfarr@amazon.com> * Integration test Signed-off-by: Thomas Farr <tsfarr@amazon.com> * Checkstyle fix Signed-off-by: Thomas Farr <tsfarr@amazon.com> * Run unreleased test Signed-off-by: Thomas Farr <tsfarr@amazon.com> * Fixes Signed-off-by: Thomas Farr <tsfarr@amazon.com> * Assume knn plugin installed Signed-off-by: Thomas Farr <tsfarr@amazon.com> * Changelog Signed-off-by: Thomas Farr <tsfarr@amazon.com> * Add to QueryBuilders Signed-off-by: Thomas Farr <tsfarr@amazon.com> --------- Signed-off-by: Thomas Farr <tsfarr@amazon.com> Signed-off-by: Thomas Farr <xtansia@xtansia.com> (cherry picked from commit f427f27) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * Fixing compile errors Signed-off-by: Vacha Shah <vachshah@amazon.com> --------- Signed-off-by: Thomas Farr <tsfarr@amazon.com> Signed-off-by: Thomas Farr <xtansia@xtansia.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Signed-off-by: Vacha Shah <vachshah@amazon.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Vacha Shah <vachshah@amazon.com>
- Loading branch information
3 people
authored
Jul 5, 2023
1 parent
b9f70b3
commit 1eb8fc5
Showing
10 changed files
with
404 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
202 changes: 202 additions & 0 deletions
202
java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/KnnQuery.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,202 @@ | ||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * The OpenSearch Contributors require contributions made to | ||
| * this file be licensed under the Apache-2.0 license or a | ||
| * compatible open source license. | ||
| */ | ||
|
|
||
| package org.opensearch.client.opensearch._types.query_dsl; | ||
|
|
||
| import jakarta.json.stream.JsonGenerator; | ||
| import java.util.function.Function; | ||
| import javax.annotation.Nullable; | ||
| import org.opensearch.client.json.JsonpDeserializable; | ||
| import org.opensearch.client.json.JsonpDeserializer; | ||
| import org.opensearch.client.json.JsonpMapper; | ||
| import org.opensearch.client.json.ObjectBuilderDeserializer; | ||
| import org.opensearch.client.json.ObjectDeserializer; | ||
| import org.opensearch.client.util.ApiTypeHelper; | ||
| import org.opensearch.client.util.ObjectBuilder; | ||
|
|
||
| @JsonpDeserializable | ||
| public class KnnQuery extends QueryBase implements QueryVariant { | ||
| private final String field; | ||
| private final float[] vector; | ||
| private final int k; | ||
| @Nullable | ||
| private final Query filter; | ||
|
|
||
| private KnnQuery(Builder builder) { | ||
| super(builder); | ||
|
|
||
| this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field"); | ||
| this.vector = ApiTypeHelper.requireNonNull(builder.vector, this, "vector"); | ||
| this.k = ApiTypeHelper.requireNonNull(builder.k, this, "k"); | ||
| this.filter = builder.filter; | ||
| } | ||
|
|
||
| public static KnnQuery of(Function<Builder, ObjectBuilder<KnnQuery>> fn) { | ||
| return fn.apply(new Builder()).build(); | ||
| } | ||
|
|
||
| /** | ||
| * Query variant kind. | ||
| * @return The query variant kind. | ||
| */ | ||
| @Override | ||
| public Query.Kind _queryKind() { | ||
| return Query.Kind.Knn; | ||
| } | ||
|
|
||
| /** | ||
| * Required - The target field. | ||
| * @return The target field. | ||
| */ | ||
| public final String field() { | ||
| return this.field; | ||
| } | ||
|
|
||
| /** | ||
| * Required - The vector to search for. | ||
| * @return The vector to search for. | ||
| */ | ||
| public final float[] vector() { | ||
| return this.vector; | ||
| } | ||
|
|
||
| /** | ||
| * Required - The number of neighbors the search of each graph will return. | ||
| * @return The number of neighbors to return. | ||
| */ | ||
| public final int k() { | ||
| return this.k; | ||
| } | ||
|
|
||
| /** | ||
| * Optional - A query to filter the results of the query. | ||
| * @return The filter query. | ||
| */ | ||
| @Nullable | ||
| public final Query filter() { | ||
| return this.filter; | ||
| } | ||
|
|
||
| @Override | ||
| protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) { | ||
| generator.writeStartObject(this.field); | ||
|
|
||
| super.serializeInternal(generator, mapper); | ||
|
|
||
| // TODO: Implement the rest of the serialization. | ||
|
|
||
| generator.writeKey("vector"); | ||
| generator.writeStartArray(); | ||
| for (float value : this.vector) { | ||
| generator.write(value); | ||
| } | ||
| generator.writeEnd(); | ||
|
|
||
| generator.write("k", this.k); | ||
|
|
||
| if (this.filter != null) { | ||
| generator.writeKey("filter"); | ||
| this.filter.serialize(generator, mapper); | ||
| } | ||
|
|
||
| generator.writeEnd(); | ||
| } | ||
|
|
||
| /** | ||
| * Builder for {@link KnnQuery}. | ||
| */ | ||
| public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<KnnQuery> { | ||
| @Nullable | ||
| private String field; | ||
| @Nullable | ||
| private float[] vector; | ||
| @Nullable | ||
| private Integer k; | ||
| @Nullable | ||
| private Query filter; | ||
|
|
||
| /** | ||
| * Required - The target field. | ||
| * @param field The target field. | ||
| * @return This builder. | ||
| */ | ||
| public Builder field(@Nullable String field) { | ||
| this.field = field; | ||
| return this; | ||
| } | ||
|
|
||
| /** | ||
| * Required - The vector to search for. | ||
| * | ||
| * @param vector The vector to search for. | ||
| * @return This builder. | ||
| */ | ||
| public Builder vector(@Nullable float[] vector) { | ||
| this.vector = vector; | ||
| return this; | ||
| } | ||
|
|
||
| /** | ||
| * Required - The number of neighbors the search of each graph will return. | ||
| * | ||
| * @param k The number of neighbors to return. | ||
| * @return This builder. | ||
| */ | ||
| public Builder k(@Nullable Integer k) { | ||
| this.k = k; | ||
| return this; | ||
| } | ||
|
|
||
| /** | ||
| * Optional - A query to filter the results of the knn query. | ||
| * | ||
| * @param filter The filter query. | ||
| * @return This builder. | ||
| */ | ||
| public Builder filter(@Nullable Query filter) { | ||
| this.filter = filter; | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| protected Builder self() { | ||
| return this; | ||
| } | ||
|
|
||
| /** | ||
| * Builds a {@link KnnQuery}. | ||
| * | ||
| * @return The built {@link KnnQuery}. | ||
| */ | ||
| @Override | ||
| public KnnQuery build() { | ||
| _checkSingleUse(); | ||
|
|
||
| return new KnnQuery(this); | ||
| } | ||
| } | ||
|
|
||
| public static final JsonpDeserializer<KnnQuery> _DESERIALIZER = ObjectBuilderDeserializer | ||
| .lazy(Builder::new, KnnQuery::setupKnnQueryDeserializer); | ||
|
|
||
| protected static void setupKnnQueryDeserializer(ObjectDeserializer<Builder> op) { | ||
| setupQueryBaseDeserializer(op); | ||
| op.add((b, v) -> { | ||
| float[] vector = new float[v.size()]; | ||
| int i = 0; | ||
| for (Float value : v) { | ||
| vector[i++] = value; | ||
| } | ||
| b.vector(vector); | ||
| }, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.floatDeserializer()), "vector"); | ||
| op.add(Builder::k, JsonpDeserializer.integerDeserializer(), "k"); | ||
| op.add(Builder::filter, Query._DESERIALIZER, "filter"); | ||
|
|
||
| op.setKey(Builder::field, JsonpDeserializer.stringDeserializer()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.