You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2015/09/15 00:03:37 UTC
svn commit: r1703070 [2/2] - in /lucene/dev/trunk: lucene/
lucene/benchmark/src/test/org/apache/lucene/benchmark/quality/
lucene/classification/src/java/org/apache/lucene/classification/
lucene/core/src/java/org/apache/lucene/index/ lucene/core/src/jav...
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java Mon Sep 14 22:03:35 2015
@@ -37,7 +37,7 @@ import org.apache.lucene.search.IndexSea
import org.apache.lucene.search.QueryUtils;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.search.similarities.DefaultSimilarity;
+import org.apache.lucene.search.similarities.ClassicSimilarity;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.search.spans.MultiSpansWrapper;
import org.apache.lucene.search.spans.SpanQuery;
@@ -255,7 +255,7 @@ public class TestPayloadTermQuery extend
CheckHits.checkHitCollector(random(), query.build(), PayloadHelper.NO_PAYLOAD_FIELD, searcher, results);
}
- static class BoostingSimilarity extends DefaultSimilarity {
+ static class BoostingSimilarity extends ClassicSimilarity {
@Override
public float queryNorm(float sumOfSquaredWeights) {
@@ -298,7 +298,7 @@ public class TestPayloadTermQuery extend
}
}
- static class FullSimilarity extends DefaultSimilarity{
+ static class FullSimilarity extends ClassicSimilarity{
public float scorePayload(int docId, String fieldName, byte[] payload, int offset, int length) {
//we know it is size 4 here, so ignore the offset/length
return payload[offset];
Copied: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestClassicSimilarity.java (from r1701895, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestDefaultSimilarity.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestClassicSimilarity.java?p2=lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestClassicSimilarity.java&p1=lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestDefaultSimilarity.java&r1=1701895&r2=1703070&rev=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestDefaultSimilarity.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestClassicSimilarity.java Mon Sep 14 22:03:35 2015
@@ -38,7 +38,7 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LuceneTestCase;
-public class TestDefaultSimilarity extends LuceneTestCase {
+public class TestClassicSimilarity extends LuceneTestCase {
private Directory directory;
private IndexReader indexReader;
private IndexSearcher indexSearcher;
@@ -55,7 +55,7 @@ public class TestDefaultSimilarity exten
}
indexReader = DirectoryReader.open(directory);
indexSearcher = newSearcher(indexReader);
- indexSearcher.setSimilarity(new DefaultSimilarity());
+ indexSearcher.setSimilarity(new ClassicSimilarity());
}
@Override
@@ -66,7 +66,7 @@ public class TestDefaultSimilarity exten
// Javadocs give this as an example so we test to make sure it's correct:
public void testPrecisionLoss() throws Exception {
- DefaultSimilarity sim = new DefaultSimilarity();
+ ClassicSimilarity sim = new ClassicSimilarity();
float v = sim.decodeNormValue(sim.encodeNormValue(.89f));
assertEquals(0.875f, v, 0.0001f);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java Mon Sep 14 22:03:35 2015
@@ -52,7 +52,7 @@ public class TestSimilarity2 extends Luc
public void setUp() throws Exception {
super.setUp();
sims = new ArrayList<>();
- sims.add(new DefaultSimilarity());
+ sims.add(new ClassicSimilarity());
sims.add(new BM25Similarity());
// TODO: not great that we dup this all with TestSimilarityBase
for (BasicModel basicModel : TestSimilarityBase.BASIC_MODELS) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java Mon Sep 14 22:03:35 2015
@@ -579,7 +579,7 @@ public class TestSimilarityBase extends
// LUCENE-5221
public void testDiscountOverlapsBoost() throws IOException {
- DefaultSimilarity expected = new DefaultSimilarity();
+ ClassicSimilarity expected = new ClassicSimilarity();
SimilarityBase actual = new DFRSimilarity(new BasicModelIne(), new AfterEffectB(), new NormalizationH2());
expected.setDiscountOverlaps(false);
actual.setDiscountOverlaps(false);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java Mon Sep 14 22:03:35 2015
@@ -35,7 +35,7 @@ import org.apache.lucene.search.IndexSea
import org.apache.lucene.search.Query;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.similarities.DefaultSimilarity;
+import org.apache.lucene.search.similarities.ClassicSimilarity;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
@@ -286,7 +286,7 @@ public class TestSpans extends LuceneTes
for (int i = 0, c = leaves.size(); i < c; i++) {
final LeafReaderContext ctx = leaves.get(i);
- final Similarity sim = new DefaultSimilarity() {
+ final Similarity sim = new ClassicSimilarity() {
@Override
public float sloppyFreq(int distance) {
return 0.0f;
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestQueryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestQueryBuilder.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestQueryBuilder.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestQueryBuilder.java Mon Sep 14 22:03:35 2015
@@ -33,6 +33,7 @@ import org.apache.lucene.search.BooleanQ
import org.apache.lucene.search.MultiPhraseQuery;
import org.apache.lucene.search.PhraseQuery;
import org.apache.lucene.search.Query;
+import org.apache.lucene.search.SynonymQuery;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.util.automaton.CharacterRunAutomaton;
import org.apache.lucene.util.automaton.RegExp;
@@ -162,11 +163,7 @@ public class TestQueryBuilder extends Lu
/** simple synonyms test */
public void testSynonyms() throws Exception {
- BooleanQuery.Builder expectedB = new BooleanQuery.Builder();
- expectedB.setDisableCoord(true);
- expectedB.add(new TermQuery(new Term("field", "dogs")), BooleanClause.Occur.SHOULD);
- expectedB.add(new TermQuery(new Term("field", "dog")), BooleanClause.Occur.SHOULD);
- Query expected = expectedB.build();
+ SynonymQuery expected = new SynonymQuery(new Term("field", "dogs"), new Term("field", "dog"));
QueryBuilder builder = new QueryBuilder(new MockSynonymAnalyzer());
assertEquals(expected, builder.createBooleanQuery("field", "dogs"));
assertEquals(expected, builder.createPhraseQuery("field", "dogs"));
@@ -281,25 +278,19 @@ public class TestQueryBuilder extends Lu
/** simple CJK synonym test */
public void testCJKSynonym() throws Exception {
- BooleanQuery.Builder expected = new BooleanQuery.Builder();
- expected.setDisableCoord(true);
- expected.add(new TermQuery(new Term("field", "å½")), BooleanClause.Occur.SHOULD);
- expected.add(new TermQuery(new Term("field", "å")), BooleanClause.Occur.SHOULD);
+ SynonymQuery expected = new SynonymQuery(new Term("field", "å½"), new Term("field", "å"));
QueryBuilder builder = new QueryBuilder(new MockCJKSynonymAnalyzer());
- assertEquals(expected.build(), builder.createBooleanQuery("field", "å½"));
- assertEquals(expected.build(), builder.createPhraseQuery("field", "å½"));
- assertEquals(expected.build(), builder.createBooleanQuery("field", "å½", BooleanClause.Occur.MUST));
+ assertEquals(expected, builder.createBooleanQuery("field", "å½"));
+ assertEquals(expected, builder.createPhraseQuery("field", "å½"));
+ assertEquals(expected, builder.createBooleanQuery("field", "å½", BooleanClause.Occur.MUST));
}
/** synonyms with default OR operator */
public void testCJKSynonymsOR() throws Exception {
BooleanQuery.Builder expected = new BooleanQuery.Builder();
expected.add(new TermQuery(new Term("field", "ä¸")), BooleanClause.Occur.SHOULD);
- BooleanQuery.Builder inner = new BooleanQuery.Builder();
- inner.setDisableCoord(true);
- inner.add(new TermQuery(new Term("field", "å½")), BooleanClause.Occur.SHOULD);
- inner.add(new TermQuery(new Term("field", "å")), BooleanClause.Occur.SHOULD);
- expected.add(inner.build(), BooleanClause.Occur.SHOULD);
+ SynonymQuery inner = new SynonymQuery(new Term("field", "å½"), new Term("field", "å"));
+ expected.add(inner, BooleanClause.Occur.SHOULD);
QueryBuilder builder = new QueryBuilder(new MockCJKSynonymAnalyzer());
assertEquals(expected.build(), builder.createBooleanQuery("field", "ä¸å½"));
}
@@ -308,16 +299,10 @@ public class TestQueryBuilder extends Lu
public void testCJKSynonymsOR2() throws Exception {
BooleanQuery.Builder expected = new BooleanQuery.Builder();
expected.add(new TermQuery(new Term("field", "ä¸")), BooleanClause.Occur.SHOULD);
- BooleanQuery.Builder inner = new BooleanQuery.Builder();
- inner.setDisableCoord(true);
- inner.add(new TermQuery(new Term("field", "å½")), BooleanClause.Occur.SHOULD);
- inner.add(new TermQuery(new Term("field", "å")), BooleanClause.Occur.SHOULD);
- expected.add(inner.build(), BooleanClause.Occur.SHOULD);
- BooleanQuery.Builder inner2 = new BooleanQuery.Builder();
- inner2.setDisableCoord(true);
- inner2.add(new TermQuery(new Term("field", "å½")), BooleanClause.Occur.SHOULD);
- inner2.add(new TermQuery(new Term("field", "å")), BooleanClause.Occur.SHOULD);
- expected.add(inner2.build(), BooleanClause.Occur.SHOULD);
+ SynonymQuery inner = new SynonymQuery(new Term("field", "å½"), new Term("field", "å"));
+ expected.add(inner, BooleanClause.Occur.SHOULD);
+ SynonymQuery inner2 = new SynonymQuery(new Term("field", "å½"), new Term("field", "å"));
+ expected.add(inner2, BooleanClause.Occur.SHOULD);
QueryBuilder builder = new QueryBuilder(new MockCJKSynonymAnalyzer());
assertEquals(expected.build(), builder.createBooleanQuery("field", "ä¸å½å½"));
}
@@ -326,11 +311,8 @@ public class TestQueryBuilder extends Lu
public void testCJKSynonymsAND() throws Exception {
BooleanQuery.Builder expected = new BooleanQuery.Builder();
expected.add(new TermQuery(new Term("field", "ä¸")), BooleanClause.Occur.MUST);
- BooleanQuery.Builder inner = new BooleanQuery.Builder();
- inner.setDisableCoord(true);
- inner.add(new TermQuery(new Term("field", "å½")), BooleanClause.Occur.SHOULD);
- inner.add(new TermQuery(new Term("field", "å")), BooleanClause.Occur.SHOULD);
- expected.add(inner.build(), BooleanClause.Occur.MUST);
+ SynonymQuery inner = new SynonymQuery(new Term("field", "å½"), new Term("field", "å"));
+ expected.add(inner, BooleanClause.Occur.MUST);
QueryBuilder builder = new QueryBuilder(new MockCJKSynonymAnalyzer());
assertEquals(expected.build(), builder.createBooleanQuery("field", "ä¸å½", BooleanClause.Occur.MUST));
}
@@ -339,16 +321,10 @@ public class TestQueryBuilder extends Lu
public void testCJKSynonymsAND2() throws Exception {
BooleanQuery.Builder expected = new BooleanQuery.Builder();
expected.add(new TermQuery(new Term("field", "ä¸")), BooleanClause.Occur.MUST);
- BooleanQuery.Builder inner = new BooleanQuery.Builder();
- inner.setDisableCoord(true);
- inner.add(new TermQuery(new Term("field", "å½")), BooleanClause.Occur.SHOULD);
- inner.add(new TermQuery(new Term("field", "å")), BooleanClause.Occur.SHOULD);
- expected.add(inner.build(), BooleanClause.Occur.MUST);
- BooleanQuery.Builder inner2 = new BooleanQuery.Builder();
- inner2.setDisableCoord(true);
- inner2.add(new TermQuery(new Term("field", "å½")), BooleanClause.Occur.SHOULD);
- inner2.add(new TermQuery(new Term("field", "å")), BooleanClause.Occur.SHOULD);
- expected.add(inner2.build(), BooleanClause.Occur.MUST);
+ SynonymQuery inner = new SynonymQuery(new Term("field", "å½"), new Term("field", "å"));
+ expected.add(inner, BooleanClause.Occur.MUST);
+ SynonymQuery inner2 = new SynonymQuery(new Term("field", "å½"), new Term("field", "å"));
+ expected.add(inner2, BooleanClause.Occur.MUST);
QueryBuilder builder = new QueryBuilder(new MockCJKSynonymAnalyzer());
assertEquals(expected.build(), builder.createBooleanQuery("field", "ä¸å½å½", BooleanClause.Occur.MUST));
}
Modified: lucene/dev/trunk/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionRescorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionRescorer.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionRescorer.java (original)
+++ lucene/dev/trunk/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionRescorer.java Mon Sep 14 22:03:35 2015
@@ -31,6 +31,7 @@ import org.apache.lucene.search.Rescorer
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.search.similarities.ClassicSimilarity;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
@@ -65,6 +66,8 @@ public class TestExpressionRescorer exte
reader = iw.getReader();
searcher = new IndexSearcher(reader);
+ // TODO: fix this test to not be so flaky and use newSearcher
+ searcher.setSimilarity(new ClassicSimilarity());
iw.close();
}
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java Mon Sep 14 22:03:35 2015
@@ -50,7 +50,7 @@ import org.apache.lucene.search.IndexSea
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.similarities.DefaultSimilarity;
+import org.apache.lucene.search.similarities.ClassicSimilarity;
import org.apache.lucene.search.similarities.PerFieldSimilarityWrapper;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.store.Directory;
@@ -267,7 +267,7 @@ public class TestTaxonomyFacetCounts ext
Directory taxoDir = newDirectory();
IndexWriterConfig iwc = newIndexWriterConfig(new MockAnalyzer(random()));
iwc.setSimilarity(new PerFieldSimilarityWrapper() {
- final Similarity sim = new DefaultSimilarity();
+ final Similarity sim = new ClassicSimilarity();
@Override
public Similarity get(String name) {
Modified: lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermExtractor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermExtractor.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermExtractor.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermExtractor.java Mon Sep 14 22:03:35 2015
@@ -80,7 +80,7 @@ public final class QueryTermExtractor
try
{
int docFreq=reader.docFreq(new Term(fieldName,terms[i].term));
- //IDF algorithm taken from DefaultSimilarity class
+ //IDF algorithm taken from ClassicSimilarity class
float idf=(float)(Math.log(totalNumDocs/(double)(docFreq+1)) + 1.0);
terms[i].weight*=idf;
}
Modified: lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java Mon Sep 14 22:03:35 2015
@@ -545,7 +545,7 @@ public class WeightedSpanTermExtractor {
while (it.hasNext()) {
WeightedSpanTerm weightedSpanTerm = terms.get(it.next());
int docFreq = reader.docFreq(new Term(fieldName, weightedSpanTerm.term));
- // IDF algorithm taken from DefaultSimilarity class
+ // IDF algorithm taken from ClassicSimilarity class
float idf = (float) (Math.log(totalNumDocs / (double) (docFreq + 1)) + 1.0);
weightedSpanTerm.weight *= idf;
}
Modified: lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java (original)
+++ lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java Mon Sep 14 22:03:35 2015
@@ -30,7 +30,7 @@ import org.apache.lucene.search.IndexSea
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.similarities.BM25Similarity;
-import org.apache.lucene.search.similarities.DefaultSimilarity;
+import org.apache.lucene.search.similarities.ClassicSimilarity;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
import org.junit.Before;
@@ -90,7 +90,7 @@ public class TestMemoryIndex extends Luc
assertThat(mi.search(new TermQuery(new Term("f1", "wibble"))), not(is(0.0f)));
// check we can set the Similarity again
- mi.setSimilarity(new DefaultSimilarity());
+ mi.setSimilarity(new ClassicSimilarity());
}
@@ -144,7 +144,7 @@ public class TestMemoryIndex extends Luc
float n1 = reader.getNormValues("f1").get(0);
// Norms are re-computed when we change the Similarity
- mi.setSimilarity(new DefaultSimilarity() {
+ mi.setSimilarity(new ClassicSimilarity() {
@Override
public float lengthNorm(FieldInvertState state) {
return 74;
Modified: lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/misc/SweetSpotSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/misc/SweetSpotSimilarity.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/misc/SweetSpotSimilarity.java (original)
+++ lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/misc/SweetSpotSimilarity.java Mon Sep 14 22:03:35 2015
@@ -17,7 +17,7 @@
package org.apache.lucene.misc;
-import org.apache.lucene.search.similarities.DefaultSimilarity;
+import org.apache.lucene.search.similarities.ClassicSimilarity;
import org.apache.lucene.index.FieldInvertState;
/**
@@ -38,7 +38,7 @@ import org.apache.lucene.index.FieldInve
*
* @see <a href="doc-files/ss.gnuplot">A Gnuplot file used to generate some of the visualizations refrenced from each function.</a>
*/
-public class SweetSpotSimilarity extends DefaultSimilarity {
+public class SweetSpotSimilarity extends ClassicSimilarity {
private int ln_min = 1;
private int ln_max = 1;
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/misc/SweetSpotSimilarityTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/misc/SweetSpotSimilarityTest.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/misc/SweetSpotSimilarityTest.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/misc/SweetSpotSimilarityTest.java Mon Sep 14 22:03:35 2015
@@ -18,7 +18,7 @@
package org.apache.lucene.misc;
-import org.apache.lucene.search.similarities.DefaultSimilarity;
+import org.apache.lucene.search.similarities.ClassicSimilarity;
import org.apache.lucene.search.similarities.PerFieldSimilarityWrapper;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.search.similarities.TFIDFSimilarity;
@@ -44,7 +44,7 @@ public class SweetSpotSimilarityTest ext
final SweetSpotSimilarity ss = new SweetSpotSimilarity();
ss.setLengthNormFactors(1,1,0.5f,true);
- Similarity d = new DefaultSimilarity();
+ Similarity d = new ClassicSimilarity();
Similarity s = ss;
@@ -200,7 +200,7 @@ public class SweetSpotSimilarityTest ext
SweetSpotSimilarity ss = new SweetSpotSimilarity();
- TFIDFSimilarity d = new DefaultSimilarity();
+ TFIDFSimilarity d = new ClassicSimilarity();
TFIDFSimilarity s = ss;
// tf equal
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java Mon Sep 14 22:03:35 2015
@@ -50,7 +50,7 @@ public class IDFValueSource extends DocF
IndexSearcher searcher = (IndexSearcher)context.get("searcher");
TFIDFSimilarity sim = asTFIDF(searcher.getSimilarity(true), field);
if (sim == null) {
- throw new UnsupportedOperationException("requires a TFIDFSimilarity (such as DefaultSimilarity)");
+ throw new UnsupportedOperationException("requires a TFIDFSimilarity (such as ClassicSimilarity)");
}
int docfreq = searcher.getIndexReader().docFreq(new Term(indexedField, indexedBytes));
float idf = sim.idf(docfreq, searcher.getIndexReader().maxDoc());
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java Mon Sep 14 22:03:35 2015
@@ -60,7 +60,7 @@ public class NormValueSource extends Val
IndexSearcher searcher = (IndexSearcher)context.get("searcher");
final TFIDFSimilarity similarity = IDFValueSource.asTFIDF(searcher.getSimilarity(true), field);
if (similarity == null) {
- throw new UnsupportedOperationException("requires a TFIDFSimilarity (such as DefaultSimilarity)");
+ throw new UnsupportedOperationException("requires a TFIDFSimilarity (such as ClassicSimilarity)");
}
final NumericDocValues norms = readerContext.reader().getNormValues(field);
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java Mon Sep 14 22:03:35 2015
@@ -56,7 +56,7 @@ public class TFValueSource extends TermF
IndexSearcher searcher = (IndexSearcher)context.get("searcher");
final TFIDFSimilarity similarity = IDFValueSource.asTFIDF(searcher.getSimilarity(true), indexedField);
if (similarity == null) {
- throw new UnsupportedOperationException("requires a TFIDFSimilarity (such as DefaultSimilarity)");
+ throw new UnsupportedOperationException("requires a TFIDFSimilarity (such as ClassicSimilarity)");
}
return new FloatDocValues(this) {
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java Mon Sep 14 22:03:35 2015
@@ -32,7 +32,7 @@ import org.apache.lucene.search.BooleanQ
import org.apache.lucene.search.BoostQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.similarities.DefaultSimilarity;
+import org.apache.lucene.search.similarities.ClassicSimilarity;
import org.apache.lucene.search.similarities.TFIDFSimilarity;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.CharsRefBuilder;
@@ -313,7 +313,7 @@ public final class MoreLikeThis {
* Constructor requiring an IndexReader.
*/
public MoreLikeThis(IndexReader ir) {
- this(ir, new DefaultSimilarity());
+ this(ir, new ClassicSimilarity());
}
public MoreLikeThis(IndexReader ir, TFIDFSimilarity sim) {
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java Mon Sep 14 22:03:35 2015
@@ -49,7 +49,7 @@ public class TestLongNormValueSource ext
static IndexSearcher searcher;
static Analyzer analyzer;
- private static Similarity sim = new PreciseDefaultSimilarity();
+ private static Similarity sim = new PreciseClassicSimilarity();
@BeforeClass
public static void beforeClass() throws Exception {
@@ -120,10 +120,10 @@ public class TestLongNormValueSource ext
/** Encodes norm as 4-byte float. */
-class PreciseDefaultSimilarity extends TFIDFSimilarity {
+class PreciseClassicSimilarity extends TFIDFSimilarity {
/** Sole constructor: parameter-free */
- public PreciseDefaultSimilarity() {}
+ public PreciseClassicSimilarity() {}
/** Implemented as <code>overlap / maxOverlap</code>. */
@Override
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java Mon Sep 14 22:03:35 2015
@@ -80,7 +80,7 @@ import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.similarities.DefaultSimilarity;
+import org.apache.lucene.search.similarities.ClassicSimilarity;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
@@ -224,7 +224,7 @@ public class TestValueSources extends Lu
public void testIDF() throws Exception {
Similarity saved = searcher.getSimilarity(true);
try {
- searcher.setSimilarity(new DefaultSimilarity());
+ searcher.setSimilarity(new ClassicSimilarity());
ValueSource vs = new IDFValueSource("bogus", "bogus", "text", new BytesRef("test"));
assertHits(new FunctionQuery(vs), new float[] { 1.0f, 1.0f });
assertAllExist(vs);
@@ -343,7 +343,7 @@ public class TestValueSources extends Lu
Similarity saved = searcher.getSimilarity(true);
try {
// no norm field (so agnostic to indexed similarity)
- searcher.setSimilarity(new DefaultSimilarity());
+ searcher.setSimilarity(new ClassicSimilarity());
ValueSource vs = new NormValueSource("byte");
assertHits(new FunctionQuery(vs), new float[] { 0f, 0f });
@@ -395,7 +395,7 @@ public class TestValueSources extends Lu
Similarity saved = searcher.getSimilarity(true);
try {
- searcher.setSimilarity(new DefaultSimilarity());
+ searcher.setSimilarity(new ClassicSimilarity());
ValueSource vs = new QueryValueSource(new TermQuery(new Term("string","bar")), 42F);
assertHits(new FunctionQuery(vs), new float[] { 42F, 1.4054651F });
@@ -502,7 +502,7 @@ public class TestValueSources extends Lu
Similarity saved = searcher.getSimilarity(true);
try {
// no norm field (so agnostic to indexed similarity)
- searcher.setSimilarity(new DefaultSimilarity());
+ searcher.setSimilarity(new ClassicSimilarity());
ValueSource vs = new TFValueSource("bogus", "bogus", "text", new BytesRef("test"));
assertHits(new FunctionQuery(vs),
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/MultiFieldQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/MultiFieldQueryParser.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/MultiFieldQueryParser.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/MultiFieldQueryParser.java Mon Sep 14 22:03:35 2015
@@ -98,7 +98,7 @@ public class MultiFieldQueryParser exten
@Override
protected Query getFieldQuery(String field, String queryText, int slop) throws ParseException {
if (field == null) {
- List<BooleanClause> clauses = new ArrayList<>();
+ List<Query> clauses = new ArrayList<>();
for (int i = 0; i < fields.length; i++) {
Query q = super.getFieldQuery(fields[i], queryText, true);
if (q != null) {
@@ -111,12 +111,12 @@ public class MultiFieldQueryParser exten
}
}
q = applySlop(q,slop);
- clauses.add(new BooleanClause(q, BooleanClause.Occur.SHOULD));
+ clauses.add(q);
}
}
if (clauses.size() == 0) // happens for stopwords
return null;
- return getBooleanQuery(clauses, true);
+ return getMultiFieldQuery(clauses);
}
Query q = super.getFieldQuery(field, queryText, true);
q = applySlop(q,slop);
@@ -144,7 +144,7 @@ public class MultiFieldQueryParser exten
@Override
protected Query getFieldQuery(String field, String queryText, boolean quoted) throws ParseException {
if (field == null) {
- List<BooleanClause> clauses = new ArrayList<>();
+ List<Query> clauses = new ArrayList<>();
for (int i = 0; i < fields.length; i++) {
Query q = super.getFieldQuery(fields[i], queryText, quoted);
if (q != null) {
@@ -156,12 +156,12 @@ public class MultiFieldQueryParser exten
q = new BoostQuery(q, boost.floatValue());
}
}
- clauses.add(new BooleanClause(q, BooleanClause.Occur.SHOULD));
+ clauses.add(q);
}
}
if (clauses.size() == 0) // happens for stopwords
return null;
- return getBooleanQuery(clauses, true);
+ return getMultiFieldQuery(clauses);
}
Query q = super.getFieldQuery(field, queryText, quoted);
return q;
@@ -172,12 +172,11 @@ public class MultiFieldQueryParser exten
protected Query getFuzzyQuery(String field, String termStr, float minSimilarity) throws ParseException
{
if (field == null) {
- List<BooleanClause> clauses = new ArrayList<>();
+ List<Query> clauses = new ArrayList<>();
for (int i = 0; i < fields.length; i++) {
- clauses.add(new BooleanClause(getFuzzyQuery(fields[i], termStr, minSimilarity),
- BooleanClause.Occur.SHOULD));
+ clauses.add(getFuzzyQuery(fields[i], termStr, minSimilarity));
}
- return getBooleanQuery(clauses, true);
+ return getMultiFieldQuery(clauses);
}
return super.getFuzzyQuery(field, termStr, minSimilarity);
}
@@ -186,12 +185,11 @@ public class MultiFieldQueryParser exten
protected Query getPrefixQuery(String field, String termStr) throws ParseException
{
if (field == null) {
- List<BooleanClause> clauses = new ArrayList<>();
+ List<Query> clauses = new ArrayList<>();
for (int i = 0; i < fields.length; i++) {
- clauses.add(new BooleanClause(getPrefixQuery(fields[i], termStr),
- BooleanClause.Occur.SHOULD));
+ clauses.add(getPrefixQuery(fields[i], termStr));
}
- return getBooleanQuery(clauses, true);
+ return getMultiFieldQuery(clauses);
}
return super.getPrefixQuery(field, termStr);
}
@@ -199,12 +197,11 @@ public class MultiFieldQueryParser exten
@Override
protected Query getWildcardQuery(String field, String termStr) throws ParseException {
if (field == null) {
- List<BooleanClause> clauses = new ArrayList<>();
+ List<Query> clauses = new ArrayList<>();
for (int i = 0; i < fields.length; i++) {
- clauses.add(new BooleanClause(getWildcardQuery(fields[i], termStr),
- BooleanClause.Occur.SHOULD));
+ clauses.add(getWildcardQuery(fields[i], termStr));
}
- return getBooleanQuery(clauses, true);
+ return getMultiFieldQuery(clauses);
}
return super.getWildcardQuery(field, termStr);
}
@@ -213,12 +210,11 @@ public class MultiFieldQueryParser exten
@Override
protected Query getRangeQuery(String field, String part1, String part2, boolean startInclusive, boolean endInclusive) throws ParseException {
if (field == null) {
- List<BooleanClause> clauses = new ArrayList<>();
+ List<Query> clauses = new ArrayList<>();
for (int i = 0; i < fields.length; i++) {
- clauses.add(new BooleanClause(getRangeQuery(fields[i], part1, part2, startInclusive, endInclusive),
- BooleanClause.Occur.SHOULD));
+ clauses.add(getRangeQuery(fields[i], part1, part2, startInclusive, endInclusive));
}
- return getBooleanQuery(clauses, true);
+ return getMultiFieldQuery(clauses);
}
return super.getRangeQuery(field, part1, part2, startInclusive, endInclusive);
}
@@ -229,15 +225,28 @@ public class MultiFieldQueryParser exten
protected Query getRegexpQuery(String field, String termStr)
throws ParseException {
if (field == null) {
- List<BooleanClause> clauses = new ArrayList<>();
+ List<Query> clauses = new ArrayList<>();
for (int i = 0; i < fields.length; i++) {
- clauses.add(new BooleanClause(getRegexpQuery(fields[i], termStr),
- BooleanClause.Occur.SHOULD));
+ clauses.add(getRegexpQuery(fields[i], termStr));
}
- return getBooleanQuery(clauses, true);
+ return getMultiFieldQuery(clauses);
}
return super.getRegexpQuery(field, termStr);
}
+
+ /** Creates a multifield query */
+ // TODO: investigate more general approach by default, e.g. DisjunctionMaxQuery?
+ protected Query getMultiFieldQuery(List<Query> queries) throws ParseException {
+ if (queries.isEmpty()) {
+ return null; // all clause words were filtered away by the analyzer.
+ }
+ BooleanQuery.Builder query = newBooleanQuery();
+ query.setDisableCoord(true);
+ for (Query sub : queries) {
+ query.add(sub, BooleanClause.Occur.SHOULD);
+ }
+ return query.build();
+ }
/**
* Parses a query which searches on the fields specified.
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java Mon Sep 14 22:03:35 2015
@@ -116,7 +116,7 @@ public abstract class QueryParserBase ex
try {
// TopLevelQuery is a Query followed by the end-of-input (EOF)
Query res = TopLevelQuery(field);
- return res!=null ? res : newBooleanQuery(false).build();
+ return res!=null ? res : newBooleanQuery().build();
}
catch (ParseException | TokenMgrError tme) {
// rethrow to include the original query:
@@ -688,30 +688,10 @@ public abstract class QueryParserBase ex
* @exception org.apache.lucene.queryparser.classic.ParseException throw in overridden method to disallow
*/
protected Query getBooleanQuery(List<BooleanClause> clauses) throws ParseException {
- return getBooleanQuery(clauses, false);
- }
-
- /**
- * Factory method for generating query, given a set of clauses.
- * By default creates a boolean query composed of clauses passed in.
- *
- * Can be overridden by extending classes, to modify query being
- * returned.
- *
- * @param clauses List that contains {@link org.apache.lucene.search.BooleanClause} instances
- * to join.
- * @param disableCoord true if coord scoring should be disabled.
- *
- * @return Resulting {@link org.apache.lucene.search.Query} object.
- * @exception org.apache.lucene.queryparser.classic.ParseException throw in overridden method to disallow
- */
- protected Query getBooleanQuery(List<BooleanClause> clauses, boolean disableCoord)
- throws ParseException
- {
if (clauses.size()==0) {
return null; // all clause words were filtered away by the analyzer.
}
- BooleanQuery.Builder query = newBooleanQuery(disableCoord);
+ BooleanQuery.Builder query = newBooleanQuery();
for(final BooleanClause clause: clauses) {
query.add(clause);
}
Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiAnalyzer.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiAnalyzer.java Mon Sep 14 22:03:35 2015
@@ -50,12 +50,12 @@ public class TestMultiAnalyzer extends B
assertEquals("\"foo foobar blah\"", qp.parse("\"foo foobar blah\"").toString());
// two tokens at the same position:
- assertEquals("(multi multi2) foo", qp.parse("multi foo").toString());
- assertEquals("foo (multi multi2)", qp.parse("foo multi").toString());
- assertEquals("(multi multi2) (multi multi2)", qp.parse("multi multi").toString());
- assertEquals("+(foo (multi multi2)) +(bar (multi multi2))",
+ assertEquals("Synonym(multi multi2) foo", qp.parse("multi foo").toString());
+ assertEquals("foo Synonym(multi multi2)", qp.parse("foo multi").toString());
+ assertEquals("Synonym(multi multi2) Synonym(multi multi2)", qp.parse("multi multi").toString());
+ assertEquals("+(foo Synonym(multi multi2)) +(bar Synonym(multi multi2))",
qp.parse("+(foo multi) +(bar multi)").toString());
- assertEquals("+(foo (multi multi2)) field:\"bar (multi multi2)\"",
+ assertEquals("+(foo Synonym(multi multi2)) field:\"bar (multi multi2)\"",
qp.parse("+(foo multi) field:\"bar multi\"").toString());
// phrases:
@@ -65,12 +65,12 @@ public class TestMultiAnalyzer extends B
qp.parse("\"foo multi foobar multi\"").toString());
// fields:
- assertEquals("(field:multi field:multi2) field:foo", qp.parse("field:multi field:foo").toString());
+ assertEquals("Synonym(field:multi field:multi2) field:foo", qp.parse("field:multi field:foo").toString());
assertEquals("field:\"(multi multi2) foo\"", qp.parse("field:\"multi foo\"").toString());
// three tokens at one position:
- assertEquals("triplemulti multi3 multi2", qp.parse("triplemulti").toString());
- assertEquals("foo (triplemulti multi3 multi2) foobar",
+ assertEquals("Synonym(multi2 multi3 triplemulti)", qp.parse("triplemulti").toString());
+ assertEquals("foo Synonym(multi2 multi3 triplemulti) foobar",
qp.parse("foo triplemulti foobar").toString());
// phrase with non-default slop:
@@ -89,7 +89,7 @@ public class TestMultiAnalyzer extends B
// non-default operator:
qp.setDefaultOperator(QueryParserBase.AND_OPERATOR);
- assertEquals("+(multi multi2) +foo", qp.parse("multi foo").toString());
+ assertEquals("+Synonym(multi multi2) +foo", qp.parse("multi foo").toString());
}
Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java Mon Sep 14 22:03:35 2015
@@ -35,6 +35,7 @@ import org.apache.lucene.search.BooleanQ
import org.apache.lucene.search.BoostQuery;
import org.apache.lucene.search.MultiPhraseQuery;
import org.apache.lucene.search.Query;
+import org.apache.lucene.search.SynonymQuery;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.util.automaton.TooComplexToDeterminizeException;
@@ -300,21 +301,16 @@ public class TestQueryParser extends Que
/** ordinary behavior, synonyms form uncoordinated boolean query */
QueryParser dumb = new QueryParser("field",
new Analyzer1());
- BooleanQuery.Builder expanded = new BooleanQuery.Builder();
- expanded.setDisableCoord(true);
- expanded.add(new TermQuery(new Term("field", "dogs")),
- BooleanClause.Occur.SHOULD);
- expanded.add(new TermQuery(new Term("field", "dog")),
- BooleanClause.Occur.SHOULD);
- assertEquals(expanded.build(), dumb.parse("\"dogs\""));
+ Query expanded = new SynonymQuery(new Term("field", "dogs"), new Term("field", "dog"));
+ assertEquals(expanded, dumb.parse("\"dogs\""));
/** even with the phrase operator the behavior is the same */
- assertEquals(expanded.build(), dumb.parse("dogs"));
+ assertEquals(expanded, dumb.parse("dogs"));
/**
* custom behavior, the synonyms are expanded, unless you use quote operator
*/
QueryParser smart = new SmartQueryParser();
- assertEquals(expanded.build(), smart.parse("dogs"));
+ assertEquals(expanded, smart.parse("dogs"));
Query unexpanded = new TermQuery(new Term("field", "dogs"));
assertEquals(unexpanded, smart.parse("\"dogs\""));
@@ -333,11 +329,7 @@ public class TestQueryParser extends Que
/** simple synonyms test */
public void testSynonyms() throws Exception {
- BooleanQuery.Builder expectedB = new BooleanQuery.Builder();
- expectedB.setDisableCoord(true);
- expectedB.add(new TermQuery(new Term("field", "dogs")), BooleanClause.Occur.SHOULD);
- expectedB.add(new TermQuery(new Term("field", "dog")), BooleanClause.Occur.SHOULD);
- Query expected = expectedB.build();
+ Query expected = new SynonymQuery(new Term("field", "dogs"), new Term("field", "dog"));
QueryParser qp = new QueryParser("field", new MockSynonymAnalyzer());
assertEquals(expected, qp.parse("dogs"));
assertEquals(expected, qp.parse("\"dogs\""));
@@ -405,11 +397,7 @@ public class TestQueryParser extends Que
/** simple CJK synonym test */
public void testCJKSynonym() throws Exception {
- BooleanQuery.Builder expectedB = new BooleanQuery.Builder();
- expectedB.setDisableCoord(true);
- expectedB.add(new TermQuery(new Term("field", "å½")), BooleanClause.Occur.SHOULD);
- expectedB.add(new TermQuery(new Term("field", "å")), BooleanClause.Occur.SHOULD);
- Query expected = expectedB.build();
+ Query expected = new SynonymQuery(new Term("field", "å½"), new Term("field", "å"));
QueryParser qp = new QueryParser("field", new MockCJKSynonymAnalyzer());
assertEquals(expected, qp.parse("å½"));
qp.setDefaultOperator(Operator.AND);
@@ -422,11 +410,8 @@ public class TestQueryParser extends Que
public void testCJKSynonymsOR() throws Exception {
BooleanQuery.Builder expectedB = new BooleanQuery.Builder();
expectedB.add(new TermQuery(new Term("field", "ä¸")), BooleanClause.Occur.SHOULD);
- BooleanQuery.Builder inner = new BooleanQuery.Builder();
- inner.setDisableCoord(true);
- inner.add(new TermQuery(new Term("field", "å½")), BooleanClause.Occur.SHOULD);
- inner.add(new TermQuery(new Term("field", "å")), BooleanClause.Occur.SHOULD);
- expectedB.add(inner.build(), BooleanClause.Occur.SHOULD);
+ Query inner = new SynonymQuery(new Term("field", "å½"), new Term("field", "å"));
+ expectedB.add(inner, BooleanClause.Occur.SHOULD);
Query expected = expectedB.build();
QueryParser qp = new QueryParser("field", new MockCJKSynonymAnalyzer());
assertEquals(expected, qp.parse("ä¸å½"));
@@ -438,16 +423,10 @@ public class TestQueryParser extends Que
public void testCJKSynonymsOR2() throws Exception {
BooleanQuery.Builder expectedB = new BooleanQuery.Builder();
expectedB.add(new TermQuery(new Term("field", "ä¸")), BooleanClause.Occur.SHOULD);
- BooleanQuery.Builder inner = new BooleanQuery.Builder();
- inner.setDisableCoord(true);
- inner.add(new TermQuery(new Term("field", "å½")), BooleanClause.Occur.SHOULD);
- inner.add(new TermQuery(new Term("field", "å")), BooleanClause.Occur.SHOULD);
- expectedB.add(inner.build(), BooleanClause.Occur.SHOULD);
- BooleanQuery.Builder inner2 = new BooleanQuery.Builder();
- inner2.setDisableCoord(true);
- inner2.add(new TermQuery(new Term("field", "å½")), BooleanClause.Occur.SHOULD);
- inner2.add(new TermQuery(new Term("field", "å")), BooleanClause.Occur.SHOULD);
- expectedB.add(inner2.build(), BooleanClause.Occur.SHOULD);
+ SynonymQuery inner = new SynonymQuery(new Term("field", "å½"), new Term("field", "å"));
+ expectedB.add(inner, BooleanClause.Occur.SHOULD);
+ SynonymQuery inner2 = new SynonymQuery(new Term("field", "å½"), new Term("field", "å"));
+ expectedB.add(inner2, BooleanClause.Occur.SHOULD);
Query expected = expectedB.build();
QueryParser qp = new QueryParser("field", new MockCJKSynonymAnalyzer());
assertEquals(expected, qp.parse("ä¸å½å½"));
@@ -459,11 +438,8 @@ public class TestQueryParser extends Que
public void testCJKSynonymsAND() throws Exception {
BooleanQuery.Builder expectedB = new BooleanQuery.Builder();
expectedB.add(new TermQuery(new Term("field", "ä¸")), BooleanClause.Occur.MUST);
- BooleanQuery.Builder inner = new BooleanQuery.Builder();
- inner.setDisableCoord(true);
- inner.add(new TermQuery(new Term("field", "å½")), BooleanClause.Occur.SHOULD);
- inner.add(new TermQuery(new Term("field", "å")), BooleanClause.Occur.SHOULD);
- expectedB.add(inner.build(), BooleanClause.Occur.MUST);
+ Query inner = new SynonymQuery(new Term("field", "å½"), new Term("field", "å"));
+ expectedB.add(inner, BooleanClause.Occur.MUST);
Query expected = expectedB.build();
QueryParser qp = new QueryParser("field", new MockCJKSynonymAnalyzer());
qp.setDefaultOperator(Operator.AND);
@@ -476,16 +452,10 @@ public class TestQueryParser extends Que
public void testCJKSynonymsAND2() throws Exception {
BooleanQuery.Builder expectedB = new BooleanQuery.Builder();
expectedB.add(new TermQuery(new Term("field", "ä¸")), BooleanClause.Occur.MUST);
- BooleanQuery.Builder inner = new BooleanQuery.Builder();
- inner.setDisableCoord(true);
- inner.add(new TermQuery(new Term("field", "å½")), BooleanClause.Occur.SHOULD);
- inner.add(new TermQuery(new Term("field", "å")), BooleanClause.Occur.SHOULD);
- expectedB.add(inner.build(), BooleanClause.Occur.MUST);
- BooleanQuery.Builder inner2 = new BooleanQuery.Builder();
- inner2.setDisableCoord(true);
- inner2.add(new TermQuery(new Term("field", "å½")), BooleanClause.Occur.SHOULD);
- inner2.add(new TermQuery(new Term("field", "å")), BooleanClause.Occur.SHOULD);
- expectedB.add(inner2.build(), BooleanClause.Occur.MUST);
+ Query inner = new SynonymQuery(new Term("field", "å½"), new Term("field", "å"));
+ expectedB.add(inner, BooleanClause.Occur.MUST);
+ Query inner2 = new SynonymQuery(new Term("field", "å½"), new Term("field", "å"));
+ expectedB.add(inner2, BooleanClause.Occur.MUST);
Query expected = expectedB.build();
QueryParser qp = new QueryParser("field", new MockCJKSynonymAnalyzer());
qp.setDefaultOperator(Operator.AND);
Modified: lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java Mon Sep 14 22:03:35 2015
@@ -41,7 +41,7 @@ import org.apache.lucene.search.Constant
import org.apache.lucene.search.MaxNonCompetitiveBoostAttribute;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.similarities.DefaultSimilarity;
+import org.apache.lucene.search.similarities.ClassicSimilarity;
import org.apache.lucene.search.similarities.TFIDFSimilarity;
import org.apache.lucene.util.AttributeSource;
import org.apache.lucene.util.BytesRef;
@@ -68,7 +68,7 @@ public class FuzzyLikeThisQuery extends
// a better way might be to convert this into multitermquery rewrite methods.
// the rewrite method can 'average' the TermContext's term statistics (docfreq,totalTermFreq)
// provided to TermQuery, so that the general idea is agnostic to any scoring system...
- static TFIDFSimilarity sim=new DefaultSimilarity();
+ static TFIDFSimilarity sim=new ClassicSimilarity();
ArrayList<FieldVals> fieldVals=new ArrayList<>();
Analyzer analyzer;
Modified: lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery2.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery2.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery2.java Mon Sep 14 22:03:35 2015
@@ -33,7 +33,7 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.MultiTermQuery;
import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.search.similarities.DefaultSimilarity;
+import org.apache.lucene.search.similarities.ClassicSimilarity;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LuceneTestCase;
@@ -111,7 +111,7 @@ public class TestSlowFuzzyQuery2 extends
}
// even though this uses a boost-only rewrite, this test relies upon queryNorm being the default implementation,
// otherwise scores are different!
- searcher.setSimilarity(new DefaultSimilarity());
+ searcher.setSimilarity(new ClassicSimilarity());
writer.close();
String line;
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/RandomSimilarityProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/RandomSimilarityProvider.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/RandomSimilarityProvider.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/RandomSimilarityProvider.java Mon Sep 14 22:03:35 2015
@@ -37,7 +37,7 @@ import org.apache.lucene.search.similari
import org.apache.lucene.search.similarities.BasicModelIne;
import org.apache.lucene.search.similarities.BasicModelP;
import org.apache.lucene.search.similarities.DFRSimilarity;
-import org.apache.lucene.search.similarities.DefaultSimilarity;
+import org.apache.lucene.search.similarities.ClassicSimilarity;
import org.apache.lucene.search.similarities.Distribution;
import org.apache.lucene.search.similarities.DistributionLL;
import org.apache.lucene.search.similarities.DistributionSPL;
@@ -63,7 +63,7 @@ import org.apache.lucene.search.similari
* for the same field.
*/
public class RandomSimilarityProvider extends PerFieldSimilarityWrapper {
- final DefaultSimilarity defaultSim = new DefaultSimilarity();
+ final ClassicSimilarity defaultSim = new ClassicSimilarity();
final List<Similarity> knownSims;
Map<String,Similarity> previousMappings = new HashMap<>();
final int perFieldSeed;
@@ -139,7 +139,7 @@ public class RandomSimilarityProvider ex
static List<Similarity> allSims;
static {
allSims = new ArrayList<>();
- allSims.add(new DefaultSimilarity());
+ allSims.add(new ClassicSimilarity());
allSims.add(new BM25Similarity());
for (BasicModel basicModel : BASIC_MODELS) {
for (AfterEffect afterEffect : AFTER_EFFECTS) {
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java Mon Sep 14 22:03:35 2015
@@ -38,7 +38,7 @@ import org.apache.lucene.codecs.mockrand
import org.apache.lucene.codecs.simpletext.SimpleTextCodec;
import org.apache.lucene.index.RandomCodec;
import org.apache.lucene.search.RandomSimilarityProvider;
-import org.apache.lucene.search.similarities.DefaultSimilarity;
+import org.apache.lucene.search.similarities.ClassicSimilarity;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.junit.internal.AssumptionViolatedException;
@@ -207,7 +207,7 @@ final class TestRuleSetupAndRestoreClass
TimeZone randomTimeZone = randomTimeZone(random());
timeZone = testTimeZone.equals("random") ? randomTimeZone : TimeZone.getTimeZone(testTimeZone);
TimeZone.setDefault(timeZone);
- similarity = random().nextBoolean() ? new DefaultSimilarity() : new RandomSimilarityProvider(random());
+ similarity = random().nextBoolean() ? new ClassicSimilarity() : new RandomSimilarityProvider(random());
// Check codec restrictions once at class level.
try {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.java Mon Sep 14 22:03:35 2015
@@ -152,7 +152,7 @@ public abstract class SolrQueryParserBas
try {
// TopLevelQuery is a Query followed by the end-of-input (EOF)
Query res = TopLevelQuery(null); // pass null so we can tell later if an explicit field was provided or not
- return res!=null ? res : newBooleanQuery(false).build();
+ return res!=null ? res : newBooleanQuery().build();
}
catch (ParseException | TokenMgrError tme) {
throw new SyntaxError("Cannot parse '" +query+ "': " + tme.getMessage(), tme);
@@ -488,30 +488,12 @@ public abstract class SolrQueryParserBas
*
* @return Resulting {@link org.apache.lucene.search.Query} object.
*/
- protected Query getBooleanQuery(List<BooleanClause> clauses) throws SyntaxError {
- return getBooleanQuery(clauses, false);
- }
-
- /**
- * Factory method for generating query, given a set of clauses.
- * By default creates a boolean query composed of clauses passed in.
- *
- * Can be overridden by extending classes, to modify query being
- * returned.
- *
- * @param clauses List that contains {@link org.apache.lucene.search.BooleanClause} instances
- * to join.
- * @param disableCoord true if coord scoring should be disabled.
- *
- * @return Resulting {@link org.apache.lucene.search.Query} object.
- */
- protected Query getBooleanQuery(List<BooleanClause> clauses, boolean disableCoord)
- throws SyntaxError
+ protected Query getBooleanQuery(List<BooleanClause> clauses) throws SyntaxError
{
if (clauses.size()==0) {
return null; // all clause words were filtered away by the analyzer.
}
- BooleanQuery.Builder query = newBooleanQuery(disableCoord);
+ BooleanQuery.Builder query = newBooleanQuery();
for(final BooleanClause clause: clauses) {
query.add(clause);
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java Mon Sep 14 22:03:35 2015
@@ -1010,8 +1010,8 @@ public class ExtendedDismaxQParser exten
}
@Override
- protected Query getBooleanQuery(List<BooleanClause> clauses, boolean disableCoord) throws SyntaxError {
- Query q = super.getBooleanQuery(clauses, disableCoord);
+ protected Query getBooleanQuery(List<BooleanClause> clauses) throws SyntaxError {
+ Query q = super.getBooleanQuery(clauses);
if (q != null) {
q = QueryUtils.makeQueryable(q);
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/DefaultSimilarityFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/DefaultSimilarityFactory.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/DefaultSimilarityFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/DefaultSimilarityFactory.java Mon Sep 14 22:03:35 2015
@@ -17,22 +17,22 @@ package org.apache.solr.search.similarit
* limitations under the License.
*/
-import org.apache.lucene.search.similarities.DefaultSimilarity;
+import org.apache.lucene.search.similarities.ClassicSimilarity;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.search.similarities.TFIDFSimilarity; // javadoc
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.schema.SimilarityFactory;
/**
- * Factory for {@link DefaultSimilarity}
+ * Factory for {@link ClassicSimilarity}
* <p>
- * DefaultSimilarity is Lucene's default scoring implementation, based
+ * ClassicSimilarity is Lucene's original scoring implementation, based
* upon the Vector Space Model.
* <p>
* Optional settings:
* <ul>
* <li>discountOverlaps (bool): Sets
- * {@link DefaultSimilarity#setDiscountOverlaps(boolean)}</li>
+ * {@link ClassicSimilarity#setDiscountOverlaps(boolean)}</li>
* </ul>
* @see TFIDFSimilarity
* @lucene.experimental
@@ -40,13 +40,13 @@ import org.apache.solr.schema.Similarity
public class DefaultSimilarityFactory extends SimilarityFactory {
/** Init param name for specifying the value to use in
- * {@link DefaultSimilarity#setDiscountOverlaps(boolean)}
+ * {@link ClassicSimilarity#setDiscountOverlaps(boolean)}
*/
public static final String DISCOUNT_OVERLAPS = "discountOverlaps";
/**
- * Controls the value of {@link DefaultSimilarity#setDiscountOverlaps(boolean)}
- * on newly constructed instances of {@link DefaultSimilarity}
+ * Controls the value of {@link ClassicSimilarity#setDiscountOverlaps(boolean)}
+ * on newly constructed instances of {@link ClassicSimilarity}
*/
protected boolean discountOverlaps = true;
@@ -58,7 +58,7 @@ public class DefaultSimilarityFactory ex
@Override
public Similarity getSimilarity() {
- DefaultSimilarity sim = new DefaultSimilarity();
+ ClassicSimilarity sim = new ClassicSimilarity();
sim.setDiscountOverlaps(discountOverlaps);
return sim;
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/SchemaSimilarityFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/SchemaSimilarityFactory.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/SchemaSimilarityFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/SchemaSimilarityFactory.java Mon Sep 14 22:03:35 2015
@@ -17,7 +17,7 @@ package org.apache.solr.search.similarit
* limitations under the License.
*/
-import org.apache.lucene.search.similarities.DefaultSimilarity;
+import org.apache.lucene.search.similarities.ClassicSimilarity;
import org.apache.lucene.search.similarities.PerFieldSimilarityWrapper;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.solr.common.params.SolrParams;
@@ -29,7 +29,7 @@ import org.apache.solr.util.plugin.SolrC
/**
* SimilarityFactory that returns a {@link PerFieldSimilarityWrapper}
* that delegates to the field type, if it's configured, otherwise
- * {@link DefaultSimilarity}.
+ * {@link ClassicSimilarity}.
*
* <p>
* <b>NOTE:</b> Users should be aware that in addition to supporting
@@ -45,7 +45,7 @@ import org.apache.solr.util.plugin.SolrC
*/
public class SchemaSimilarityFactory extends SimilarityFactory implements SolrCoreAware {
private Similarity similarity;
- private Similarity defaultSimilarity = new DefaultSimilarity();
+ private Similarity defaultSimilarity = new ClassicSimilarity();
private volatile SolrCore core;
@Override
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java Mon Sep 14 22:03:35 2015
@@ -18,7 +18,7 @@ package org.apache.solr.search.similarit
*/
import org.apache.lucene.misc.SweetSpotSimilarity;
-import org.apache.lucene.search.similarities.DefaultSimilarity; // jdoc
+import org.apache.lucene.search.similarities.ClassicSimilarity; // jdoc
import org.apache.lucene.search.similarities.Similarity;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.schema.SimilarityFactory;
@@ -28,7 +28,7 @@ import static org.apache.solr.common.Sol
* <p>Factory for {@link SweetSpotSimilarity}.</p>
* <p>
* <code>SweetSpotSimilarity</code> is an extension of
- * {@link DefaultSimilarity} that provides additional tuning options for
+ * {@link ClassicSimilarity} that provides additional tuning options for
* specifying the "sweetspot" of optimal <code>tf</code> and
* <code>lengthNorm</code> values in the source data.
* </p>
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java Mon Sep 14 22:03:35 2015
@@ -27,7 +27,7 @@ import java.util.List;
import java.util.Random;
import org.apache.lucene.index.FieldInvertState;
-import org.apache.lucene.search.similarities.DefaultSimilarity;
+import org.apache.lucene.search.similarities.ClassicSimilarity;
import org.apache.lucene.search.similarities.TFIDFSimilarity;
import org.apache.solr.SolrTestCaseJ4;
import org.junit.BeforeClass;
@@ -326,7 +326,7 @@ public class TestFunctionQuery extends S
assertQ(req("fl","*,score","q", "{!func}docfreq($field,$value)", "fq","id:6", "field","a_t", "value","cow"), "//float[@name='score']='3.0'");
assertQ(req("fl","*,score","q", "{!func}termfreq(a_t,cow)", "fq","id:6"), "//float[@name='score']='5.0'");
- TFIDFSimilarity similarity = new DefaultSimilarity();
+ TFIDFSimilarity similarity = new ClassicSimilarity();
// make sure it doesn't get a NPE if no terms are present in a field.
assertQ(req("fl","*,score","q", "{!func}termfreq(nofield_t,cow)", "fq","id:6"), "//float[@name='score']='0.0'");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/MockConfigurableSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/MockConfigurableSimilarity.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/MockConfigurableSimilarity.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/MockConfigurableSimilarity.java Mon Sep 14 22:03:35 2015
@@ -16,9 +16,9 @@
*/
package org.apache.solr.search.similarities;
-import org.apache.lucene.search.similarities.DefaultSimilarity;
+import org.apache.lucene.search.similarities.ClassicSimilarity;
-public class MockConfigurableSimilarity extends DefaultSimilarity {
+public class MockConfigurableSimilarity extends ClassicSimilarity {
private String passthrough;
public MockConfigurableSimilarity(String passthrough) {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestDefaultSimilarityFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestDefaultSimilarityFactory.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestDefaultSimilarityFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestDefaultSimilarityFactory.java Mon Sep 14 22:03:35 2015
@@ -17,7 +17,7 @@ package org.apache.solr.search.similarit
* limitations under the License.
*/
-import org.apache.lucene.search.similarities.DefaultSimilarity;
+import org.apache.lucene.search.similarities.ClassicSimilarity;
import org.apache.lucene.search.similarities.Similarity;
import org.junit.BeforeClass;
@@ -33,14 +33,14 @@ public class TestDefaultSimilarityFactor
/** default parameters */
public void testDefaults() throws Exception {
Similarity sim = getSimilarity("text");
- assertEquals(DefaultSimilarity.class, sim.getClass());
- assertEquals(true, ((DefaultSimilarity)sim).getDiscountOverlaps());
+ assertEquals(ClassicSimilarity.class, sim.getClass());
+ assertEquals(true, ((ClassicSimilarity)sim).getDiscountOverlaps());
}
/** explicit params */
public void testParams() throws Exception {
Similarity sim = getSimilarity("text_overlap");
- assertEquals(DefaultSimilarity.class, sim.getClass());
- assertEquals(false, ((DefaultSimilarity)sim).getDiscountOverlaps());
+ assertEquals(ClassicSimilarity.class, sim.getClass());
+ assertEquals(false, ((ClassicSimilarity)sim).getDiscountOverlaps());
}
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestNonDefinedSimilarityFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestNonDefinedSimilarityFactory.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestNonDefinedSimilarityFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestNonDefinedSimilarityFactory.java Mon Sep 14 22:03:35 2015
@@ -17,7 +17,7 @@ package org.apache.solr.search.similarit
* limitations under the License.
*/
-import org.apache.lucene.search.similarities.DefaultSimilarity;
+import org.apache.lucene.search.similarities.ClassicSimilarity;
import org.apache.lucene.util.Version;
import org.junit.After;
@@ -37,7 +37,7 @@ public class TestNonDefinedSimilarityFac
public void testCurrent() throws Exception {
// no sys prop set, rely on LATEST
initCore("solrconfig-basic.xml","schema-tiny.xml");
- DefaultSimilarity sim = getSimilarity("text", DefaultSimilarity.class);
+ ClassicSimilarity sim = getSimilarity("text", ClassicSimilarity.class);
assertEquals(true, sim.getDiscountOverlaps());
}
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestPerFieldSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestPerFieldSimilarity.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestPerFieldSimilarity.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestPerFieldSimilarity.java Mon Sep 14 22:03:35 2015
@@ -18,7 +18,7 @@ package org.apache.solr.search.similarit
*/
import org.apache.lucene.misc.SweetSpotSimilarity;
-import org.apache.lucene.search.similarities.DefaultSimilarity;
+import org.apache.lucene.search.similarities.ClassicSimilarity;
import org.apache.lucene.search.similarities.Similarity;
import org.junit.BeforeClass;
@@ -59,18 +59,18 @@ public class TestPerFieldSimilarity exte
/** test a field where no similarity is specified */
public void testDefaults() throws Exception {
Similarity sim = getSimilarity("sim3text");
- assertEquals(DefaultSimilarity.class, sim.getClass());;
+ assertEquals(ClassicSimilarity.class, sim.getClass());;
}
/** ... and for a dynamic field */
public void testDefaultsDynamic() throws Exception {
Similarity sim = getSimilarity("text_sim3");
- assertEquals(DefaultSimilarity.class, sim.getClass());
+ assertEquals(ClassicSimilarity.class, sim.getClass());
}
/** test a field that does not exist */
public void testNonexistent() throws Exception {
Similarity sim = getSimilarity("sdfdsfdsfdswr5fsdfdsfdsfs");
- assertEquals(DefaultSimilarity.class, sim.getClass());
+ assertEquals(ClassicSimilarity.class, sim.getClass());
}
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestSweetSpotSimilarityFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestSweetSpotSimilarityFactory.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestSweetSpotSimilarityFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/similarities/TestSweetSpotSimilarityFactory.java Mon Sep 14 22:03:35 2015
@@ -18,7 +18,7 @@ package org.apache.solr.search.similarit
*/
import org.apache.lucene.misc.SweetSpotSimilarity;
-import org.apache.lucene.search.similarities.DefaultSimilarity;
+import org.apache.lucene.search.similarities.ClassicSimilarity;
import org.apache.lucene.search.similarities.Similarity;
import org.junit.BeforeClass;
@@ -36,7 +36,7 @@ public class TestSweetSpotSimilarityFact
SweetSpotSimilarity sim = getSimilarity("text", SweetSpotSimilarity.class);
// SSS tf w/defaults should behave just like DS
- DefaultSimilarity d = new DefaultSimilarity();
+ ClassicSimilarity d = new ClassicSimilarity();
for (int i = 0; i <=1000; i++) {
assertEquals("tf: i="+i, d.tf(i), sim.tf(i), 0.0F);
}
@@ -52,7 +52,7 @@ public class TestSweetSpotSimilarityFact
SweetSpotSimilarity sim = getSimilarity("text_baseline",
SweetSpotSimilarity.class);
- DefaultSimilarity d = new DefaultSimilarity();
+ ClassicSimilarity d = new ClassicSimilarity();
// constant up to 6
for (int i = 1; i <=6; i++) {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java?rev=1703070&r1=1703069&r2=1703070&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java Mon Sep 14 22:03:35 2015
@@ -24,7 +24,7 @@ import org.apache.lucene.index.Indexable
import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.index.SlowCompositeReaderWrapper;
-import org.apache.lucene.search.similarities.DefaultSimilarity;
+import org.apache.lucene.search.similarities.ClassicSimilarity;
import org.apache.lucene.util.TestUtil;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrDocument;
@@ -352,11 +352,11 @@ public class DocumentBuilderTest extends
SolrIndexSearcher searcher = req.getSearcher();
LeafReader reader = SlowCompositeReaderWrapper.wrap(searcher.getTopReaderContext().reader());
- assertTrue("similarity doesn't extend DefaultSimilarity, " +
+ assertTrue("similarity doesn't extend ClassicSimilarity, " +
"config or defaults have changed since test was written",
- searcher.getSimilarity(true) instanceof DefaultSimilarity);
+ searcher.getSimilarity(true) instanceof ClassicSimilarity);
- DefaultSimilarity sim = (DefaultSimilarity) searcher.getSimilarity(true);
+ ClassicSimilarity sim = (ClassicSimilarity) searcher.getSimilarity(true);
NumericDocValues titleNorms = reader.getNormValues("title");
NumericDocValues fooNorms = reader.getNormValues("foo_t");
@@ -380,7 +380,7 @@ public class DocumentBuilderTest extends
/**
* Given a length, and boost returns the expected encoded norm
*/
- private static byte expectedNorm(final DefaultSimilarity sim,
+ private static byte expectedNorm(final ClassicSimilarity sim,
final int length, final float boost) {
return (byte) sim.encodeNormValue(boost / ((float) Math.sqrt(length)));
}