LUCENE-9362: Fix rewriting check in ExpressionValueSource (#1485)
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index a35f575..484556c 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -235,6 +235,9 @@
* LUCENE-9314: Single-document monitor runs were using the less efficient MultiDocumentBatch
implementation. (Pierre-Luc Perron, Alan Woodward)
+* LUCENE-9362: Fix equality check in ExpressionValueSource#rewrite. This fixes rewriting of inner value sources.
+ (Dmitry Emets)
+
Other
---------------------
diff --git a/lucene/expressions/src/java/org/apache/lucene/expressions/ExpressionValueSource.java b/lucene/expressions/src/java/org/apache/lucene/expressions/ExpressionValueSource.java
index f4fa894..1f8713d 100644
--- a/lucene/expressions/src/java/org/apache/lucene/expressions/ExpressionValueSource.java
+++ b/lucene/expressions/src/java/org/apache/lucene/expressions/ExpressionValueSource.java
@@ -174,7 +174,7 @@
DoubleValuesSource[] rewritten = new DoubleValuesSource[variables.length];
for (int i = 0; i < variables.length; i++) {
rewritten[i] = variables[i].rewrite(searcher);
- changed |= (rewritten[i] == variables[i]);
+ changed |= (rewritten[i] != variables[i]);
}
if (changed) {
return new ExpressionValueSource(rewritten, expression, needsScores);
diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java
index d5dbabe..3b5589b 100644
--- a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java
+++ b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java
@@ -28,9 +28,12 @@
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.search.DoubleValues;
import org.apache.lucene.search.DoubleValuesSource;
+import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
+import java.io.IOException;
+
public class TestExpressionValueSource extends LuceneTestCase {
DirectoryReader reader;
Directory dir;
@@ -125,4 +128,59 @@
assertFalse(vs1.equals(vs4));
}
+ public void testRewrite() throws Exception {
+ Expression expr = JavascriptCompiler.compile("a");
+
+ ExpressionValueSource rewritingExpressionSource = new ExpressionValueSource(
+ new DoubleValuesSource[]{createDoubleValuesSourceMock(true)},
+ expr,
+ false);
+ ExpressionValueSource notRewritingExpressionSource = new ExpressionValueSource(
+ new DoubleValuesSource[]{createDoubleValuesSourceMock(false)},
+ expr,
+ false);
+
+ assertNotSame(rewritingExpressionSource, rewritingExpressionSource.rewrite(null));
+ assertSame(notRewritingExpressionSource, notRewritingExpressionSource.rewrite(null));
+ }
+
+ private static DoubleValuesSource createDoubleValuesSourceMock(boolean rewriting) {
+ return new DoubleValuesSource() {
+ @Override
+ public DoubleValues getValues(LeafReaderContext ctx, DoubleValues scores) throws IOException {
+ return null;
+ }
+
+ @Override
+ public boolean needsScores() {
+ return false;
+ }
+
+ @Override
+ public DoubleValuesSource rewrite(IndexSearcher reader) throws IOException {
+ return rewriting ? createDoubleValuesSourceMock(true) : this;
+ }
+
+ @Override
+ public int hashCode() {
+ return 0;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ return false;
+ }
+
+ @Override
+ public String toString() {
+ return null;
+ }
+
+ @Override
+ public boolean isCacheable(LeafReaderContext ctx) {
+ return false;
+ }
+ };
+ }
+
}
