honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix assertions in testEquivalence and beef up the test

This commit is contained in:
Simon Willnauer 2013-11-27 15:20:43 +01:00
parent 596d511466
commit ba3269dedc
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java
View File

@ -161,7 +161,7 @@ public class QueryRescorerTests extends ElasticsearchIntegrationTest {
assertThirdHit(searchResponse, hasId("3")); assertThirdHit(searchResponse, hasId("3"));
} }
private static final void assertEquivalent(SearchResponse plain, SearchResponse rescored) { private static final void assertEquivalent(String query, SearchResponse plain, SearchResponse rescored) {
assertNoFailures(plain); assertNoFailures(plain);
assertNoFailures(rescored); assertNoFailures(rescored);
SearchHits leftHits = plain.getHits(); SearchHits leftHits = plain.getHits();
@ -169,8 +169,15 @@ public class QueryRescorerTests extends ElasticsearchIntegrationTest {
assertThat(leftHits.getTotalHits(), equalTo(rightHits.getTotalHits())); assertThat(leftHits.getTotalHits(), equalTo(rightHits.getTotalHits()));
assertThat(leftHits.getHits().length, equalTo(rightHits.getHits().length)); assertThat(leftHits.getHits().length, equalTo(rightHits.getHits().length));
SearchHit[] hits = leftHits.getHits(); SearchHit[] hits = leftHits.getHits();
SearchHit[] rHits = rightHits.getHits();
for (int i = 0; i < hits.length; i++) { for (int i = 0; i < hits.length; i++) {
assertThat(hits[i].getId(), equalTo(rightHits.getHits()[i].getId())); assertThat("query: " + query, hits[i].getScore(), equalTo(rHits[i].getScore()));
}
for (int i = 0; i < hits.length; i++) {
if (hits[i].getScore() == hits[hits.length-1].getScore()) {
return; // we need to cut off here since this is the tail of the queue and we might not have fetched enough docs
}
assertThat("query: " + query,hits[i].getId(), equalTo(rHits[i].getId()));
} }
} }
@ -185,6 +192,9 @@ public class QueryRescorerTests extends ElasticsearchIntegrationTest {
assertThat(((String) otherHits[0].sourceAsMap().get("field1")).contains(query), equalTo(true)); assertThat(((String) otherHits[0].sourceAsMap().get("field1")).contains(query), equalTo(true));
} else { } else {
for (int i = 0; i < hits.length; i++) { for (int i = 0; i < hits.length; i++) {
if (hits[i].getScore() == hits[hits.length-1].getScore()) {
return; // we need to cut off here since this is the tail of the queue and we might not have fetched enough docs
}
assertThat(query, hits[i].getId(), equalTo(rightHits.getHits()[i].getId())); assertThat(query, hits[i].getId(), equalTo(rightHits.getHits()[i].getId()));
} }
} }
@ -212,6 +222,8 @@ public class QueryRescorerTests extends ElasticsearchIntegrationTest {
ensureGreen(); ensureGreen();
final int iters = atLeast(50); final int iters = atLeast(50);
for (int i = 0; i < iters; i++) { for (int i = 0; i < iters; i++) {
int resultSize = between(5, 30);
int rescoreWindow = between(1, 3) * resultSize;
String intToEnglish = English.intToEnglish(between(0, numDocs-1)); String intToEnglish = English.intToEnglish(between(0, numDocs-1));
String query = intToEnglish.split(" ")[0]; String query = intToEnglish.split(" ")[0];
SearchResponse rescored = client() SearchResponse rescored = client()
@ -219,30 +231,30 @@ public class QueryRescorerTests extends ElasticsearchIntegrationTest {
.setPreference("test") // ensure we hit the same shards for tie-breaking .setPreference("test") // ensure we hit the same shards for tie-breaking
.setQuery(QueryBuilders.matchQuery("field1", query).operator(MatchQueryBuilder.Operator.OR)) .setQuery(QueryBuilders.matchQuery("field1", query).operator(MatchQueryBuilder.Operator.OR))
.setFrom(0) .setFrom(0)
.setSize(10) .setSize(resultSize)
.setRescorer( .setRescorer(
RescoreBuilder RescoreBuilder
.queryRescorer( .queryRescorer(
QueryBuilders QueryBuilders
.constantScoreQuery(QueryBuilders.matchPhraseQuery("field1", intToEnglish).slop(3))) .constantScoreQuery(QueryBuilders.matchPhraseQuery("field1", intToEnglish).slop(3)))
.setQueryWeight(1.0f) .setQueryWeight(1.0f)
.setRescoreQueryWeight(0.0f)) // no weigth - so we basically use the same score as the actual query .setRescoreQueryWeight(0.0f)) // no weight - so we basically use the same score as the actual query
.setRescoreWindow(50).execute().actionGet(); .setRescoreWindow(rescoreWindow).execute().actionGet();
SearchResponse plain = client().prepareSearch() SearchResponse plain = client().prepareSearch()
.setPreference("test") // ensure we hit the same shards for tie-breaking .setPreference("test") // ensure we hit the same shards for tie-breaking
.setQuery(QueryBuilders.matchQuery("field1", query).operator(MatchQueryBuilder.Operator.OR)).setFrom(0).setSize(10) .setQuery(QueryBuilders.matchQuery("field1", query).operator(MatchQueryBuilder.Operator.OR)).setFrom(0).setSize(resultSize)
.execute().actionGet(); .execute().actionGet();
// check equivalence // check equivalence
assertEquivalent(plain, rescored); assertEquivalent(query, plain, rescored);
rescored = client() rescored = client()
.prepareSearch() .prepareSearch()
.setPreference("test") // ensure we hit the same shards for tie-breaking .setPreference("test") // ensure we hit the same shards for tie-breaking
.setQuery(QueryBuilders.matchQuery("field1", query).operator(MatchQueryBuilder.Operator.OR)) .setQuery(QueryBuilders.matchQuery("field1", query).operator(MatchQueryBuilder.Operator.OR))
.setFrom(0) .setFrom(0)
.setSize(10) .setSize(resultSize)
.setRescorer( .setRescorer(
RescoreBuilder RescoreBuilder
.queryRescorer( .queryRescorer(
@ -250,21 +262,21 @@ public class QueryRescorerTests extends ElasticsearchIntegrationTest {
.constantScoreQuery(QueryBuilders.matchPhraseQuery("field1", "not in the index").slop(3))) .constantScoreQuery(QueryBuilders.matchPhraseQuery("field1", "not in the index").slop(3)))
.setQueryWeight(1.0f) .setQueryWeight(1.0f)
.setRescoreQueryWeight(1.0f)) .setRescoreQueryWeight(1.0f))
.setRescoreWindow(50).execute().actionGet(); .setRescoreWindow(rescoreWindow).execute().actionGet();
// check equivalence // check equivalence
assertEquivalent(plain, rescored); assertEquivalent(query, plain, rescored);
rescored = client() rescored = client()
.prepareSearch() .prepareSearch()
.setPreference("test") // ensure we hit the same shards for tie-breaking .setPreference("test") // ensure we hit the same shards for tie-breaking
.setQuery(QueryBuilders.matchQuery("field1", query).operator(MatchQueryBuilder.Operator.OR)) .setQuery(QueryBuilders.matchQuery("field1", query).operator(MatchQueryBuilder.Operator.OR))
.setFrom(0) .setFrom(0)
.setSize(10) .setSize(resultSize)
.setRescorer( .setRescorer(
RescoreBuilder RescoreBuilder
.queryRescorer( .queryRescorer(
QueryBuilders.matchPhraseQuery("field1", intToEnglish).slop(0)) QueryBuilders.matchPhraseQuery("field1", intToEnglish).slop(0))
.setQueryWeight(1.0f).setRescoreQueryWeight(1.0f)).setRescoreWindow(100).execute().actionGet(); .setQueryWeight(1.0f).setRescoreQueryWeight(1.0f)).setRescoreWindow(2 * rescoreWindow).execute().actionGet();
// check equivalence or if the first match differs we check if the phrase is a substring of the top doc // check equivalence or if the first match differs we check if the phrase is a substring of the top doc
assertEquivalentOrSubstringMatch(intToEnglish, plain, rescored); assertEquivalentOrSubstringMatch(intToEnglish, plain, rescored);
} }