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

Address MinAndMax generics warnings (#52642) 

`MinAndMax` encapsulates min and max values for a shard. It uses generics to make sure that the values are of the same type and are also comparable. Though there are warnings whenever this class is currently used, which are addressed with this commit.

Relates to #49092
This commit is contained in:
Luca Cavanna 2020-03-03 16:08:10 +01:00 committed by GitHub
parent cb868d2f5e
commit 8a05b670ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 63 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/main/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhase.java
View File

@ -133,7 +133,7 @@ final class CanMatchPreFilterSearchPhase extends AbstractSearchAsyncAction<CanMa
private static Comparator<Integer> shardComparator(GroupShardsIterator<SearchShardIterator> shardsIts, private static Comparator<Integer> shardComparator(GroupShardsIterator<SearchShardIterator> shardsIts,
MinAndMax<?>[] minAndMaxes, MinAndMax<?>[] minAndMaxes,
SortOrder order) { SortOrder order) {
final Comparator<Integer> comparator = Comparator.comparing(index -> minAndMaxes[index], MinAndMax.getComparator(order)); final Comparator<Integer> comparator = Comparator.comparing(index -> minAndMaxes[index], MinAndMax.getComparator(order));
return comparator.thenComparing(index -> shardsIts.get(index).shardId()); return comparator.thenComparing(index -> shardsIts.get(index).shardId());
} }

112
server/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java
View File

@ -499,46 +499,6 @@ public class FieldSortBuilder extends SortBuilder<FieldSortBuilder> {
return source.sorts().get(0) instanceof FieldSortBuilder ? (FieldSortBuilder) source.sorts().get(0) : null; return source.sorts().get(0) instanceof FieldSortBuilder ? (FieldSortBuilder) source.sorts().get(0) : null;
} }
/**
* Return a {@link Function} that converts a serialized point into a {@link Number} according to the provided
* {@link SortField}. This is needed for {@link SortField} that converts values from one type to another using
* {@link FieldSortBuilder#setNumericType(String)} )} (e.g.: long to double).
*/
private static Function<byte[], Comparable> numericPointConverter(SortField sortField, NumberFieldType numberFieldType) {
switch (IndexSortConfig.getSortFieldType(sortField)) {
case LONG:
return v -> numberFieldType.parsePoint(v).longValue();
case INT:
return v -> numberFieldType.parsePoint(v).intValue();
case DOUBLE:
return v -> numberFieldType.parsePoint(v).doubleValue();
case FLOAT:
return v -> numberFieldType.parsePoint(v).floatValue();
default:
return v -> null;
}
}
/**
* Return a {@link Function} that converts a serialized date point into a {@link Long} according to the provided
* {@link NumericType}.
*/
private static Function<byte[], Comparable> datePointConverter(DateFieldType dateFieldType, String numericTypeStr) {
if (numericTypeStr != null) {
NumericType numericType = resolveNumericType(numericTypeStr);
if (dateFieldType.resolution() == MILLISECONDS && numericType == NumericType.DATE_NANOSECONDS) {
return v -> DateUtils.toNanoSeconds(LongPoint.decodeDimension(v, 0));
} else if (dateFieldType.resolution() == NANOSECONDS && numericType == NumericType.DATE) {
return v -> DateUtils.toMilliSeconds(LongPoint.decodeDimension(v, 0));
}
}
return v -> LongPoint.decodeDimension(v, 0);
}
/** /**
* Return the {@link MinAndMax} indexed value from the provided {@link FieldSortBuilder} or <code>null</code> if unknown. * Return the {@link MinAndMax} indexed value from the provided {@link FieldSortBuilder} or <code>null</code> if unknown.
* The value can be extracted on non-nested indexed mapped fields of type keyword, numeric or date, other fields * The value can be extracted on non-nested indexed mapped fields of type keyword, numeric or date, other fields
@ -555,41 +515,73 @@ public class FieldSortBuilder extends SortBuilder<FieldSortBuilder> {
if (reader == null || (fieldType == null || fieldType.indexOptions() == IndexOptions.NONE)) { if (reader == null || (fieldType == null || fieldType.indexOptions() == IndexOptions.NONE)) {
return null; return null;
} }
String fieldName = fieldType.name();
switch (IndexSortConfig.getSortFieldType(sortField)) { switch (IndexSortConfig.getSortFieldType(sortField)) {
case LONG: case LONG:
case INT: case INT:
case DOUBLE: case DOUBLE:
case FLOAT: case FLOAT:
final Function<byte[], Comparable> converter; return extractNumericMinAndMax(reader, sortField, fieldType, sortBuilder);
if (fieldType instanceof NumberFieldType) {
converter = numericPointConverter(sortField, (NumberFieldType) fieldType);
} else if (fieldType instanceof DateFieldType) {
converter = datePointConverter((DateFieldType) fieldType, sortBuilder.getNumericType());
} else {
return null;
}
if (PointValues.size(reader, fieldName) == 0) {
return null;
}
final Comparable min = converter.apply(PointValues.getMinPackedValue(reader, fieldName));
final Comparable max = converter.apply(PointValues.getMaxPackedValue(reader, fieldName));
return MinAndMax.newMinMax(min, max);
case STRING: case STRING:
case STRING_VAL: case STRING_VAL:
if (fieldType instanceof KeywordFieldMapper.KeywordFieldType) { if (fieldType instanceof KeywordFieldMapper.KeywordFieldType) {
Terms terms = MultiTerms.getTerms(reader, fieldName); Terms terms = MultiTerms.getTerms(reader, fieldType.name());
if (terms == null) { if (terms == null) {
return null; return null;
} }
return terms.getMin() != null ? MinAndMax.newMinMax(terms.getMin(), terms.getMax()) : null; return terms.getMin() != null ? new MinAndMax<>(terms.getMin(), terms.getMax()) : null;
} }
break; break;
} }
return null; return null;
} }
private static MinAndMax<?> extractNumericMinAndMax(IndexReader reader,
SortField sortField,
MappedFieldType fieldType,
FieldSortBuilder sortBuilder) throws IOException {
String fieldName = fieldType.name();
if (PointValues.size(reader, fieldName) == 0) {
return null;
}
if (fieldType instanceof NumberFieldType) {
NumberFieldType numberFieldType = (NumberFieldType) fieldType;
Number minPoint = numberFieldType.parsePoint(PointValues.getMinPackedValue(reader, fieldName));
Number maxPoint = numberFieldType.parsePoint(PointValues.getMaxPackedValue(reader, fieldName));
switch (IndexSortConfig.getSortFieldType(sortField)) {
case LONG:
return new MinAndMax<>(minPoint.longValue(), maxPoint.longValue());
case INT:
return new MinAndMax<>(minPoint.intValue(), maxPoint.intValue());
case DOUBLE:
return new MinAndMax<>(minPoint.doubleValue(), maxPoint.doubleValue());
case FLOAT:
return new MinAndMax<>(minPoint.floatValue(), maxPoint.floatValue());
default:
return null;
}
} else if (fieldType instanceof DateFieldType) {
DateFieldType dateFieldType = (DateFieldType) fieldType;
Function<byte[], Long> dateConverter = createDateConverter(sortBuilder, dateFieldType);
Long min = dateConverter.apply(PointValues.getMinPackedValue(reader, fieldName));
Long max = dateConverter.apply(PointValues.getMaxPackedValue(reader, fieldName));
return new MinAndMax<>(min, max);
}
return null;
}
private static Function<byte[], Long> createDateConverter(FieldSortBuilder sortBuilder, DateFieldType dateFieldType) {
String numericTypeStr = sortBuilder.getNumericType();
if (numericTypeStr != null) {
NumericType numericType = resolveNumericType(numericTypeStr);
if (dateFieldType.resolution() == MILLISECONDS && numericType == NumericType.DATE_NANOSECONDS) {
return v -> DateUtils.toNanoSeconds(LongPoint.decodeDimension(v, 0));
} else if (dateFieldType.resolution() == NANOSECONDS && numericType == NumericType.DATE) {
return v -> DateUtils.toMilliSeconds(LongPoint.decodeDimension(v, 0));
}
}
return v -> LongPoint.decodeDimension(v, 0);
}
/** /**
* Throws an exception if max children is not located at top level nested sort. * Throws an exception if max children is not located at top level nested sort.
*/ */
@ -647,7 +639,7 @@ public class FieldSortBuilder extends SortBuilder<FieldSortBuilder> {
private static final ObjectParser<FieldSortBuilder, Void> PARSER = new ObjectParser<>(NAME); private static final ObjectParser<FieldSortBuilder, Void> PARSER = new ObjectParser<>(NAME);
static { static {
PARSER.declareField(FieldSortBuilder::missing, p -> p.objectText(), MISSING, ValueType.VALUE); PARSER.declareField(FieldSortBuilder::missing, XContentParser::objectText, MISSING, ValueType.VALUE);
PARSER.declareString((fieldSortBuilder, nestedPath) -> { PARSER.declareString((fieldSortBuilder, nestedPath) -> {
deprecationLogger.deprecated("[nested_path] has been deprecated in favor of the [nested] parameter"); deprecationLogger.deprecated("[nested_path] has been deprecated in favor of the [nested] parameter");
fieldSortBuilder.setNestedPath(nestedPath); fieldSortBuilder.setNestedPath(nestedPath);
@ -660,7 +652,7 @@ public class FieldSortBuilder extends SortBuilder<FieldSortBuilder> {
return SortBuilder.parseNestedFilter(p); return SortBuilder.parseNestedFilter(p);
}, NESTED_FILTER_FIELD); }, NESTED_FILTER_FIELD);
PARSER.declareObject(FieldSortBuilder::setNestedSort, (p, c) -> NestedSortBuilder.fromXContent(p), NESTED_FIELD); PARSER.declareObject(FieldSortBuilder::setNestedSort, (p, c) -> NestedSortBuilder.fromXContent(p), NESTED_FIELD);
PARSER.declareString((b, v) -> b.setNumericType(v), NUMERIC_TYPE); PARSER.declareString(FieldSortBuilder::setNumericType, NUMERIC_TYPE);
} }
@Override @Override

21
server/src/main/java/org/elasticsearch/search/sort/MinAndMax.java
View File

@ -29,20 +29,21 @@ import java.util.Comparator;
import java.util.Objects; import java.util.Objects;
/** /**
* A class that encapsulates a minimum and a maximum {@link Comparable}. * A class that encapsulates a minimum and a maximum, that are of the same type and {@link Comparable}.
*/ */
public class MinAndMax<T extends Comparable<? super T>> implements Writeable { public class MinAndMax<T extends Comparable<? super T>> implements Writeable {
private final T minValue; private final T minValue;
private final T maxValue; private final T maxValue;
private MinAndMax(T minValue, T maxValue) { public MinAndMax(T minValue, T maxValue) {
this.minValue = Objects.requireNonNull(minValue); this.minValue = Objects.requireNonNull(minValue);
this.maxValue = Objects.requireNonNull(maxValue); this.maxValue = Objects.requireNonNull(maxValue);
} }
@SuppressWarnings("unchecked")
public MinAndMax(StreamInput in) throws IOException { public MinAndMax(StreamInput in) throws IOException {
this.minValue = (T) Lucene.readSortValue(in); this.minValue = (T)Lucene.readSortValue(in);
this.maxValue = (T) Lucene.readSortValue(in); this.maxValue = (T)Lucene.readSortValue(in);
} }
@Override @Override
@ -54,27 +55,23 @@ public class MinAndMax<T extends Comparable<? super T>> implements Writeable {
/** /**
* Return the minimum value. * Return the minimum value.
*/ */
public T getMin() { T getMin() {
return minValue; return minValue;
} }
/** /**
* Return the maximum value. * Return the maximum value.
*/ */
public T getMax() { T getMax() {
return maxValue; return maxValue;
} }
public static <T extends Comparable<? super T>> MinAndMax<T> newMinMax(T min, T max) {
return new MinAndMax<>(min, max);
}
/** /**
* Return a {@link Comparator} for {@link MinAndMax} values according to the provided {@link SortOrder}. * Return a {@link Comparator} for {@link MinAndMax} values according to the provided {@link SortOrder}.
*/ */
public static Comparator<MinAndMax<?>> getComparator(SortOrder order) { public static Comparator<MinAndMax<?>> getComparator(SortOrder order) {
Comparator<MinAndMax> cmp = order == SortOrder.ASC ? Comparator<MinAndMax<?>> cmp = order == SortOrder.ASC ?
Comparator.comparing(v -> (Comparable) v.getMin()) : Comparator.comparing(v -> (Comparable) v.getMax()); Comparator.comparing(MinAndMax::getMin) : Comparator.comparing(MinAndMax::getMax);
if (order == SortOrder.DESC) { if (order == SortOrder.DESC) {
cmp = cmp.reversed(); cmp = cmp.reversed();
} }

2
server/src/test/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhaseTests.java
View File

@ -298,7 +298,7 @@ public class CanMatchPreFilterSearchPhaseTests extends ESTestCase {
ActionListener<SearchService.CanMatchResponse> listener) { ActionListener<SearchService.CanMatchResponse> listener) {
Long min = rarely() ? null : randomLong(); Long min = rarely() ? null : randomLong();
Long max = min == null ? null : randomLongBetween(min, Long.MAX_VALUE); Long max = min == null ? null : randomLongBetween(min, Long.MAX_VALUE);
MinAndMax<?> minMax = min == null ? null : MinAndMax.newMinMax(min, max); MinAndMax<?> minMax = min == null ? null : new MinAndMax<>(min, max);
boolean canMatch = frequently(); boolean canMatch = frequently();
synchronized (shardIds) { synchronized (shardIds) {
shardIds.add(request.shardId()); shardIds.add(request.shardId());