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

Tests: Fix RangeQueryBuilderTest, adding separate test for unmapped field & timestamp

This commit is contained in:
Christoph Büscher 2015-06-12 11:02:06 +02:00
parent b8dd7e688e
commit 9fd61f786e
2 changed files with 42 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/org/elasticsearch/index/query/RangeQueryBuilder.java
View File

@ -301,6 +301,11 @@ public class RangeQueryBuilder extends MultiTermQueryBuilder<RangeQueryBuilder>
//LUCENE 4 UPGRADE Mapper#rangeQuery should use bytesref as well? //LUCENE 4 UPGRADE Mapper#rangeQuery should use bytesref as well?
query = mapper.rangeQuery(from, to, includeLower, includeUpper, parseContext); query = mapper.rangeQuery(from, to, includeLower, includeUpper, parseContext);
} }
} else {
if (timeZone != null) {
throw new QueryParsingException(parseContext, "[range] time_zone can not be applied to non unmapped field ["
+ fieldName + "]");
}
} }
if (query == null) { if (query == null) {

59
core/src/test/java/org/elasticsearch/index/query/RangeQueryBuilderTest.java
View File

@ -55,7 +55,7 @@ public class RangeQueryBuilderTest extends BaseQueryTestCase<RangeQueryBuilder>
} else { } else {
// use unmapped field for numeric range queries // use unmapped field for numeric range queries
query = new RangeQueryBuilder(randomAsciiOfLengthBetween(1, 10)); query = new RangeQueryBuilder(randomAsciiOfLengthBetween(1, 10));
query.from(0.0-randomDouble()); query.from(0.0 - randomDouble());
query.to(randomDouble()); query.to(randomDouble());
} }
} else { } else {
@ -63,11 +63,15 @@ public class RangeQueryBuilderTest extends BaseQueryTestCase<RangeQueryBuilder>
query = new RangeQueryBuilder(DATE_FIELD_NAME); query = new RangeQueryBuilder(DATE_FIELD_NAME);
query.from(new DateTime(System.currentTimeMillis() - randomIntBetween(0, 1000000)).toString()); query.from(new DateTime(System.currentTimeMillis() - randomIntBetween(0, 1000000)).toString());
query.to(new DateTime(System.currentTimeMillis() + randomIntBetween(0, 1000000)).toString()); query.to(new DateTime(System.currentTimeMillis() + randomIntBetween(0, 1000000)).toString());
if (randomBoolean()) { // Use timestamp option then we have a date mapper, otherwise we would trigger exception.
query.timeZone(TIMEZONE_IDS.get(randomIntBetween(0, TIMEZONE_IDS.size()-1))); // There is a separate test for that.
} if (createContext().fieldMapper(DATE_FIELD_NAME) != null) {
if (randomBoolean()) { if (randomBoolean()) {
query.format("yyyy-MM-dd'T'HH:mm:ss.SSSZZ"); query.timeZone(TIMEZONE_IDS.get(randomIntBetween(0, TIMEZONE_IDS.size() - 1)));
}
if (randomBoolean()) {
query.format("yyyy-MM-dd'T'HH:mm:ss.SSSZZ");
}
} }
} }
query.includeLower(randomBoolean()).includeUpper(randomBoolean()); query.includeLower(randomBoolean()).includeUpper(randomBoolean());
@ -91,14 +95,13 @@ public class RangeQueryBuilderTest extends BaseQueryTestCase<RangeQueryBuilder>
protected Query createExpectedQuery(RangeQueryBuilder queryBuilder, QueryParseContext context) throws IOException { protected Query createExpectedQuery(RangeQueryBuilder queryBuilder, QueryParseContext context) throws IOException {
Query expectedQuery; Query expectedQuery;
String fieldName = queryBuilder.fieldName(); String fieldName = queryBuilder.fieldName();
if (getCurrentTypes().length == 0 || (fieldName.equals(DATE_FIELD_NAME) == false && fieldName.equals(INT_FIELD_NAME) == false) ) { if (getCurrentTypes().length == 0 || (fieldName.equals(DATE_FIELD_NAME) == false && fieldName.equals(INT_FIELD_NAME) == false)) {
expectedQuery = new TermRangeQuery(fieldName, expectedQuery = new TermRangeQuery(fieldName, BytesRefs.toBytesRef(queryBuilder.from()),
BytesRefs.toBytesRef(queryBuilder.from()), BytesRefs.toBytesRef(queryBuilder.to()), BytesRefs.toBytesRef(queryBuilder.to()), queryBuilder.includeLower(), queryBuilder.includeUpper());
queryBuilder.includeLower(), queryBuilder.includeUpper());
} else if (fieldName.equals(DATE_FIELD_NAME)) { } else if (fieldName.equals(DATE_FIELD_NAME)) {
DateMathParser forcedDateParser = null; DateMathParser forcedDateParser = null;
if (queryBuilder.format() != null) { if (queryBuilder.format() != null) {
forcedDateParser = new DateMathParser(Joda.forPattern(queryBuilder.format())); forcedDateParser = new DateMathParser(Joda.forPattern(queryBuilder.format()));
} }
DateTimeZone dateTimeZone = null; DateTimeZone dateTimeZone = null;
@ -106,9 +109,11 @@ public class RangeQueryBuilderTest extends BaseQueryTestCase<RangeQueryBuilder>
dateTimeZone = DateTimeZone.forID(queryBuilder.timeZone()); dateTimeZone = DateTimeZone.forID(queryBuilder.timeZone());
} }
MappedFieldType mapper = context.fieldMapper(queryBuilder.fieldName()); MappedFieldType mapper = context.fieldMapper(queryBuilder.fieldName());
expectedQuery = ((DateFieldMapper.DateFieldType) mapper).rangeQuery(queryBuilder.from(), queryBuilder.to(), queryBuilder.includeLower(), queryBuilder.includeUpper(), dateTimeZone, forcedDateParser, context); expectedQuery = ((DateFieldMapper.DateFieldType) mapper).rangeQuery(queryBuilder.from(), queryBuilder.to(),
queryBuilder.includeLower(), queryBuilder.includeUpper(), dateTimeZone, forcedDateParser, context);
} else if (queryBuilder.fieldName().equals(INT_FIELD_NAME)) { } else if (queryBuilder.fieldName().equals(INT_FIELD_NAME)) {
expectedQuery = NumericRangeQuery.newIntRange(INT_FIELD_NAME, (Integer) queryBuilder.from(), (Integer) queryBuilder.to(), queryBuilder.includeLower(), queryBuilder.includeUpper()); expectedQuery = NumericRangeQuery.newIntRange(INT_FIELD_NAME, (Integer) queryBuilder.from(), (Integer) queryBuilder.to(),
queryBuilder.includeLower(), queryBuilder.includeUpper());
} else { } else {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@ -145,13 +150,23 @@ public class RangeQueryBuilderTest extends BaseQueryTestCase<RangeQueryBuilder>
assertThat(rangeQueryBuilder.validate().validationErrors().size(), is(2)); assertThat(rangeQueryBuilder.validate().validationErrors().size(), is(2));
} }
// /** /**
// * Specifying a timezone together with a numeric range query should throw an error. * Specifying a timezone together with a numeric range query should throw an exception.
// */ */
// @Test(expected=QueryParsingException.class) @Test(expected=QueryParsingException.class)
// public void testToQueryNonDateWithTimezone() throws QueryParsingException, IOException { public void testToQueryNonDateWithTimezone() throws QueryParsingException, IOException {
// RangeQueryBuilder query = new RangeQueryBuilder(INT_FIELD_NAME); RangeQueryBuilder query = new RangeQueryBuilder(INT_FIELD_NAME);
// query.from(1).to(10).timeZone("UTC"); query.from(1).to(10).timeZone("UTC");
// query.toQuery(createContext()); query.toQuery(createContext());
// } }
/**
* Specifying a timezone together with an unmapped field should throw an exception.
*/
@Test(expected=QueryParsingException.class)
public void testToQueryUnmappedWithTimezone() throws QueryParsingException, IOException {
RangeQueryBuilder query = new RangeQueryBuilder("bogus_field");
query.from(1).to(10).timeZone("UTC");
query.toQuery(createContext());
}
} }