third_codes/elasticsearch-analysis-ik
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #116 from wyhw/upgrade2_1

Browse Source 
Elasticsearch upgrade 2.1
This commit is contained in:
Medcl 2015-11-26 23:02:42 +08:00
commit ce6424dd3f
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -10,7 +10,8 @@ Versions
IK version | ES version IK version | ES version
-----------|----------- -----------|-----------
master | 2.0.0 -> master master | 2.1.0 -> master
1.5.1 | 2.1.0
1.5.0 | 2.0.0 1.5.0 | 2.0.0
1.4.1 | 1.7.2 1.4.1 | 1.7.2
1.4.0 | 1.6.0 1.4.0 | 1.6.0

4
pom.xml
View File

@ -6,13 +6,13 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.elasticsearch</groupId> <groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch-analysis-ik</artifactId> <artifactId>elasticsearch-analysis-ik</artifactId>
<version>1.5.0</version> <version>1.5.1</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<description>IK Analyzer for ElasticSearch</description> <description>IK Analyzer for ElasticSearch</description>
<inceptionYear>2009</inceptionYear> <inceptionYear>2009</inceptionYear>
<properties> <properties>
<elasticsearch.version>2.0.0</elasticsearch.version> <elasticsearch.version>2.1.0</elasticsearch.version>
<elasticsearch.assembly.descriptor>${project.basedir}/src/main/assemblies/plugin.xml</elasticsearch.assembly.descriptor> <elasticsearch.assembly.descriptor>${project.basedir}/src/main/assemblies/plugin.xml</elasticsearch.assembly.descriptor>
<elasticsearch.plugin.classname>org.elasticsearch.plugin.analysis.ik.AnalysisIkPlugin</elasticsearch.plugin.classname> <elasticsearch.plugin.classname>org.elasticsearch.plugin.analysis.ik.AnalysisIkPlugin</elasticsearch.plugin.classname>

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

@ -4,7 +4,6 @@ import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment; import org.elasticsearch.env.Environment;
import org.elasticsearch.index.Index; import org.elasticsearch.index.Index;
import org.elasticsearch.index.settings.IndexSettings;
import org.wltea.analyzer.cfg.Configuration; import org.wltea.analyzer.cfg.Configuration;
import org.wltea.analyzer.dic.Dictionary; import org.wltea.analyzer.dic.Dictionary;
import org.wltea.analyzer.lucene.IKAnalyzer; import org.wltea.analyzer.lucene.IKAnalyzer;
@ -14,7 +13,7 @@ public class IkAnalyzerProvider extends AbstractIndexAnalyzerProvider<IKAnalyzer
private boolean useSmart=false; private boolean useSmart=false;
@Inject @Inject
public IkAnalyzerProvider(Index index, @IndexSettings Settings indexSettings,Environment env, String name, Settings settings) { public IkAnalyzerProvider(Index index, Settings indexSettings,Environment env, String name, Settings settings) {
super(index, indexSettings, name, settings); super(index, indexSettings, name, settings);
Dictionary.initial(new Configuration(env)); Dictionary.initial(new Configuration(env));
useSmart = settings.get("use_smart", "false").equals("true"); useSmart = settings.get("use_smart", "false").equals("true");

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

@ -6,7 +6,6 @@ import org.elasticsearch.common.inject.assistedinject.Assisted;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment; import org.elasticsearch.env.Environment;
import org.elasticsearch.index.Index; import org.elasticsearch.index.Index;
import org.elasticsearch.index.settings.IndexSettings;
import org.wltea.analyzer.cfg.Configuration; import org.wltea.analyzer.cfg.Configuration;
import org.wltea.analyzer.dic.Dictionary; import org.wltea.analyzer.dic.Dictionary;
import org.wltea.analyzer.lucene.IKTokenizer; import org.wltea.analyzer.lucene.IKTokenizer;
@ -16,7 +15,7 @@ public class IkTokenizerFactory extends AbstractTokenizerFactory {
private boolean useSmart=false; private boolean useSmart=false;
@Inject @Inject
public IkTokenizerFactory(Index index, @IndexSettings Settings indexSettings, Environment env, @Assisted String name, @Assisted Settings settings) { public IkTokenizerFactory(Index index, Settings indexSettings, Environment env, @Assisted String name, @Assisted Settings settings) {
super(index, indexSettings, name, settings); super(index, indexSettings, name, settings);
this.settings=settings; this.settings=settings;
Dictionary.initial(new Configuration(env)); Dictionary.initial(new Configuration(env));