You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by to...@apache.org on 2015/06/05 17:02:31 UTC
svn commit: r1683777 - in /jackrabbit/oak/branches/1.0/oak-solr-core/src:
main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java
main/resources/solr/oak/conf/solrconfig.xml
test/resources/solr/oak/conf/solrconfig.xml
Author: tommaso
Date: Fri Jun 5 15:02:31 2015
New Revision: 1683777
URL: http://svn.apache.org/r1683777
Log:
OAK-2958, OAK-2483 - backporting rep:suggest to branch 1.0
Modified:
jackrabbit/oak/branches/1.0/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java
jackrabbit/oak/branches/1.0/oak-solr-core/src/main/resources/solr/oak/conf/solrconfig.xml
jackrabbit/oak/branches/1.0/oak-solr-core/src/test/resources/solr/oak/conf/solrconfig.xml
Modified: jackrabbit/oak/branches/1.0/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java?rev=1683777&r1=1683776&r2=1683777&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java (original)
+++ jackrabbit/oak/branches/1.0/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java Fri Jun 5 15:02:31 2015
@@ -141,8 +141,6 @@ class FilterQueryParser {
}
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/branches/1.0/oak-solr-core/src/main/resources/solr/oak/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-solr-core/src/main/resources/solr/oak/conf/solrconfig.xml?rev=1683777&r1=1683776&r2=1683777&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-solr-core/src/main/resources/solr/oak/conf/solrconfig.xml (original)
+++ jackrabbit/oak/branches/1.0/oak-solr-core/src/main/resources/solr/oak/conf/solrconfig.xml Fri Jun 5 15:02:31 2015
@@ -1122,6 +1122,7 @@
<str name="field">:suggest</str>
<str name="weightField">:suggest-weight</str>
<str name="suggestAnalyzerFieldType">string</str>
+ <str name="buildOnCommit">true</str>
</lst>
</searchComponent>
Modified: jackrabbit/oak/branches/1.0/oak-solr-core/src/test/resources/solr/oak/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-solr-core/src/test/resources/solr/oak/conf/solrconfig.xml?rev=1683777&r1=1683776&r2=1683777&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-solr-core/src/test/resources/solr/oak/conf/solrconfig.xml (original)
+++ jackrabbit/oak/branches/1.0/oak-solr-core/src/test/resources/solr/oak/conf/solrconfig.xml Fri Jun 5 15:02:31 2015
@@ -1155,6 +1155,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>