Skip to content

Commit

Permalink
Upgrade to Lucene 6.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@mikemccand
mikemccand committed Aug 24, 2016
1 parent 9bedbba commit 0ccfe69
Show file tree
Hide file tree
Showing 128 changed files with 189 additions and 210 deletions.
2 changes: 1 addition & 1 deletion buildSrc/version.properties
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
elasticsearch = 5.0.0-alpha6
lucene = 6.1.0
lucene = 6.2.0

# optional dependencies
spatial4j = 0.6
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/lucene/analysis/miscellaneous/UniqueTokenFilter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@

package org.apache.lucene.analysis.miscellaneous;

import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.analysis.util.CharArraySet;

import java.io.IOException;

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/elasticsearch/Version.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public class Version {
public static final int V_5_0_0_alpha5_ID = 5000005;
public static final Version V_5_0_0_alpha5 = new Version(V_5_0_0_alpha5_ID, org.apache.lucene.util.Version.LUCENE_6_1_0);
public static final int V_5_0_0_alpha6_ID = 5000006;
public static final Version V_5_0_0_alpha6 = new Version(V_5_0_0_alpha6_ID, org.apache.lucene.util.Version.LUCENE_6_1_0);
public static final Version V_5_0_0_alpha6 = new Version(V_5_0_0_alpha6_ID, org.apache.lucene.util.Version.LUCENE_6_2_0);
public static final Version CURRENT = V_5_0_0_alpha6;

static {
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/elasticsearch/common/lucene/Lucene.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
public class Lucene {
public static final String LATEST_DOC_VALUES_FORMAT = "Lucene54";
public static final String LATEST_POSTINGS_FORMAT = "Lucene50";
public static final String LATEST_CODEC = "Lucene60";
public static final String LATEST_CODEC = "Lucene62";

static {
Deprecated annotation = PostingsFormat.forName(LATEST_POSTINGS_FORMAT).getClass().getAnnotation(Deprecated.class);
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/org/elasticsearch/index/analysis/Analysis.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@
package org.elasticsearch.index.analysis;

import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.LegacyNumericTokenStream;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.ar.ArabicAnalyzer;
import org.apache.lucene.analysis.bg.BulgarianAnalyzer;
import org.apache.lucene.analysis.br.BrazilianAnalyzer;
Expand Down Expand Up @@ -55,7 +56,6 @@
import org.apache.lucene.analysis.th.ThaiAnalyzer;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tr.TurkishAnalyzer;
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.util.Version;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.io.FileSystemUtils;
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/org/elasticsearch/index/analysis/ArabicAnalyzerProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

package org.elasticsearch.index.analysis;

import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.ar.ArabicAnalyzer;
import org.apache.lucene.analysis.util.CharArraySet;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings;
Expand All @@ -43,4 +43,4 @@ public ArabicAnalyzerProvider(IndexSettings indexSettings, Environment env, Stri
public ArabicAnalyzer get() {
return this.arabicAnalyzer;
}
}
}
4 changes: 2 additions & 2 deletions core/src/main/java/org/elasticsearch/index/analysis/ArmenianAnalyzerProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

package org.elasticsearch.index.analysis;

import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.hy.ArmenianAnalyzer;
import org.apache.lucene.analysis.util.CharArraySet;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings;
Expand All @@ -43,4 +43,4 @@ public ArmenianAnalyzerProvider(IndexSettings indexSettings, Environment env, St
public ArmenianAnalyzer get() {
return this.analyzer;
}
}
}
4 changes: 2 additions & 2 deletions core/src/main/java/org/elasticsearch/index/analysis/BasqueAnalyzerProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

package org.elasticsearch.index.analysis;

import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.eu.BasqueAnalyzer;
import org.apache.lucene.analysis.util.CharArraySet;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings;
Expand All @@ -43,4 +43,4 @@ public BasqueAnalyzerProvider(IndexSettings indexSettings, Environment env, Stri
public BasqueAnalyzer get() {
return this.analyzer;
}
}
}
4 changes: 2 additions & 2 deletions core/src/main/java/org/elasticsearch/index/analysis/BrazilianAnalyzerProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

package org.elasticsearch.index.analysis;

import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.br.BrazilianAnalyzer;
import org.apache.lucene.analysis.util.CharArraySet;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings;
Expand All @@ -43,4 +43,4 @@ public BrazilianAnalyzerProvider(IndexSettings indexSettings, Environment env, S
public BrazilianAnalyzer get() {
return this.analyzer;
}
}
}
4 changes: 2 additions & 2 deletions core/src/main/java/org/elasticsearch/index/analysis/BrazilianStemTokenFilterFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.br.BrazilianStemFilter;
import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter;
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.analysis.CharArraySet;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings;
Expand All @@ -42,4 +42,4 @@ public BrazilianStemTokenFilterFactory(IndexSettings indexSettings, Environment
public TokenStream create(TokenStream tokenStream) {
return new BrazilianStemFilter(new SetKeywordMarkerFilter(tokenStream, exclusions));
}
}
}
4 changes: 2 additions & 2 deletions core/src/main/java/org/elasticsearch/index/analysis/BulgarianAnalyzerProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

package org.elasticsearch.index.analysis;

import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.bg.BulgarianAnalyzer;
import org.apache.lucene.analysis.util.CharArraySet;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings;
Expand All @@ -43,4 +43,4 @@ public BulgarianAnalyzerProvider(IndexSettings indexSettings, Environment env, S
public BulgarianAnalyzer get() {
return this.analyzer;
}
}
}
4 changes: 2 additions & 2 deletions core/src/main/java/org/elasticsearch/index/analysis/CatalanAnalyzerProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

package org.elasticsearch.index.analysis;

import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.ca.CatalanAnalyzer;
import org.apache.lucene.analysis.util.CharArraySet;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings;
Expand All @@ -43,4 +43,4 @@ public CatalanAnalyzerProvider(IndexSettings indexSettings, Environment env, Str
public CatalanAnalyzer get() {
return this.analyzer;
}
}
}
4 changes: 2 additions & 2 deletions core/src/main/java/org/elasticsearch/index/analysis/CjkAnalyzerProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

package org.elasticsearch.index.analysis;

import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.cjk.CJKAnalyzer;
import org.apache.lucene.analysis.util.CharArraySet;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings;
Expand All @@ -44,4 +44,4 @@ public CjkAnalyzerProvider(IndexSettings indexSettings, Environment env, String
public CJKAnalyzer get() {
return this.analyzer;
}
}
}
2 changes: 1 addition & 1 deletion core/src/main/java/org/elasticsearch/index/analysis/CommonGramsTokenFilterFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@

package org.elasticsearch.index.analysis;

import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.commongrams.CommonGramsFilter;
import org.apache.lucene.analysis.commongrams.CommonGramsQueryFilter;
import org.apache.lucene.analysis.util.CharArraySet;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings;
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/org/elasticsearch/index/analysis/CzechAnalyzerProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

package org.elasticsearch.index.analysis;

import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.cz.CzechAnalyzer;
import org.apache.lucene.analysis.util.CharArraySet;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings;
Expand All @@ -43,4 +43,4 @@ public CzechAnalyzerProvider(IndexSettings indexSettings, Environment env, Strin
public CzechAnalyzer get() {
return this.analyzer;
}
}
}
4 changes: 2 additions & 2 deletions core/src/main/java/org/elasticsearch/index/analysis/DanishAnalyzerProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

package org.elasticsearch.index.analysis;

import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.da.DanishAnalyzer;
import org.apache.lucene.analysis.util.CharArraySet;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings;
Expand All @@ -43,4 +43,4 @@ public DanishAnalyzerProvider(IndexSettings indexSettings, Environment env, Stri
public DanishAnalyzer get() {
return this.analyzer;
}
}
}
4 changes: 2 additions & 2 deletions core/src/main/java/org/elasticsearch/index/analysis/DutchAnalyzerProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

package org.elasticsearch.index.analysis;

import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.nl.DutchAnalyzer;
import org.apache.lucene.analysis.util.CharArraySet;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings;
Expand All @@ -43,4 +43,4 @@ public DutchAnalyzerProvider(IndexSettings indexSettings, Environment env, Strin
public DutchAnalyzer get() {
return this.analyzer;
}
}
}
4 changes: 2 additions & 2 deletions core/src/main/java/org/elasticsearch/index/analysis/DutchStemTokenFilterFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@

package org.elasticsearch.index.analysis;

import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter;
import org.apache.lucene.analysis.snowball.SnowballFilter;
import org.apache.lucene.analysis.util.CharArraySet;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings;
Expand All @@ -45,4 +45,4 @@ public TokenStream create(TokenStream tokenStream) {
tokenStream = new SetKeywordMarkerFilter(tokenStream, exclusions);
return new SnowballFilter(tokenStream, new DutchStemmer());
}
}
}
4 changes: 2 additions & 2 deletions core/src/main/java/org/elasticsearch/index/analysis/ElisionTokenFilterFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

package org.elasticsearch.index.analysis;

import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.analysis.util.ElisionFilter;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
Expand All @@ -47,4 +47,4 @@ public TokenStream create(TokenStream tokenStream) {
public Object getMultiTermComponent() {
return this;
}
}
}
4 changes: 2 additions & 2 deletions core/src/main/java/org/elasticsearch/index/analysis/EnglishAnalyzerProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

package org.elasticsearch.index.analysis;

import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.en.EnglishAnalyzer;
import org.apache.lucene.analysis.util.CharArraySet;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings;
Expand All @@ -43,4 +43,4 @@ public EnglishAnalyzerProvider(IndexSettings indexSettings, Environment env, Str
public EnglishAnalyzer get() {
return this.analyzer;
}
}
}
6 changes: 3 additions & 3 deletions core/src/main/java/org/elasticsearch/index/analysis/FingerprintAnalyzer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
package org.elasticsearch.index.analysis;

import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.LowerCaseFilter;
import org.apache.lucene.analysis.StopFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.core.LowerCaseFilter;
import org.apache.lucene.analysis.core.StopFilter;
import org.apache.lucene.analysis.miscellaneous.ASCIIFoldingFilter;
import org.apache.lucene.analysis.miscellaneous.FingerprintFilter;
import org.apache.lucene.analysis.standard.StandardTokenizer;
import org.apache.lucene.analysis.util.CharArraySet;

/** OpenRefine Fingerprinting, which uses a Standard tokenizer and lowercase + stop + fingerprint + asciifolding filters */
public final class FingerprintAnalyzer extends Analyzer {
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/elasticsearch/index/analysis/FingerprintAnalyzerProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
package org.elasticsearch.index.analysis;

import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.analysis.CharArraySet;
import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/org/elasticsearch/index/analysis/FinnishAnalyzerProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

package org.elasticsearch.index.analysis;

import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.fi.FinnishAnalyzer;
import org.apache.lucene.analysis.util.CharArraySet;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings;
Expand All @@ -43,4 +43,4 @@ public FinnishAnalyzerProvider(IndexSettings indexSettings, Environment env, Str
public FinnishAnalyzer get() {
return this.analyzer;
}
}
}
4 changes: 2 additions & 2 deletions core/src/main/java/org/elasticsearch/index/analysis/FrenchAnalyzerProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

package org.elasticsearch.index.analysis;

import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.fr.FrenchAnalyzer;
import org.apache.lucene.analysis.util.CharArraySet;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings;
Expand All @@ -43,4 +43,4 @@ public FrenchAnalyzerProvider(IndexSettings indexSettings, Environment env, Stri
public FrenchAnalyzer get() {
return this.analyzer;
}
}
}
4 changes: 2 additions & 2 deletions core/src/main/java/org/elasticsearch/index/analysis/FrenchStemTokenFilterFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@

package org.elasticsearch.index.analysis;

import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter;
import org.apache.lucene.analysis.snowball.SnowballFilter;
import org.apache.lucene.analysis.util.CharArraySet;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings;
Expand All @@ -45,4 +45,4 @@ public TokenStream create(TokenStream tokenStream) {
tokenStream = new SetKeywordMarkerFilter(tokenStream, exclusions);
return new SnowballFilter(tokenStream, new FrenchStemmer());
}
}
}
Loading

1 comment on commit 0ccfe69

@nengine
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @mikemccand, It was indicated that myanmarAsWords is not configurable yet. Please let me know if it would be possible to have that option as false to perform syllable segmentation, instead of dictionary base segmentation when it is true by default. Thanks a lot.

Please sign in to comment.