You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by ma...@apache.org on 2010/02/16 17:47:21 UTC
svn commit: r910589 - in /lucene/solr/branches/cloud: ./ example/solr/conf/
lib/ src/java/org/apache/solr/search/function/ src/webapp/web/admin/
Author: markrmiller
Date: Tue Feb 16 16:47:20 2010
New Revision: 910589
URL: http://svn.apache.org/viewvc?rev=910589&view=rev
Log:
merge up to r910306
Added:
lucene/solr/branches/cloud/lib/lucene-analyzers-2.9.2.jar
- copied unchanged from r910306, lucene/solr/trunk/lib/lucene-analyzers-2.9.2.jar
lucene/solr/branches/cloud/lib/lucene-collation-2.9.2.jar
- copied unchanged from r910306, lucene/solr/trunk/lib/lucene-collation-2.9.2.jar
lucene/solr/branches/cloud/lib/lucene-core-2.9.2.jar
- copied unchanged from r910306, lucene/solr/trunk/lib/lucene-core-2.9.2.jar
lucene/solr/branches/cloud/lib/lucene-fast-vector-highlighter-2.9.2.jar
- copied unchanged from r910306, lucene/solr/trunk/lib/lucene-fast-vector-highlighter-2.9.2.jar
lucene/solr/branches/cloud/lib/lucene-highlighter-2.9.2.jar
- copied unchanged from r910306, lucene/solr/trunk/lib/lucene-highlighter-2.9.2.jar
lucene/solr/branches/cloud/lib/lucene-memory-2.9.2.jar
- copied unchanged from r910306, lucene/solr/trunk/lib/lucene-memory-2.9.2.jar
lucene/solr/branches/cloud/lib/lucene-misc-2.9.2.jar
- copied unchanged from r910306, lucene/solr/trunk/lib/lucene-misc-2.9.2.jar
lucene/solr/branches/cloud/lib/lucene-queries-2.9.2.jar
- copied unchanged from r910306, lucene/solr/trunk/lib/lucene-queries-2.9.2.jar
lucene/solr/branches/cloud/lib/lucene-snowball-2.9.2.jar
- copied unchanged from r910306, lucene/solr/trunk/lib/lucene-snowball-2.9.2.jar
lucene/solr/branches/cloud/lib/lucene-spatial-2.9.2.jar
- copied unchanged from r910306, lucene/solr/trunk/lib/lucene-spatial-2.9.2.jar
lucene/solr/branches/cloud/lib/lucene-spellchecker-2.9.2.jar
- copied unchanged from r910306, lucene/solr/trunk/lib/lucene-spellchecker-2.9.2.jar
Removed:
lucene/solr/branches/cloud/lib/lucene-analyzers-2.9.1-dev.jar
lucene/solr/branches/cloud/lib/lucene-collation-2.9.1-dev.jar
lucene/solr/branches/cloud/lib/lucene-core-2.9.1-dev.jar
lucene/solr/branches/cloud/lib/lucene-fast-vector-highlighter-2.9.1-dev.jar
lucene/solr/branches/cloud/lib/lucene-highlighter-2.9.1-dev.jar
lucene/solr/branches/cloud/lib/lucene-memory-2.9.1-dev.jar
lucene/solr/branches/cloud/lib/lucene-misc-2.9.1-dev.jar
lucene/solr/branches/cloud/lib/lucene-queries-2.9.1-dev.jar
lucene/solr/branches/cloud/lib/lucene-snowball-2.9.1-dev.jar
lucene/solr/branches/cloud/lib/lucene-spatial-2.9.1-dev.jar
lucene/solr/branches/cloud/lib/lucene-spellchecker-2.9.1-dev.jar
Modified:
lucene/solr/branches/cloud/ (props changed)
lucene/solr/branches/cloud/CHANGES.txt
lucene/solr/branches/cloud/common-build.xml
lucene/solr/branches/cloud/example/solr/conf/solrconfig.xml
lucene/solr/branches/cloud/src/java/org/apache/solr/search/function/StringIndexDocValues.java
lucene/solr/branches/cloud/src/webapp/web/admin/stats.jsp
Propchange: lucene/solr/branches/cloud/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 16 16:47:20 2010
@@ -1 +1 @@
-/lucene/solr/trunk:888480-908357
+/lucene/solr/trunk:888480-910306
Modified: lucene/solr/branches/cloud/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/CHANGES.txt?rev=910589&r1=910588&r2=910589&view=diff
==============================================================================
--- lucene/solr/branches/cloud/CHANGES.txt (original)
+++ lucene/solr/branches/cloud/CHANGES.txt Tue Feb 16 16:47:20 2010
@@ -33,6 +33,9 @@
Versions of Major Components
---------------------
+Apache Lucene 2.9.2-rc1 (r910082 on 2.9 branch)
+Apache Tika 0.4
+Carrot2 3.1.0
Detailed Change List
----------------------
@@ -175,6 +178,9 @@
* SOLR-1736:In the slave , If 'mov'ing file does not succeed , copy the file (noble)
+* SOLR-1579: Fixes to XML escaping in stats.jsp
+ (David Bowen and hossman)
+
Other Changes
----------------------
@@ -227,10 +233,11 @@
* SOLR-1696 : Deprecate old <highlighting> syntax and move configuration to HighlightComponent (noble)
-* Upgraded to Lucene 2.9-dev r900226 (koji)
-
* SOLR-1727: SolrEventListener should extend NamedListInitializedPlugin (noble)
-
+
+* SOLR-1771: Improved error message when StringIndex cannot be initialized
+ for a function query (hossman)
+
Build
----------------------
Modified: lucene/solr/branches/cloud/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/common-build.xml?rev=910589&r1=910588&r2=910589&view=diff
==============================================================================
--- lucene/solr/branches/cloud/common-build.xml (original)
+++ lucene/solr/branches/cloud/common-build.xml Tue Feb 16 16:47:20 2010
@@ -114,7 +114,7 @@
The version suffix of the Lucene artifacts checked into "lib"
IF YOU CHANGE THIS, SANITY CHECK "javadoc.link.lucene"
-->
- <property name="lucene_version" value="2.9.1-dev"/>
+ <property name="lucene_version" value="2.9.2"/>
<!-- The version number to assign to the Maven artifacts. -->
<property name="maven_version" value="1.5-SNAPSHOT"/>
Modified: lucene/solr/branches/cloud/example/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/example/solr/conf/solrconfig.xml?rev=910589&r1=910588&r2=910589&view=diff
==============================================================================
--- lucene/solr/branches/cloud/example/solr/conf/solrconfig.xml (original)
+++ lucene/solr/branches/cloud/example/solr/conf/solrconfig.xml Tue Feb 16 16:47:20 2010
@@ -36,7 +36,7 @@
and use them to resolve any "plugins" specified in your solrconfig.xml or
schema.xml (ie: Analyzers, Request Handlers, etc...).
- All directories and paths are resolved relative the instanceDir.
+ All directories and paths are resolved relative to the instanceDir.
If a "./lib" directory exists in your instanceDir, all files found in it
are included as if you had used the following syntax...
Modified: lucene/solr/branches/cloud/src/java/org/apache/solr/search/function/StringIndexDocValues.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/search/function/StringIndexDocValues.java?rev=910589&r1=910588&r2=910589&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/search/function/StringIndexDocValues.java (original)
+++ lucene/solr/branches/cloud/src/java/org/apache/solr/search/function/StringIndexDocValues.java Tue Feb 16 16:47:20 2010
@@ -32,12 +32,16 @@
protected final ValueSource vs;
public StringIndexDocValues(ValueSource vs, IndexReader reader, String field) throws IOException {
- index = FieldCache.DEFAULT.getStringIndex(reader, field);
+ try {
+ index = FieldCache.DEFAULT.getStringIndex(reader, field);
+ } catch (RuntimeException e) {
+ throw new StringIndexException(field, e);
+ }
order = index.order;
lookup = index.lookup;
this.vs = vs;
}
-
+
protected abstract String toTerm(String readableValue);
@Override
@@ -82,4 +86,12 @@
return vs.description() + '=' + strVal(doc);
}
+ public static final class StringIndexException extends RuntimeException {
+ public StringIndexException(final String fieldName,
+ final RuntimeException cause) {
+ super("Can't initialize StringIndex to generate (function) " +
+ "DocValues for field: " + fieldName, cause);
+ }
}
+
+}
Modified: lucene/solr/branches/cloud/src/webapp/web/admin/stats.jsp
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/webapp/web/admin/stats.jsp?rev=910589&r1=910588&r2=910589&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/webapp/web/admin/stats.jsp (original)
+++ lucene/solr/branches/cloud/src/webapp/web/admin/stats.jsp Tue Feb 16 16:47:20 2010
@@ -27,12 +27,12 @@
<solr>
<%
if (core.getName() != null) { %>
- <core><%=core.getName()%></core>
+ <core><% XML.escapeCharData(core.getName(), out); %></core>
<% } %>
- <schema><%= collectionName %></schema>
- <host><%= hostname %></host>
- <now><%= new Date().toString() %></now>
- <start><%= new Date(core.getStartTime()) %></start>
+ <schema><% XML.escapeCharData(collectionName, out); %></schema>
+ <host><% XML.escapeCharData(hostname, out); %></host>
+ <now><% XML.escapeCharData(new Date().toString(), out); %></now>
+ <start><% XML.escapeCharData(new Date(core.getStartTime()).toString(), out); %></start>
<solr-info>
<%
for (SolrInfoMBean.Category cat : SolrInfoMBean.Category.values()) {
@@ -55,23 +55,23 @@
%>
<entry>
<name>
- <%= key %>
+ <% XML.escapeCharData(key, out); %>
</name>
<class>
- <%= name %>
+ <% XML.escapeCharData(name, out); %>
</class>
<version>
- <%= vers %>
+ <% XML.escapeCharData(vers, out); %>
</version>
<description>
- <%= desc %>
+ <% XML.escapeCharData(desc, out); %>
</description>
<stats>
<%
for (int i = 0; i < nl.size() ; i++) {
%>
- <stat name="<%XML.escapeCharData(nl.getName(i), out); %>" >
- <%= nl.getVal(i).toString() %>
+ <stat name="<% XML.escapeAttributeValue(nl.getName(i), out); %>" >
+ <% XML.escapeCharData(nl.getVal(i).toString(), out); %>
</stat>
<%
}