Author: tommaso
Date: Fri Feb 6 09:40:09 2015
New Revision: 1657766
URL: http://svn.apache.org/r1657766
Log:
OAK-2483 - leveraging Solr capabilites for building spellcheck/suggest
dictionaries at index time
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java
jackrabbit/oak/trunk/oak-solr-core/src/main/resources/solr/oak/conf/solrconfig.xml
jackrabbit/oak/trunk/oak-solr-core/src/test/resources/solr/oak/conf/solrconfig.xml
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java?rev=1657766&r1=1657765&r2=1657766&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java
Fri Feb 6 09:40:09 2015
@@ -108,18 +108,12 @@ class FilterQueryParser {
kv[0] = "spellcheck.q";
}
solrQuery.setParam("spellcheck", true);
-
- // TODO : this should not be always passed
to avoid building the dictionary on each spellcheck request
- solrQuery.setParam("spellcheck.build",
true);
}
if ("/suggest".equals(requestHandlerString)) {
if ("term".equals(kv[0])) {
kv[0] = "suggest.q";
}
solrQuery.setParam("suggest", true);
-
- // TODO : this should not be always passed
to avoid building the dictionary on each suggest request
- solrQuery.setParam("suggest.build", true);
}
solrQuery.setParam(kv[0], kv[1]);
}
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/resources/solr/oak/conf/solrconfig.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/resources/solr/oak/conf/solrconfig.xml?rev=1657766&r1=1657765&r2=1657766&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/resources/solr/oak/conf/solrconfig.xml
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/resources/solr/oak/conf/solrconfig.xml
Fri Feb 6 09:40:09 2015
@@ -1110,6 +1110,7 @@
<str name="field">:suggest</str>
<str name="weightField">:suggest-weight</str>
<str name="suggestAnalyzerFieldType">string</str>
+ <str name="buildOnCommit">true</str>
</lst>
</searchComponent>
@@ -1180,10 +1181,6 @@
<str name="queryAnalyzerFieldType">text_general</str>
- <!-- Multiple "Spell Checkers" can be declared and used by this
- component
- -->
-
<!-- a spellchecker built from a field of the main index -->
<lst name="spellchecker">
<str name="name">default</str>
@@ -1204,15 +1201,6 @@
<float name="maxQueryFrequency">0.01</float>
</lst>
- <lst name="spellchecker">
- <str name="name">wordbreak</str>
- <str name="classname">solr.WordBreakSolrSpellChecker</str>
- <str name="field">name</str>
- <str name="combineWords">true</str>
- <str name="breakWords">true</str>
- <int name="maxChanges">10</int>
- </lst>
-
</searchComponent>
<requestHandler name="/spellcheck" class="solr.SearchHandler"
startup="lazy">
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/test/resources/solr/oak/conf/solrconfig.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/resources/solr/oak/conf/solrconfig.xml?rev=1657766&r1=1657765&r2=1657766&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/test/resources/solr/oak/conf/solrconfig.xml
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/test/resources/solr/oak/conf/solrconfig.xml
Fri Feb 6 09:40:09 2015
@@ -1156,6 +1156,7 @@ current implementation relies on the upd
<str name="field">:suggest</str>
<str name="weightField">:suggest-weight</str>
<str name="suggestAnalyzerFieldType">string</str>
+ <str name="buildOnCommit">true</str>
</lst>
</searchComponent>
@@ -1246,7 +1247,6 @@ current implementation relies on the upd
<int name="minQueryLength">4</int>
<!-- maximum threshold of documents a query term can appear to be
considered for correction -->
<float name="maxQueryFrequency">0.01</float>
-
</lst>
<!-- a spellchecker that can break or combine words. See "/spell"
handler below for usage -->
@@ -1257,6 +1257,7 @@ current implementation relies on the upd
<str name="combineWords">true</str>
<str name="breakWords">true</str>
<int name="maxChanges">10</int>
+ <str name="buildOnCommit">true</str>
</lst>
<!-- a spellchecker that uses a different distance measure -->
