//
diff --git a/solr/src/java/org/apache/solr/schema/SimilarityFactory.java b/solr/src/java/org/apache/solr/schema/SimilarityFactory.java
index f2e29d575b5..25b03a0ad68 100644
--- a/solr/src/java/org/apache/solr/schema/SimilarityFactory.java
+++ b/solr/src/java/org/apache/solr/schema/SimilarityFactory.java
@@ -16,7 +16,7 @@ package org.apache.solr.schema;
* limitations under the License.
*/
-import org.apache.lucene.search.SimilarityProvider;
+import org.apache.lucene.search.Similarity;
import org.apache.solr.common.params.SolrParams;
public abstract class SimilarityFactory {
@@ -25,5 +25,5 @@ public abstract class SimilarityFactory {
public void init(SolrParams params) { this.params = params; }
public SolrParams getParams() { return params; }
- public abstract SimilarityProvider getSimilarityProvider();
+ public abstract Similarity getSimilarity();
}
diff --git a/solr/src/java/org/apache/solr/schema/SimilarityProviderFactory.java b/solr/src/java/org/apache/solr/schema/SimilarityProviderFactory.java
new file mode 100644
index 00000000000..dafb9411df2
--- /dev/null
+++ b/solr/src/java/org/apache/solr/schema/SimilarityProviderFactory.java
@@ -0,0 +1,34 @@
+package org.apache.solr.schema;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.solr.common.util.NamedList;
+import org.apache.solr.search.SolrSimilarityProvider;
+
+/**
+ * Expert: Factory to provide a {@link SolrSimilarityProvider}.
+ *
+ * Usually you would implement this if you want to customize the
+ * scoring routines that are not field-specific, such as coord() and queryNorm().
+ * Most scoring customization happens in the fieldtype's Similarity
+ */
+public abstract class SimilarityProviderFactory {
+ public void init(NamedList args) {}
+
+ public abstract SolrSimilarityProvider getSimilarityProvider(IndexSchema schema);
+}
diff --git a/solr/src/java/org/apache/solr/search/SolrSimilarityProvider.java b/solr/src/java/org/apache/solr/search/SolrSimilarityProvider.java
new file mode 100644
index 00000000000..2fe437fd999
--- /dev/null
+++ b/solr/src/java/org/apache/solr/search/SolrSimilarityProvider.java
@@ -0,0 +1,56 @@
+package org.apache.solr.search;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.lucene.search.DefaultSimilarityProvider;
+import org.apache.lucene.search.Similarity;
+import org.apache.solr.schema.FieldType;
+import org.apache.solr.schema.IndexSchema;
+
+/**
+ * SimilarityProvider that uses the default Lucene implementation, unless
+ * otherwise specified by the fieldtype.
+ *
+ * You can extend this class to customize the behavior of the parts
+ * of lucene's ranking system that are not field-specific, such as
+ * {@link #coord(int, int)} and {@link #queryNorm(float)}.
+ */
+public class SolrSimilarityProvider extends DefaultSimilarityProvider {
+ private final IndexSchema schema;
+
+ public SolrSimilarityProvider(IndexSchema schema) {
+ this.schema = schema;
+ }
+
+ /**
+ * Solr implementation delegates to the fieldtype's similarity.
+ * If this does not exist, uses the schema's default similarity.
+ */
+ // note: this is intentionally final, to maintain consistency with
+ // whatever is specified in the the schema!
+ @Override
+ public final Similarity get(String field) {
+ FieldType fieldType = schema.getFieldTypeNoEx(field);
+ if (fieldType == null) {
+ return schema.getFallbackSimilarity();
+ } else {
+ Similarity similarity = fieldType.getSimilarity();
+ return similarity == null ? schema.getFallbackSimilarity() : similarity;
+ }
+ }
+}
diff --git a/solr/src/test-files/solr/conf/schema.xml b/solr/src/test-files/solr/conf/schema.xml
index 6dabdde653b..f0fa272ff2b 100644
--- a/solr/src/test-files/solr/conf/schema.xml
+++ b/solr/src/test-files/solr/conf/schema.xml
@@ -391,6 +391,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ is there an echo?
+
+
+
+
+
+
+
+
+
@@ -496,6 +522,9 @@
+
+
+
@@ -574,6 +603,10 @@
+
+
+
+
text
@@ -607,12 +640,18 @@
-
-
+
is there an echo?
-
+
+
+
+ I am your default sim
+
diff --git a/solr/src/test/org/apache/solr/schema/CustomSimilarityFactory.java b/solr/src/test/org/apache/solr/schema/CustomSimilarityFactory.java
index 03fbaecaec2..98267cce285 100644
--- a/solr/src/test/org/apache/solr/schema/CustomSimilarityFactory.java
+++ b/solr/src/test/org/apache/solr/schema/CustomSimilarityFactory.java
@@ -16,11 +16,11 @@
*/
package org.apache.solr.schema;
-import org.apache.lucene.search.SimilarityProvider;
+import org.apache.lucene.search.Similarity;
public class CustomSimilarityFactory extends SimilarityFactory {
@Override
- public SimilarityProvider getSimilarityProvider() {
+ public Similarity getSimilarity() {
return new MockConfigurableSimilarity(params.get("echo"));
}
}
diff --git a/solr/src/test/org/apache/solr/schema/CustomSimilarityProviderFactory.java b/solr/src/test/org/apache/solr/schema/CustomSimilarityProviderFactory.java
new file mode 100644
index 00000000000..68de144e6b7
--- /dev/null
+++ b/solr/src/test/org/apache/solr/schema/CustomSimilarityProviderFactory.java
@@ -0,0 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.schema;
+
+import org.apache.solr.common.util.NamedList;
+import org.apache.solr.search.SolrSimilarityProvider;
+
+public class CustomSimilarityProviderFactory extends SimilarityProviderFactory {
+ String echoParam;
+
+ @Override
+ public void init(NamedList args) {
+ echoParam = (String) args.get("echo");
+ }
+
+ @Override
+ public SolrSimilarityProvider getSimilarityProvider(IndexSchema schema) {
+ return new MockConfigurableSimilarityProvider(schema, echoParam);
+ }
+}
diff --git a/solr/src/test/org/apache/solr/schema/IndexSchemaTest.java b/solr/src/test/org/apache/solr/schema/IndexSchemaTest.java
index cb176d8dee8..737cb90ffc1 100644
--- a/solr/src/test/org/apache/solr/schema/IndexSchemaTest.java
+++ b/solr/src/test/org/apache/solr/schema/IndexSchemaTest.java
@@ -81,11 +81,11 @@ public class IndexSchemaTest extends SolrTestCaseJ4 {
}
@Test
- public void testSimilarityFactory() {
+ public void testSimilarityProviderFactory() {
SolrCore core = h.getCore();
- SimilarityProvider similarity = core.getSchema().getSimilarityProvider();
- assertTrue("wrong class", similarity instanceof MockConfigurableSimilarity);
- assertEquals("is there an echo?", ((MockConfigurableSimilarity)similarity).getPassthrough());
+ SimilarityProvider similarityProvider = core.getSchema().getSimilarityProvider();
+ assertTrue("wrong class", similarityProvider instanceof MockConfigurableSimilarityProvider);
+ assertEquals("is there an echo?", ((MockConfigurableSimilarityProvider)similarityProvider).getPassthrough());
}
@Test
diff --git a/solr/src/test/org/apache/solr/schema/MockConfigurableSimilarity.java b/solr/src/test/org/apache/solr/schema/MockConfigurableSimilarity.java
index 6b8f6c1d362..36021fab4e7 100644
--- a/solr/src/test/org/apache/solr/schema/MockConfigurableSimilarity.java
+++ b/solr/src/test/org/apache/solr/schema/MockConfigurableSimilarity.java
@@ -16,9 +16,9 @@
*/
package org.apache.solr.schema;
-import org.apache.lucene.search.DefaultSimilarityProvider;
+import org.apache.lucene.search.DefaultSimilarity;
-public class MockConfigurableSimilarity extends DefaultSimilarityProvider {
+public class MockConfigurableSimilarity extends DefaultSimilarity {
private String passthrough;
public MockConfigurableSimilarity(String passthrough) {
diff --git a/solr/src/test/org/apache/solr/schema/MockConfigurableSimilarityProvider.java b/solr/src/test/org/apache/solr/schema/MockConfigurableSimilarityProvider.java
new file mode 100644
index 00000000000..3a6e8a40ed0
--- /dev/null
+++ b/solr/src/test/org/apache/solr/schema/MockConfigurableSimilarityProvider.java
@@ -0,0 +1,32 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.schema;
+
+import org.apache.solr.search.SolrSimilarityProvider;
+
+public class MockConfigurableSimilarityProvider extends SolrSimilarityProvider {
+ private String passthrough;
+
+ public MockConfigurableSimilarityProvider(IndexSchema schema, String passthrough) {
+ super(schema);
+ this.passthrough = passthrough;
+ }
+
+ public String getPassthrough() {
+ return passthrough;
+ }
+}
diff --git a/solr/src/test/org/apache/solr/schema/TestPerFieldSimilarity.java b/solr/src/test/org/apache/solr/schema/TestPerFieldSimilarity.java
new file mode 100644
index 00000000000..3aa81c30c84
--- /dev/null
+++ b/solr/src/test/org/apache/solr/schema/TestPerFieldSimilarity.java
@@ -0,0 +1,106 @@
+package org.apache.solr.schema;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.lucene.misc.SweetSpotSimilarity;
+import org.apache.lucene.search.DefaultSimilarity;
+import org.apache.lucene.search.Similarity;
+import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.core.SolrCore;
+import org.apache.solr.search.SolrIndexSearcher;
+import org.apache.solr.util.RefCounted;
+import org.junit.BeforeClass;
+
+/**
+ * Tests per-field similarity support in the schema
+ */
+public class TestPerFieldSimilarity extends SolrTestCaseJ4 {
+
+ @BeforeClass
+ public static void beforeClass() throws Exception {
+ initCore("solrconfig.xml","schema.xml");
+ }
+
+ /** test a field where the sim is specified directly */
+ public void testDirect() throws Exception {
+ SolrCore core = h.getCore();
+ RefCounted searcher = core.getSearcher();
+ Similarity sim = searcher.get().getSimilarityProvider().get("sim1text");
+ assertEquals(SweetSpotSimilarity.class, sim.getClass());
+ searcher.decref();
+ }
+
+ /** ... and for a dynamic field */
+ public void testDirectDynamic() throws Exception {
+ SolrCore core = h.getCore();
+ RefCounted searcher = core.getSearcher();
+ Similarity sim = searcher.get().getSimilarityProvider().get("text_sim1");
+ assertEquals(SweetSpotSimilarity.class, sim.getClass());
+ searcher.decref();
+ }
+
+ /** test a field where a configurable sim factory is defined */
+ public void testFactory() throws Exception {
+ SolrCore core = h.getCore();
+ RefCounted searcher = core.getSearcher();
+ Similarity sim = searcher.get().getSimilarityProvider().get("sim2text");
+ assertEquals(MockConfigurableSimilarity.class, sim.getClass());
+ assertEquals("is there an echo?", ((MockConfigurableSimilarity)sim).getPassthrough());
+ searcher.decref();
+ }
+
+ /** ... and for a dynamic field */
+ public void testFactoryDynamic() throws Exception {
+ SolrCore core = h.getCore();
+ RefCounted searcher = core.getSearcher();
+ Similarity sim = searcher.get().getSimilarityProvider().get("text_sim2");
+ assertEquals(MockConfigurableSimilarity.class, sim.getClass());
+ assertEquals("is there an echo?", ((MockConfigurableSimilarity)sim).getPassthrough());
+ searcher.decref();
+ }
+
+ /** test a field where no similarity is specified */
+ public void testDefaults() throws Exception {
+ SolrCore core = h.getCore();
+ RefCounted searcher = core.getSearcher();
+ Similarity sim = searcher.get().getSimilarityProvider().get("sim3text");
+ assertEquals(MockConfigurableSimilarity.class, sim.getClass());
+ assertEquals("I am your default sim", ((MockConfigurableSimilarity)sim).getPassthrough());
+ searcher.decref();
+ }
+
+ /** ... and for a dynamic field */
+ public void testDefaultsDynamic() throws Exception {
+ SolrCore core = h.getCore();
+ RefCounted searcher = core.getSearcher();
+ Similarity sim = searcher.get().getSimilarityProvider().get("text_sim3");
+ assertEquals(MockConfigurableSimilarity.class, sim.getClass());
+ assertEquals("I am your default sim", ((MockConfigurableSimilarity)sim).getPassthrough());
+ searcher.decref();
+ }
+
+ /** test a field that does not exist */
+ public void testNonexistent() throws Exception {
+ SolrCore core = h.getCore();
+ RefCounted searcher = core.getSearcher();
+ Similarity sim = searcher.get().getSimilarityProvider().get("sdfdsfdsfdswr5fsdfdsfdsfs");
+ assertEquals(MockConfigurableSimilarity.class, sim.getClass());
+ assertEquals("I am your default sim", ((MockConfigurableSimilarity)sim).getPassthrough());
+ searcher.decref();
+ }
+}