Skip to content

Remove IcuCollationTokenFilterFactory #15827 #35900

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

Remove IcuCollationTokenFilterFactory #15827 #35900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 0 additions & 109 deletions ...ns/analysis-icu/src/main/java/org/elasticsearch/index/analysis/ICUCollationKeyFilter.java
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion ...is-icu/src/main/java/org/elasticsearch/index/analysis/IcuCollationTokenFilterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.nio.file.InvalidPathException;

import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.collation.ICUCollationDocValuesField;
import org.elasticsearch.common.io.Streams;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
Expand Down Expand Up @@ -172,6 +173,6 @@ public IcuCollationTokenFilterFactory(IndexSettings indexSettings, Environment e

@Override
public TokenStream create(TokenStream tokenStream) {
return new ICUCollationKeyFilter(tokenStream, collator);
return new ICUCollationDocValuesField(tokenStream.toString(), collator).tokenStreamValue();
Copy link
Member

@cbuescher cbuescher Nov 26, 2018

Choose a reason for hiding this comment

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

I doubt this is going to be sufficient. ICUCollationDocValuesField's first argument is a the field name (per Javadoc) and I'm not sure the tokenStreamValue will work either, but maybe it does.

}
}