Author: hossman
Date: Mon May 31 23:24:40 2010
New Revision: 949888
URL: http://svn.apache.org/viewvc?rev=949888&view=rev
Log:
merging r884393 from solr/branches/branch-1.5-dev for SOLR-1558
Modified:
lucene/solr/branches/branch-1.4/ (props changed)
lucene/solr/branches/branch-1.4/CHANGES.txt
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java
(props changed)
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/DumpRequestHandler.java
(props changed)
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
(props changed)
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/request/RawResponseWriter.java
(props changed)
lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml
lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-altdirectory.xml
lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-facet-sort.xml
lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-highlight.xml
lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-nocache.xml
lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-termindex.xml
lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-xinclude.xml
Propchange: lucene/solr/branches/branch-1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 23:24:40 2010
@@ -1 +1 @@
-/lucene/solr/trunk:881642,881906,882838,883566,891596,891889,898119,903271,911245,919871,925898
+/lucene/solr/trunk:881642,881906,882838,883566,884393,891596,891889,898119,903271,911245,919871,925898
Modified: lucene/solr/branches/branch-1.4/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/CHANGES.txt?rev=949888&r1=949887&r2=949888&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/CHANGES.txt (original)
+++ lucene/solr/branches/branch-1.4/CHANGES.txt Mon May 31 23:24:40 2010
@@ -89,6 +89,12 @@ Bug Fixes
(an extremely small) potential for deadlock.
(gabriele renzi via hossman)
+* SOLR-1558: QueryElevationComponent only works if the uniqueKey field is
+ implemented using StrField. In previous versions of Solr no warning or
+ error would be generated if you attempted to use QueryElevationComponent,
+ it would just fail in unexpected ways. This has been changed so that it
+ will fail with a clear error message on initialization. (hossman)
+
================== Release 1.4.0 ==================
Release Date: See http://lucene.apache.org/solr for the official release date.
Propchange:
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 23:24:40 2010
@@ -1 +1 @@
-/lucene/solr/trunk/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java:881642,881906,882838,883566,891596,891889,898119,903271,906553,911245,919871,925898
+/lucene/solr/trunk/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java:881642,881906,882838,883566,884393,891596,891889,898119,903271,906553,911245,919871,925898
Propchange:
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/DumpRequestHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 23:24:40 2010
@@ -1 +1 @@
-/lucene/solr/trunk/src/java/org/apache/solr/handler/DumpRequestHandler.java:881642,881906,882838,883566,891596,891889,898119,903271,906553,911245,919871,925898
+/lucene/solr/trunk/src/java/org/apache/solr/handler/DumpRequestHandler.java:881642,881906,882838,883566,884393,891596,891889,898119,903271,906553,911245,919871,925898
Propchange:
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 23:24:40 2010
@@ -1 +1 @@
-/lucene/solr/trunk/src/java/org/apache/solr/handler/MoreLikeThisHandler.java:881642,881906,882838,883566,891596,891889,898119,903271,906553,911245,919871,925898
+/lucene/solr/trunk/src/java/org/apache/solr/handler/MoreLikeThisHandler.java:881642,881906,882838,883566,884393,891596,891889,898119,903271,906553,911245,919871,925898
Modified:
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/component/QueryElevationComponent.java?rev=949888&r1=949887&r2=949888&view=diff
==============================================================================
---
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
(original)
+++
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
Mon May 31 23:24:40 2010
@@ -51,6 +51,7 @@ import org.apache.solr.common.util.Named
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.core.Config;
import org.apache.solr.core.SolrCore;
+import org.apache.solr.schema.StrField;
import org.apache.solr.schema.FieldType;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.search.SortSpec;
@@ -152,9 +153,9 @@ public class QueryElevationComponent ext
}
SchemaField sf = core.getSchema().getUniqueKeyField();
- if( sf == null ) {
+ if( sf == null || !(sf.getType() instanceof StrField)) {
throw new SolrException( SolrException.ErrorCode.SERVER_ERROR,
- "QueryElevationComponent requires the schema to have a
uniqueKeyField" );
+ "QueryElevationComponent requires the schema to have a
uniqueKeyField implemented using StrField" );
}
idField = StringHelper.intern(sf.getName());
Propchange:
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/request/RawResponseWriter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 23:24:40 2010
@@ -1,2 +1,2 @@
-/lucene/solr/trunk/src/java/org/apache/solr/request/RawResponseWriter.java:881642,881906,882838,883566,891596,891889,898119,903271,911245,919871,925898
+/lucene/solr/trunk/src/java/org/apache/solr/request/RawResponseWriter.java:881642,881906,882838,883566,884393,891596,891889,898119,903271,911245,919871,925898
/lucene/solr/trunk/src/java/org/apache/solr/response/RawResponseWriter.java:906553
Modified:
lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml?rev=949888&r1=949887&r2=949888&view=diff
==============================================================================
---
lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml
(original)
+++
lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml
Mon May 31 23:24:40 2010
@@ -308,21 +308,6 @@
<bool name="httpCaching">false</bool>
</requestHandler>
- <!-- test elevation -->
- <searchComponent name="elevate"
class="org.apache.solr.handler.component.QueryElevationComponent" >
- <str name="queryFieldType">string</str>
- <str name="config-file">elevate.xml</str>
- </searchComponent>
-
- <requestHandler name="/elevate"
class="org.apache.solr.handler.component.SearchHandler">
- <lst name="defaults">
- <str name="echoParams">explicit</str>
- </lst>
- <arr name="last-components">
- <str>elevate</str>
- </arr>
- </requestHandler>
-
<searchComponent name="spellcheck"
class="org.apache.solr.handler.component.SpellCheckComponent">
<str name="queryAnalyzerFieldType">lowerfilt</str>
Modified:
lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-altdirectory.xml
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-altdirectory.xml?rev=949888&r1=949887&r2=949888&view=diff
==============================================================================
---
lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-altdirectory.xml
(original)
+++
lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-altdirectory.xml
Mon May 31 23:24:40 2010
@@ -316,21 +316,6 @@
<bool name="httpCaching">false</bool>
</requestHandler>
- <!-- test elevation -->
- <searchComponent name="elevate"
class="org.apache.solr.handler.component.QueryElevationComponent" >
- <str name="queryFieldType">string</str>
- <str name="config-file">elevate.xml</str>
- </searchComponent>
-
- <requestHandler name="/elevate"
class="org.apache.solr.handler.component.SearchHandler">
- <lst name="defaults">
- <str name="echoParams">explicit</str>
- </lst>
- <arr name="last-components">
- <str>elevate</str>
- </arr>
- </requestHandler>
-
<searchComponent name="spellcheck"
class="org.apache.solr.handler.component.SpellCheckComponent">
<str name="queryAnalyzerFieldType">lowerfilt</str>
Modified:
lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-facet-sort.xml
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-facet-sort.xml?rev=949888&r1=949887&r2=949888&view=diff
==============================================================================
---
lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-facet-sort.xml
(original)
+++
lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-facet-sort.xml
Mon May 31 23:24:40 2010
@@ -311,21 +311,6 @@
<bool name="httpCaching">false</bool>
</requestHandler>
- <!-- test elevation -->
- <searchComponent name="elevate"
class="org.apache.solr.handler.component.QueryElevationComponent" >
- <str name="queryFieldType">string</str>
- <str name="config-file">elevate.xml</str>
- </searchComponent>
-
- <requestHandler name="/elevate"
class="org.apache.solr.handler.component.SearchHandler">
- <lst name="defaults">
- <str name="echoParams">explicit</str>
- </lst>
- <arr name="last-components">
- <str>elevate</str>
- </arr>
- </requestHandler>
-
<searchComponent name="spellcheck"
class="org.apache.solr.handler.component.SpellCheckComponent">
<str name="queryAnalyzerFieldType">lowerfilt</str>
Modified:
lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-highlight.xml
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-highlight.xml?rev=949888&r1=949887&r2=949888&view=diff
==============================================================================
---
lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-highlight.xml
(original)
+++
lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-highlight.xml
Mon May 31 23:24:40 2010
@@ -302,22 +302,6 @@
<requestHandler name="/update" class="solr.XmlUpdateRequestHandler"
/>
<requestHandler name="/update/csv" class="solr.CSVRequestHandler"
startup="lazy" />
- <!-- test elevation -->
- <searchComponent name="elevate"
class="org.apache.solr.handler.component.QueryElevationComponent" >
- <str name="queryFieldType">string</str>
- <str name="config-file">elevate.xml</str>
- </searchComponent>
-
- <requestHandler name="/elevate"
class="org.apache.solr.handler.component.SearchHandler">
- <lst name="defaults">
- <str name="echoParams">explicit</str>
- </lst>
- <arr name="last-components">
- <str>elevate</str>
- </arr>
- </requestHandler>
-
-
<highlighting class="org.apache.solr.highlight.DummyHighlighter">
<!-- Configure the standard fragmenter -->
<fragmenter name="gap" class="org.apache.solr.highlight.GapFragmenter"
default="true">
Modified:
lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-nocache.xml
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-nocache.xml?rev=949888&r1=949887&r2=949888&view=diff
==============================================================================
---
lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-nocache.xml
(original)
+++
lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-nocache.xml
Mon May 31 23:24:40 2010
@@ -266,22 +266,6 @@
<requestHandler name="/update" class="solr.XmlUpdateRequestHandler"
/>
<requestHandler name="/update/csv" class="solr.CSVRequestHandler"
startup="lazy" />
- <!-- test elevation -->
- <searchComponent name="elevate"
class="org.apache.solr.handler.component.QueryElevationComponent" >
- <str name="queryFieldType">string</str>
- <str name="config-file">elevate.xml</str>
- </searchComponent>
-
- <requestHandler name="/elevate"
class="org.apache.solr.handler.component.SearchHandler">
- <lst name="defaults">
- <str name="echoParams">explicit</str>
- </lst>
- <arr name="last-components">
- <str>elevate</str>
- </arr>
- </requestHandler>
-
-
<highlighting>
<!-- Configure the standard fragmenter -->
<fragmenter name="gap" class="org.apache.solr.highlight.GapFragmenter"
default="true">
Modified:
lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-termindex.xml
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-termindex.xml?rev=949888&r1=949887&r2=949888&view=diff
==============================================================================
---
lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-termindex.xml
(original)
+++
lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-termindex.xml
Mon May 31 23:24:40 2010
@@ -328,21 +328,6 @@
<bool name="httpCaching">false</bool>
</requestHandler>
- <!-- test elevation -->
- <searchComponent name="elevate"
class="org.apache.solr.handler.component.QueryElevationComponent" >
- <str name="queryFieldType">string</str>
- <str name="config-file">elevate.xml</str>
- </searchComponent>
-
- <requestHandler name="/elevate"
class="org.apache.solr.handler.component.SearchHandler">
- <lst name="defaults">
- <str name="echoParams">explicit</str>
- </lst>
- <arr name="last-components">
- <str>elevate</str>
- </arr>
- </requestHandler>
-
<searchComponent name="spellcheck"
class="org.apache.solr.handler.component.SpellCheckComponent">
<str name="queryAnalyzerFieldType">lowerfilt</str>
Modified:
lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-xinclude.xml
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-xinclude.xml?rev=949888&r1=949887&r2=949888&view=diff
==============================================================================
---
lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-xinclude.xml
(original)
+++
lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig-xinclude.xml
Mon May 31 23:24:40 2010
@@ -305,21 +305,6 @@
<bool name="httpCaching">false</bool>
</requestHandler>
- <!-- test elevation -->
- <searchComponent name="elevate"
class="org.apache.solr.handler.component.QueryElevationComponent" >
- <str name="queryFieldType">string</str>
- <str name="config-file">elevate.xml</str>
- </searchComponent>
-
- <requestHandler name="/elevate"
class="org.apache.solr.handler.component.SearchHandler">
- <lst name="defaults">
- <str name="echoParams">explicit</str>
- </lst>
- <arr name="last-components">
- <str>elevate</str>
- </arr>
- </requestHandler>
-
<searchComponent name="spellcheck"
class="org.apache.solr.handler.component.SpellCheckComponent">
<str name="queryAnalyzerFieldType">lowerfilt</str>
