You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2015/11/06 22:03:52 UTC
svn commit: r1713039 - in /lucene/dev/trunk/solr: ./
core/src/java/org/apache/solr/search/similarities/
core/src/test-files/solr/collection1/conf/
core/src/test/org/apache/solr/search/similarities/
Author: hossman
Date: Fri Nov 6 21:03:52 2015
New Revision: 1713039
URL: http://svn.apache.org/viewvc?rev=1713039&view=rev
Log:
SOLR-8239: remove (deprecated) DefaultSimilarityFactory from trunk
Removed:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/DefaultSimilarityFactory.java
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-tfidf.xml
lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestClassicSimilarityFactory.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1713039&r1=1713038&r2=1713039&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Fri Nov 6 21:03:52 2015
@@ -51,6 +51,9 @@ Upgrading from Solr 5.x
to allow for multiple full query results (DocLists) per Solr request.
TransformContext was rendered redundant and was removed. (yonik)
+* DefaultSimilarityFactory has been removed. If you currently have DefaultSimilarityFactory explicitly
+ refrenced in your schema.xml, edit your config to use the functionally identical ClassicSimilarityFactory.
+ See SOLR-8239 for more details.
Detailed Change List
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-tfidf.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-tfidf.xml?rev=1713039&r1=1713038&r2=1713039&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-tfidf.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-tfidf.xml Fri Nov 6 21:03:52 2015
@@ -38,22 +38,6 @@
</similarity>
</fieldType>
- <!-- testDefaultWithDefaults -->
- <field name="text__default" type="text__default" indexed="true" stored="false"/>
- <fieldType name="text__default" class="solr.TextField">
- <analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
- <similarity class="solr.DefaultSimilarityFactory"/>
- </fieldType>
-
- <!-- testDefaultWithParams -->
- <field name="text_overlap__default" type="text_overlap__default" indexed="true" stored="false"/>
- <fieldType name="text_overlap__default" class="solr.TextField">
- <analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
- <similarity class="solr.DefaultSimilarityFactory">
- <bool name="discountOverlaps">false</bool>
- </similarity>
- </fieldType>
-
<field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
<fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<defaultSearchField>text</defaultSearchField>
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestClassicSimilarityFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestClassicSimilarityFactory.java?rev=1713039&r1=1713038&r2=1713039&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestClassicSimilarityFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestClassicSimilarityFactory.java Fri Nov 6 21:03:52 2015
@@ -22,7 +22,7 @@ import org.apache.lucene.search.similari
import org.junit.BeforeClass;
/**
- * Tests {@link DefaultSimilarityFactory} when specified on a per-fieldtype basis with various init options.
+ * Tests {@link ClassicSimilarityFactory} when specified on a per-fieldtype basis with various init options.
* @see SchemaSimilarityFactory
*/
public class TestClassicSimilarityFactory extends BaseSimilarityTestCase {
@@ -42,15 +42,4 @@ public class TestClassicSimilarityFactor
assertEquals(false, sim.getDiscountOverlaps());
}
- /** Default w/ default parameters */
- public void testDefaultWithDefaults() throws Exception {
- ClassicSimilarity sim = getSimilarity("text__default", ClassicSimilarity.class);
- assertEquals(true, sim.getDiscountOverlaps());
- }
- /** Default w/ explicit params */
- public void testDefaultWithParams() throws Exception {
- ClassicSimilarity sim = getSimilarity("text_overlap__default", ClassicSimilarity.class);
- assertEquals(false, sim.getDiscountOverlaps());
- }
-
}