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

Merge pull request #16068 from jasontedor/ip-field-mapper-term-queries 

Single IPv4 addresses in IP field term queries

Closes #16058
This commit is contained in:
Jason Tedor 2016-01-18 17:46:50 -05:00
parent 63090f5d4b de992877b8
commit b6c9eaa24a
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/main/java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java
View File

@ -213,11 +213,24 @@ public class IpFieldMapper extends NumberFieldMapper {
@Override @Override
public Query termQuery(Object value, @Nullable QueryShardContext context) { public Query termQuery(Object value, @Nullable QueryShardContext context) {
if (value != null) { if (value != null) {
long[] fromTo; String term;
if (value instanceof BytesRef) { if (value instanceof BytesRef) {
fromTo = Cidrs.cidrMaskToMinMax(((BytesRef) value).utf8ToString()); term = ((BytesRef) value).utf8ToString();
} else { } else {
fromTo = Cidrs.cidrMaskToMinMax(value.toString()); term = value.toString();
}
long[] fromTo;
// assume that the term is either a CIDR range or the
// term is a single IPv4 address; if either of these
// assumptions is wrong, the CIDR parsing will fail
// anyway, and that is okay
if (term.contains("/")) {
// treat the term as if it is in CIDR notation
fromTo = Cidrs.cidrMaskToMinMax(term);
} else {
// treat the term as if it is a single IPv4, and
// apply a CIDR mask equivalent to the host route
fromTo = Cidrs.cidrMaskToMinMax(term + "/32");
} }
if (fromTo != null) { if (fromTo != null) {
return rangeQuery(fromTo[0] == 0 ? null : fromTo[0], return rangeQuery(fromTo[0] == 0 ? null : fromTo[0],

11
core/src/test/java/org/elasticsearch/search/simple/SimpleSearchIT.java
View File

@ -40,6 +40,7 @@ import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF
import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_SHARDS; import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_SHARDS;
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
import static org.elasticsearch.index.query.QueryBuilders.boolQuery; import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
import static org.elasticsearch.index.query.QueryBuilders.queryStringQuery;
import static org.elasticsearch.index.query.QueryBuilders.rangeQuery; import static org.elasticsearch.index.query.QueryBuilders.rangeQuery;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertFailures; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertFailures;
@ -124,6 +125,16 @@ public class SimpleSearchIT extends ESIntegTestCase {
refresh(); refresh();
SearchResponse search = client().prepareSearch() SearchResponse search = client().prepareSearch()
.setQuery(boolQuery().must(QueryBuilders.termQuery("ip", "192.168.0.1")))
.execute().actionGet();
assertHitCount(search, 1L);
search = client().prepareSearch()
.setQuery(queryStringQuery("ip: 192.168.0.1"))
.execute().actionGet();
assertHitCount(search, 1L);
search = client().prepareSearch()
.setQuery(boolQuery().must(QueryBuilders.termQuery("ip", "192.168.0.1/32"))) .setQuery(boolQuery().must(QueryBuilders.termQuery("ip", "192.168.0.1/32")))
.execute().actionGet(); .execute().actionGet();
assertHitCount(search, 1l); assertHitCount(search, 1l);