Skip to content

修复同义词查询有概率查询不到 #16

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

修复同义词查询有概率查询不到 #16

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0304b05
修复同义词查询有概率查询不到
xiaoheike Jan 23, 2017
241f11b
Merge branch 'master' into master
xiaoheike Jan 23, 2017
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
18 changes: 12 additions & 6 deletions .../com/bellszhu/elasticsearch/plugin/synonym/analysis/DynamicSynonymTokenFilterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@
import org.elasticsearch.indices.analysis.AnalysisModule;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;


/**
*
Expand Down Expand Up @@ -63,8 +71,8 @@ public Thread newThread(Runnable r) {
private final int interval;

private SynonymMap synonymMap;
private Map<DynamicSynonymFilter, Integer> dynamicSynonymFilters = new WeakHashMap<DynamicSynonymFilter, Integer>();

// private Map<DynamicSynonymFilter, Integer> dynamicSynonymFilters = new WeakHashMap<DynamicSynonymFilter, Integer>();
private List<DynamicSynonymFilter> dynamicSynonymFilters = Collections.synchronizedList(new ArrayList<>());
public DynamicSynonymTokenFilterFactory(
IndexSettings indexSettings,
Environment env,
Expand Down Expand Up @@ -132,8 +140,7 @@ protected TokenStreamComponents createComponents(String fieldName) {
public TokenStream create(TokenStream tokenStream) {
DynamicSynonymFilter dynamicSynonymFilter = new DynamicSynonymFilter(
tokenStream, synonymMap, ignoreCase);
dynamicSynonymFilters.put(dynamicSynonymFilter, 1);

dynamicSynonymFilters.add(dynamicSynonymFilter);
// fst is null means no synonyms
return synonymMap.fst == null ? tokenStream : dynamicSynonymFilter;
}
Expand All @@ -150,8 +157,7 @@ public Monitor(SynonymFile synonymFile) {
public void run() {
if (synonymFile.isNeedReloadSynonymMap()) {
synonymMap = synonymFile.reloadSynonymMap();
for (DynamicSynonymFilter dynamicSynonymFilter : dynamicSynonymFilters
.keySet()) {
for (DynamicSynonymFilter dynamicSynonymFilter : dynamicSynonymFilters) {
dynamicSynonymFilter.update(synonymMap);
logger.info("success reload synonym");
}
Expand Down