honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-16 09:54:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to Lucene 4.10.0

Browse Source 
Closes #44.
This commit is contained in:
David Pilato 2014-09-08 18:18:48 +02:00
parent 6e48989cd0
commit 677211ad93
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -33,7 +33,7 @@
<properties>
<elasticsearch.version>2.0.0-SNAPSHOT</elasticsearch.version>
<lucene.version>4.9.0</lucene.version>
<lucene.version>4.10.0</lucene.version>
<tests.jvms>1</tests.jvms>
<tests.shuffle>true</tests.shuffle>
<tests.output>onerror</tests.output>

2
src/main/java/org/elasticsearch/index/analysis/KuromojiAnalyzerProvider.java
View File

@ -44,7 +44,7 @@ public class KuromojiAnalyzerProvider extends AbstractIndexAnalyzerProvider<Japa
final Set<?> stopWords = Analysis.parseStopWords(env, settings, JapaneseAnalyzer.getDefaultStopSet(), version);
final JapaneseTokenizer.Mode mode = KuromojiTokenizerFactory.getMode(settings);
final UserDictionary userDictionary = KuromojiTokenizerFactory.getUserDictionary(env, settings);
analyzer = new JapaneseAnalyzer(version, userDictionary, mode, CharArraySet.copy(version, stopWords), JapaneseAnalyzer.getDefaultStopTags());
analyzer = new JapaneseAnalyzer(userDictionary, mode, CharArraySet.copy(stopWords), JapaneseAnalyzer.getDefaultStopTags());
}
@Override

3
src/main/java/org/elasticsearch/index/analysis/KuromojiPartOfSpeechFilterFactory.java
View File

@ -23,7 +23,6 @@ import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.ja.JapanesePartOfSpeechStopFilter;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.inject.assistedinject.Assisted;
import org.elasticsearch.common.lucene.Lucene;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.Index;
@ -48,7 +47,7 @@ public class KuromojiPartOfSpeechFilterFactory extends AbstractTokenFilterFactor
@Override
public TokenStream create(TokenStream tokenStream) {
return new JapanesePartOfSpeechStopFilter(Lucene.ANALYZER_VERSION, tokenStream, stopTags);
return new JapanesePartOfSpeechStopFilter(tokenStream, stopTags);
}
}

6
src/main/java/org/elasticsearch/indices/analysis/KuromojiIndicesAnalysis.java
View File

@ -25,7 +25,6 @@ import org.apache.lucene.analysis.ja.*;
import org.apache.lucene.analysis.ja.JapaneseTokenizer.Mode;
import org.elasticsearch.common.component.AbstractComponent;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.lucene.Lucene;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.analysis.*;
@ -44,7 +43,7 @@ public class KuromojiIndicesAnalysis extends AbstractComponent {
indicesAnalysisService.analyzerProviderFactories().put("kuromoji",
new PreBuiltAnalyzerProviderFactory("kuromoji", AnalyzerScope.INDICES,
new JapaneseAnalyzer(Lucene.ANALYZER_VERSION)));
new JapaneseAnalyzer()));
indicesAnalysisService.charFilterFactories().put("kuromoji_iteration_mark",
new KurumojiCharFilterFactoryFactory(new CharFilterFactory() {
@ -98,8 +97,7 @@ public class KuromojiIndicesAnalysis extends AbstractComponent {
@Override
public TokenStream create(TokenStream tokenStream) {
return new JapanesePartOfSpeechStopFilter(Lucene.ANALYZER_VERSION,
tokenStream, JapaneseAnalyzer
return new JapanesePartOfSpeechStopFilter(tokenStream, JapaneseAnalyzer
.getDefaultStopTags());
}
}));