Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Super randomized tests for fetch fields API #70278

Merged
merged 24 commits into from
Mar 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -136,4 +136,10 @@ public void testRejectMultiValuedFields() throws MapperParsingException, IOExcep
assertEquals("[rank_feature] fields do not support indexing multiple values for the same field [foo.field] in the same document",
e.getCause().getMessage());
}

@Override
protected Object generateRandomInputValue(MappedFieldType ft) {
assumeFalse("Test implemented in a follow up", true);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did this because I wanted to be able to open the PR and for everything to compile. I do expect to handle this in a follow up.

return null;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -135,4 +135,10 @@ public void testRejectMultiValuedFields() throws MapperParsingException, IOExcep
assertEquals("[rank_features] fields do not support indexing multiple values for the same rank feature [foo.field.bar] in " +
"the same document", e.getCause().getMessage());
}

@Override
protected Object generateRandomInputValue(MappedFieldType ft) {
assumeFalse("Test implemented in a follow up", true);
return null;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -271,4 +271,30 @@ public void testRejectIndexOptions() {
containsString("Failed to parse mapping: unknown parameter [index_options] on mapper [field] of type [scaled_float]"));
}

@Override
protected void randomFetchTestFieldConfig(XContentBuilder b) throws IOException {
// Large floats are a terrible idea but the round trip should still work no matter how badly you configure the field
b.field("type", "scaled_float").field("scaling_factor", randomDoubleBetween(0, Float.MAX_VALUE, true));
}

@Override
protected Object generateRandomInputValue(MappedFieldType ft) {
/*
* randomDoubleBetween will smear the random values out across a huge
* range of valid values.
*/
double v = randomDoubleBetween(-Float.MAX_VALUE, Float.MAX_VALUE, true);
switch (between(0, 3)) {
case 0:
return v;
case 1:
return (float) v;
case 2:
return Double.toString(v);
case 3:
return Float.toString((float) v);
default:
throw new IllegalArgumentException();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -745,4 +745,10 @@ private static PrefixFieldMapper getPrefixFieldMapper(DocumentMapper defaultMapp
assertThat(mapper, instanceOf(PrefixFieldMapper.class));
return (PrefixFieldMapper) mapper;
}

@Override
protected Object generateRandomInputValue(MappedFieldType ft) {
assumeFalse("We don't have doc values or fielddata", true);
return null;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -177,4 +177,20 @@ private ParseContext.Document parseDocument(DocumentMapper mapper, SourceToParse
return mapper.parse(request)
.docs().stream().findFirst().orElseThrow(() -> new IllegalStateException("Test object not parsed"));
}

@Override
protected String generateRandomInputValue(MappedFieldType ft) {
int words = between(1, 1000);
StringBuilder b = new StringBuilder(words * 5);
b.append(randomAlphaOfLength(4));
for (int w = 1; w < words; w++) {
b.append(' ').append(randomAlphaOfLength(4));
}
return b.toString();
}

@Override
protected void randomFetchTestFieldConfig(XContentBuilder b) throws IOException {
b.field("type", "token_count").field("analyzer", "standard");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public Query regexpQuery(String value, int syntaxFlags, int matchFlags, int maxD
throw new UnsupportedOperationException("[regexp] queries are not supported on [" + CONTENT_TYPE + "] fields.");
}

public static DocValueFormat COLLATE_FORMAT = new DocValueFormat() {
public static final DocValueFormat COLLATE_FORMAT = new DocValueFormat() {
@Override
public String getWriteableName() {
return "collate";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import com.ibm.icu.text.Collator;
import com.ibm.icu.text.RawCollationKey;
import com.ibm.icu.util.ULocale;

import org.apache.lucene.index.DocValuesType;
import org.apache.lucene.index.IndexOptions;
import org.apache.lucene.index.IndexableField;
Expand Down Expand Up @@ -280,4 +281,13 @@ public void testUpdateIgnoreAbove() throws IOException {
assertEquals(0, fields.length);
}

@Override
protected String generateRandomInputValue(MappedFieldType ft) {
assumeFalse("docvalue_fields is broken", true);
// https://github.com/elastic/elasticsearch/issues/70276
/*
* docvalue_fields loads garbage bytes.
*/
return null;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.elasticsearch.index.analysis.StandardTokenizerFactory;
import org.elasticsearch.index.analysis.TokenFilterFactory;
import org.elasticsearch.index.mapper.DocumentMapper;
import org.elasticsearch.index.mapper.MappedFieldType;
import org.elasticsearch.index.mapper.MapperParsingException;
import org.elasticsearch.index.mapper.MapperService;
import org.elasticsearch.index.mapper.MapperTestCase;
Expand Down Expand Up @@ -552,4 +553,9 @@ public void testAnalyzedFieldPositionIncrementWithoutPositions() {
}
}

@Override
protected Object generateRandomInputValue(MappedFieldType ft) {
assumeFalse("annotated_text doesn't have fielddata so we can't check against anything here.", true);
return null;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import org.apache.lucene.index.IndexableField;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.index.mapper.DocumentMapper;
import org.elasticsearch.index.mapper.MappedFieldType;
import org.elasticsearch.index.mapper.MapperTestCase;
import org.elasticsearch.index.mapper.ParsedDocument;
import org.elasticsearch.plugin.mapper.MapperMurmur3Plugin;
Expand Down Expand Up @@ -56,4 +57,9 @@ public void testDefaults() throws Exception {
assertEquals(DocValuesType.SORTED_NUMERIC, field.fieldType().docValuesType());
}

@Override
protected Object generateRandomInputValue(MappedFieldType ft) {
assumeFalse("Test implemented in a follow up", true);
return null;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,10 @@ public Query intersectsQuery(String field, Object from, Object to, boolean inclu
}
};

public final String name;
private final NumberFieldMapper.NumberType numberType;
public final LengthType lengthType;

RangeType(String name, LengthType lengthType) {
this.name = name;
this.numberType = null;
Expand Down Expand Up @@ -699,9 +703,9 @@ public final Mapper.TypeParser parser() {
return new FieldMapper.TypeParser((n, c) -> new RangeFieldMapper.Builder(n, this, c.getSettings()));
}

public final String name;
private final NumberFieldMapper.NumberType numberType;
public final LengthType lengthType;
NumberFieldMapper.NumberType numberType() {
return numberType;
}

public enum LengthType {
FIXED_4 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,4 +118,16 @@ public void testStoredValue() throws IOException {
assertEquals(new BytesArray(value), originalValue);
}
}

@Override
protected Object generateRandomInputValue(MappedFieldType ft) {
assumeFalse("We can't parse the binary doc values we send", true);
// AwaitsFix https://github.com/elastic/elasticsearch/issues/70244
return null;
}

@Override
protected void randomFetchTestFieldConfig(XContentBuilder b) throws IOException {
b.field("type", "binary").field("doc_values", true); // enable doc_values so the test is happy
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -162,4 +162,20 @@ public void testDocValues() throws Exception {
assertEquals(DocValuesType.NONE, fields[0].fieldType().docValuesType());
assertEquals(DocValuesType.SORTED_NUMERIC, fields[1].fieldType().docValuesType());
}

@Override
protected Object generateRandomInputValue(MappedFieldType ft) {
switch (between(0, 3)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will definitely be nicer when it doesn't return a Supplier as then we get a random mix of types within a single doc.

case 0:
return randomBoolean();
case 1:
return randomBoolean() ? "true" : "false";
case 2:
return randomBoolean() ? "true" : "";
case 3:
return randomBoolean() ? "true" : null;
default:
throw new IllegalStateException();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,15 @@ protected List<OutOfRangeSpec> outOfRangeSpecs() {
protected void minimalMapping(XContentBuilder b) throws IOException {
b.field("type", "byte");
}

@Override
protected Number randomNumber() {
if (randomBoolean()) {
return randomByte();
}
if (randomBoolean()) {
return randomDouble();
}
return randomDoubleBetween(Byte.MIN_VALUE, Byte.MAX_VALUE, true);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -778,4 +778,9 @@ protected V featureValueOf(T actual) {
};
}

@Override
protected Object generateRandomInputValue(MappedFieldType ft) {
assumeFalse("We don't have doc values or fielddata", true);
return null;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.elasticsearch.common.time.DateFormatter;
import org.elasticsearch.common.time.DateUtils;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.index.mapper.DateFieldMapper.DateFieldType;
import org.elasticsearch.index.termvectors.TermVectorsService;
import org.elasticsearch.search.DocValueFormat;

Expand Down Expand Up @@ -500,6 +501,50 @@ public void testFetchNanosFromFixedNanosFormatted() throws IOException {
);
}

@Override
protected void randomFetchTestFieldConfig(XContentBuilder b) throws IOException {
b.field("type", randomBoolean() ? "date" : "date_nanos");
}

@Override
protected String randomFetchTestFormat() {
// TODO more choices! The test should work fine even for choices that throw out a ton of precision.
switch (randomInt(2)) {
case 0:
return null;
case 1:
return "epoch_millis";
case 2:
return "iso8601";
default:
throw new IllegalStateException();
}
}

@Override
protected Object generateRandomInputValue(MappedFieldType ft) {
switch (((DateFieldType) ft).resolution()) {
case MILLISECONDS:
if (randomBoolean()) {
return randomIs8601Nanos(MAX_ISO_DATE);
}
return randomLongBetween(0, Long.MAX_VALUE);
case NANOSECONDS:
switch (randomInt(2)) {
case 0:
return randomLongBetween(0, MAX_NANOS);
case 1:
return randomIs8601Nanos(MAX_NANOS);
case 2:
return new BigDecimal(randomDecimalNanos(MAX_MILLIS_DOUBLE_NANOS_KEEPS_PRECISION));
default:
throw new IllegalStateException();
}
default:
throw new IllegalStateException();
}
}

private MapperService dateNanosMapperService() throws IOException {
return createMapperService(mapping(b -> b.startObject("field").field("type", "date_nanos").endObject()));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,15 @@ protected List<OutOfRangeSpec> outOfRangeSpecs() {
protected void minimalMapping(XContentBuilder b) throws IOException {
b.field("type", "double");
}

@Override
protected Number randomNumber() {
/*
* The source parser and doc values round trip will both increase
* the precision to 64 bits if the value is less precise.
* randomDoubleBetween will smear the values out across a wide
* range of valid values.
*/
return randomBoolean() ? randomDoubleBetween(-Double.MAX_VALUE, Double.MAX_VALUE, true) : randomFloat();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,15 @@ protected List<OutOfRangeSpec> outOfRangeSpecs() {
protected void minimalMapping(XContentBuilder b) throws IOException {
b.field("type", "float");
}

@Override
protected Number randomNumber() {
/*
* The source parser and doc values round trip will both reduce
* the precision to 32 bits if the value is more precise.
* randomDoubleBetween will smear the values out across a wide
* range of valid values.
*/
return randomBoolean() ? randomDoubleBetween(-Float.MAX_VALUE, Float.MAX_VALUE, true) : randomFloat();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -340,4 +340,10 @@ protected void assertSearchable(MappedFieldType fieldType) {
//always searchable even if it uses TextSearchInfo.NONE
assertTrue(fieldType.isSearchable());
}

@Override
protected Object generateRandomInputValue(MappedFieldType ft) {
assumeFalse("Test implemented in a follow up", true);
return null;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -226,4 +226,10 @@ protected void assertSearchable(MappedFieldType fieldType) {
//always searchable even if it uses TextSearchInfo.NONE
assertTrue(fieldType.isSearchable());
}

@Override
protected Object generateRandomInputValue(MappedFieldType ft) {
assumeFalse("Test implemented in a follow up", true);
return null;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

package org.elasticsearch.index.mapper;

import org.apache.lucene.document.HalfFloatPoint;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.index.mapper.NumberFieldMapper.NumberType;
import org.elasticsearch.index.mapper.NumberFieldTypeTests.OutOfRangeSpec;
Expand Down Expand Up @@ -38,4 +39,16 @@ protected List<OutOfRangeSpec> outOfRangeSpecs() {
protected void minimalMapping(XContentBuilder b) throws IOException {
b.field("type", "half_float");
}

@Override
protected Number randomNumber() {
/*
* The native valueFetcher returns 32 bits of precision but the
* doc values fetcher returns 16 bits of precision. To make it
* all line up we round here instead of in the fetcher. This bug
* is tracked in:
* https://github.com/elastic/elasticsearch/issues/70260
*/
return HalfFloatPoint.sortableShortToHalfFloat(HalfFloatPoint.halfFloatToSortableShort(randomFloat()));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,15 @@ protected List<OutOfRangeSpec> outOfRangeSpecs() {
protected void minimalMapping(XContentBuilder b) throws IOException {
b.field("type", "integer");
}

@Override
protected Number randomNumber() {
if (randomBoolean()) {
return randomInt();
}
if (randomBoolean()) {
return randomDouble();
}
return randomDoubleBetween(Integer.MIN_VALUE, Integer.MAX_VALUE, true);
}
}
Loading