Skip to content

[8.x] Handle null text values in RankedDocsResults.asMap() (#118597) #118764

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
Dec 16, 2024
Merged

[8.x] Handle null text values in RankedDocsResults.asMap() (#118597) #118764

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
6 changes: 5 additions & 1 deletion .../core/src/main/java/org/elasticsearch/xpack/core/inference/results/RankedDocsResults.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,11 @@ public void writeTo(StreamOutput out) throws IOException {
}

public Map<String, Object> asMap() {
return Map.of(NAME, Map.of(INDEX, index, RELEVANCE_SCORE, relevanceScore, TEXT, text));
if (text != null) {
return Map.of(NAME, Map.of(INDEX, index, RELEVANCE_SCORE, relevanceScore, TEXT, text));
} else {
return Map.of(NAME, Map.of(INDEX, index, RELEVANCE_SCORE, relevanceScore));
}
}

@Override
Expand Down
12 changes: 12 additions & 0 deletions .../src/test/java/org/elasticsearch/xpack/core/inference/results/RankedDocsResultsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@
import org.elasticsearch.common.io.stream.Writeable;
import org.elasticsearch.xcontent.XContentParser;
import org.elasticsearch.xpack.core.ml.AbstractChunkedBWCSerializationTestCase;
import org.hamcrest.Matchers;

import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

public class RankedDocsResultsTests extends AbstractChunkedBWCSerializationTestCase<RankedDocsResults> {

Expand All @@ -37,6 +39,16 @@ public static RankedDocsResults.RankedDoc createRandomDoc() {
return new RankedDocsResults.RankedDoc(randomIntBetween(0, 100), randomFloat(), randomBoolean() ? null : randomAlphaOfLength(10));
}

public void test_asMap() {
var index = randomIntBetween(0, 100);
var score = randomFloat();
var mapNullText = new RankedDocsResults.RankedDoc(index, score, null).asMap();
assertThat(mapNullText, Matchers.is(Map.of("ranked_doc", Map.of("index", index, "relevance_score", score))));

var mapWithText = new RankedDocsResults.RankedDoc(index, score, "Sample text").asMap();
assertThat(mapWithText, Matchers.is(Map.of("ranked_doc", Map.of("index", index, "relevance_score", score, "text", "Sample text"))));
}

@Override
protected RankedDocsResults mutateInstance(RankedDocsResults instance) throws IOException {
List<RankedDocsResults.RankedDoc> copy = new ArrayList<>(List.copyOf(instance.getRankedDocs()));
Expand Down