(solr) branch main updated: SOLR-18305: add end-to-end test we use correct similarity with query limits (#4906)

[ab]

This is an automated email from the ASF dual-hosted git repository.

sigram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/main by this push:
     new 7456291d284 SOLR-18305: add end-to-end test we use correct similarity 
with query limits (#4906)
7456291d284 is described below

commit 7456291d2845364f1683d5cc3cff98e71f2f21c2
Author: Pierre Salagnac <psalag...@apache.org>
AuthorDate: Wed Sep 16 22:10:33 2026 +0200

    SOLR-18305: add end-to-end test we use correct similarity with query limits 
(#4906)
---
 .../solr/core/ExitableDirectoryReaderTest.java     | 57 ++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git 
a/solr/core/src/test/org/apache/solr/core/ExitableDirectoryReaderTest.java 
b/solr/core/src/test/org/apache/solr/core/ExitableDirectoryReaderTest.java
index df4ab85494b..8115ad18d03 100644
--- a/solr/core/src/test/org/apache/solr/core/ExitableDirectoryReaderTest.java
+++ b/solr/core/src/test/org/apache/solr/core/ExitableDirectoryReaderTest.java
@@ -18,7 +18,11 @@ package org.apache.solr.core;
 
 import java.util.Map;
 import java.util.Set;
+import org.apache.lucene.search.CollectionStatistics;
+import org.apache.lucene.search.TermStatistics;
+import org.apache.lucene.search.similarities.Similarity;
 import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.schema.SimilarityFactory;
 import org.apache.solr.search.CallerSpecificQueryLimit;
 import org.apache.solr.util.QueryLimitsTestInjectionRule;
 import org.apache.solr.util.TestInjection;
@@ -54,6 +58,7 @@ public class ExitableDirectoryReaderTest extends 
SolrTestCaseJ4 {
   @After
   public void tearDownCore() {
     deleteCore();
+    TestInjection.reset();
   }
 
   @Test
@@ -86,4 +91,56 @@ public class ExitableDirectoryReaderTest extends 
SolrTestCaseJ4 {
         "there should be at least " + maxCount + " calls from 
ExitableTermsEnum: " + callCounts,
         callCounts.get(callerExpr) >= maxCount);
   }
+
+  /**
+   * Checks that a custom {@link Similarity} configured on the core is honored 
when scoring with
+   * query limits enabled (Regression test for SOLR-18305).
+   */
+  @Test
+  public void testCustomSimilarity() throws Exception {
+    System.setProperty("solr.similarity", 
DummySimilarityFactory.class.getName());
+    initCore("solrconfig-minimal.xml", "schema-tiny.xml");
+
+    assertU(adoc("id", "1", "aaa_t", "a1"));
+    assertU(commit());
+
+    // Check the dummy similarity is used as expected with no query limits.
+    // The returned doc has score 42.0, in both the result and the debug 
explanation plan.
+    String q = "aaa_t:a1";
+    assertQ(
+        req("q", q, "fl", "id,score", "debug", "results"),
+        "//result[@numFound = '1']",
+        "//result/doc[1]/float[@name='score'][.='42.0']",
+        
"//lst[@name='debug']/lst[@name='explain']/str[@name='1'][contains(text(),'DummySimilarity')]",
+        
"//lst[@name='debug']/lst[@name='explain']/str[@name='1'][contains(text(),'42.0 
= score')]");
+
+    // Similar assertion as before, the only difference is we add a query 
limit with parameter
+    // 'timeAllowed=xxx'
+    assertQ(
+        req("q", q, "fl", "id,score", "debug", "results", "timeAllowed", 
"60000"),
+        "//result[@numFound = '1']",
+        "//result/doc[1]/float[@name='score'][.='42.0']",
+        
"//lst[@name='debug']/lst[@name='explain']/str[@name='1'][contains(text(),'DummySimilarity')]",
+        
"//lst[@name='debug']/lst[@name='explain']/str[@name='1'][contains(text(),'42.0 
= score')]");
+  }
+
+  public static class DummySimilarityFactory extends SimilarityFactory {
+    public static class DummySimilarity extends Similarity {
+      @Override
+      public SimScorer scorer(
+          float boost, CollectionStatistics collectionStats, TermStatistics... 
termStats) {
+        return new Similarity.SimScorer() {
+          @Override
+          public float score(float freq, long norm) {
+            return 42f;
+          }
+        };
+      }
+    }
+
+    @Override
+    public Similarity getSimilarity() {
+      return new DummySimilarity();
+    }
+  }
 }