Skip to content

Commit

Permalink
Update to use set for building metafields in response
Browse files Browse the repository at this point in the history
Signed-off-by: Andrew Carbonetto <andrewc@bitquilltech.com>
  • Loading branch information
acarbonetto committed Apr 6, 2023
1 parent e409060 commit ccdc290
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 31 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ public OpenSearchResponse search(Function<SearchRequest, SearchResponse> searchA
List<String> includes = fetchSource != null && fetchSource.includes() != null
? Arrays.asList(this.sourceBuilder.fetchSource().includes())
: List.of();

return new OpenSearchResponse(openSearchResponse, exprValueFactory, includes);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

package org.opensearch.sql.opensearch.response;

import static org.opensearch.sql.opensearch.storage.OpenSearchIndex.METADATAFIELD_TYPE_MAP;
import static org.opensearch.sql.opensearch.storage.OpenSearchIndex.METADATA_FIELD_ID;
import static org.opensearch.sql.opensearch.storage.OpenSearchIndex.METADATA_FIELD_INDEX;
import static org.opensearch.sql.opensearch.storage.OpenSearchIndex.METADATA_FIELD_MAXSCORE;
Expand All @@ -14,9 +15,11 @@

import com.google.common.collect.ImmutableMap;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import lombok.EqualsAndHashCode;
import lombok.ToString;
Expand Down Expand Up @@ -112,21 +115,9 @@ public Iterator<ExprValue> iterator() {
return (ExprValue) ExprTupleValue.fromExprValueMap(builder.build());
}).iterator();
} else {
boolean includeId = includes.stream().anyMatch(
include -> include.equalsIgnoreCase(METADATA_FIELD_ID)
);
boolean includeIndex = includes.stream().anyMatch(
include -> include.equalsIgnoreCase(METADATA_FIELD_INDEX)
);
boolean includeScore = includes.stream().anyMatch(
include -> include.equalsIgnoreCase(METADATA_FIELD_SCORE)
);
boolean includeMaxScore = includes.stream().anyMatch(
include -> include.equalsIgnoreCase(METADATA_FIELD_MAXSCORE)
);
boolean includeSort = includes.stream().anyMatch(
include -> include.equalsIgnoreCase(METADATA_FIELD_SORT)
);
List<String> metaDataFieldSet = includes.stream()

This comment has been minimized.

Copy link
@dai-chen

dai-chen Apr 7, 2023

Collaborator

np: maybe metaDataFields because it's a List

.filter(include -> METADATAFIELD_TYPE_MAP.containsKey(include))
.collect(Collectors.toList());
ExprFloatValue maxScore = Float.isNaN(hits.getMaxScore())
? null : new ExprFloatValue(hits.getMaxScore());
return Arrays.stream(hits.getHits())
Expand All @@ -136,21 +127,32 @@ public Iterator<ExprValue> iterator() {

ImmutableMap.Builder<String, ExprValue> builder = new ImmutableMap.Builder<>();
builder.putAll(docData.tupleValue());
if (includeIndex) {
builder.put(METADATA_FIELD_INDEX, new ExprStringValue(hit.getIndex()));
}
if (includeId) {
builder.put(METADATA_FIELD_ID, new ExprStringValue(hit.getId()));
}
if (includeScore && !Float.isNaN(hit.getScore())) {
builder.put(METADATA_FIELD_SCORE, new ExprFloatValue(hit.getScore()));
}
if (includeMaxScore && maxScore != null) {
builder.put(METADATA_FIELD_MAXSCORE, maxScore);
}
if (includeSort) {
builder.put(METADATA_FIELD_SORT, new ExprLongValue(hit.getSeqNo()));
}
metaDataFieldSet.forEach(metaDataField -> {
switch (metaDataField) {
case METADATA_FIELD_INDEX:
builder.put(METADATA_FIELD_INDEX, new ExprStringValue(hit.getIndex()));
break;
case METADATA_FIELD_ID:
builder.put(METADATA_FIELD_ID, new ExprStringValue(hit.getId()));
break;
case METADATA_FIELD_SCORE:
if (!Float.isNaN(hit.getScore())) {
builder.put(METADATA_FIELD_SCORE, new ExprFloatValue(hit.getScore()));
}
break;
case METADATA_FIELD_MAXSCORE:
if (maxScore != null) {
builder.put(METADATA_FIELD_MAXSCORE, maxScore);
}
break;
case METADATA_FIELD_SORT:
builder.put(METADATA_FIELD_SORT, new ExprLongValue(hit.getSeqNo()));
break;
default:
// no-op
}
}
);

if (!hit.getHighlightFields().isEmpty()) {
var hlBuilder = ImmutableMap.<String, ExprValue>builder();
Expand Down

0 comments on commit ccdc290

Please sign in to comment.