github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-29 09:54:06 -04:00
Code Issues Projects Releases Packages Wiki Activity

fix potiential NPE

Browse source
This commit is contained in:
Simon Willnauer 2014-10-30 17:48:46 +01:00
parent c4428b12e1
commit 41f6aab388
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/org/elasticsearch/common/lucene/docset/DocIdSets.java
View file

@ -81,8 +81,11 @@ public class DocIdSets {
return set; return set;
} }
// TODO: should we use WAH8DocIdSet like Lucene? // TODO: should we use WAH8DocIdSet like Lucene?
FixedBitSet fixedBitSet = new FixedBitSet(reader.maxDoc());
it = set.iterator(); it = set.iterator();
if (it == null) {
return DocIdSet.EMPTY;
}
FixedBitSet fixedBitSet = new FixedBitSet(reader.maxDoc());
long cost = it.cost(); long cost = it.cost();
fixedBitSet.or(it); fixedBitSet.or(it);
return new BitDocIdSet(fixedBitSet, cost); return new BitDocIdSet(fixedBitSet, cost);

10
src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java
View file

@ -70,6 +70,7 @@ import static org.elasticsearch.index.query.QueryBuilders.constantScoreQuery;
import static org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders.factorFunction; import static org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders.factorFunction;
import static org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders.scriptFunction; import static org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders.scriptFunction;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse;
import static org.hamcrest.Matchers.*; import static org.hamcrest.Matchers.*;
/** /**
@ -2005,7 +2006,6 @@ public class SimpleChildQuerySearchTests extends ElasticsearchIntegrationTest {
assertNoFailures(scrollResponse); assertNoFailures(scrollResponse);
assertThat(scrollResponse.getHits().totalHits(), equalTo(10l)); assertThat(scrollResponse.getHits().totalHits(), equalTo(10l));
int scannedDocs = 0; int scannedDocs = 0;
do { do {
scrollResponse = client() scrollResponse = client()
@ -2232,7 +2232,7 @@ public class SimpleChildQuerySearchTests extends ElasticsearchIntegrationTest {
} }
SearchResponse MinMaxQuery(String scoreType, int minChildren, int maxChildren, int cutoff) throws SearchPhaseExecutionException { SearchResponse MinMaxQuery(String scoreType, int minChildren, int maxChildren, int cutoff) throws SearchPhaseExecutionException {
return client() SearchResponse response = client()
.prepareSearch("test") .prepareSearch("test")
.setQuery( .setQuery(
QueryBuilders QueryBuilders
@ -2244,15 +2244,19 @@ public class SimpleChildQuerySearchTests extends ElasticsearchIntegrationTest {
.add(FilterBuilders.termFilter("foo", "four"), factorFunction(1))).scoreType(scoreType) .add(FilterBuilders.termFilter("foo", "four"), factorFunction(1))).scoreType(scoreType)
.minChildren(minChildren).maxChildren(maxChildren).setShortCircuitCutoff(cutoff)) .minChildren(minChildren).maxChildren(maxChildren).setShortCircuitCutoff(cutoff))
.addSort("_score", SortOrder.DESC).addSort("id", SortOrder.ASC).get(); .addSort("_score", SortOrder.DESC).addSort("id", SortOrder.ASC).get();
assertSearchResponse(response);
return response;
} }
SearchResponse MinMaxFilter( int minChildren, int maxChildren, int cutoff) throws SearchPhaseExecutionException { SearchResponse MinMaxFilter( int minChildren, int maxChildren, int cutoff) throws SearchPhaseExecutionException {
return client() SearchResponse response = client()
.prepareSearch("test") .prepareSearch("test")
.setQuery( .setQuery(
QueryBuilders.constantScoreQuery(FilterBuilders.hasChildFilter("child", termFilter("foo", "two")) QueryBuilders.constantScoreQuery(FilterBuilders.hasChildFilter("child", termFilter("foo", "two"))
.minChildren(minChildren).maxChildren(maxChildren).setShortCircuitCutoff(cutoff))) .minChildren(minChildren).maxChildren(maxChildren).setShortCircuitCutoff(cutoff)))
.addSort("id", SortOrder.ASC).setTrackScores(true).get(); .addSort("id", SortOrder.ASC).setTrackScores(true).get();
assertSearchResponse(response);
return response;
} }