From 616b3dcb189c9823e6b8c3e06c5a2a32d24a62bb Mon Sep 17 00:00:00 2001 From: kimchy Date: Fri, 18 Mar 2011 01:35:29 +0200 Subject: [PATCH] shard the default analyzer (standard) on the node level --- .../elasticsearch/index/analysis/AnalysisModule.java | 1 + .../indices/analysis/IndicesAnalysisService.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AnalysisModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AnalysisModule.java index ba5b1fc561a..0712422b319 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AnalysisModule.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/AnalysisModule.java @@ -336,6 +336,7 @@ public class AnalysisModule extends AbstractModule { } @Override public void processAnalyzers(AnalyzersBindings analyzersBindings) { + analyzersBindings.processAnalyzer("default", StandardAnalyzerProvider.class); analyzersBindings.processAnalyzer("standard", StandardAnalyzerProvider.class); analyzersBindings.processAnalyzer("standard_html_strip", StandardHtmlStripAnalyzerProvider.class); analyzersBindings.processAnalyzer("standardHtmlStrip", StandardHtmlStripAnalyzerProvider.class); diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisService.java index 0d8baf74516..1fb4d7728bd 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisService.java @@ -60,7 +60,9 @@ public class IndicesAnalysisService extends AbstractComponent { @Inject public IndicesAnalysisService(Settings settings) { super(settings); - analyzerProviderFactories.put("standard", new PreBuiltAnalyzerProviderFactory("standard", AnalyzerScope.INDICES, new StandardAnalyzer(Lucene.ANALYZER_VERSION))); + StandardAnalyzer standardAnalyzer = new StandardAnalyzer(Lucene.ANALYZER_VERSION); + analyzerProviderFactories.put("default", new PreBuiltAnalyzerProviderFactory("default", AnalyzerScope.INDICES, standardAnalyzer)); + analyzerProviderFactories.put("standard", new PreBuiltAnalyzerProviderFactory("standard", AnalyzerScope.INDICES, standardAnalyzer)); analyzerProviderFactories.put("keyword", new PreBuiltAnalyzerProviderFactory("keyword", AnalyzerScope.INDICES, new KeywordAnalyzer())); analyzerProviderFactories.put("stop", new PreBuiltAnalyzerProviderFactory("stop", AnalyzerScope.INDICES, new StopAnalyzer(Lucene.ANALYZER_VERSION))); analyzerProviderFactories.put("whitespace", new PreBuiltAnalyzerProviderFactory("whitespace", AnalyzerScope.INDICES, new WhitespaceAnalyzer())); @@ -99,7 +101,11 @@ public class IndicesAnalysisService extends AbstractComponent { public void close() { for (PreBuiltAnalyzerProviderFactory analyzerProviderFactory : analyzerProviderFactories.values()) { - analyzerProviderFactory.analyzer().close(); + try { + analyzerProviderFactory.analyzer().close(); + } catch (Exception e) { + // ignore + } } } }