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.

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

fix(customSearch): apply query string interpolation to function score #11406

Merged
merged 1 commit into from
Sep 17, 2024
Merged

fix(customSearch): apply query string interpolation to function score #11406

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
9 changes: 7 additions & 2 deletions .../com/linkedin/metadata/search/elasticsearch/query/request/AutocompleteRequestHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,15 @@ public SearchRequest getSearchRequest(
opContext.getObjectMapper(),
cac,
queryWithDefaultFilters,
customQueryConfig))
customQueryConfig,
input))
.orElse(
SearchQueryBuilder.buildScoreFunctions(
opContext, customQueryConfig, List.of(entitySpec), queryWithDefaultFilters));
opContext,
customQueryConfig,
List.of(entitySpec),
input,
queryWithDefaultFilters));
searchSourceBuilder.query(functionScoreQueryBuilder);

ESUtils.buildSortOrder(searchSourceBuilder, null, List.of(entitySpec));
Expand Down
25 changes: 18 additions & 7 deletions ...java/com/linkedin/metadata/search/elasticsearch/query/request/CustomizedQueryHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,16 +119,18 @@ private static BoolQueryBuilder toBoolQueryBuilder(
public static FunctionScoreQueryBuilder functionScoreQueryBuilder(
@Nonnull ObjectMapper objectMapper,
@Nonnull QueryConfiguration customQueryConfiguration,
QueryBuilder queryBuilder) {
QueryBuilder queryBuilder,
String query) {
return toFunctionScoreQueryBuilder(
objectMapper, queryBuilder, customQueryConfiguration.getFunctionScore());
objectMapper, queryBuilder, customQueryConfiguration.getFunctionScore(), query);
}

public static Optional<FunctionScoreQueryBuilder> functionScoreQueryBuilder(
@Nonnull ObjectMapper objectMapper,
@Nonnull AutocompleteConfiguration customAutocompleteConfiguration,
QueryBuilder queryBuilder,
@Nullable QueryConfiguration customQueryConfiguration) {
@Nullable QueryConfiguration customQueryConfiguration,
String query) {

Optional<FunctionScoreQueryBuilder> result = Optional.empty();

Expand All @@ -143,14 +145,17 @@ public static Optional<FunctionScoreQueryBuilder> functionScoreQueryBuilder(
result =
Optional.of(
toFunctionScoreQueryBuilder(
objectMapper, queryBuilder, customQueryConfiguration.getFunctionScore()));
objectMapper, queryBuilder, customQueryConfiguration.getFunctionScore(), query));
} else if (customAutocompleteConfiguration.getFunctionScore() != null
&& !customAutocompleteConfiguration.getFunctionScore().isEmpty()) {
log.debug("Applying custom autocomplete function scores.");
result =
Optional.of(
toFunctionScoreQueryBuilder(
objectMapper, queryBuilder, customAutocompleteConfiguration.getFunctionScore()));
objectMapper,
queryBuilder,
customAutocompleteConfiguration.getFunctionScore(),
query));
}

return result;
Expand All @@ -159,7 +164,8 @@ public static Optional<FunctionScoreQueryBuilder> functionScoreQueryBuilder(
private static FunctionScoreQueryBuilder toFunctionScoreQueryBuilder(
@Nonnull ObjectMapper objectMapper,
@Nonnull QueryBuilder queryBuilder,
@Nonnull Map<String, Object> params) {
@Nonnull Map<String, Object> params,
String query) {
try {
HashMap<String, Object> body = new HashMap<>(params);
if (!body.isEmpty()) {
Expand All @@ -168,7 +174,12 @@ private static FunctionScoreQueryBuilder toFunctionScoreQueryBuilder(

body.put("query", objectMapper.readValue(queryBuilder.toString(), Map.class));

String jsonFragment = objectMapper.writeValueAsString(Map.of("function_score", body));
String jsonFragment =
objectMapper
.writeValueAsString(Map.of("function_score", body))
.replace("\"{{query_string}}\"", objectMapper.writeValueAsString(query))
.replace(
"\"{{unquoted_query_string}}\"", objectMapper.writeValueAsString(unquote(query)));
XContentParser parser =
XContentType.JSON
.xContent()
Expand Down
5 changes: 3 additions & 2 deletions ...ain/java/com/linkedin/metadata/search/elasticsearch/query/request/SearchQueryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public QueryBuilder buildQuery(

final QueryBuilder queryBuilder =
buildInternalQuery(opContext, customQueryConfig, entitySpecs, query, fulltext);
return buildScoreFunctions(opContext, customQueryConfig, entitySpecs, queryBuilder);
return buildScoreFunctions(opContext, customQueryConfig, entitySpecs, query, queryBuilder);
}

/**
Expand Down Expand Up @@ -485,12 +485,13 @@ static FunctionScoreQueryBuilder buildScoreFunctions(
@Nonnull OperationContext opContext,
@Nullable QueryConfiguration customQueryConfig,
@Nonnull List<EntitySpec> entitySpecs,
String query,
@Nonnull QueryBuilder queryBuilder) {

if (customQueryConfig != null) {
// Prefer configuration function scoring over annotation scoring
return CustomizedQueryHandler.functionScoreQueryBuilder(
opContext.getObjectMapper(), customQueryConfig, queryBuilder);
opContext.getObjectMapper(), customQueryConfig, queryBuilder, query);
} else {
return QueryBuilders.functionScoreQuery(
queryBuilder, buildAnnotationScoreFunctions(entitySpecs))
Expand Down
4 changes: 2 additions & 2 deletions .../src/test/java/com/linkedin/metadata/search/query/request/CustomizedQueryHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ public void functionScoreQueryBuilderTest() {
*/
FunctionScoreQueryBuilder selectStarTest =
CustomizedQueryHandler.functionScoreQueryBuilder(
new ObjectMapper(), test.lookupQueryConfig("*").get(), inputQuery);
new ObjectMapper(), test.lookupQueryConfig("*").get(), inputQuery, "*");

FunctionScoreQueryBuilder.FilterFunctionBuilder[] expectedSelectStarScoreFunctions = {
new FunctionScoreQueryBuilder.FilterFunctionBuilder(
Expand All @@ -203,7 +203,7 @@ public void functionScoreQueryBuilderTest() {
*/
FunctionScoreQueryBuilder defaultTest =
CustomizedQueryHandler.functionScoreQueryBuilder(
new ObjectMapper(), test.lookupQueryConfig("foobar").get(), inputQuery);
new ObjectMapper(), test.lookupQueryConfig("foobar").get(), inputQuery, "foobar");

FunctionScoreQueryBuilder.FilterFunctionBuilder[] expectedDefaultScoreFunctions = {
new FunctionScoreQueryBuilder.FilterFunctionBuilder(
Expand Down
Loading