Apache Lucene open-source search software
Improve round trip conversion of ValueSource <-> DoublesValueSource (#15406)
Chris Hostetterba277acb0f3e
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txtindex 918901d2c77..abf067a8a2b 100644--- a/lucene/CHANGES.txt+++ b/lucene/CHANGES.txt@@ -233,6 +233,8 @@ Optimizations* GITHUB#15003: Avoid reconstructing HNSW graph during merging (Pulkit Gupta)+* GITHUB#15406: Improve round trip conversion of ValueSource <-> DoublesValueSource (hossman)+Bug Fixes---------------------* GITHUB#14161: PointInSetQuery's constructor now throws IllegalArgumentExceptiondiff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSource.javaindex 65885fceeee..8f31c9af02c 100644--- a/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSource.java+++ b/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSource.java@@ -265,7 +265,10 @@ public abstract class ValueSource {}public static ValueSource fromDoubleValuesSource(DoubleValuesSource in) {- return new FromDoubleValuesSource(in);+ return switch (in) {+ case WrappedDoubleValuesSource wrapped -> wrapped.in;+ default -> new FromDoubleValuesSource(in);+ };}private static class FromDoubleValuesSource extends ValueSource {@@ -276,6 +279,12 @@ public abstract class ValueSource {this.in = in;}+ /** Return the original DoubleValuesSource */+ @Override+ public DoubleValuesSource asDoubleValuesSource() {+ return in;+ }+@Overridepublic FunctionValues getValues(Map<Object, Object> context, LeafReaderContext readerContext)throws IOException {diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.javaindex 6155c71ddef..70b996cca75 100644--- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java+++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java@@ -740,6 +740,16 @@ public class TestValueSources extends LuceneTestCase {}}+ public void testReWrappingAsDoubleValues() throws Exception {+ final ValueSource original = new DoubleFieldSource("double");+ assertSame(original, ValueSource.fromDoubleValuesSource(original.asDoubleValuesSource()));+ }++ public void testUnWrappingDoubleValues() throws Exception {+ final DoubleValuesSource original = DoubleValuesSource.fromDoubleField("double");+ assertSame(original, ValueSource.fromDoubleValuesSource(original).asDoubleValuesSource());+ }+public void testWrappingAsDoubleValues() throws Exception {class AssertScoreComputedOnceQuery extends Query {