-
Notifications
You must be signed in to change notification settings - Fork 24.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closes #20345 Adds minhash filter for use in Elasticsearch #20346
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
/* | ||
* Licensed to Elasticsearch under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch licenses this file to you under | ||
* the Apache License, Version 2.0 (the "License"); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
package org.elasticsearch.index.analysis; | ||
|
||
import org.apache.lucene.analysis.TokenStream; | ||
import org.apache.lucene.analysis.minhash.MinHashFilter; | ||
import org.apache.lucene.analysis.minhash.MinHashFilterFactory; | ||
import org.elasticsearch.common.settings.Settings; | ||
import org.elasticsearch.env.Environment; | ||
import org.elasticsearch.index.IndexSettings; | ||
|
||
import java.util.HashMap; | ||
import java.util.Map; | ||
|
||
|
||
public class MinHashTokenFilterFactory extends AbstractTokenFilterFactory { | ||
private MinHashFilterFactory luceneFactory; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this should also be final? |
||
|
||
/** | ||
* Create a {@link org.apache.lucene.analysis.minhash.MinHashFilterFactory}. | ||
*/ | ||
public MinHashTokenFilterFactory(IndexSettings indexSettings, Environment environment, String name, Settings settings) { | ||
super(indexSettings, name, settings); | ||
|
||
// annoying settings indirection because MinHashFilter | ||
// has package-private constructor and defaults :( | ||
// see https://issues.apache.org/jira/browse/LUCENE-7436 | ||
Map<String, String> settingsMap = new HashMap<String, String>(); | ||
settingsMap.put("hashCount" ,settings.get("num_hash_tables")); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I wonder if we should at least use the same terms just |
||
settingsMap.put("bucketCount" ,settings.get("num_buckets")); | ||
settingsMap.put("hashSetSize" ,settings.get("bucket_depth")); | ||
settingsMap.put("withRotation", settings.get("rotate")); | ||
luceneFactory = new MinHashFilterFactory(settingsMap); | ||
} | ||
|
||
/* | ||
* (non-Javadoc) | ||
* | ||
* @see org.apache.lucene.analysis.util.TokenFilterFactory#create(org.apache.lucene.analysis.TokenStream) | ||
*/ | ||
@Override | ||
public TokenStream create(TokenStream input) { | ||
return luceneFactory.create(input); | ||
|
||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,126 +19,14 @@ | |
|
||
package org.elasticsearch.indices.analysis; | ||
|
||
import org.apache.lucene.analysis.minhash.MinHashFilterFactory; | ||
import org.elasticsearch.Version; | ||
import org.elasticsearch.cluster.metadata.IndexMetaData; | ||
import org.elasticsearch.common.NamedRegistry; | ||
import org.elasticsearch.common.settings.Settings; | ||
import org.elasticsearch.env.Environment; | ||
import org.elasticsearch.index.IndexSettings; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. these changes are unrelated? |
||
import org.elasticsearch.index.analysis.ASCIIFoldingTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.AnalysisRegistry; | ||
import org.elasticsearch.index.analysis.AnalyzerProvider; | ||
import org.elasticsearch.index.analysis.ApostropheFilterFactory; | ||
import org.elasticsearch.index.analysis.ArabicAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.ArabicNormalizationFilterFactory; | ||
import org.elasticsearch.index.analysis.ArabicStemTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.ArmenianAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.BasqueAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.BrazilianAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.BrazilianStemTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.BulgarianAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.CJKBigramFilterFactory; | ||
import org.elasticsearch.index.analysis.CJKWidthFilterFactory; | ||
import org.elasticsearch.index.analysis.CatalanAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.CharFilterFactory; | ||
import org.elasticsearch.index.analysis.ChineseAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.CjkAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.ClassicFilterFactory; | ||
import org.elasticsearch.index.analysis.ClassicTokenizerFactory; | ||
import org.elasticsearch.index.analysis.CommonGramsTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.CzechAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.CzechStemTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.DanishAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.DecimalDigitFilterFactory; | ||
import org.elasticsearch.index.analysis.DelimitedPayloadTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.DutchAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.DutchStemTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.EdgeNGramTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.EdgeNGramTokenizerFactory; | ||
import org.elasticsearch.index.analysis.ElisionTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.EnglishAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.FingerprintAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.FingerprintTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.FinnishAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.FrenchAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.FrenchStemTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.GalicianAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.GermanAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.GermanNormalizationFilterFactory; | ||
import org.elasticsearch.index.analysis.GermanStemTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.GreekAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.HindiAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.HindiNormalizationFilterFactory; | ||
import org.elasticsearch.index.analysis.HtmlStripCharFilterFactory; | ||
import org.elasticsearch.index.analysis.HungarianAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.HunspellTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.IndicNormalizationFilterFactory; | ||
import org.elasticsearch.index.analysis.IndonesianAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.IrishAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.ItalianAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.KStemTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.KeepTypesFilterFactory; | ||
import org.elasticsearch.index.analysis.KeepWordFilterFactory; | ||
import org.elasticsearch.index.analysis.KeywordAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.KeywordMarkerTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.KeywordTokenizerFactory; | ||
import org.elasticsearch.index.analysis.LatvianAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.LengthTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.LetterTokenizerFactory; | ||
import org.elasticsearch.index.analysis.LimitTokenCountFilterFactory; | ||
import org.elasticsearch.index.analysis.LithuanianAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.LowerCaseTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.LowerCaseTokenizerFactory; | ||
import org.elasticsearch.index.analysis.MappingCharFilterFactory; | ||
import org.elasticsearch.index.analysis.NGramTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.NGramTokenizerFactory; | ||
import org.elasticsearch.index.analysis.NorwegianAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.PathHierarchyTokenizerFactory; | ||
import org.elasticsearch.index.analysis.PatternAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.PatternCaptureGroupTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.PatternReplaceCharFilterFactory; | ||
import org.elasticsearch.index.analysis.PatternReplaceTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.PatternTokenizerFactory; | ||
import org.elasticsearch.index.analysis.PersianAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.PersianNormalizationFilterFactory; | ||
import org.elasticsearch.index.analysis.PorterStemTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.PortugueseAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.ReverseTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.RomanianAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.RussianAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.RussianStemTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.ScandinavianFoldingFilterFactory; | ||
import org.elasticsearch.index.analysis.ScandinavianNormalizationFilterFactory; | ||
import org.elasticsearch.index.analysis.SerbianNormalizationFilterFactory; | ||
import org.elasticsearch.index.analysis.ShingleTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.SimpleAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.SnowballAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.SnowballTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.SoraniAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.SoraniNormalizationFilterFactory; | ||
import org.elasticsearch.index.analysis.SpanishAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.StandardAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.StandardHtmlStripAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.StandardTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.StandardTokenizerFactory; | ||
import org.elasticsearch.index.analysis.StemmerOverrideTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.StemmerTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.StopAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.StopTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.SwedishAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.ThaiAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.ThaiTokenizerFactory; | ||
import org.elasticsearch.index.analysis.TokenFilterFactory; | ||
import org.elasticsearch.index.analysis.TokenizerFactory; | ||
import org.elasticsearch.index.analysis.TrimTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.TruncateTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.TurkishAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.UAX29URLEmailTokenizerFactory; | ||
import org.elasticsearch.index.analysis.UniqueTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.UpperCaseTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.WhitespaceAnalyzerProvider; | ||
import org.elasticsearch.index.analysis.WhitespaceTokenizerFactory; | ||
import org.elasticsearch.index.analysis.WordDelimiterTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.*; | ||
import org.elasticsearch.index.analysis.compound.DictionaryCompoundWordTokenFilterFactory; | ||
import org.elasticsearch.index.analysis.compound.HyphenationCompoundWordTokenFilterFactory; | ||
import org.elasticsearch.plugins.AnalysisPlugin; | ||
|
@@ -258,6 +146,7 @@ private NamedRegistry<AnalysisProvider<TokenFilterFactory>> setupTokenFilters(Li | |
tokenFilters.register("classic", ClassicFilterFactory::new); | ||
tokenFilters.register("decimal_digit", DecimalDigitFilterFactory::new); | ||
tokenFilters.register("fingerprint", FingerprintTokenFilterFactory::new); | ||
tokenFilters.register("minhash", MinHashTokenFilterFactory::new); | ||
tokenFilters.extractAndRegister(plugins, AnalysisPlugin::getTokenFilters); | ||
return tokenFilters; | ||
} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can this be final?