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/09 00:42:54 UTC
svn commit: r1616901 [10/11] - in /lucene/dev/trunk: lucene/
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/org/apache/lucene/analysis/br/ lu...
Modified: lucene/dev/trunk/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikAnalyzer.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikAnalyzer.java Fri Aug 8 22:42:48 2014
@@ -24,7 +24,6 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.standard.StandardFilter;
import org.apache.lucene.analysis.standard.StandardTokenizer;
-import org.apache.lucene.util.Version;
/**
* {@link org.apache.lucene.analysis.Analyzer} using Morfologik library.
@@ -32,12 +31,10 @@ import org.apache.lucene.util.Version;
*/
public class MorfologikAnalyzer extends Analyzer {
private final String dictionary;
- private final Version version;
/**
* Builds an analyzer with an explicit dictionary resource.
*
- * @param version Lucene compatibility version
* @param dictionaryResource A constant specifying which dictionary to choose. The
* dictionary resource must be named <code>morfologik/dictionaries/{dictionaryResource}.dict</code>
* and have an associated <code>.info</code> metadata file. See the Morfologik project
@@ -45,16 +42,15 @@ public class MorfologikAnalyzer extends
*
* @see "http://morfologik.blogspot.com/"
*/
- public MorfologikAnalyzer(final Version version, final String dictionaryResource) {
- this.version = version;
- this.dictionary = dictionaryResource;
+ public MorfologikAnalyzer(final String dictionaryResource) {
+ this.dictionary = dictionaryResource;
}
/**
* Builds an analyzer with the default Morfologik's Polish dictionary.
*/
- public MorfologikAnalyzer(final Version version) {
- this(version, MorfologikFilterFactory.DEFAULT_DICTIONARY_RESOURCE);
+ public MorfologikAnalyzer() {
+ this(MorfologikFilterFactory.DEFAULT_DICTIONARY_RESOURCE);
}
/**
@@ -69,10 +65,10 @@ public class MorfologikAnalyzer extends
*/
@Override
protected TokenStreamComponents createComponents(final String field) {
- final Tokenizer src = new StandardTokenizer(this.version);
+ final Tokenizer src = new StandardTokenizer();
return new TokenStreamComponents(
src,
- new MorfologikFilter(new StandardFilter(this.version, src), dictionary, this.version));
+ new MorfologikFilter(new StandardFilter(src), dictionary));
}
}
Modified: lucene/dev/trunk/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilter.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilter.java Fri Aug 8 22:42:48 2014
@@ -49,7 +49,7 @@ public class MorfologikFilter extends To
private final KeywordAttribute keywordAttr = addAttribute(KeywordAttribute.class);
private final CharsRef scratch = new CharsRef(0);
- private final CharacterUtils charUtils;
+ private final CharacterUtils charUtils = CharacterUtils.getInstance();
private State current;
private final TokenStream input;
@@ -63,8 +63,8 @@ public class MorfologikFilter extends To
/**
* Creates a filter with the default (Polish) dictionary.
*/
- public MorfologikFilter(final TokenStream in, final Version version) {
- this(in, MorfologikFilterFactory.DEFAULT_DICTIONARY_RESOURCE, version);
+ public MorfologikFilter(final TokenStream in) {
+ this(in, MorfologikFilterFactory.DEFAULT_DICTIONARY_RESOURCE);
}
/**
@@ -72,9 +72,8 @@ public class MorfologikFilter extends To
*
* @param in input token stream.
* @param dict Dictionary resource from classpath.
- * @param version Lucene version compatibility for lowercasing.
*/
- public MorfologikFilter(final TokenStream in, final String dict, final Version version) {
+ public MorfologikFilter(final TokenStream in, final String dict) {
super(in);
this.input = in;
@@ -84,7 +83,6 @@ public class MorfologikFilter extends To
try {
me.setContextClassLoader(morfologik.stemming.Dictionary.class.getClassLoader());
this.stemmer = new DictionaryLookup(morfologik.stemming.Dictionary.getForLanguage(dict));
- this.charUtils = CharacterUtils.getInstance(version);
this.lemmaList = Collections.emptyList();
} finally {
me.setContextClassLoader(cl);
Modified: lucene/dev/trunk/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilterFactory.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilterFactory.java (original)
+++ lucene/dev/trunk/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilterFactory.java Fri Aug 8 22:42:48 2014
@@ -75,6 +75,6 @@ public class MorfologikFilterFactory ext
@Override
public TokenStream create(TokenStream ts) {
- return new MorfologikFilter(ts, dictionaryResource, luceneMatchVersion);
+ return new MorfologikFilter(ts, dictionaryResource);
}
}
Modified: lucene/dev/trunk/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikAnalyzer.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikAnalyzer.java Fri Aug 8 22:42:48 2014
@@ -29,7 +29,6 @@ import org.apache.lucene.analysis.standa
import org.apache.lucene.analysis.standard.StandardTokenizer;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.util.CharArraySet;
-import org.apache.lucene.util.Version;
/**
* TODO: The tests below rely on the order of returned lemmas, which is probably not good.
@@ -37,7 +36,7 @@ import org.apache.lucene.util.Version;
public class TestMorfologikAnalyzer extends BaseTokenStreamTestCase {
private Analyzer getTestAnalyzer() {
- return new MorfologikAnalyzer(TEST_VERSION_CURRENT);
+ return new MorfologikAnalyzer();
}
/** Test stemming of single tokens with Morfologik library. */
@@ -166,18 +165,16 @@ public class TestMorfologikAnalyzer exte
/** */
public final void testKeywordAttrTokens() throws IOException {
- final Version version = TEST_VERSION_CURRENT;
-
- Analyzer a = new MorfologikAnalyzer(version) {
+ Analyzer a = new MorfologikAnalyzer() {
@Override
protected TokenStreamComponents createComponents(String field) {
- final CharArraySet keywords = new CharArraySet(version, 1, false);
+ final CharArraySet keywords = new CharArraySet(1, false);
keywords.add("liÅcie");
- final Tokenizer src = new StandardTokenizer(TEST_VERSION_CURRENT);
- TokenStream result = new StandardFilter(TEST_VERSION_CURRENT, src);
+ final Tokenizer src = new StandardTokenizer();
+ TokenStream result = new StandardFilter(src);
result = new SetKeywordMarkerFilter(result, keywords);
- result = new MorfologikFilter(result, TEST_VERSION_CURRENT);
+ result = new MorfologikFilter(result);
return new TokenStreamComponents(src, result);
}
Modified: lucene/dev/trunk/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilter.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilter.java Fri Aug 8 22:42:48 2014
@@ -18,7 +18,6 @@
package org.apache.lucene.analysis.phonetic;
import java.io.IOException;
-import java.io.Reader;
import java.io.StringReader;
import org.apache.commons.codec.Encoder;
@@ -28,7 +27,6 @@ import org.apache.lucene.analysis.BaseTo
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.core.KeywordTokenizer;
-import org.apache.lucene.analysis.core.WhitespaceTokenizer;
/**
* Tests {@link PhoneticFilter}
@@ -66,7 +64,7 @@ public class TestPhoneticFilter extends
static void assertAlgorithm(Encoder encoder, boolean inject, String input,
String[] expected) throws Exception {
- Tokenizer tokenizer = new WhitespaceTokenizer(TEST_VERSION_CURRENT);
+ Tokenizer tokenizer = new MockTokenizer(MockTokenizer.WHITESPACE, false);
tokenizer.setReader(new StringReader(input));
PhoneticFilter filter = new PhoneticFilter(tokenizer, encoder, inject);
assertTokenStreamContents(filter, expected);
Modified: lucene/dev/trunk/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java Fri Aug 8 22:42:48 2014
@@ -88,18 +88,15 @@ public final class SmartChineseAnalyzer
// make sure it is unmodifiable as we expose it in the outer class
return CharArraySet.unmodifiableSet(WordlistLoader.getWordSet(IOUtils
.getDecodingReader(SmartChineseAnalyzer.class, DEFAULT_STOPWORD_FILE,
- StandardCharsets.UTF_8), STOPWORD_FILE_COMMENT,
- Version.LUCENE_CURRENT));
+ StandardCharsets.UTF_8), STOPWORD_FILE_COMMENT));
}
}
- private final Version matchVersion;
-
/**
* Create a new SmartChineseAnalyzer, using the default stopword list.
*/
- public SmartChineseAnalyzer(Version matchVersion) {
- this(matchVersion, true);
+ public SmartChineseAnalyzer() {
+ this(true);
}
/**
@@ -113,10 +110,9 @@ public final class SmartChineseAnalyzer
*
* @param useDefaultStopWords true to use the default stopword list.
*/
- public SmartChineseAnalyzer(Version matchVersion, boolean useDefaultStopWords) {
+ public SmartChineseAnalyzer(boolean useDefaultStopWords) {
stopWords = useDefaultStopWords ? DefaultSetHolder.DEFAULT_STOP_SET
: CharArraySet.EMPTY_SET;
- this.matchVersion = matchVersion;
}
/**
@@ -128,16 +124,15 @@ public final class SmartChineseAnalyzer
* </p>
* @param stopWords {@link Set} of stopwords to use.
*/
- public SmartChineseAnalyzer(Version matchVersion, CharArraySet stopWords) {
- this.stopWords = stopWords==null?CharArraySet.EMPTY_SET:stopWords;
- this.matchVersion = matchVersion;
+ public SmartChineseAnalyzer(CharArraySet stopWords) {
+ this.stopWords = stopWords == null ? CharArraySet.EMPTY_SET : stopWords;
}
@Override
public TokenStreamComponents createComponents(String fieldName) {
final Tokenizer tokenizer;
TokenStream result;
- if (matchVersion.onOrAfter(Version.LUCENE_4_8)) {
+ if (getVersion().onOrAfter(Version.LUCENE_4_8)) {
tokenizer = new HMMChineseTokenizer();
result = tokenizer;
} else {
@@ -149,7 +144,7 @@ public final class SmartChineseAnalyzer
// The porter stemming is too strict, this is not a bug, this is a feature:)
result = new PorterStemFilter(result);
if (!stopWords.isEmpty()) {
- result = new StopFilter(matchVersion, result, stopWords);
+ result = new StopFilter(result, stopWords);
}
return new TokenStreamComponents(tokenizer, result);
}
Modified: lucene/dev/trunk/lucene/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestSmartChineseAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestSmartChineseAnalyzer.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestSmartChineseAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestSmartChineseAnalyzer.java Fri Aug 8 22:42:48 2014
@@ -34,12 +34,12 @@ import org.apache.lucene.util.Version;
public class TestSmartChineseAnalyzer extends BaseTokenStreamTestCase {
public void testChineseStopWordsDefault() throws Exception {
- Analyzer ca = new SmartChineseAnalyzer(Version.LUCENE_CURRENT); /* will load stopwords */
+ Analyzer ca = new SmartChineseAnalyzer(); /* will load stopwords */
String sentence = "æè´ä¹°äºéå
·åæè£
ã";
String result[] = { "æ", "è´ä¹°", "äº", "éå
·", "å", "æè£
" };
assertAnalyzesTo(ca, sentence, result);
// set stop-words from the outer world - must yield same behavior
- ca = new SmartChineseAnalyzer(Version.LUCENE_CURRENT, SmartChineseAnalyzer.getDefaultStopSet());
+ ca = new SmartChineseAnalyzer(SmartChineseAnalyzer.getDefaultStopSet());
assertAnalyzesTo(ca, sentence, result);
}
@@ -48,7 +48,7 @@ public class TestSmartChineseAnalyzer ex
* This tests to ensure the SentenceTokenizer->WordTokenFilter chain works correctly.
*/
public void testChineseStopWordsDefaultTwoPhrases() throws Exception {
- Analyzer ca = new SmartChineseAnalyzer(Version.LUCENE_CURRENT); /* will load stopwords */
+ Analyzer ca = new SmartChineseAnalyzer(); /* will load stopwords */
String sentence = "æè´ä¹°äºéå
·åæè£
ã æè´ä¹°äºéå
·åæè£
ã";
String result[] = { "æ", "è´ä¹°", "äº", "éå
·", "å", "æè£
", "æ", "è´ä¹°", "äº", "éå
·", "å", "æè£
" };
assertAnalyzesTo(ca, sentence, result);
@@ -59,7 +59,7 @@ public class TestSmartChineseAnalyzer ex
* This tests to ensure the stopwords are working correctly.
*/
public void testChineseStopWordsDefaultTwoPhrasesIdeoSpace() throws Exception {
- Analyzer ca = new SmartChineseAnalyzer(Version.LUCENE_CURRENT); /* will load stopwords */
+ Analyzer ca = new SmartChineseAnalyzer(); /* will load stopwords */
String sentence = "æè´ä¹°äºéå
·åæè£
ãæè´ä¹°äºéå
·åæè£
ã";
String result[] = { "æ", "è´ä¹°", "äº", "éå
·", "å", "æè£
", "æ", "è´ä¹°", "äº", "éå
·", "å", "æè£
" };
assertAnalyzesTo(ca, sentence, result);
@@ -73,8 +73,8 @@ public class TestSmartChineseAnalyzer ex
*/
public void testChineseStopWordsOff() throws Exception {
Analyzer[] analyzers = new Analyzer[] {
- new SmartChineseAnalyzer(Version.LUCENE_CURRENT, false),/* doesn't load stopwords */
- new SmartChineseAnalyzer(Version.LUCENE_CURRENT, null) /* sets stopwords to empty set */};
+ new SmartChineseAnalyzer(false),/* doesn't load stopwords */
+ new SmartChineseAnalyzer(null) /* sets stopwords to empty set */};
String sentence = "æè´ä¹°äºéå
·åæè£
ã";
String result[] = { "æ", "è´ä¹°", "äº", "éå
·", "å", "æè£
", "," };
for (Analyzer analyzer : analyzers) {
@@ -88,7 +88,7 @@ public class TestSmartChineseAnalyzer ex
* when stopfilter is configured with enablePositionIncrements
*/
public void testChineseStopWords2() throws Exception {
- Analyzer ca = new SmartChineseAnalyzer(Version.LUCENE_CURRENT); /* will load stopwords */
+ Analyzer ca = new SmartChineseAnalyzer(); /* will load stopwords */
String sentence = "Title:San"; // : is a stopword
String result[] = { "titl", "san"};
int startOffsets[] = { 0, 6 };
@@ -98,7 +98,7 @@ public class TestSmartChineseAnalyzer ex
}
public void testChineseAnalyzer() throws Exception {
- Analyzer ca = new SmartChineseAnalyzer(Version.LUCENE_CURRENT, true);
+ Analyzer ca = new SmartChineseAnalyzer(true);
String sentence = "æè´ä¹°äºéå
·åæè£
ã";
String[] result = { "æ", "è´ä¹°", "äº", "éå
·", "å", "æè£
" };
assertAnalyzesTo(ca, sentence, result);
@@ -108,7 +108,7 @@ public class TestSmartChineseAnalyzer ex
* English words are lowercased and porter-stemmed.
*/
public void testMixedLatinChinese() throws Exception {
- assertAnalyzesTo(new SmartChineseAnalyzer(Version.LUCENE_CURRENT, true), "æè´ä¹° Tests äºéå
·åæè£
",
+ assertAnalyzesTo(new SmartChineseAnalyzer(true), "æè´ä¹° Tests äºéå
·åæè£
",
new String[] { "æ", "è´ä¹°", "test", "äº", "éå
·", "å", "æè£
"});
}
@@ -116,7 +116,7 @@ public class TestSmartChineseAnalyzer ex
* Numerics are parsed as their own tokens
*/
public void testNumerics() throws Exception {
- assertAnalyzesTo(new SmartChineseAnalyzer(Version.LUCENE_CURRENT, true), "æè´ä¹° Tests äºéå
·åæè£
1234",
+ assertAnalyzesTo(new SmartChineseAnalyzer(true), "æè´ä¹° Tests äºéå
·åæè£
1234",
new String[] { "æ", "è´ä¹°", "test", "äº", "éå
·", "å", "æè£
", "1234"});
}
@@ -124,7 +124,7 @@ public class TestSmartChineseAnalyzer ex
* Full width alphas and numerics are folded to half-width
*/
public void testFullWidth() throws Exception {
- assertAnalyzesTo(new SmartChineseAnalyzer(Version.LUCENE_CURRENT, true), "æè´ä¹° ï¼´ï½
ï½ï½ï½ äºéå
·åæè£
ï¼ï¼ï¼ï¼",
+ assertAnalyzesTo(new SmartChineseAnalyzer(true), "æè´ä¹° ï¼´ï½
ï½ï½ï½ äºéå
·åæè£
ï¼ï¼ï¼ï¼",
new String[] { "æ", "è´ä¹°", "test", "äº", "éå
·", "å", "æè£
", "1234"});
}
@@ -132,7 +132,7 @@ public class TestSmartChineseAnalyzer ex
* Presentation form delimiters are removed
*/
public void testDelimiters() throws Exception {
- assertAnalyzesTo(new SmartChineseAnalyzer(Version.LUCENE_CURRENT, true), "æè´ä¹°ï¸± Tests äºéå
·åæè£
",
+ assertAnalyzesTo(new SmartChineseAnalyzer(true), "æè´ä¹°ï¸± Tests äºéå
·åæè£
",
new String[] { "æ", "è´ä¹°", "test", "äº", "éå
·", "å", "æè£
"});
}
@@ -141,7 +141,7 @@ public class TestSmartChineseAnalyzer ex
* (regardless of Unicode category)
*/
public void testNonChinese() throws Exception {
- assertAnalyzesTo(new SmartChineseAnalyzer(Version.LUCENE_CURRENT, true), "æè´ä¹° رÙبرتTests äºéå
·åæè£
",
+ assertAnalyzesTo(new SmartChineseAnalyzer(true), "æè´ä¹° رÙبرتTests äºéå
·åæè£
",
new String[] { "æ", "è´ä¹°", "ر", "Ù", "ب", "ر", "ت", "test", "äº", "éå
·", "å", "æè£
"});
}
@@ -151,22 +151,22 @@ public class TestSmartChineseAnalyzer ex
* Currently it is being analyzed into single characters...
*/
public void testOOV() throws Exception {
- assertAnalyzesTo(new SmartChineseAnalyzer(Version.LUCENE_CURRENT, true), "ä¼ç´ ç¦Â·ææ·åæå°¼",
+ assertAnalyzesTo(new SmartChineseAnalyzer(true), "ä¼ç´ ç¦Â·ææ·åæå°¼",
new String[] { "ä¼", "ç´ ", "ç¦", "æ", "æ", "å", "æ", "å°¼" });
- assertAnalyzesTo(new SmartChineseAnalyzer(Version.LUCENE_CURRENT, true), "ä¼ç´ ç¦ææåæå°¼",
+ assertAnalyzesTo(new SmartChineseAnalyzer(true), "ä¼ç´ ç¦ææåæå°¼",
new String[] { "ä¼", "ç´ ", "ç¦", "æ", "æ", "å", "æ", "å°¼" });
}
public void testOffsets() throws Exception {
- assertAnalyzesTo(new SmartChineseAnalyzer(Version.LUCENE_CURRENT, true), "æè´ä¹°äºéå
·åæè£
",
+ assertAnalyzesTo(new SmartChineseAnalyzer(true), "æè´ä¹°äºéå
·åæè£
",
new String[] { "æ", "è´ä¹°", "äº", "éå
·", "å", "æè£
" },
new int[] { 0, 1, 3, 4, 6, 7 },
new int[] { 1, 3, 4, 6, 7, 9 });
}
public void testReusableTokenStream() throws Exception {
- Analyzer a = new SmartChineseAnalyzer(Version.LUCENE_CURRENT);
+ Analyzer a = new SmartChineseAnalyzer();
assertAnalyzesTo(a, "æè´ä¹° Tests äºéå
·åæè£
",
new String[] { "æ", "è´ä¹°", "test", "äº", "éå
·", "å", "æè£
"},
new int[] { 0, 1, 4, 10, 11, 13, 14 },
@@ -183,7 +183,7 @@ public class TestSmartChineseAnalyzer ex
for (int i = 0; i < 5000; i++) {
sb.append("æè´ä¹°äºéå
·åæè£
ã");
}
- Analyzer analyzer = new SmartChineseAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer analyzer = new SmartChineseAnalyzer();
try (TokenStream stream = analyzer.tokenStream("", sb.toString())) {
stream.reset();
while (stream.incrementToken()) {
@@ -198,7 +198,7 @@ public class TestSmartChineseAnalyzer ex
for (int i = 0; i < 5000; i++) {
sb.append("æè´ä¹°äºéå
·åæè£
");
}
- Analyzer analyzer = new SmartChineseAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer analyzer = new SmartChineseAnalyzer();
try (TokenStream stream = analyzer.tokenStream("", sb.toString())) {
stream.reset();
while (stream.incrementToken()) {
@@ -227,13 +227,13 @@ public class TestSmartChineseAnalyzer ex
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new SmartChineseAnalyzer(TEST_VERSION_CURRENT), 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), new SmartChineseAnalyzer(), 1000*RANDOM_MULTIPLIER);
}
/** blast some random large strings through the analyzer */
public void testRandomHugeStrings() throws Exception {
Random random = random();
- checkRandomData(random, new SmartChineseAnalyzer(TEST_VERSION_CURRENT), 100*RANDOM_MULTIPLIER, 8192);
+ checkRandomData(random, new SmartChineseAnalyzer(), 100*RANDOM_MULTIPLIER, 8192);
}
public void testEmptyTerm() throws IOException {
Modified: lucene/dev/trunk/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java Fri Aug 8 22:42:48 2014
@@ -35,7 +35,6 @@ import org.apache.lucene.analysis.util.C
import org.apache.lucene.analysis.util.StopwordAnalyzerBase;
import org.apache.lucene.analysis.util.WordlistLoader;
import org.apache.lucene.util.IOUtils;
-import org.apache.lucene.util.Version;
import org.egothor.stemmer.Trie;
/**
@@ -77,7 +76,7 @@ public final class PolishAnalyzer extend
static {
try {
DEFAULT_STOP_SET = WordlistLoader.getWordSet(IOUtils.getDecodingReader(PolishAnalyzer.class,
- DEFAULT_STOPWORD_FILE, StandardCharsets.UTF_8), "#", Version.LUCENE_CURRENT);
+ DEFAULT_STOPWORD_FILE, StandardCharsets.UTF_8), "#");
} catch (IOException ex) {
// default set should always be present as it is part of the
// distribution (JAR)
@@ -97,18 +96,17 @@ public final class PolishAnalyzer extend
/**
* Builds an analyzer with the default stop words: {@link #DEFAULT_STOPWORD_FILE}.
*/
- public PolishAnalyzer(Version matchVersion) {
- this(matchVersion, DefaultsHolder.DEFAULT_STOP_SET);
+ public PolishAnalyzer() {
+ this(DefaultsHolder.DEFAULT_STOP_SET);
}
/**
* Builds an analyzer with the given stop words.
*
- * @param matchVersion lucene compatibility version
* @param stopwords a stopword set
*/
- public PolishAnalyzer(Version matchVersion, CharArraySet stopwords) {
- this(matchVersion, stopwords, CharArraySet.EMPTY_SET);
+ public PolishAnalyzer(CharArraySet stopwords) {
+ this(stopwords, CharArraySet.EMPTY_SET);
}
/**
@@ -116,15 +114,13 @@ public final class PolishAnalyzer extend
* provided this analyzer will add a {@link SetKeywordMarkerFilter} before
* stemming.
*
- * @param matchVersion lucene compatibility version
* @param stopwords a stopword set
* @param stemExclusionSet a set of terms not to be stemmed
*/
- public PolishAnalyzer(Version matchVersion, CharArraySet stopwords, CharArraySet stemExclusionSet) {
- super(matchVersion, stopwords);
+ public PolishAnalyzer(CharArraySet stopwords, CharArraySet stemExclusionSet) {
+ super(stopwords);
this.stemTable = DefaultsHolder.DEFAULT_TABLE;
- this.stemExclusionSet = CharArraySet.unmodifiableSet(CharArraySet.copy(
- matchVersion, stemExclusionSet));
+ this.stemExclusionSet = CharArraySet.unmodifiableSet(CharArraySet.copy(stemExclusionSet));
}
/**
@@ -141,10 +137,10 @@ public final class PolishAnalyzer extend
*/
@Override
protected TokenStreamComponents createComponents(String fieldName) {
- final Tokenizer source = new StandardTokenizer(matchVersion);
- TokenStream result = new StandardFilter(matchVersion, source);
- result = new LowerCaseFilter(matchVersion, result);
- result = new StopFilter(matchVersion, result, stopwords);
+ final Tokenizer source = new StandardTokenizer();
+ TokenStream result = new StandardFilter(source);
+ result = new LowerCaseFilter(result);
+ result = new StopFilter(result, stopwords);
if(!stemExclusionSet.isEmpty())
result = new SetKeywordMarkerFilter(result, stemExclusionSet);
result = new StempelFilter(result, new StempelStemmer(stemTable));
Modified: lucene/dev/trunk/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/pl/TestPolishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/pl/TestPolishAnalyzer.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/pl/TestPolishAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/pl/TestPolishAnalyzer.java Fri Aug 8 22:42:48 2014
@@ -27,12 +27,12 @@ public class TestPolishAnalyzer extends
/** This test fails with NPE when the
* stopwords file is missing in classpath */
public void testResourcesAvailable() {
- new PolishAnalyzer(TEST_VERSION_CURRENT);
+ new PolishAnalyzer();
}
/** test stopwords and stemming */
public void testBasics() throws IOException {
- Analyzer a = new PolishAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer a = new PolishAnalyzer();
// stemming
checkOneTerm(a, "studenta", "student");
checkOneTerm(a, "studenci", "student");
@@ -42,15 +42,14 @@ public class TestPolishAnalyzer extends
/** test use of exclusion set */
public void testExclude() throws IOException {
- CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("studenta"), false);;
- Analyzer a = new PolishAnalyzer(TEST_VERSION_CURRENT,
- PolishAnalyzer.getDefaultStopSet(), exclusionSet);
+ CharArraySet exclusionSet = new CharArraySet(asSet("studenta"), false);;
+ Analyzer a = new PolishAnalyzer(PolishAnalyzer.getDefaultStopSet(), exclusionSet);
checkOneTerm(a, "studenta", "studenta");
checkOneTerm(a, "studenci", "student");
}
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new PolishAnalyzer(TEST_VERSION_CURRENT), 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), new PolishAnalyzer(), 1000*RANDOM_MULTIPLIER);
}
}
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java Fri Aug 8 22:42:48 2014
@@ -33,7 +33,6 @@ import org.apache.lucene.search.spans.Sp
import org.apache.lucene.search.spans.SpanQuery;
import org.apache.lucene.search.spans.SpanTermQuery;
import org.apache.lucene.benchmark.byTask.tasks.NewAnalyzerTask;
-import org.apache.lucene.util.Version;
/**
* A QueryMaker that uses common and uncommon actual Wikipedia queries for
@@ -93,7 +92,7 @@ public class EnwikiQueryMaker extends Ab
* @return array of Lucene queries
*/
private static Query[] createQueries(List<Object> qs, Analyzer a) {
- QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, DocMaker.BODY_FIELD, a);
+ QueryParser qp = new QueryParser(DocMaker.BODY_FIELD, a);
List<Object> queries = new ArrayList<>();
for (int i = 0; i < qs.size(); i++) {
try {
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java Fri Aug 8 22:42:48 2014
@@ -6,7 +6,6 @@ import org.apache.lucene.queryparser.cla
import org.apache.lucene.search.Query;
import org.apache.lucene.benchmark.byTask.tasks.NewAnalyzerTask;
import org.apache.lucene.util.IOUtils;
-import org.apache.lucene.util.Version;
import java.io.*;
import java.nio.charset.StandardCharsets;
@@ -52,7 +51,7 @@ public class FileBasedQueryMaker extends
Analyzer anlzr = NewAnalyzerTask.createAnalyzer(config.get("analyzer",
"org.apache.lucene.analysis.standard.StandardAnalyzer"));
String defaultField = config.get("file.query.maker.default.field", DocMaker.BODY_FIELD);
- QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, defaultField, anlzr);
+ QueryParser qp = new QueryParser(defaultField, anlzr);
qp.setAllowLeadingWildcard(true);
List<Query> qq = new ArrayList<>();
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishQueryMaker.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishQueryMaker.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishQueryMaker.java Fri Aug 8 22:42:48 2014
@@ -25,7 +25,6 @@ import org.apache.lucene.benchmark.byTas
import org.apache.lucene.benchmark.byTask.utils.Config;
import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.search.Query;
-import org.apache.lucene.util.Version;
import com.ibm.icu.text.RuleBasedNumberFormat;
/**
@@ -60,7 +59,7 @@ public class LongToEnglishQueryMaker imp
@Override
public void setConfig(Config config) throws Exception {
Analyzer anlzr = NewAnalyzerTask.createAnalyzer(config.get("analyzer", StandardAnalyzer.class.getName()));
- parser = new QueryParser(Version.LUCENE_CURRENT, DocMaker.BODY_FIELD, anlzr);
+ parser = new QueryParser(DocMaker.BODY_FIELD, anlzr);
}
@Override
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java Fri Aug 8 22:42:48 2014
@@ -27,7 +27,6 @@ import org.apache.lucene.search.spans.Sp
import org.apache.lucene.search.spans.SpanQuery;
import org.apache.lucene.search.spans.SpanTermQuery;
import org.apache.lucene.benchmark.byTask.tasks.NewAnalyzerTask;
-import org.apache.lucene.util.Version;
import java.util.ArrayList;
import java.util.Arrays;
@@ -73,7 +72,7 @@ public class ReutersQueryMaker extends A
* @return array of Lucene queries
*/
private static Query[] createQueries(List<Object> qs, Analyzer a) {
- QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, DocMaker.BODY_FIELD, a);
+ QueryParser qp = new QueryParser(DocMaker.BODY_FIELD, a);
List<Object> queries = new ArrayList<>();
for (int i = 0; i < qs.size(); i++) {
try {
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java Fri Aug 8 22:42:48 2014
@@ -25,7 +25,6 @@ import org.apache.lucene.search.BooleanQ
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.benchmark.byTask.tasks.NewAnalyzerTask;
-import org.apache.lucene.util.Version;
import java.util.ArrayList;
@@ -48,7 +47,7 @@ public class SimpleQueryMaker extends Ab
Analyzer anlzr= NewAnalyzerTask.createAnalyzer(config.get("analyzer",
"org.apache.lucene.analysis.standard.StandardAnalyzer"));
- QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, DocMaker.BODY_FIELD,anlzr);
+ QueryParser qp = new QueryParser(DocMaker.BODY_FIELD,anlzr);
ArrayList<Query> qq = new ArrayList<>();
Query q1 = new TermQuery(new Term(DocMaker.ID_FIELD,"doc2"));
qq.add(q1);
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewCollationAnalyzerTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewCollationAnalyzerTask.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewCollationAnalyzerTask.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewCollationAnalyzerTask.java Fri Aug 8 22:42:48 2014
@@ -24,7 +24,6 @@ import java.util.StringTokenizer;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.benchmark.byTask.PerfRunData;
-import org.apache.lucene.util.Version;
/**
* Task to support benchmarking collation.
@@ -73,8 +72,8 @@ public class NewCollationAnalyzerTask ex
final Class<? extends Analyzer> clazz = Class.forName(impl.className)
.asSubclass(Analyzer.class);
- Constructor<? extends Analyzer> ctor = clazz.getConstructor(Version.class, collatorClazz);
- return ctor.newInstance(Version.LUCENE_CURRENT, collator);
+ Constructor<? extends Analyzer> ctor = clazz.getConstructor(collatorClazz);
+ return ctor.newInstance(collator);
}
@Override
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SimpleQQParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SimpleQQParser.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SimpleQQParser.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SimpleQQParser.java Fri Aug 8 22:42:48 2014
@@ -63,7 +63,7 @@ public class SimpleQQParser implements Q
public Query parse(QualityQuery qq) throws ParseException {
QueryParser qp = queryParser.get();
if (qp==null) {
- qp = new QueryParser(Version.LUCENE_CURRENT, indexField, new StandardAnalyzer(Version.LUCENE_CURRENT));
+ qp = new QueryParser(indexField, new StandardAnalyzer());
queryParser.set(qp);
}
BooleanQuery bq = new BooleanQuery();
Modified: lucene/dev/trunk/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java Fri Aug 8 22:42:48 2014
@@ -951,25 +951,22 @@ public class TestPerfTasksLogic extends
public void testCollator() throws Exception {
// ROOT locale
Benchmark benchmark = execBenchmark(getCollatorConfig("ROOT", "impl:jdk"));
- CollationKeyAnalyzer expected = new CollationKeyAnalyzer(TEST_VERSION_CURRENT, Collator
- .getInstance(new Locale("")));
+ CollationKeyAnalyzer expected = new CollationKeyAnalyzer(Collator.getInstance(new Locale("")));
assertEqualCollation(expected, benchmark.getRunData().getAnalyzer(), "foobar");
// specify just a language
benchmark = execBenchmark(getCollatorConfig("de", "impl:jdk"));
- expected = new CollationKeyAnalyzer(TEST_VERSION_CURRENT, Collator.getInstance(new Locale("de")));
+ expected = new CollationKeyAnalyzer(Collator.getInstance(new Locale("de")));
assertEqualCollation(expected, benchmark.getRunData().getAnalyzer(), "foobar");
// specify language + country
benchmark = execBenchmark(getCollatorConfig("en,US", "impl:jdk"));
- expected = new CollationKeyAnalyzer(TEST_VERSION_CURRENT, Collator.getInstance(new Locale("en",
- "US")));
+ expected = new CollationKeyAnalyzer(Collator.getInstance(new Locale("en", "US")));
assertEqualCollation(expected, benchmark.getRunData().getAnalyzer(), "foobar");
// specify language + country + variant
benchmark = execBenchmark(getCollatorConfig("no,NO,NY", "impl:jdk"));
- expected = new CollationKeyAnalyzer(TEST_VERSION_CURRENT, Collator.getInstance(new Locale("no",
- "NO", "NY")));
+ expected = new CollationKeyAnalyzer(Collator.getInstance(new Locale("no", "NO", "NY")));
assertEqualCollation(expected, benchmark.getRunData().getAnalyzer(), "foobar");
}
Modified: lucene/dev/trunk/lucene/classification/src/test/org/apache/lucene/classification/SimpleNaiveBayesClassifierTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/classification/src/test/org/apache/lucene/classification/SimpleNaiveBayesClassifierTest.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/classification/src/test/org/apache/lucene/classification/SimpleNaiveBayesClassifierTest.java (original)
+++ lucene/dev/trunk/lucene/classification/src/test/org/apache/lucene/classification/SimpleNaiveBayesClassifierTest.java Fri Aug 8 22:42:48 2014
@@ -57,7 +57,7 @@ public class SimpleNaiveBayesClassifierT
@Override
protected TokenStreamComponents createComponents(String fieldName) {
final Tokenizer tokenizer = new KeywordTokenizer();
- return new TokenStreamComponents(tokenizer, new ReverseStringFilter(TEST_VERSION_CURRENT, new EdgeNGramTokenFilter(TEST_VERSION_CURRENT, new ReverseStringFilter(TEST_VERSION_CURRENT, tokenizer), 10, 20)));
+ return new TokenStreamComponents(tokenizer, new ReverseStringFilter(new EdgeNGramTokenFilter(new ReverseStringFilter(tokenizer), 10, 20)));
}
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java Fri Aug 8 22:42:48 2014
@@ -19,6 +19,7 @@ package org.apache.lucene.analysis;
import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.util.CloseableThreadLocal;
+import org.apache.lucene.util.Version;
import java.io.Closeable;
import java.io.IOException;
@@ -71,6 +72,7 @@ import java.util.Map;
public abstract class Analyzer implements Closeable {
private final ReuseStrategy reuseStrategy;
+ private Version version = Version.LUCENE_CURRENT;
// non final as it gets nulled if closed; pkg private for access by ReuseStrategy's final helper methods:
CloseableThreadLocal<Object> storedValue = new CloseableThreadLocal<>();
@@ -236,6 +238,20 @@ public abstract class Analyzer implement
return reuseStrategy;
}
+ /**
+ * Set the version of Lucene this analyzer should mimic the behavior for for analysis.
+ */
+ public void setVersion(Version v) {
+ version = v; // TODO: make write once?
+ }
+
+ /**
+ * Return the version of Lucene this analyzer will mimic the behavior of for analysis.
+ */
+ public Version getVersion() {
+ return version;
+ }
+
/** Frees persistent resources used by this Analyzer */
@Override
public void close() {
Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java Fri Aug 8 22:42:48 2014
@@ -88,7 +88,7 @@ public class IndexFiles {
Directory dir = FSDirectory.open(new File(indexPath));
// :Post-Release-Update-Version.LUCENE_XY:
- Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_5_0);
+ Analyzer analyzer = new StandardAnalyzer();
IndexWriterConfig iwc = new IndexWriterConfig(Version.LUCENE_5_0, analyzer);
if (create) {
Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java Fri Aug 8 22:42:48 2014
@@ -37,7 +37,6 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.FSDirectory;
-import org.apache.lucene.util.Version;
/** Simple command-line based search demo. */
public class SearchFiles {
@@ -91,8 +90,7 @@ public class SearchFiles {
IndexReader reader = DirectoryReader.open(FSDirectory.open(new File(index)));
IndexSearcher searcher = new IndexSearcher(reader);
- // :Post-Release-Update-Version.LUCENE_XY:
- Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_5_0);
+ Analyzer analyzer = new StandardAnalyzer();
BufferedReader in = null;
if (queries != null) {
@@ -100,8 +98,7 @@ public class SearchFiles {
} else {
in = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
}
- // :Post-Release-Update-Version.LUCENE_XY:
- QueryParser parser = new QueryParser(Version.LUCENE_5_0, field, analyzer);
+ QueryParser parser = new QueryParser(field, analyzer);
while (true) {
if (queries == null && queryString == null) { // prompt the user
System.out.println("Enter query: ");
Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/AssociationsFacetsExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/AssociationsFacetsExample.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/AssociationsFacetsExample.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/AssociationsFacetsExample.java Fri Aug 8 22:42:48 2014
@@ -62,7 +62,7 @@ public class AssociationsFacetsExample {
/** Build the example index. */
private void index() throws IOException {
IndexWriterConfig iwc = new IndexWriterConfig(FacetExamples.EXAMPLES_VER,
- new WhitespaceAnalyzer(FacetExamples.EXAMPLES_VER));
+ new WhitespaceAnalyzer());
IndexWriter indexWriter = new IndexWriter(indexDir, iwc);
// Writes facet ords to a separate directory from the main index
Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/DistanceFacetsExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/DistanceFacetsExample.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/DistanceFacetsExample.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/DistanceFacetsExample.java Fri Aug 8 22:42:48 2014
@@ -88,7 +88,7 @@ public class DistanceFacetsExample imple
/** Build the example index. */
public void index() throws IOException {
IndexWriter writer = new IndexWriter(indexDir, new IndexWriterConfig(FacetExamples.EXAMPLES_VER,
- new WhitespaceAnalyzer(FacetExamples.EXAMPLES_VER)));
+ new WhitespaceAnalyzer()));
// TODO: we could index in radians instead ... saves all the conversions in getBoundingBoxFilter
Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/ExpressionAggregationFacetsExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/ExpressionAggregationFacetsExample.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/ExpressionAggregationFacetsExample.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/ExpressionAggregationFacetsExample.java Fri Aug 8 22:42:48 2014
@@ -59,7 +59,7 @@ public class ExpressionAggregationFacets
/** Build the example index. */
private void index() throws IOException {
IndexWriter indexWriter = new IndexWriter(indexDir, new IndexWriterConfig(FacetExamples.EXAMPLES_VER,
- new WhitespaceAnalyzer(FacetExamples.EXAMPLES_VER)));
+ new WhitespaceAnalyzer()));
// Writes facet ords to a separate directory from the main index
DirectoryTaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/MultiCategoryListsFacetsExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/MultiCategoryListsFacetsExample.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/MultiCategoryListsFacetsExample.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/MultiCategoryListsFacetsExample.java Fri Aug 8 22:42:48 2014
@@ -57,7 +57,7 @@ public class MultiCategoryListsFacetsExa
/** Build the example index. */
private void index() throws IOException {
IndexWriter indexWriter = new IndexWriter(indexDir, new IndexWriterConfig(FacetExamples.EXAMPLES_VER,
- new WhitespaceAnalyzer(FacetExamples.EXAMPLES_VER)));
+ new WhitespaceAnalyzer()));
// Writes facet ords to a separate directory from the main index
DirectoryTaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/RangeFacetsExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/RangeFacetsExample.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/RangeFacetsExample.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/RangeFacetsExample.java Fri Aug 8 22:42:48 2014
@@ -61,7 +61,7 @@ public class RangeFacetsExample implemen
/** Build the example index. */
public void index() throws IOException {
IndexWriter indexWriter = new IndexWriter(indexDir, new IndexWriterConfig(FacetExamples.EXAMPLES_VER,
- new WhitespaceAnalyzer(FacetExamples.EXAMPLES_VER)));
+ new WhitespaceAnalyzer()));
// Add documents with a fake timestamp, 1000 sec before
// "now", 2000 sec before "now", ...:
Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.java Fri Aug 8 22:42:48 2014
@@ -58,7 +58,7 @@ public class SimpleFacetsExample {
/** Build the example index. */
private void index() throws IOException {
IndexWriter indexWriter = new IndexWriter(indexDir, new IndexWriterConfig(FacetExamples.EXAMPLES_VER,
- new WhitespaceAnalyzer(FacetExamples.EXAMPLES_VER)));
+ new WhitespaceAnalyzer()));
// Writes facet ords to a separate directory from the main index
DirectoryTaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleSortedSetFacetsExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleSortedSetFacetsExample.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleSortedSetFacetsExample.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleSortedSetFacetsExample.java Fri Aug 8 22:42:48 2014
@@ -56,7 +56,7 @@ public class SimpleSortedSetFacetsExampl
/** Build the example index. */
private void index() throws IOException {
IndexWriter indexWriter = new IndexWriter(indexDir, new IndexWriterConfig(FacetExamples.EXAMPLES_VER,
- new WhitespaceAnalyzer(FacetExamples.EXAMPLES_VER)));
+ new WhitespaceAnalyzer()));
Document doc = new Document();
doc.add(new SortedSetDocValuesFacetField("Author", "Bob"));
doc.add(new SortedSetDocValuesFacetField("Publish Year", "2010"));
Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java Fri Aug 8 22:42:48 2014
@@ -64,7 +64,7 @@ public class FormBasedXmlQueryDemo exten
private QueryTemplateManager queryTemplateManager;
private CorePlusExtensionsParser xmlParser;
private IndexSearcher searcher;
- private Analyzer analyzer = new StandardAnalyzer(org.apache.lucene.util.Version.LUCENE_CURRENT);
+ private Analyzer analyzer = new StandardAnalyzer();
/** for instantiation by the servlet container */
public FormBasedXmlQueryDemo() {}
Modified: lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (original)
+++ lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java Fri Aug 8 22:42:48 2014
@@ -238,7 +238,7 @@ public class MemoryIndexTest extends Bas
IndexReader reader = DirectoryReader.open(ramdir);
IndexSearcher ram = newSearcher(reader);
IndexSearcher mem = memory.createSearcher();
- QueryParser qp = new QueryParser(TEST_VERSION_CURRENT, "foo", analyzer);
+ QueryParser qp = new QueryParser("foo", analyzer);
for (String query : queries) {
TopDocs ramDocs = ram.search(qp.parse(query), 1);
TopDocs memDocs = mem.search(qp.parse(query), 1);
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/analyzing/AnalyzingQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/analyzing/AnalyzingQueryParser.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/analyzing/AnalyzingQueryParser.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/analyzing/AnalyzingQueryParser.java Fri Aug 8 22:42:48 2014
@@ -26,7 +26,6 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.search.Query;
-import org.apache.lucene.util.Version;
/**
* Overrides Lucene's default QueryParser so that Fuzzy-, Prefix-, Range-, and WildcardQuerys
@@ -42,8 +41,8 @@ import org.apache.lucene.util.Version;
public class AnalyzingQueryParser extends org.apache.lucene.queryparser.classic.QueryParser {
// gobble escaped chars or find a wildcard character
private final Pattern wildcardPattern = Pattern.compile("(\\.)|([?*]+)");
- public AnalyzingQueryParser(Version matchVersion, String field, Analyzer analyzer) {
- super(matchVersion, field, analyzer);
+ public AnalyzingQueryParser(String field, Analyzer analyzer) {
+ super(field, analyzer);
setAnalyzeRangeTerms(true);
}
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=1616901&r1=1616900&r2=1616901&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 Fri Aug 8 22:42:48 2014
@@ -27,7 +27,6 @@ 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.util.Version;
/**
* A QueryParser which constructs queries to search multiple fields.
@@ -65,8 +64,8 @@ public class MultiFieldQueryParser exten
* <p>In other words, all the query's terms must appear, but it doesn't matter in
* what fields they appear.</p>
*/
- public MultiFieldQueryParser(Version matchVersion, String[] fields, Analyzer analyzer, Map<String,Float> boosts) {
- this(matchVersion, fields, analyzer);
+ public MultiFieldQueryParser(String[] fields, Analyzer analyzer, Map<String,Float> boosts) {
+ this(fields, analyzer);
this.boosts = boosts;
}
@@ -90,8 +89,8 @@ public class MultiFieldQueryParser exten
* <p>In other words, all the query's terms must appear, but it doesn't matter in
* what fields they appear.</p>
*/
- public MultiFieldQueryParser(Version matchVersion, String[] fields, Analyzer analyzer) {
- super(matchVersion, null, analyzer);
+ public MultiFieldQueryParser(String[] fields, Analyzer analyzer) {
+ super(null, analyzer);
this.fields = fields;
}
@@ -239,7 +238,6 @@ public class MultiFieldQueryParser exten
* (field1:query1) (field2:query2) (field3:query3)...(fieldx:queryx)
* </code>
* </pre>
- * @param matchVersion Lucene version to match; this is passed through to QueryParser.
* @param queries Queries strings to parse
* @param fields Fields to search on
* @param analyzer Analyzer to use
@@ -247,15 +245,13 @@ public class MultiFieldQueryParser exten
* @throws IllegalArgumentException if the length of the queries array differs
* from the length of the fields array
*/
- public static Query parse(Version matchVersion, String[] queries, String[] fields,
- Analyzer analyzer) throws ParseException
- {
+ public static Query parse(String[] queries, String[] fields, Analyzer analyzer) throws ParseException {
if (queries.length != fields.length)
throw new IllegalArgumentException("queries.length != fields.length");
BooleanQuery bQuery = new BooleanQuery();
for (int i = 0; i < fields.length; i++)
{
- QueryParser qp = new QueryParser(matchVersion, fields[i], analyzer);
+ QueryParser qp = new QueryParser(fields[i], analyzer);
Query q = qp.parse(queries[i]);
if (q!=null && // q never null, just being defensive
(!(q instanceof BooleanQuery) || ((BooleanQuery)q).getClauses().length>0)) {
@@ -288,7 +284,6 @@ public class MultiFieldQueryParser exten
* </code>
* </pre>
*
- * @param matchVersion Lucene version to match; this is passed through to QueryParser.
* @param query Query string to parse
* @param fields Fields to search on
* @param flags Flags describing the fields
@@ -297,13 +292,13 @@ public class MultiFieldQueryParser exten
* @throws IllegalArgumentException if the length of the fields array differs
* from the length of the flags array
*/
- public static Query parse(Version matchVersion, String query, String[] fields,
+ public static Query parse(String query, String[] fields,
BooleanClause.Occur[] flags, Analyzer analyzer) throws ParseException {
if (fields.length != flags.length)
throw new IllegalArgumentException("fields.length != flags.length");
BooleanQuery bQuery = new BooleanQuery();
for (int i = 0; i < fields.length; i++) {
- QueryParser qp = new QueryParser(matchVersion, fields[i], analyzer);
+ QueryParser qp = new QueryParser(fields[i], analyzer);
Query q = qp.parse(query);
if (q!=null && // q never null, just being defensive
(!(q instanceof BooleanQuery) || ((BooleanQuery)q).getClauses().length>0)) {
@@ -337,7 +332,6 @@ public class MultiFieldQueryParser exten
* </code>
* </pre>
*
- * @param matchVersion Lucene version to match; this is passed through to QueryParser.
* @param queries Queries string to parse
* @param fields Fields to search on
* @param flags Flags describing the fields
@@ -346,7 +340,7 @@ public class MultiFieldQueryParser exten
* @throws IllegalArgumentException if the length of the queries, fields,
* and flags array differ
*/
- public static Query parse(Version matchVersion, String[] queries, String[] fields, BooleanClause.Occur[] flags,
+ public static Query parse(String[] queries, String[] fields, BooleanClause.Occur[] flags,
Analyzer analyzer) throws ParseException
{
if (!(queries.length == fields.length && queries.length == flags.length))
@@ -354,7 +348,7 @@ public class MultiFieldQueryParser exten
BooleanQuery bQuery = new BooleanQuery();
for (int i = 0; i < fields.length; i++)
{
- QueryParser qp = new QueryParser(matchVersion, fields[i], analyzer);
+ QueryParser qp = new QueryParser(fields[i], analyzer);
Query q = qp.parse(queries[i]);
if (q!=null && // q never null, just being defensive
(!(q instanceof BooleanQuery) || ((BooleanQuery)q).getClauses().length>0)) {
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java Fri Aug 8 22:42:48 2014
@@ -12,7 +12,6 @@ import org.apache.lucene.search.BooleanC
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermRangeQuery;
import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.util.Version;
/**
* This class is generated by JavaCC. The most important method is
@@ -76,14 +75,6 @@ import org.apache.lucene.util.Version;
* <p><b>NOTE</b>: there is a new QueryParser in contrib, which matches
* the same syntax as this class, but is more modular,
* enabling substantial customization to how a query is created.
- *
- * <a name="version"/>
- * <p><b>NOTE</b>: You must specify the required {@link Version}
- * compatibility when creating QueryParser:
- * <ul>
- * <li> As of 3.1, {@link #setAutoGeneratePhraseQueries} is false by
- * default.
- * </ul>
*/
public class QueryParser extends QueryParserBase implements QueryParserConstants {
/** The default operator for parsing queries.
@@ -92,13 +83,12 @@ public class QueryParser extends QueryPa
static public enum Operator { OR, AND }
/** Create a query parser.
- * @param matchVersion Lucene version to match. See <a href="#version">above</a>.
* @param f the default field for query terms.
* @param a used to find terms in the query text.
*/
- public QueryParser(Version matchVersion, String f, Analyzer a) {
+ public QueryParser(String f, Analyzer a) {
this(new FastCharStream(new StringReader("")));
- init(matchVersion, f, a);
+ init(f, a);
}
// * Query ::= ( Clause )*
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.jj
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.jj?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.jj (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.jj Fri Aug 8 22:42:48 2014
@@ -36,7 +36,6 @@ import org.apache.lucene.search.BooleanC
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermRangeQuery;
import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.util.Version;
/**
* This class is generated by JavaCC. The most important method is
@@ -100,14 +99,6 @@ import org.apache.lucene.util.Version;
* <p><b>NOTE</b>: there is a new QueryParser in contrib, which matches
* the same syntax as this class, but is more modular,
* enabling substantial customization to how a query is created.
- *
- * <a name="version"/>
- * <p><b>NOTE</b>: You must specify the required {@link Version}
- * compatibility when creating QueryParser:
- * <ul>
- * <li> As of 3.1, {@link #setAutoGeneratePhraseQueries} is false by
- * default.
- * </ul>
*/
public class QueryParser extends QueryParserBase {
/** The default operator for parsing queries.
@@ -116,13 +107,12 @@ public class QueryParser extends QueryPa
static public enum Operator { OR, AND }
/** Create a query parser.
- * @param matchVersion Lucene version to match. See <a href="#version">above</a>.
* @param f the default field for query terms.
* @param a used to find terms in the query text.
*/
- public QueryParser(Version matchVersion, String f, Analyzer a) {
+ public QueryParser(String f, Analyzer a) {
this(new FastCharStream(new StringReader("")));
- init(matchVersion, f, a);
+ init(f, a);
}
}
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=1616901&r1=1616900&r2=1616901&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 Fri Aug 8 22:42:48 2014
@@ -33,7 +33,6 @@ import org.apache.lucene.search.*;
import org.apache.lucene.search.BooleanQuery.TooManyClauses;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.QueryBuilder;
-import org.apache.lucene.util.Version;
/** This class is overridden by QueryParser in QueryParser.jj
* and acts to separate the majority of the Java code from the .jj grammar file.
@@ -89,11 +88,10 @@ public abstract class QueryParserBase ex
}
/** Initializes a query parser. Called by the QueryParser constructor
- * @param matchVersion Lucene version to match.
* @param f the default field for query terms.
* @param a used to find terms in the query text.
*/
- public void init(Version matchVersion, String f, Analyzer a) {
+ public void init(String f, Analyzer a) {
setAnalyzer(a);
field = f;
setAutoGeneratePhraseQueries(false);
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/ComplexPhraseQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/ComplexPhraseQueryParser.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/ComplexPhraseQueryParser.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/ComplexPhraseQueryParser.java Fri Aug 8 22:42:48 2014
@@ -38,7 +38,6 @@ import org.apache.lucene.search.spans.Sp
import org.apache.lucene.search.spans.SpanOrQuery;
import org.apache.lucene.search.spans.SpanQuery;
import org.apache.lucene.search.spans.SpanTermQuery;
-import org.apache.lucene.util.Version;
/**
* QueryParser which permits complex phrase query syntax eg "(john jon
@@ -80,8 +79,8 @@ public class ComplexPhraseQueryParser ex
private ComplexPhraseQuery currentPhraseQuery = null;
- public ComplexPhraseQueryParser(Version matchVersion, String f, Analyzer a) {
- super(matchVersion, f, a);
+ public ComplexPhraseQueryParser(String f, Analyzer a) {
+ super(f, a);
}
@Override
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/ExtendableQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/ExtendableQueryParser.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/ExtendableQueryParser.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/ExtendableQueryParser.java Fri Aug 8 22:42:48 2014
@@ -84,24 +84,18 @@ public class ExtendableQueryParser exten
/**
* Creates a new {@link ExtendableQueryParser} instance
*
- * @param matchVersion
- * the lucene version to use.
* @param f
* the default query field
* @param a
* the analyzer used to find terms in a query string
*/
- public ExtendableQueryParser(final Version matchVersion, final String f,
- final Analyzer a) {
- this(matchVersion, f, a, DEFAULT_EXTENSION);
-
+ public ExtendableQueryParser(final String f, final Analyzer a) {
+ this(f, a, DEFAULT_EXTENSION);
}
/**
* Creates a new {@link ExtendableQueryParser} instance
*
- * @param matchVersion
- * the lucene version to use.
* @param f
* the default query field
* @param a
@@ -109,9 +103,9 @@ public class ExtendableQueryParser exten
* @param ext
* the query parser extensions
*/
- public ExtendableQueryParser(final Version matchVersion, final String f,
+ public ExtendableQueryParser(final String f,
final Analyzer a, final Extensions ext) {
- super(matchVersion, f, a);
+ super(f, a);
this.defaultField = f;
this.extensions = ext;
}
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/UserInputQueryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/UserInputQueryBuilder.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/UserInputQueryBuilder.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/UserInputQueryBuilder.java Fri Aug 8 22:42:48 2014
@@ -86,7 +86,7 @@ public class UserInputQueryBuilder imple
* @return QueryParser
*/
protected QueryParser createQueryParser(String fieldName, Analyzer analyzer) {
- return new QueryParser(Version.LUCENE_CURRENT, fieldName, analyzer);
+ return new QueryParser(fieldName, analyzer);
}
}
Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/analyzing/TestAnalyzingQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/analyzing/TestAnalyzingQueryParser.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/analyzing/TestAnalyzingQueryParser.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/analyzing/TestAnalyzingQueryParser.java Fri Aug 8 22:42:48 2014
@@ -120,7 +120,7 @@ public class TestAnalyzingQueryParser ex
assertEquals("Should have returned nothing", true, ex);
ex = false;
- AnalyzingQueryParser qp = new AnalyzingQueryParser(TEST_VERSION_CURRENT, FIELD, a);
+ AnalyzingQueryParser qp = new AnalyzingQueryParser(FIELD, a);
try{
qp.analyzeSingleChunk(FIELD, "", "not a single chunk");
} catch (ParseException e){
@@ -212,7 +212,7 @@ public class TestAnalyzingQueryParser ex
}
private Query getAnalyzedQuery(String s, Analyzer a, boolean allowLeadingWildcard) throws ParseException {
- AnalyzingQueryParser qp = new AnalyzingQueryParser(TEST_VERSION_CURRENT, FIELD, a);
+ AnalyzingQueryParser qp = new AnalyzingQueryParser(FIELD, a);
qp.setAllowLeadingWildcard(allowLeadingWildcard);
org.apache.lucene.search.Query q = qp.parse(s);
return q;
@@ -264,7 +264,7 @@ public class TestAnalyzingQueryParser ex
public void testByteTerms() throws Exception {
String s = "à¹à¸";
Analyzer analyzer = new MockBytesAnalyzer();
- QueryParser qp = new AnalyzingQueryParser(TEST_VERSION_CURRENT, FIELD, analyzer);
+ QueryParser qp = new AnalyzingQueryParser(FIELD, analyzer);
Query q = qp.parse("[à¹à¸ TO à¹à¸]");
assertEquals(true, isAHit(q, s, analyzer));
}
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=1616901&r1=1616900&r2=1616901&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 Fri Aug 8 22:42:48 2014
@@ -40,7 +40,7 @@ public class TestMultiAnalyzer extends B
public void testMultiAnalyzer() throws ParseException {
- QueryParser qp = new QueryParser(TEST_VERSION_CURRENT, "", new MultiAnalyzer());
+ QueryParser qp = new QueryParser("", new MultiAnalyzer());
// trivial, no multiple tokens:
assertEquals("foo", qp.parse("foo").toString());
@@ -113,7 +113,7 @@ public class TestMultiAnalyzer extends B
}
public void testPosIncrementAnalyzer() throws ParseException {
- QueryParser qp = new QueryParser(Version.LUCENE_4_0, "", new PosIncrementAnalyzer());
+ QueryParser qp = new QueryParser("", new PosIncrementAnalyzer());
assertEquals("quick brown", qp.parse("the quick brown").toString());
assertEquals("quick brown fox", qp.parse("the quick brown fox").toString());
}
@@ -234,7 +234,7 @@ public class TestMultiAnalyzer extends B
private final static class DumbQueryParser extends QueryParser {
public DumbQueryParser(String f, Analyzer a) {
- super(TEST_VERSION_CURRENT, f, a);
+ super(f, a);
}
/** expose super's version */
Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java Fri Aug 8 22:42:48 2014
@@ -62,18 +62,18 @@ public class TestMultiFieldQueryParser e
String[] fields = {"b", "t"};
Occur occur[] = {Occur.SHOULD, Occur.SHOULD};
TestQueryParser.QPTestAnalyzer a = new TestQueryParser.QPTestAnalyzer();
- MultiFieldQueryParser mfqp = new MultiFieldQueryParser(TEST_VERSION_CURRENT, fields, a);
+ MultiFieldQueryParser mfqp = new MultiFieldQueryParser(fields, a);
Query q = mfqp.parse(qtxt);
assertEquals(expectedRes, q.toString());
- q = MultiFieldQueryParser.parse(TEST_VERSION_CURRENT, qtxt, fields, occur, a);
+ q = MultiFieldQueryParser.parse(qtxt, fields, occur, a);
assertEquals(expectedRes, q.toString());
}
public void testSimple() throws Exception {
String[] fields = {"b", "t"};
- MultiFieldQueryParser mfqp = new MultiFieldQueryParser(TEST_VERSION_CURRENT, fields, new MockAnalyzer(random()));
+ MultiFieldQueryParser mfqp = new MultiFieldQueryParser(fields, new MockAnalyzer(random()));
Query q = mfqp.parse("one");
assertEquals("b:one t:one", q.toString());
@@ -136,7 +136,7 @@ public class TestMultiFieldQueryParser e
boosts.put("b", Float.valueOf(5));
boosts.put("t", Float.valueOf(10));
String[] fields = {"b", "t"};
- MultiFieldQueryParser mfqp = new MultiFieldQueryParser(TEST_VERSION_CURRENT, fields, new MockAnalyzer(random()), boosts);
+ MultiFieldQueryParser mfqp = new MultiFieldQueryParser(fields, new MockAnalyzer(random()), boosts);
//Check for simple
@@ -162,24 +162,24 @@ public class TestMultiFieldQueryParser e
public void testStaticMethod1() throws ParseException {
String[] fields = {"b", "t"};
String[] queries = {"one", "two"};
- Query q = MultiFieldQueryParser.parse(TEST_VERSION_CURRENT, queries, fields, new MockAnalyzer(random()));
+ Query q = MultiFieldQueryParser.parse(queries, fields, new MockAnalyzer(random()));
assertEquals("b:one t:two", q.toString());
String[] queries2 = {"+one", "+two"};
- q = MultiFieldQueryParser.parse(TEST_VERSION_CURRENT, queries2, fields, new MockAnalyzer(random()));
+ q = MultiFieldQueryParser.parse(queries2, fields, new MockAnalyzer(random()));
assertEquals("(+b:one) (+t:two)", q.toString());
String[] queries3 = {"one", "+two"};
- q = MultiFieldQueryParser.parse(TEST_VERSION_CURRENT, queries3, fields, new MockAnalyzer(random()));
+ q = MultiFieldQueryParser.parse(queries3, fields, new MockAnalyzer(random()));
assertEquals("b:one (+t:two)", q.toString());
String[] queries4 = {"one +more", "+two"};
- q = MultiFieldQueryParser.parse(TEST_VERSION_CURRENT, queries4, fields, new MockAnalyzer(random()));
+ q = MultiFieldQueryParser.parse(queries4, fields, new MockAnalyzer(random()));
assertEquals("(b:one +b:more) (+t:two)", q.toString());
String[] queries5 = {"blah"};
try {
- q = MultiFieldQueryParser.parse(TEST_VERSION_CURRENT, queries5, fields, new MockAnalyzer(random()));
+ q = MultiFieldQueryParser.parse(queries5, fields, new MockAnalyzer(random()));
fail();
} catch(IllegalArgumentException e) {
// expected exception, array length differs
@@ -189,11 +189,11 @@ public class TestMultiFieldQueryParser e
TestQueryParser.QPTestAnalyzer stopA = new TestQueryParser.QPTestAnalyzer();
String[] queries6 = {"((+stop))", "+((stop))"};
- q = MultiFieldQueryParser.parse(TEST_VERSION_CURRENT, queries6, fields, stopA);
+ q = MultiFieldQueryParser.parse(queries6, fields, stopA);
assertEquals("", q.toString());
String[] queries7 = {"one ((+stop)) +more", "+((stop)) +two"};
- q = MultiFieldQueryParser.parse(TEST_VERSION_CURRENT, queries7, fields, stopA);
+ q = MultiFieldQueryParser.parse(queries7, fields, stopA);
assertEquals("(b:one +b:more) (+t:two)", q.toString());
}
@@ -201,15 +201,15 @@ public class TestMultiFieldQueryParser e
public void testStaticMethod2() throws ParseException {
String[] fields = {"b", "t"};
BooleanClause.Occur[] flags = {BooleanClause.Occur.MUST, BooleanClause.Occur.MUST_NOT};
- Query q = MultiFieldQueryParser.parse(TEST_VERSION_CURRENT, "one", fields, flags, new MockAnalyzer(random()));
+ Query q = MultiFieldQueryParser.parse("one", fields, flags, new MockAnalyzer(random()));
assertEquals("+b:one -t:one", q.toString());
- q = MultiFieldQueryParser.parse(TEST_VERSION_CURRENT, "one two", fields, flags, new MockAnalyzer(random()));
+ q = MultiFieldQueryParser.parse("one two", fields, flags, new MockAnalyzer(random()));
assertEquals("+(b:one b:two) -(t:one t:two)", q.toString());
try {
BooleanClause.Occur[] flags2 = {BooleanClause.Occur.MUST};
- q = MultiFieldQueryParser.parse(TEST_VERSION_CURRENT, "blah", fields, flags2, new MockAnalyzer(random()));
+ q = MultiFieldQueryParser.parse("blah", fields, flags2, new MockAnalyzer(random()));
fail();
} catch(IllegalArgumentException e) {
// expected exception, array length differs
@@ -221,15 +221,15 @@ public class TestMultiFieldQueryParser e
//int[] flags = {MultiFieldQueryParser.REQUIRED_FIELD, MultiFieldQueryParser.PROHIBITED_FIELD};
BooleanClause.Occur[] flags = {BooleanClause.Occur.MUST, BooleanClause.Occur.MUST_NOT};
- Query q = MultiFieldQueryParser.parse(TEST_VERSION_CURRENT, "one", fields, flags, new MockAnalyzer(random()));//, fields, flags, new MockAnalyzer(random));
+ Query q = MultiFieldQueryParser.parse("one", fields, flags, new MockAnalyzer(random()));//, fields, flags, new MockAnalyzer(random));
assertEquals("+b:one -t:one", q.toString());
- q = MultiFieldQueryParser.parse(TEST_VERSION_CURRENT, "one two", fields, flags, new MockAnalyzer(random()));
+ q = MultiFieldQueryParser.parse("one two", fields, flags, new MockAnalyzer(random()));
assertEquals("+(b:one b:two) -(t:one t:two)", q.toString());
try {
BooleanClause.Occur[] flags2 = {BooleanClause.Occur.MUST};
- q = MultiFieldQueryParser.parse(TEST_VERSION_CURRENT, "blah", fields, flags2, new MockAnalyzer(random()));
+ q = MultiFieldQueryParser.parse("blah", fields, flags2, new MockAnalyzer(random()));
fail();
} catch(IllegalArgumentException e) {
// expected exception, array length differs
@@ -241,12 +241,12 @@ public class TestMultiFieldQueryParser e
String[] fields = {"f1", "f2", "f3"};
BooleanClause.Occur[] flags = {BooleanClause.Occur.MUST,
BooleanClause.Occur.MUST_NOT, BooleanClause.Occur.SHOULD};
- Query q = MultiFieldQueryParser.parse(TEST_VERSION_CURRENT, queries, fields, flags, new MockAnalyzer(random()));
+ Query q = MultiFieldQueryParser.parse(queries, fields, flags, new MockAnalyzer(random()));
assertEquals("+f1:one -f2:two f3:three", q.toString());
try {
BooleanClause.Occur[] flags2 = {BooleanClause.Occur.MUST};
- q = MultiFieldQueryParser.parse(TEST_VERSION_CURRENT, queries, fields, flags2, new MockAnalyzer(random()));
+ q = MultiFieldQueryParser.parse(queries, fields, flags2, new MockAnalyzer(random()));
fail();
} catch(IllegalArgumentException e) {
// expected exception, array length differs
@@ -257,12 +257,12 @@ public class TestMultiFieldQueryParser e
String[] queries = {"one", "two"};
String[] fields = {"b", "t"};
BooleanClause.Occur[] flags = {BooleanClause.Occur.MUST, BooleanClause.Occur.MUST_NOT};
- Query q = MultiFieldQueryParser.parse(TEST_VERSION_CURRENT, queries, fields, flags, new MockAnalyzer(random()));
+ Query q = MultiFieldQueryParser.parse(queries, fields, flags, new MockAnalyzer(random()));
assertEquals("+b:one -t:two", q.toString());
try {
BooleanClause.Occur[] flags2 = {BooleanClause.Occur.MUST};
- q = MultiFieldQueryParser.parse(TEST_VERSION_CURRENT, queries, fields, flags2, new MockAnalyzer(random()));
+ q = MultiFieldQueryParser.parse(queries, fields, flags2, new MockAnalyzer(random()));
fail();
} catch(IllegalArgumentException e) {
// expected exception, array length differs
@@ -271,7 +271,7 @@ public class TestMultiFieldQueryParser e
public void testAnalyzerReturningNull() throws ParseException {
String[] fields = new String[] { "f1", "f2", "f3" };
- MultiFieldQueryParser parser = new MultiFieldQueryParser(TEST_VERSION_CURRENT, fields, new AnalyzerReturningNull());
+ MultiFieldQueryParser parser = new MultiFieldQueryParser(fields, new AnalyzerReturningNull());
Query q = parser.parse("bla AND blo");
assertEquals("+(f2:bla f3:bla) +(f2:blo f3:blo)", q.toString());
// the following queries are not affected as their terms are not analyzed anyway:
@@ -293,7 +293,7 @@ public class TestMultiFieldQueryParser e
iw.shutdown();
MultiFieldQueryParser mfqp =
- new MultiFieldQueryParser(TEST_VERSION_CURRENT, new String[] {"body"}, analyzer);
+ new MultiFieldQueryParser(new String[] {"body"}, analyzer);
mfqp.setDefaultOperator(QueryParser.Operator.AND);
Query q = mfqp.parse("the footest");
IndexReader ir = DirectoryReader.open(ramDir);
@@ -334,7 +334,7 @@ public class TestMultiFieldQueryParser e
public void testSimpleRegex() throws ParseException {
String[] fields = new String[] {"a", "b"};
- MultiFieldQueryParser mfqp = new MultiFieldQueryParser(TEST_VERSION_CURRENT, fields, new MockAnalyzer(random()));
+ MultiFieldQueryParser mfqp = new MultiFieldQueryParser(fields, new MockAnalyzer(random()));
BooleanQuery bq = new BooleanQuery(true);
bq.add(new RegexpQuery(new Term("a", "[a-z][123]")), Occur.SHOULD);