Apache Solr open-source search software
SOLR-17749: linear function support for RankQParserPlugin (#3339)
Christine Poerschkefed00c706992
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 5501eb95017..f02a4a41c33 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -207,6 +207,8 @@ New Features* SSOLR-17447 : Support terminating a search early based on maxHitsAllowed per shard. (Siju Varghese, Houston Putman, David Smiley, Gus Heck)+* SOLR-17749: Added linear function support for RankField via RankQParserPlugin. (Christine Poerschke)+Improvements---------------------* SOLR-15751: The v2 API now has parity with the v1 "COLSTATUS" and "segments" APIs, which can be used to fetch detailed information aboutdiff --git a/solr/core/src/java/org/apache/solr/search/RankQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/RankQParserPlugin.javaindex 6bc40d9be6a..da695b4df3c 100644--- a/solr/core/src/java/org/apache/solr/search/RankQParserPlugin.java+++ b/solr/core/src/java/org/apache/solr/search/RankQParserPlugin.java@@ -73,6 +73,17 @@ public class RankQParserPlugin extends QParserPlugin {}}},+ LINEAR {+ @Override+ public Query createQuery(String fieldName, SolrParams params) throws SyntaxError {+ float weight = params.getFloat(WEIGHT, 1f);+ try {+ return FeatureField.newLinearQuery(RankField.INTERNAL_RANK_FIELD_NAME, fieldName, weight);+ } catch (IllegalArgumentException iae) {+ throw new SyntaxError(iae.getMessage());+ }+ }+ },LOG {@Overridepublic Query createQuery(String fieldName, SolrParams params) throws SyntaxError {diff --git a/solr/core/src/test/org/apache/solr/search/RankQParserPluginTest.java b/solr/core/src/test/org/apache/solr/search/RankQParserPluginTest.javaindex 8df79b50084..1cfc840e7ef 100644--- a/solr/core/src/test/org/apache/solr/search/RankQParserPluginTest.java+++ b/solr/core/src/test/org/apache/solr/search/RankQParserPluginTest.java@@ -82,6 +82,20 @@ public class RankQParserPluginTest extends SolrTestCaseJ4 {() -> getRankQParser(params(FIELD, "id"), req()).parse());}+ public void testBadLinearParameters() {+ assertSyntaxError(+ "Expecting bad weight",+ "weight must be in",+ () ->+ getRankQParser(+ params(+ FIELD, "rank_1",+ FUNCTION, "linear",+ WEIGHT, "0"),+ req())+ .parse());+ }+public void testBadLogParameters() {assertSyntaxError("Expecting bad weight",@@ -208,6 +222,36 @@ public class RankQParserPluginTest extends SolrTestCaseJ4 {.parse());}+ public void testParseLinear() throws IOException, SyntaxError {+ assertValidRankQuery(+ expectedFeatureQueryToString("rank_1", expectedLinearToString(), 1),+ params(+ FIELD, "rank_1",+ FUNCTION, "linear",+ WEIGHT, "1"));++ assertValidRankQuery(+ expectedFeatureQueryToString("rank_1", expectedLinearToString(), 1),+ params(+ FIELD, "rank_1",+ FUNCTION, "linear",+ WEIGHT, "1"));++ assertValidRankQuery(+ expectedFeatureQueryToString("rank_1", expectedLinearToString(), 2.5f),+ params(+ FIELD, "rank_1",+ FUNCTION, "linear",+ WEIGHT, "2.5"));++ assertValidRankQuery(+ expectedFeatureQueryToString("rank_1", expectedLinearToString(), 2.5f),+ params(+ FIELD, "rank_1",+ FUNCTION, "Linear", // use different case+ WEIGHT, "2.5"));+ }+public void testParseLog() throws IOException, SyntaxError {assertValidRankQuery(expectedFeatureQueryToString("rank_1", expectedLogToString(1), 1),@@ -330,6 +374,10 @@ public class RankQParserPluginTest extends SolrTestCaseJ4 {return "(" + featureQueryStr + ")^" + boost;}+ private String expectedLinearToString() {+ return "LinearFunction";+ }+private String expectedLogToString(float scalingFactor) {return "LogFunction(scalingFactor=" + scalingFactor + ")";}