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

Java API: Setting track scores does not affect scan search type 

When setting track scores, the scan search type will return the scores for each document. The Java API builder does not properly set this value (it only sets it if a sort in in place, which is not relevant for scan search type).

closes #3949
This commit is contained in:
Shay Banon 2013-10-22 18:04:22 -07:00
parent 0e6e6f97dc
commit a3122a88e4
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java
View File

@ -753,9 +753,10 @@ public class SearchSourceBuilder implements ToXContent {
builder.endObject();
}
builder.endArray();
if (trackScores) {
builder.field("track_scores", trackScores);
}
}
if (trackScores) {
builder.field("track_scores", trackScores);
}
if (indexBoost != null) {

17
src/test/java/org/elasticsearch/search/scan/SearchScanScrollingTests.java
View File

@ -32,14 +32,15 @@ import java.util.Set;
import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThan;
public class SearchScanScrollingTests extends AbstractIntegrationTest {
public void testRandomized() throws Exception {
testScroll(between(1, 4), atLeast(100), between(1, 300), getRandom().nextBoolean());
testScroll(between(1, 4), atLeast(100), between(1, 300), getRandom().nextBoolean(), getRandom().nextBoolean());
}
private void testScroll(int numberOfShards, long numberOfDocs, int size, boolean unbalanced) throws Exception {
private void testScroll(int numberOfShards, long numberOfDocs, int size, boolean unbalanced, boolean trackScores) throws Exception {
client().admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", numberOfShards)).get();
ensureGreen();
@ -72,10 +73,11 @@ public class SearchScanScrollingTests extends AbstractIntegrationTest {
.setQuery(matchAllQuery())
.setSize(size)
.setScroll(TimeValue.timeValueMinutes(2))
.setTrackScores(trackScores)
.execute().actionGet();
try {
assertHitCount(searchResponse, numberOfDocs);
// start scrolling, until we get not results
while (true) {
searchResponse = client().prepareSearchScroll(searchResponse.getScrollId()).setScroll(TimeValue.timeValueMinutes(2)).execute().actionGet();
@ -84,12 +86,17 @@ public class SearchScanScrollingTests extends AbstractIntegrationTest {
for (SearchHit hit : searchResponse.getHits()) {
assertThat(hit.id() + "should not exist in the result set", ids.contains(hit.id()), equalTo(false));
ids.add(hit.id());
if (trackScores) {
assertThat(hit.getScore(), greaterThan(0.0f));
} else {
assertThat(hit.getScore(), equalTo(0.0f));
}
}
if (searchResponse.getHits().hits().length == 0) {
break;
}
}
assertThat(expectedIds, equalTo(ids));
} finally {
clearScroll(searchResponse.getScrollId());