You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rj...@apache.org on 2014/08/21 05:12:58 UTC
svn commit: r1619283 [11/11] - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/analysis/
lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/
lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/
lucene/analysis/common/src/java/...
Modified: lucene/dev/branches/branch_4x/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java Thu Aug 21 03:12:52 2014
@@ -46,7 +46,7 @@ public class TestQueryParser extends Que
public static class QPTestParser extends QueryParser {
public QPTestParser(String f, Analyzer a) {
- super(TEST_VERSION_CURRENT, f, a);
+ super(f, a);
}
@Override
@@ -64,7 +64,7 @@ public class TestQueryParser extends Que
public QueryParser getParser(Analyzer a) throws Exception {
if (a == null) a = new MockAnalyzer(random(), MockTokenizer.SIMPLE, true);
- QueryParser qp = new QueryParser(TEST_VERSION_CURRENT, getDefaultField(), a);
+ QueryParser qp = new QueryParser(getDefaultField(), a);
qp.setDefaultOperator(QueryParserBase.OR_OPERATOR);
return qp;
}
@@ -170,7 +170,7 @@ public class TestQueryParser extends Que
}
public void testFuzzySlopeExtendability() throws ParseException {
- QueryParser qp = new QueryParser(TEST_VERSION_CURRENT, "a", new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false)) {
+ QueryParser qp = new QueryParser("a", new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false)) {
@Override
Query handleBareFuzzy(String qfield, Token fuzzySlop, String termImage)
@@ -194,7 +194,7 @@ public class TestQueryParser extends Que
@Override
public void testStarParsing() throws Exception {
final int[] type = new int[1];
- QueryParser qp = new QueryParser(TEST_VERSION_CURRENT, "field",
+ QueryParser qp = new QueryParser("field",
new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false)) {
@Override
protected Query getWildcardQuery(String field, String termStr) {
@@ -281,7 +281,7 @@ public class TestQueryParser extends Que
Analyzer morePrecise = new Analyzer2();
public SmartQueryParser() {
- super(TEST_VERSION_CURRENT, "field", new Analyzer1());
+ super("field", new Analyzer1());
}
@Override
@@ -295,7 +295,7 @@ public class TestQueryParser extends Que
@Override
public void testNewFieldQuery() throws Exception {
/** ordinary behavior, synonyms form uncoordinated boolean query */
- QueryParser dumb = new QueryParser(TEST_VERSION_CURRENT, "field",
+ QueryParser dumb = new QueryParser("field",
new Analyzer1());
BooleanQuery expanded = new BooleanQuery(true);
expanded.add(new TermQuery(new Term("field", "dogs")),
@@ -332,7 +332,7 @@ public class TestQueryParser extends Que
BooleanQuery expected = new BooleanQuery(true);
expected.add(new TermQuery(new Term("field", "dogs")), BooleanClause.Occur.SHOULD);
expected.add(new TermQuery(new Term("field", "dog")), BooleanClause.Occur.SHOULD);
- QueryParser qp = new QueryParser(TEST_VERSION_CURRENT, "field", new MockSynonymAnalyzer());
+ QueryParser qp = new QueryParser("field", new MockSynonymAnalyzer());
assertEquals(expected, qp.parse("dogs"));
assertEquals(expected, qp.parse("\"dogs\""));
qp.setDefaultOperator(Operator.AND);
@@ -348,7 +348,7 @@ public class TestQueryParser extends Que
MultiPhraseQuery expected = new MultiPhraseQuery();
expected.add(new Term("field", "old"));
expected.add(new Term[] { new Term("field", "dogs"), new Term("field", "dog") });
- QueryParser qp = new QueryParser(TEST_VERSION_CURRENT, "field", new MockSynonymAnalyzer());
+ QueryParser qp = new QueryParser("field", new MockSynonymAnalyzer());
assertEquals(expected, qp.parse("\"old dogs\""));
qp.setDefaultOperator(Operator.AND);
assertEquals(expected, qp.parse("\"old dogs\""));
@@ -402,7 +402,7 @@ public class TestQueryParser extends Que
BooleanQuery expected = new BooleanQuery(true);
expected.add(new TermQuery(new Term("field", "å½")), BooleanClause.Occur.SHOULD);
expected.add(new TermQuery(new Term("field", "å")), BooleanClause.Occur.SHOULD);
- QueryParser qp = new QueryParser(TEST_VERSION_CURRENT, "field", new MockCJKSynonymAnalyzer());
+ QueryParser qp = new QueryParser("field", new MockCJKSynonymAnalyzer());
assertEquals(expected, qp.parse("å½"));
qp.setDefaultOperator(Operator.AND);
assertEquals(expected, qp.parse("å½"));
@@ -418,7 +418,7 @@ public class TestQueryParser extends Que
inner.add(new TermQuery(new Term("field", "å½")), BooleanClause.Occur.SHOULD);
inner.add(new TermQuery(new Term("field", "å")), BooleanClause.Occur.SHOULD);
expected.add(inner, BooleanClause.Occur.SHOULD);
- QueryParser qp = new QueryParser(TEST_VERSION_CURRENT, "field", new MockCJKSynonymAnalyzer());
+ QueryParser qp = new QueryParser("field", new MockCJKSynonymAnalyzer());
assertEquals(expected, qp.parse("ä¸å½"));
expected.setBoost(2.0f);
assertEquals(expected, qp.parse("ä¸å½^2"));
@@ -436,7 +436,7 @@ public class TestQueryParser extends Que
inner2.add(new TermQuery(new Term("field", "å½")), BooleanClause.Occur.SHOULD);
inner2.add(new TermQuery(new Term("field", "å")), BooleanClause.Occur.SHOULD);
expected.add(inner2, BooleanClause.Occur.SHOULD);
- QueryParser qp = new QueryParser(TEST_VERSION_CURRENT, "field", new MockCJKSynonymAnalyzer());
+ QueryParser qp = new QueryParser("field", new MockCJKSynonymAnalyzer());
assertEquals(expected, qp.parse("ä¸å½å½"));
expected.setBoost(2.0f);
assertEquals(expected, qp.parse("ä¸å½å½^2"));
@@ -450,7 +450,7 @@ public class TestQueryParser extends Que
inner.add(new TermQuery(new Term("field", "å½")), BooleanClause.Occur.SHOULD);
inner.add(new TermQuery(new Term("field", "å")), BooleanClause.Occur.SHOULD);
expected.add(inner, BooleanClause.Occur.MUST);
- QueryParser qp = new QueryParser(TEST_VERSION_CURRENT, "field", new MockCJKSynonymAnalyzer());
+ QueryParser qp = new QueryParser("field", new MockCJKSynonymAnalyzer());
qp.setDefaultOperator(Operator.AND);
assertEquals(expected, qp.parse("ä¸å½"));
expected.setBoost(2.0f);
@@ -469,7 +469,7 @@ public class TestQueryParser extends Que
inner2.add(new TermQuery(new Term("field", "å½")), BooleanClause.Occur.SHOULD);
inner2.add(new TermQuery(new Term("field", "å")), BooleanClause.Occur.SHOULD);
expected.add(inner2, BooleanClause.Occur.MUST);
- QueryParser qp = new QueryParser(TEST_VERSION_CURRENT, "field", new MockCJKSynonymAnalyzer());
+ QueryParser qp = new QueryParser("field", new MockCJKSynonymAnalyzer());
qp.setDefaultOperator(Operator.AND);
assertEquals(expected, qp.parse("ä¸å½å½"));
expected.setBoost(2.0f);
@@ -481,7 +481,7 @@ public class TestQueryParser extends Que
MultiPhraseQuery expected = new MultiPhraseQuery();
expected.add(new Term("field", "ä¸"));
expected.add(new Term[] { new Term("field", "å½"), new Term("field", "å")});
- QueryParser qp = new QueryParser(TEST_VERSION_CURRENT, "field", new MockCJKSynonymAnalyzer());
+ QueryParser qp = new QueryParser("field", new MockCJKSynonymAnalyzer());
qp.setDefaultOperator(Operator.AND);
assertEquals(expected, qp.parse("\"ä¸å½\""));
expected.setBoost(2.0f);
Modified: lucene/dev/branches/branch_4x/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java Thu Aug 21 03:12:52 2014
@@ -86,7 +86,7 @@ public class TestComplexPhraseQuery exte
}
private void checkBadQuery(String qString) {
- ComplexPhraseQueryParser qp = new ComplexPhraseQueryParser(TEST_VERSION_CURRENT, defaultFieldName, analyzer);
+ ComplexPhraseQueryParser qp = new ComplexPhraseQueryParser(defaultFieldName, analyzer);
qp.setInOrder(inOrder);
Throwable expected = null;
try {
@@ -100,7 +100,7 @@ public class TestComplexPhraseQuery exte
private void checkMatches(String qString, String expectedVals)
throws Exception {
- ComplexPhraseQueryParser qp = new ComplexPhraseQueryParser(TEST_VERSION_CURRENT, defaultFieldName, analyzer);
+ ComplexPhraseQueryParser qp = new ComplexPhraseQueryParser(defaultFieldName, analyzer);
qp.setInOrder(inOrder);
qp.setFuzzyPrefixLength(1); // usually a good idea
@@ -140,7 +140,7 @@ public class TestComplexPhraseQuery exte
}
public void testHashcodeEquals() throws Exception {
- ComplexPhraseQueryParser qp = new ComplexPhraseQueryParser(TEST_VERSION_CURRENT, defaultFieldName, analyzer);
+ ComplexPhraseQueryParser qp = new ComplexPhraseQueryParser(defaultFieldName, analyzer);
qp.setInOrder(true);
qp.setFuzzyPrefixLength(1);
Modified: lucene/dev/branches/branch_4x/lucene/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtendableQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtendableQueryParser.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtendableQueryParser.java (original)
+++ lucene/dev/branches/branch_4x/lucene/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtendableQueryParser.java Thu Aug 21 03:12:52 2014
@@ -48,8 +48,8 @@ public class TestExtendableQueryParser e
if (a == null)
a = new MockAnalyzer(random(), MockTokenizer.SIMPLE, true);
QueryParser qp = extensions == null ? new ExtendableQueryParser(
- TEST_VERSION_CURRENT, getDefaultField(), a) : new ExtendableQueryParser(
- TEST_VERSION_CURRENT, getDefaultField(), a, extensions);
+ getDefaultField(), a) : new ExtendableQueryParser(
+ getDefaultField(), a, extensions);
qp.setDefaultOperator(QueryParserBase.OR_OPERATOR);
return qp;
}
Modified: lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java (original)
+++ lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java Thu Aug 21 03:12:52 2014
@@ -28,8 +28,10 @@ import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.AnalyzerWrapper;
+import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.ngram.EdgeNGramTokenFilter;
+import org.apache.lucene.analysis.ngram.Lucene43EdgeNGramTokenFilter;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.codecs.lucene410.Lucene410Codec;
Modified: lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java (original)
+++ lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java Thu Aug 21 03:12:52 2014
@@ -341,13 +341,13 @@ public class AnalyzingInfixSuggesterTest
}
public void testSuggestStopFilter() throws Exception {
- final CharArraySet stopWords = StopFilter.makeStopSet(TEST_VERSION_CURRENT, "a");
+ final CharArraySet stopWords = StopFilter.makeStopSet("a");
Analyzer indexAnalyzer = new Analyzer() {
@Override
protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
MockTokenizer tokens = new MockTokenizer(reader);
return new TokenStreamComponents(tokens,
- new StopFilter(TEST_VERSION_CURRENT, tokens, stopWords));
+ new StopFilter(tokens, stopWords));
}
};
Modified: lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java (original)
+++ lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java Thu Aug 21 03:12:52 2014
@@ -46,7 +46,7 @@ public class BlendedInfixSuggesterTest e
File tempDir = createTempDir("BlendedInfixSuggesterTest");
- Analyzer a = new StandardAnalyzer(TEST_VERSION_CURRENT, CharArraySet.EMPTY_SET);
+ Analyzer a = new StandardAnalyzer(CharArraySet.EMPTY_SET);
BlendedInfixSuggester suggester = new BlendedInfixSuggester(TEST_VERSION_CURRENT, newFSDirectory(tempDir), a, a,
AnalyzingInfixSuggester.DEFAULT_MIN_PREFIX_CHARS,
BlendedInfixSuggester.BlenderType.POSITION_LINEAR,
@@ -84,7 +84,7 @@ public class BlendedInfixSuggesterTest e
};
File tempDir = createTempDir("BlendedInfixSuggesterTest");
- Analyzer a = new StandardAnalyzer(TEST_VERSION_CURRENT, CharArraySet.EMPTY_SET);
+ Analyzer a = new StandardAnalyzer(CharArraySet.EMPTY_SET);
// BlenderType.LINEAR is used by default (remove position*10%)
BlendedInfixSuggester suggester = new BlendedInfixSuggester(TEST_VERSION_CURRENT, newFSDirectory(tempDir), a);
@@ -125,7 +125,7 @@ public class BlendedInfixSuggesterTest e
};
File tempDir = createTempDir("BlendedInfixSuggesterTest");
- Analyzer a = new StandardAnalyzer(TEST_VERSION_CURRENT, CharArraySet.EMPTY_SET);
+ Analyzer a = new StandardAnalyzer(CharArraySet.EMPTY_SET);
// if factor is small, we don't get the expected element
BlendedInfixSuggester suggester = new BlendedInfixSuggester(TEST_VERSION_CURRENT, newFSDirectory(tempDir), a, a,
@@ -175,7 +175,7 @@ public class BlendedInfixSuggesterTest e
};
File tempDir = createTempDir("BlendedInfixSuggesterTest");
- Analyzer a = new StandardAnalyzer(TEST_VERSION_CURRENT, CharArraySet.EMPTY_SET);
+ Analyzer a = new StandardAnalyzer(CharArraySet.EMPTY_SET);
// if factor is small, we don't get the expected element
BlendedInfixSuggester suggester = new BlendedInfixSuggester(TEST_VERSION_CURRENT, newFSDirectory(tempDir), a, a,
Modified: lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFreeTextSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFreeTextSuggester.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFreeTextSuggester.java (original)
+++ lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFreeTextSuggester.java Thu Aug 21 03:12:52 2014
@@ -252,8 +252,8 @@ public class TestFreeTextSuggester exten
@Override
public TokenStreamComponents createComponents(String field, Reader reader) {
Tokenizer tokenizer = new MockTokenizer(reader);
- CharArraySet stopSet = StopFilter.makeStopSet(TEST_VERSION_CURRENT, "of");
- return new TokenStreamComponents(tokenizer, new StopFilter(TEST_VERSION_CURRENT, tokenizer, stopSet));
+ CharArraySet stopSet = StopFilter.makeStopSet("of");
+ return new TokenStreamComponents(tokenizer, new StopFilter(tokenizer, stopSet));
}
};
@@ -280,8 +280,8 @@ public class TestFreeTextSuggester exten
@Override
public TokenStreamComponents createComponents(String field, Reader reader) {
Tokenizer tokenizer = new MockTokenizer(reader);
- CharArraySet stopSet = StopFilter.makeStopSet(TEST_VERSION_CURRENT, "of");
- return new TokenStreamComponents(tokenizer, new StopFilter(TEST_VERSION_CURRENT, tokenizer, stopSet));
+ CharArraySet stopSet = StopFilter.makeStopSet("of");
+ return new TokenStreamComponents(tokenizer, new StopFilter(tokenizer, stopSet));
}
};
Modified: lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestSuggestStopFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestSuggestStopFilter.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestSuggestStopFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestSuggestStopFilter.java Thu Aug 21 03:12:52 2014
@@ -28,7 +28,7 @@ import org.apache.lucene.analysis.util.C
public class TestSuggestStopFilter extends BaseTokenStreamTestCase {
public void testEndNotStopWord() throws Exception {
- CharArraySet stopWords = StopFilter.makeStopSet(TEST_VERSION_CURRENT, "to");
+ CharArraySet stopWords = StopFilter.makeStopSet("to");
TokenStream stream = new MockTokenizer(new StringReader("go to"));
TokenStream filter = new SuggestStopFilter(stream, stopWords);
assertTokenStreamContents(filter,
@@ -45,7 +45,7 @@ public class TestSuggestStopFilter exten
public void testEndIsStopWord() throws Exception {
- CharArraySet stopWords = StopFilter.makeStopSet(TEST_VERSION_CURRENT, "to");
+ CharArraySet stopWords = StopFilter.makeStopSet("to");
TokenStream stream = new MockTokenizer(new StringReader("go to "));
TokenStream filter = new SuggestStopFilter(stream, stopWords);
@@ -64,7 +64,7 @@ public class TestSuggestStopFilter exten
public void testMidStopWord() throws Exception {
- CharArraySet stopWords = StopFilter.makeStopSet(TEST_VERSION_CURRENT, "to");
+ CharArraySet stopWords = StopFilter.makeStopSet("to");
TokenStream stream = new MockTokenizer(new StringReader("go to school"));
TokenStream filter = new SuggestStopFilter(stream, stopWords);
@@ -83,7 +83,7 @@ public class TestSuggestStopFilter exten
public void testMultipleStopWords() throws Exception {
- CharArraySet stopWords = StopFilter.makeStopSet(TEST_VERSION_CURRENT, "to", "the", "a");
+ CharArraySet stopWords = StopFilter.makeStopSet("to", "the", "a");
TokenStream stream = new MockTokenizer(new StringReader("go to a the school"));
TokenStream filter = new SuggestStopFilter(stream, stopWords);
@@ -102,7 +102,7 @@ public class TestSuggestStopFilter exten
public void testMultipleStopWordsEnd() throws Exception {
- CharArraySet stopWords = StopFilter.makeStopSet(TEST_VERSION_CURRENT, "to", "the", "a");
+ CharArraySet stopWords = StopFilter.makeStopSet("to", "the", "a");
TokenStream stream = new MockTokenizer(new StringReader("go to a the"));
TokenStream filter = new SuggestStopFilter(stream, stopWords);
@@ -121,7 +121,7 @@ public class TestSuggestStopFilter exten
public void testMultipleStopWordsEnd2() throws Exception {
- CharArraySet stopWords = StopFilter.makeStopSet(TEST_VERSION_CURRENT, "to", "the", "a");
+ CharArraySet stopWords = StopFilter.makeStopSet("to", "the", "a");
TokenStream stream = new MockTokenizer(new StringReader("go to a the "));
TokenStream filter = new SuggestStopFilter(stream, stopWords);
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java Thu Aug 21 03:12:52 2014
@@ -679,7 +679,7 @@ public class SpellCheckComponent extends
IndexSchema schema = core.getLatestSchema();
String fieldTypeName = (String) initParams.get("queryAnalyzerFieldType");
FieldType fieldType = schema.getFieldTypes().get(fieldTypeName);
- Analyzer analyzer = fieldType == null ? new WhitespaceAnalyzer(core.getSolrConfig().luceneMatchVersion)
+ Analyzer analyzer = fieldType == null ? new WhitespaceAnalyzer()
: fieldType.getQueryAnalyzer();
//TODO: There's got to be a better way! Where's Spring when you need it?
queryConverter.setAnalyzer(analyzer);
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedStopFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedStopFilterFactory.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedStopFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedStopFilterFactory.java Thu Aug 21 03:12:52 2014
@@ -82,7 +82,7 @@ public class ManagedStopFilterFactory ex
// which is slightly inefficient to do for every instance of the managed filter
// but ManagedResource's don't have access to the luceneMatchVersion
boolean ignoreCase = args.getBooleanArg("ignoreCase");
- stopWords = new CharArraySet(luceneMatchVersion, managedWords.size(), ignoreCase);
+ stopWords = new CharArraySet(managedWords.size(), ignoreCase);
stopWords.addAll(managedWords);
}
@@ -94,6 +94,6 @@ public class ManagedStopFilterFactory ex
if (stopWords == null) {
throw new IllegalStateException("Managed stopwords not initialized correctly!");
}
- return new StopFilter(luceneMatchVersion, input, stopWords);
+ return new StopFilter(input, stopWords);
}
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/CollationField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/CollationField.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/CollationField.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/CollationField.java Thu Aug 21 03:12:52 2014
@@ -146,7 +146,7 @@ public class CollationField extends Fiel
else
throw new SolrException(ErrorCode.SERVER_ERROR, "Invalid decomposition: " + decomposition);
}
- analyzer = new CollationKeyAnalyzer(Version.LUCENE_CURRENT, collator);
+ analyzer = new CollationKeyAnalyzer(collator);
}
/**
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java Thu Aug 21 03:12:52 2014
@@ -261,7 +261,7 @@ public final class FieldTypePluginLoader
try {
// No need to be core-aware as Analyzers are not in the core-aware list
final Class<? extends Analyzer> clazz = loader.findClass(analyzerName, Analyzer.class);
-
+
try {
// first try to use a ctor with version parameter
// (needed for many new Analyzers that have no default one anymore)
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/ComplexPhraseQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/ComplexPhraseQParserPlugin.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/ComplexPhraseQParserPlugin.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/ComplexPhraseQParserPlugin.java Thu Aug 21 03:12:52 2014
@@ -88,7 +88,7 @@ class ComplexPhraseQParser extends QPars
defaultField = getReq().getSchema().getDefaultSearchFieldName();
}
- lparser = new ComplexPhraseQueryParser(getReq().getCore().getSolrConfig().luceneMatchVersion, defaultField, getReq().getSchema().getQueryAnalyzer());
+ lparser = new ComplexPhraseQueryParser(defaultField, getReq().getSchema().getQueryAnalyzer());
if (localParams != null)
inOrder = localParams.getBool("inOrder", inOrder);
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/spelling/SolrSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/spelling/SolrSpellChecker.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/spelling/SolrSpellChecker.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/spelling/SolrSpellChecker.java Thu Aug 21 03:12:52 2014
@@ -74,7 +74,7 @@ public abstract class SolrSpellChecker {
analyzer = fieldType.getQueryAnalyzer();
}
if (analyzer == null) {
- analyzer = new WhitespaceAnalyzer(core.getSolrConfig().luceneMatchVersion);
+ analyzer = new WhitespaceAnalyzer();
}
return name;
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test-files/solr/collection1/conf/schema-luceneMatchVersion.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test-files/solr/collection1/conf/schema-luceneMatchVersion.xml?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test-files/solr/collection1/conf/schema-luceneMatchVersion.xml (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test-files/solr/collection1/conf/schema-luceneMatchVersion.xml Thu Aug 21 03:12:52 2014
@@ -24,7 +24,7 @@
<tokenizer class="solr.StandardTokenizerFactory" luceneMatchVersion="LUCENE_40"/>
<filter class="solr.StandardFilterFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
- <filter class="solr.StopFilterFactory" luceneMatchVersion="4.0"/>
+ <filter class="solr.StopFilterFactory" luceneMatchVersion="4.3.0"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
</fieldtype>
@@ -37,11 +37,11 @@
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
</fieldtype>
- <fieldtype name="textStandardAnalyzer40" class="solr.TextField">
- <analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer" luceneMatchVersion="LUCENE_4_0"/>
+ <fieldtype name="textTurkishAnalyzer40" class="solr.TextField">
+ <analyzer class="org.apache.lucene.analysis.tr.TurkishAnalyzer" luceneMatchVersion="LUCENE_4_0"/>
</fieldtype>
- <fieldtype name="textStandardAnalyzerDefault" class="solr.TextField">
- <analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
+ <fieldtype name="textTurkishAnalyzerDefault" class="solr.TextField">
+ <analyzer class="org.apache.lucene.analysis.tr.TurkishAnalyzer"/>
</fieldtype>
</types>
<fields>
@@ -49,8 +49,8 @@
<field name="signatureField" type="string" indexed="true" stored="false"/>
<field name="text40" type="text40" indexed="true" stored="false" />
<field name="textDefault" type="textDefault" indexed="true" stored="false" />
- <field name="textStandardAnalyzer40" type="textStandardAnalyzer40" indexed="true" stored="false" />
- <field name="textStandardAnalyzerDefault" type="textStandardAnalyzerDefault" indexed="true" stored="false" />
+ <field name="textTurkishAnalyzer40" type="textTurkishAnalyzer40" indexed="true" stored="false" />
+ <field name="textTurkishAnalyzerDefault" type="textTurkishAnalyzerDefault" indexed="true" stored="false" />
<field name="_version_" type="long" indexed="true" stored="true" multiValued="false" />
<dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
</fields>
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/analysis/TestLuceneMatchVersion.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/analysis/TestLuceneMatchVersion.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/analysis/TestLuceneMatchVersion.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/analysis/TestLuceneMatchVersion.java Thu Aug 21 03:12:52 2014
@@ -18,12 +18,12 @@ package org.apache.solr.analysis;
import java.lang.reflect.Field;
+import org.apache.lucene.analysis.tr.TurkishAnalyzer;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.core.Config;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.FieldType;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.util.Version;
import org.junit.BeforeClass;
@@ -54,20 +54,16 @@ public class TestLuceneMatchVersion exte
type = schema.getFieldType("text40");
ana = (TokenizerChain) type.getIndexAnalyzer();
assertEquals(Version.LUCENE_4_0_0, (ana.getTokenizerFactory()).getLuceneMatchVersion());
- assertEquals(Version.LUCENE_4_0_0, (ana.getTokenFilterFactories()[2]).getLuceneMatchVersion());
+ assertEquals(Version.LUCENE_4_3_0, (ana.getTokenFilterFactories()[2]).getLuceneMatchVersion());
- // this is a hack to get the private matchVersion field in StandardAnalyzer's superclass, may break in later lucene versions - we have no getter :(
- final Field matchVersionField = StandardAnalyzer.class.getSuperclass().getDeclaredField("matchVersion");
- matchVersionField.setAccessible(true);
-
- type = schema.getFieldType("textStandardAnalyzerDefault");
+ type = schema.getFieldType("textTurkishAnalyzerDefault");
Analyzer ana1 = type.getIndexAnalyzer();
- assertTrue(ana1 instanceof StandardAnalyzer);
- assertEquals(DEFAULT_VERSION, matchVersionField.get(ana1));
+ assertTrue(ana1 instanceof TurkishAnalyzer);
+ assertEquals(DEFAULT_VERSION, ana1.getVersion());
- type = schema.getFieldType("textStandardAnalyzer40");
+ type = schema.getFieldType("textTurkishAnalyzer40");
ana1 = type.getIndexAnalyzer();
- assertTrue(ana1 instanceof StandardAnalyzer);
- assertEquals(Version.LUCENE_4_0_0, matchVersionField.get(ana1));
+ assertTrue(ana1 instanceof TurkishAnalyzer);
+ assertEquals(Version.LUCENE_4_0_0, ana1.getVersion());
}
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java Thu Aug 21 03:12:52 2014
@@ -115,7 +115,7 @@ public class TestArbitraryIndexDir exten
Directory dir = newFSDirectory(newDir);
IndexWriter iw = new IndexWriter(
dir,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new StandardAnalyzer(TEST_VERSION_CURRENT))
+ new IndexWriterConfig(TEST_VERSION_CURRENT, new StandardAnalyzer())
);
Document doc = new Document();
doc.add(new TextField("id", "2", Field.Store.YES));
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java Thu Aug 21 03:12:52 2014
@@ -172,7 +172,7 @@ public class HighlighterTest extends Sol
@Test
public void testTermOffsetsTokenStream() throws Exception {
String[] multivalued = { "a b c d", "e f g", "h", "i j k l m n" };
- Analyzer a1 = new WhitespaceAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer a1 = new WhitespaceAnalyzer();
TokenStream tokenStream = a1.tokenStream("", "a b c d e f g h i j k l m n");
tokenStream.reset();
@@ -180,7 +180,7 @@ public class HighlighterTest extends Sol
tokenStream);
for( String v : multivalued ){
TokenStream ts1 = tots.getMultiValuedTokenStream( v.length() );
- Analyzer a2 = new WhitespaceAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer a2 = new WhitespaceAnalyzer();
TokenStream ts2 = a2.tokenStream("", v);
ts2.reset();
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestSort.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestSort.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestSort.java Thu Aug 21 03:12:52 2014
@@ -183,7 +183,7 @@ public class TestSort extends SolrTestCa
for (int iterCnt = 0; iterCnt<iter; iterCnt++) {
IndexWriter iw = new IndexWriter(
dir,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)).
+ new IndexWriterConfig(TEST_VERSION_CURRENT, new SimpleAnalyzer()).
setOpenMode(IndexWriterConfig.OpenMode.CREATE)
);
final MyDoc[] mydocs = new MyDoc[ndocs];
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java Thu Aug 21 03:12:52 2014
@@ -289,7 +289,7 @@ public class IndexBasedSpellCheckerTest
Directory dir = newFSDirectory(altIndexDir);
IndexWriter iw = new IndexWriter(
dir,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
+ new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer())
);
for (int i = 0; i < ALT_DOCS.length; i++) {
Document doc = new Document();
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/SimpleQueryConverter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/SimpleQueryConverter.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/SimpleQueryConverter.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/SimpleQueryConverter.java Thu Aug 21 03:12:52 2014
@@ -42,7 +42,7 @@ class SimpleQueryConverter extends Spell
@Override
public Collection<Token> convert(String origQuery) {
Collection<Token> result = new HashSet<>();
- WhitespaceAnalyzer analyzer = new WhitespaceAnalyzer(LuceneTestCase.TEST_VERSION_CURRENT);
+ WhitespaceAnalyzer analyzer = new WhitespaceAnalyzer();
TokenStream ts = null;
try {
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java Thu Aug 21 03:12:52 2014
@@ -40,7 +40,7 @@ public class SpellingQueryConverterTest
public void test() throws Exception {
SpellingQueryConverter converter = new SpellingQueryConverter();
converter.init(new NamedList());
- converter.setAnalyzer(new WhitespaceAnalyzer(TEST_VERSION_CURRENT));
+ converter.setAnalyzer(new WhitespaceAnalyzer());
Collection<Token> tokens = converter.convert("field:foo");
assertTrue("tokens is null and it shouldn't be", tokens != null);
assertTrue("tokens Size: " + tokens.size() + " is not: " + 1, tokens.size() == 1);
@@ -50,7 +50,7 @@ public class SpellingQueryConverterTest
public void testSpecialChars() {
SpellingQueryConverter converter = new SpellingQueryConverter();
converter.init(new NamedList());
- converter.setAnalyzer(new WhitespaceAnalyzer(TEST_VERSION_CURRENT));
+ converter.setAnalyzer(new WhitespaceAnalyzer());
String original = "field_with_underscore:value_with_underscore";
Collection<Token> tokens = converter.convert(original);
assertTrue("tokens is null and it shouldn't be", tokens != null);
@@ -96,7 +96,7 @@ public class SpellingQueryConverterTest
public void testUnicode() {
SpellingQueryConverter converter = new SpellingQueryConverter();
converter.init(new NamedList());
- converter.setAnalyzer(new WhitespaceAnalyzer(TEST_VERSION_CURRENT));
+ converter.setAnalyzer(new WhitespaceAnalyzer());
// chinese text value
Collection<Token> tokens = converter.convert("text_field:æè´ä¹°äºéå
·åæè£
ã");
@@ -116,7 +116,7 @@ public class SpellingQueryConverterTest
public void testMultipleClauses() {
SpellingQueryConverter converter = new SpellingQueryConverter();
converter.init(new NamedList());
- converter.setAnalyzer(new WhitespaceAnalyzer(TEST_VERSION_CURRENT));
+ converter.setAnalyzer(new WhitespaceAnalyzer());
// two field:value pairs should give two tokens
Collection<Token> tokens = converter.convert("ä¹°text_field:æè´ä¹°äºéå
·åæè£
ã field2:bar");
@@ -133,7 +133,7 @@ public class SpellingQueryConverterTest
public void testRequiredOrProhibitedFlags() {
SpellingQueryConverter converter = new SpellingQueryConverter();
converter.init(new NamedList());
- converter.setAnalyzer(new WhitespaceAnalyzer(TEST_VERSION_CURRENT));
+ converter.setAnalyzer(new WhitespaceAnalyzer());
{
List<Token> tokens = new ArrayList<>(converter.convert("aaa bbb ccc"));
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/TestSuggestSpellingConverter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/TestSuggestSpellingConverter.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/TestSuggestSpellingConverter.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/TestSuggestSpellingConverter.java Thu Aug 21 03:12:52 2014
@@ -52,8 +52,8 @@ public class TestSuggestSpellingConverte
Tokenizer tokenizer = new KeywordTokenizer(reader);
TokenStream filter = new PatternReplaceFilter(tokenizer,
Pattern.compile("([^\\p{L}\\p{M}\\p{N}\\p{Cs}]*[\\p{L}\\p{M}\\p{N}\\p{Cs}\\_]+:)|([^\\p{L}\\p{M}\\p{N}\\p{Cs}])+"), " ", true);
- filter = new LowerCaseFilter(TEST_VERSION_CURRENT, filter);
- filter = new TrimFilter(TEST_VERSION_CURRENT, filter, false);
+ filter = new LowerCaseFilter(filter);
+ filter = new TrimFilter(filter);
return new TokenStreamComponents(tokenizer, filter);
}
});