lucene-solr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From markrmil...@apache.org
Subject svn commit: r915071 - in /lucene/solr/branches/cloud: ./ lib/ src/java/org/apache/solr/search/ src/java/org/apache/solr/search/function/ src/webapp/src/org/apache/solr/servlet/ src/webapp/web/admin/
Date Mon, 22 Feb 2010 21:20:14 GMT
Author: markrmiller
Date: Mon Feb 22 21:20:13 2010
New Revision: 915071

URL: http://svn.apache.org/viewvc?rev=915071&view=rev
Log:
merge up to r915035

Modified:
    lucene/solr/branches/cloud/   (props changed)
    lucene/solr/branches/cloud/CHANGES.txt
    lucene/solr/branches/cloud/lib/lucene-analyzers-2.9.2.jar
    lucene/solr/branches/cloud/lib/lucene-collation-2.9.2.jar
    lucene/solr/branches/cloud/lib/lucene-core-2.9.2.jar
    lucene/solr/branches/cloud/lib/lucene-fast-vector-highlighter-2.9.2.jar
    lucene/solr/branches/cloud/lib/lucene-highlighter-2.9.2.jar
    lucene/solr/branches/cloud/lib/lucene-memory-2.9.2.jar
    lucene/solr/branches/cloud/lib/lucene-misc-2.9.2.jar
    lucene/solr/branches/cloud/lib/lucene-queries-2.9.2.jar
    lucene/solr/branches/cloud/lib/lucene-snowball-2.9.2.jar
    lucene/solr/branches/cloud/lib/lucene-spatial-2.9.2.jar
    lucene/solr/branches/cloud/lib/lucene-spellchecker-2.9.2.jar
    lucene/solr/branches/cloud/src/java/org/apache/solr/search/QueryResultKey.java
    lucene/solr/branches/cloud/src/java/org/apache/solr/search/function/ValueSource.java
    lucene/solr/branches/cloud/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java
    lucene/solr/branches/cloud/src/webapp/web/admin/analysis.xsl
    lucene/solr/branches/cloud/src/webapp/web/admin/ping.xsl
    lucene/solr/branches/cloud/src/webapp/web/admin/registry.xsl
    lucene/solr/branches/cloud/src/webapp/web/admin/stats.xsl
    lucene/solr/branches/cloud/src/webapp/web/admin/tabular.xsl
    lucene/solr/branches/cloud/src/webapp/web/admin/threaddump.xsl

Propchange: lucene/solr/branches/cloud/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 22 21:20:13 2010
@@ -1 +1 @@
-/lucene/solr/trunk:888480-911595
+/lucene/solr/trunk:888480-915069

Modified: lucene/solr/branches/cloud/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/CHANGES.txt?rev=915071&r1=915070&r2=915071&view=diff
==============================================================================
--- lucene/solr/branches/cloud/CHANGES.txt (original)
+++ lucene/solr/branches/cloud/CHANGES.txt Mon Feb 22 21:20:13 2010
@@ -33,7 +33,7 @@
 
 Versions of Major Components
 ---------------------
-Apache Lucene 2.9.2-rc1 (r910082 on 2.9 branch)
+Apache Lucene 2.9.2-rc2
 Apache Tika 0.6
 Carrot2 3.1.0
 
@@ -188,8 +188,6 @@
 * SOLR-1777: fieldTypes with sortMissingLast=true or sortMissingFirst=true can
   result in incorrectly sorted results.  (yonik)
 
-* SOLR-1779: Fix parsing of points with more than 2 dimensions (gsingers)
-
 
 Other Changes
 ----------------------

Modified: lucene/solr/branches/cloud/lib/lucene-analyzers-2.9.2.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/lib/lucene-analyzers-2.9.2.jar?rev=915071&r1=915070&r2=915071&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/solr/branches/cloud/lib/lucene-collation-2.9.2.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/lib/lucene-collation-2.9.2.jar?rev=915071&r1=915070&r2=915071&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/solr/branches/cloud/lib/lucene-core-2.9.2.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/lib/lucene-core-2.9.2.jar?rev=915071&r1=915070&r2=915071&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/solr/branches/cloud/lib/lucene-fast-vector-highlighter-2.9.2.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/lib/lucene-fast-vector-highlighter-2.9.2.jar?rev=915071&r1=915070&r2=915071&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/solr/branches/cloud/lib/lucene-highlighter-2.9.2.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/lib/lucene-highlighter-2.9.2.jar?rev=915071&r1=915070&r2=915071&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/solr/branches/cloud/lib/lucene-memory-2.9.2.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/lib/lucene-memory-2.9.2.jar?rev=915071&r1=915070&r2=915071&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/solr/branches/cloud/lib/lucene-misc-2.9.2.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/lib/lucene-misc-2.9.2.jar?rev=915071&r1=915070&r2=915071&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/solr/branches/cloud/lib/lucene-queries-2.9.2.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/lib/lucene-queries-2.9.2.jar?rev=915071&r1=915070&r2=915071&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/solr/branches/cloud/lib/lucene-snowball-2.9.2.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/lib/lucene-snowball-2.9.2.jar?rev=915071&r1=915070&r2=915071&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/solr/branches/cloud/lib/lucene-spatial-2.9.2.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/lib/lucene-spatial-2.9.2.jar?rev=915071&r1=915070&r2=915071&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/solr/branches/cloud/lib/lucene-spellchecker-2.9.2.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/lib/lucene-spellchecker-2.9.2.jar?rev=915071&r1=915070&r2=915071&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/solr/branches/cloud/src/java/org/apache/solr/search/QueryResultKey.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/search/QueryResultKey.java?rev=915071&r1=915070&r2=915071&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/search/QueryResultKey.java (original)
+++ lucene/solr/branches/cloud/src/java/org/apache/solr/search/QueryResultKey.java Mon Feb
22 21:20:13 2010
@@ -50,15 +50,7 @@
 
     sfields = (this.sort !=null) ? this.sort.getSort() : defaultSort;
     for (SortField sf : sfields) {
-      // mix the bits so that sortFields are position dependent
-      // so that a,b won't hash to the same value as b,a
-      h ^= (h << 8) | (h >>> 25);   // reversible hash
-
-      if (sf.getField() != null) h += sf.getField().hashCode();
-      h += sf.getType();
-      if (sf.getReverse()) h=~h;
-      if (sf.getLocale()!=null) h+=sf.getLocale().hashCode();
-      if (sf.getFactory()!=null) h+=sf.getFactory().hashCode();
+      h = h*29 + sf.hashCode();
     }
 
     hc = h;
@@ -87,12 +79,7 @@
     for (int i=0; i<sfields.length; i++) {
       SortField sf1 = this.sfields[i];
       SortField sf2 = other.sfields[i];
-      if (sf1.getType() != sf2.getType()) return false;
-      if (sf1.getReverse() != sf2.getReverse()) return false;
-      if (!isEqual(sf1.getField(),sf2.getField())) return false;
-      if (!isEqual(sf1.getLocale(), sf2.getLocale())) return false;
-      if (!isEqual(sf1.getFactory(), sf2.getFactory())) return false;
-      // NOTE: the factory must be identical!!! use singletons!
+      if (!sf1.equals(sf2)) return false;
     }
 
     return true;

Modified: lucene/solr/branches/cloud/src/java/org/apache/solr/search/function/ValueSource.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/search/function/ValueSource.java?rev=915071&r1=915070&r2=915071&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/search/function/ValueSource.java (original)
+++ lucene/solr/branches/cloud/src/java/org/apache/solr/search/function/ValueSource.java Mon
Feb 22 21:20:13 2010
@@ -68,10 +68,13 @@
   }
 
   /**
+   * EXPERIMENTAL: This method is subject to change.
+   * <br>WARNING: Sorted function queries are not currently weighted.
+   * <p>
    * Get the SortField for this ValueSource.  Uses the {@link #getValues(java.util.Map, org.apache.lucene.index.IndexReader)}
    * to populate the SortField.
    * 
-   * @param reverse true if the order should be reversed.
+   * @param reverse true if this is a reverse sort.
    * @return The {@link org.apache.lucene.search.SortField} for the ValueSource
    * @throws IOException if there was a problem reading the values.
    */

Modified: lucene/solr/branches/cloud/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java?rev=915071&r1=915070&r2=915071&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java
(original)
+++ lucene/solr/branches/cloud/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java
Mon Feb 22 21:20:13 2010
@@ -91,7 +91,7 @@
     }
     catch( Throwable t ) {
       // catch this so our filter still works
-      log.error( "Could not start SOLR. Check solr/home property", t);
+      log.error( "Could not start Solr. Check solr/home property", t);
       SolrConfig.severeErrors.add( t );
       SolrCore.log( t );
     }

Modified: lucene/solr/branches/cloud/src/webapp/web/admin/analysis.xsl
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/webapp/web/admin/analysis.xsl?rev=915071&r1=915070&r2=915071&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/webapp/web/admin/analysis.xsl (original)
+++ lucene/solr/branches/cloud/src/webapp/web/admin/analysis.xsl Mon Feb 22 21:20:13 2010
@@ -36,11 +36,11 @@
         <link rel="stylesheet" type="text/css" href="solr-admin.css"></link>
         <link rel="icon" href="favicon.ico" type="image/ico"></link>
         <link rel="shortcut icon" href="favicon.ico" type="image/ico"></link>
-        <title>SOLR Info</title>
+        <title>Solr Info</title>
       </head>
       <body>
         <a href="">
-          <img border="0" align="right" height="78" width="142" src="solr_small.png" alt="SOLR"/>
+          <img border="0" align="right" height="78" width="142" src="solr_small.png" alt="Apache
Solr"/>
   </a>
         <h1>Solr Admin (<xsl:value-of select="solr/meta/collection" />)</h1>
         <div style="margin-top: 1em;">

Modified: lucene/solr/branches/cloud/src/webapp/web/admin/ping.xsl
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/webapp/web/admin/ping.xsl?rev=915071&r1=915070&r2=915071&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/webapp/web/admin/ping.xsl (original)
+++ lucene/solr/branches/cloud/src/webapp/web/admin/ping.xsl Mon Feb 22 21:20:13 2010
@@ -40,7 +40,7 @@
       </head>
       <body>
         <a href=".">
-	   <img border="0" align="right" height="78" width="142" src="solr_small.png" alt="SOLR">
+	   <img border="0" align="right" height="78" width="142" src="solr_small.png" alt="Apache
Solr">
 	   </img>
 	</a>
         <h1>Solr Admin (<xsl:value-of select="solr/meta/collection" />)</h1>

Modified: lucene/solr/branches/cloud/src/webapp/web/admin/registry.xsl
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/webapp/web/admin/registry.xsl?rev=915071&r1=915070&r2=915071&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/webapp/web/admin/registry.xsl (original)
+++ lucene/solr/branches/cloud/src/webapp/web/admin/registry.xsl Mon Feb 22 21:20:13 2010
@@ -38,14 +38,14 @@
         <link rel="stylesheet" type="text/css" href="solr-admin.css"></link>
 	<link rel="icon" href="favicon.ico" type="image/ico"></link>
 	<link rel="shortcut icon" href="favicon.ico" type="image/ico"></link>
-        <title>SOLR Info</title>
+        <title>Solr Info</title>
       </head>
       <body>
         <a href=".">
-	   <img border="0" align="right" height="78" width="142" src="solr_small.png" alt="SOLR">
+	   <img border="0" align="right" height="78" width="142" src="solr_small.png" alt="Apache
Solr">
 	   </img>
 	</a>
-        <h1>SOLR Info (<xsl:value-of select="solr/schema" />)</h1>
+        <h1>Solr Info (<xsl:value-of select="solr/schema" />)</h1>
           <xsl:value-of select="solr/host" />
           <br clear="all" />
         <xsl:apply-templates/>

Modified: lucene/solr/branches/cloud/src/webapp/web/admin/stats.xsl
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/webapp/web/admin/stats.xsl?rev=915071&r1=915070&r2=915071&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/webapp/web/admin/stats.xsl (original)
+++ lucene/solr/branches/cloud/src/webapp/web/admin/stats.xsl Mon Feb 22 21:20:13 2010
@@ -49,7 +49,7 @@
       </head>
       <body>
         <a href=".">
-	   <img border="0" align="right" height="78" width="142" src="solr_small.png" alt="SOLR">
+	   <img border="0" align="right" height="78" width="142" src="solr_small.png" alt="Apache
Solr">
 	   </img>
 	</a>
         <h1><xsl:value-of select="$title"/></h1>

Modified: lucene/solr/branches/cloud/src/webapp/web/admin/tabular.xsl
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/webapp/web/admin/tabular.xsl?rev=915071&r1=915070&r2=915071&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/webapp/web/admin/tabular.xsl (original)
+++ lucene/solr/branches/cloud/src/webapp/web/admin/tabular.xsl Mon Feb 22 21:20:13 2010
@@ -39,14 +39,14 @@
         <link rel="stylesheet" type="text/css" href="solr-admin.css"></link>
         <link rel="icon" href="favicon.ico" type="image/ico"></link>
         <link rel="shortcut icon" href="favicon.ico" type="image/ico"></link>
-        <title>SOLR Search Results</title>
+        <title>Solr Search Results</title>
       </head>
       <body>
         <a href=".">
-           <img border="0" align="right" height="78" width="142" src="solr_small.png"
alt="SOLR">
+           <img border="0" align="right" height="78" width="142" src="solr_small.png"
alt="Apache Solr">
            </img>
         </a>
-        <h1>SOLR Search Results</h1>
+        <h1>Solr Search Results</h1>
           <br clear="all" />
         <xsl:apply-templates/>
         <br /><br />

Modified: lucene/solr/branches/cloud/src/webapp/web/admin/threaddump.xsl
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/webapp/web/admin/threaddump.xsl?rev=915071&r1=915070&r2=915071&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/webapp/web/admin/threaddump.xsl (original)
+++ lucene/solr/branches/cloud/src/webapp/web/admin/threaddump.xsl Mon Feb 22 21:20:13 2010
@@ -36,11 +36,11 @@
         <link rel="stylesheet" type="text/css" href="solr-admin.css"></link>
         <link rel="icon" href="favicon.ico" type="image/ico"></link>
         <link rel="shortcut icon" href="favicon.ico" type="image/ico"></link>
-        <title>SOLR Info</title>
+        <title>Solr Info</title>
       </head>
       <body>
         <a href=".">
-          <img border="0" align="right" height="78" width="142" src="solr_small.png" alt="SOLR"/>
+          <img border="0" align="right" height="78" width="142" src="solr_small.png" alt="Apache
Solr"/>
         </a>
         <h1>Solr Admin (<xsl:value-of select="solr/meta/collection" />)</h1>
         <h2>Thread Dump</h2>



Mime
View raw message