diff --git a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldMapperTests.java b/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldMapperTests.java index 83fe07170d6e7..1f1430d70c690 100644 --- a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldMapperTests.java +++ b/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldMapperTests.java @@ -31,7 +31,6 @@ import org.elasticsearch.xcontent.XContentBuilder; import org.elasticsearch.xcontent.XContentFactory; import org.elasticsearch.xcontent.XContentType; -import org.hamcrest.Matcher; import org.junit.AssumptionViolatedException; import java.io.IOException; @@ -39,7 +38,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Stream; @@ -48,7 +46,6 @@ import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.notANumber; public class ScaledFloatFieldMapperTests extends NumberFieldMapperTests { @@ -382,7 +379,7 @@ public SyntheticSourceExample example(int maxValues) { if (randomBoolean()) { Value v = generateValue(); if (v.malformedOutput == null) { - return new SyntheticSourceExample(v.input, v.output, roundDocValues(v.output), this::mapping); + return new SyntheticSourceExample(v.input, v.output, this::mapping); } return new SyntheticSourceExample(v.input, v.malformedOutput, null, this::mapping); } @@ -396,9 +393,7 @@ public SyntheticSourceExample example(int maxValues) { List outList = Stream.concat(outputFromDocValues.stream(), malformedOutput).toList(); Object out = outList.size() == 1 ? outList.get(0) : outList; - List outBlockList = outputFromDocValues.stream().map(this::roundDocValues).sorted().toList(); - Object outBlock = outBlockList.size() == 1 ? outBlockList.get(0) : outBlockList; - return new SyntheticSourceExample(in, out, outBlock, this::mapping); + return new SyntheticSourceExample(in, out, this::mapping); } private record Value(Object input, Double output, Object malformedOutput) {} @@ -442,16 +437,6 @@ private double round(double d) { return decoded; } - private double roundDocValues(double d) { - // Special case due to rounding, see implementation. - if (Math.abs(d) == Double.MAX_VALUE) { - return d; - } - - long encoded = Math.round(d * scalingFactor); - return encoded * (1 / scalingFactor); - } - private void mapping(XContentBuilder b) throws IOException { b.field("type", "scaled_float"); b.field("scaling_factor", scalingFactor); @@ -475,14 +460,9 @@ public List invalidExample() throws IOException { } } - @Override - protected Function loadBlockExpected() { - return v -> (Number) v; - } - - @Override - protected Matcher blockItemMatcher(Object expected) { - return "NaN".equals(expected) ? notANumber() : equalTo(expected); + protected BlockReaderSupport getSupportedReaders(MapperService mapper, String loaderFieldName) { + assumeTrue("Disabled, tested by ScaledFloatFieldBlockLoaderTests instead", false); + return null; } @Override diff --git a/muted-tests.yml b/muted-tests.yml index 3344b6e4335b8..9cb8eab0dd5d6 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -332,18 +332,9 @@ tests: - class: org.elasticsearch.xpack.esql.action.CrossClusterQueryWithPartialResultsIT method: testPartialResults issue: https://github.com/elastic/elasticsearch/issues/123101 -- class: org.elasticsearch.index.mapper.extras.ScaledFloatFieldMapperTests - method: testBlockLoaderFromRowStrideReader - issue: https://github.com/elastic/elasticsearch/issues/123126 -- class: org.elasticsearch.index.mapper.extras.ScaledFloatFieldMapperTests - method: testBlockLoaderFromRowStrideReaderWithSyntheticSource - issue: https://github.com/elastic/elasticsearch/issues/123145 - class: org.elasticsearch.xpack.esql.action.CrossClusterAsyncQueryStopIT method: testStopQueryLocal issue: https://github.com/elastic/elasticsearch/issues/121672 -- class: org.elasticsearch.index.mapper.extras.ScaledFloatFieldMapperTests - method: testBlockLoaderFromColumnReaderWithSyntheticSource - issue: https://github.com/elastic/elasticsearch/issues/123149 # Examples: #