-
Notifications
You must be signed in to change notification settings - Fork 46
add basic warming query configs #844
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.
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
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,115 @@ | ||
/* | ||
* Copyright 2020 Yelp Inc. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package com.yelp.nrtsearch.server.warming; | ||
|
||
import com.yelp.nrtsearch.server.grpc.BooleanClause; | ||
import com.yelp.nrtsearch.server.grpc.BooleanQuery; | ||
import com.yelp.nrtsearch.server.grpc.ConstantScoreQuery; | ||
import com.yelp.nrtsearch.server.grpc.DisjunctionMaxQuery; | ||
import com.yelp.nrtsearch.server.grpc.MultiFunctionScoreQuery; | ||
import com.yelp.nrtsearch.server.grpc.NestedQuery; | ||
import com.yelp.nrtsearch.server.grpc.Query; | ||
import com.yelp.nrtsearch.server.grpc.SearchRequest; | ||
import org.slf4j.Logger; | ||
import org.slf4j.LoggerFactory; | ||
|
||
public class WarmingUtils { | ||
private static final Logger logger = LoggerFactory.getLogger(WarmingUtils.class); | ||
|
||
public static SearchRequest simplifySearchRequestForWarming( | ||
SearchRequest.Builder searchRequestBuilder) { | ||
Query basicSearchRequest = stripScriptQuery(searchRequestBuilder.getQuery()); | ||
SearchRequest searchRequest = | ||
searchRequestBuilder | ||
.setQuery(basicSearchRequest) | ||
.clearQuerySort() | ||
.clearRescorers() | ||
.clearRetrieveFields() | ||
.clearFetchTasks() | ||
.clearFacets() | ||
.clearCollectors() | ||
.clearHighlight() | ||
.setProfile(false) | ||
.build(); | ||
return searchRequest; | ||
} | ||
|
||
private static Query stripScriptQuery(Query query) { | ||
if (query.hasFunctionScoreQuery()) { | ||
return stripScriptQuery(query.getFunctionScoreQuery().getQuery()); | ||
} | ||
if (query.hasFunctionFilterQuery()) { | ||
return Query.newBuilder().build(); | ||
} | ||
if (query.hasMultiFunctionScoreQuery()) { | ||
MultiFunctionScoreQuery multiFunctionScoreQuery = query.getMultiFunctionScoreQuery(); | ||
for (MultiFunctionScoreQuery.FilterFunction function : | ||
multiFunctionScoreQuery.getFunctionsList()) { | ||
if (function.hasScript()) { | ||
return stripScriptQuery(function.getFilter()); | ||
} | ||
} | ||
} | ||
|
||
Query.Builder queryBuilder = query.toBuilder(); | ||
switch (query.getQueryNodeCase()) { | ||
case BOOLEANQUERY -> queryBuilder.setBooleanQuery(stripBooleanQuery(query.getBooleanQuery())); | ||
case DISJUNCTIONMAXQUERY -> | ||
queryBuilder.setDisjunctionMaxQuery( | ||
stripDisjunctionMaxQuery(query.getDisjunctionMaxQuery())); | ||
case NESTEDQUERY -> queryBuilder.setNestedQuery(stripNestedQuery(query.getNestedQuery())); | ||
case CONSTANTSCOREQUERY -> | ||
queryBuilder.setConstantScoreQuery( | ||
stripConstantScoreQuery(query.getConstantScoreQuery())); | ||
default -> {} | ||
} | ||
// Add other cases as needed | ||
return queryBuilder.build(); | ||
} | ||
|
||
private static BooleanQuery stripBooleanQuery(BooleanQuery booleanQuery) { | ||
BooleanQuery.Builder booleanQueryBuilder = booleanQuery.toBuilder(); | ||
for (int i = 0; i < booleanQuery.getClausesCount(); i++) { | ||
BooleanClause clause = booleanQuery.getClauses(i); | ||
BooleanClause.Builder clauseBuilder = clause.toBuilder(); | ||
clauseBuilder.setQuery(stripScriptQuery(clause.getQuery())); | ||
booleanQueryBuilder.setClauses(i, clauseBuilder.build()); | ||
} | ||
return booleanQueryBuilder.build(); | ||
} | ||
|
||
private static DisjunctionMaxQuery stripDisjunctionMaxQuery( | ||
DisjunctionMaxQuery disjunctionMaxQuery) { | ||
DisjunctionMaxQuery.Builder disjunctionMaxQueryBuilder = disjunctionMaxQuery.toBuilder(); | ||
for (int i = 0; i < disjunctionMaxQuery.getDisjunctsCount(); i++) { | ||
disjunctionMaxQueryBuilder.setDisjuncts( | ||
i, stripScriptQuery(disjunctionMaxQuery.getDisjuncts(i))); | ||
} | ||
return disjunctionMaxQueryBuilder.build(); | ||
} | ||
|
||
private static NestedQuery stripNestedQuery(NestedQuery nestedQuery) { | ||
NestedQuery.Builder nestedQueryBuilder = nestedQuery.toBuilder(); | ||
nestedQueryBuilder.setQuery(stripScriptQuery(nestedQuery.getQuery())); | ||
return nestedQueryBuilder.build(); | ||
} | ||
|
||
private static ConstantScoreQuery stripConstantScoreQuery(ConstantScoreQuery constantScoreQuery) { | ||
ConstantScoreQuery.Builder constantScoreQueryBuilder = constantScoreQuery.toBuilder(); | ||
constantScoreQueryBuilder.setFilter(stripScriptQuery(constantScoreQuery.getFilter())); | ||
return constantScoreQueryBuilder.build(); | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,7 +22,9 @@ | |
|
||
import com.amazonaws.services.s3.AmazonS3; | ||
import com.yelp.nrtsearch.server.config.NrtsearchConfig; | ||
import com.yelp.nrtsearch.server.grpc.FunctionScoreQuery; | ||
import com.yelp.nrtsearch.server.grpc.Query; | ||
import com.yelp.nrtsearch.server.grpc.Script; | ||
import com.yelp.nrtsearch.server.grpc.SearchRequest; | ||
import com.yelp.nrtsearch.server.grpc.TermQuery; | ||
import com.yelp.nrtsearch.server.handler.SearchHandler; | ||
|
@@ -105,6 +107,28 @@ public void testWarmFromS3() | |
verifyNoMoreInteractions(mockSearchHandler); | ||
} | ||
|
||
@Test | ||
public void testWarmFromS3_basic() | ||
throws IOException, SearchHandler.SearchHandlerException, InterruptedException { | ||
Warmer warmerWithBasic = new Warmer(remoteBackend, service, index, 2, 30); | ||
|
||
List<String> testSearchRequestsJson = getTestSearchRequestsAsJsonStrings(); | ||
byte[] warmingBytes = getWarmingBytes(testSearchRequestsJson); | ||
remoteBackend.uploadWarmingQueries(service, "test_index", warmingBytes); | ||
|
||
IndexState mockIndexState = mock(IndexState.class); | ||
SearchHandler mockSearchHandler = mock(SearchHandler.class); | ||
|
||
// nextInt(100) for this seed is: 28, 33, 20, 10 | ||
waziqi89 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
warmerWithBasic.randomThreadLocal.get().setSeed(1234); | ||
warmerWithBasic.warmFromS3(mockIndexState, 0, mockSearchHandler); | ||
|
||
for (SearchRequest testRequest : getTestBasicSearchRequests()) { | ||
verify(mockSearchHandler).handle(mockIndexState, testRequest); | ||
} | ||
verifyNoMoreInteractions(mockSearchHandler); | ||
} | ||
|
||
@Test | ||
public void testWarmFromS3_multiple() | ||
throws IOException, SearchHandler.SearchHandlerException, InterruptedException { | ||
|
@@ -167,17 +191,47 @@ private List<SearchRequest> getTestSearchRequests() { | |
.setIndexName(index) | ||
.setQuery( | ||
Query.newBuilder() | ||
.setTermQuery(TermQuery.newBuilder().setField("field" + i).build()) | ||
.build()) | ||
.setFunctionScoreQuery( | ||
FunctionScoreQuery.newBuilder() | ||
.setQuery( | ||
Query.newBuilder() | ||
.setTermQuery(TermQuery.newBuilder().setField("field" + i))) | ||
.setScript(Script.newBuilder().setLang("js").setSource("3 * 5")))) | ||
.build(); | ||
testRequests.add(searchRequest); | ||
} | ||
return testRequests; | ||
} | ||
|
||
private List<SearchRequest> getTestBasicSearchRequests() { | ||
List<SearchRequest> testRequests = new ArrayList<>(); | ||
SearchRequest searchRequest = | ||
SearchRequest.newBuilder() | ||
.setIndexName(index) | ||
.setQuery(Query.newBuilder().setTermQuery(TermQuery.newBuilder().setField("field0"))) | ||
.build(); | ||
testRequests.add(searchRequest); | ||
|
||
searchRequest = | ||
waziqi89 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
SearchRequest.newBuilder() | ||
.setIndexName(index) | ||
.setQuery( | ||
Query.newBuilder() | ||
.setFunctionScoreQuery( | ||
FunctionScoreQuery.newBuilder() | ||
.setQuery( | ||
Query.newBuilder() | ||
.setTermQuery(TermQuery.newBuilder().setField("field1"))) | ||
.setScript(Script.newBuilder().setLang("js").setSource("3 * 5")))) | ||
.build(); | ||
testRequests.add(searchRequest); | ||
|
||
return testRequests; | ||
} | ||
|
||
private List<String> getTestSearchRequestsAsJsonStrings() { | ||
return List.of( | ||
"{\"indexName\":\"test_index\",\"query\":{\"termQuery\":{\"field\":\"field0\"}}}", | ||
"{\"indexName\":\"test_index\",\"query\":{\"termQuery\":{\"field\":\"field1\"}}}"); | ||
"{\"indexName\":\"test_index\",\"query\":{\"functionScoreQuery\":{\"query\":{\"termQuery\":{\"field\":\"field0\"}},\"script\":{\"lang\":\"js\",\"source\":\"3 * 5\"}}}}", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Before we were testing the same query twice to test it being simplified or not. With the last commit change, we have 2 extra identical queries and I am just wondering what is being tested with these extra identical queries. Just wondering if we need them or if we can keep only two and simplify the test code by removing the extra for loops in getTestBasicSearchRequests. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Adding 2 more lines to ensure the "random" works exactly as we expected. Only 2 queries might be coincident. We ain't aiming to test the major stripping logic here |
||
"{\"indexName\":\"test_index\",\"query\":{\"functionScoreQuery\":{\"query\":{\"termQuery\":{\"field\":\"field1\"}},\"script\":{\"lang\":\"js\",\"source\":\"3 * 5\"}}}}"); | ||
} | ||
} |
Uh oh!
There was an error while loading. Please reload this page.