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 gs...@apache.org on 2008/05/26 14:03:03 UTC

svn commit: r660172 - in /lucene/solr/trunk: lib/ src/test/org/apache/solr/handler/

Author: gsingers
Date: Mon May 26 05:03:01 2008
New Revision: 660172

URL: http://svn.apache.org/viewvc?rev=660172&view=rev
Log:
SOLR-553: Finish off by adding right Lucene jars and fix the spell checker test

Added:
    lucene/solr/trunk/lib/lucene-analyzers-2.4-dev.jar   (with props)
    lucene/solr/trunk/lib/lucene-core-2.4-dev.jar   (with props)
    lucene/solr/trunk/lib/lucene-highlighter-2.4-dev.jar   (with props)
    lucene/solr/trunk/lib/lucene-queries-2.4-dev.jar   (with props)
    lucene/solr/trunk/lib/lucene-snowball-2.4-dev.jar   (with props)
    lucene/solr/trunk/lib/lucene-spellchecker-2.4-dev.jar   (with props)
Removed:
    lucene/solr/trunk/lib/lucene-analyzers-2.3.2.jar
    lucene/solr/trunk/lib/lucene-core-2.3.2.jar
    lucene/solr/trunk/lib/lucene-highlighter-2.3.2.jar
    lucene/solr/trunk/lib/lucene-queries-2.3.2.jar
    lucene/solr/trunk/lib/lucene-snowball-2.3.2.jar
    lucene/solr/trunk/lib/lucene-spellchecker-2.3.2.jar
Modified:
    lucene/solr/trunk/src/test/org/apache/solr/handler/SpellCheckerRequestHandlerTest.java

Added: lucene/solr/trunk/lib/lucene-analyzers-2.4-dev.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-analyzers-2.4-dev.jar?rev=660172&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/trunk/lib/lucene-analyzers-2.4-dev.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lucene/solr/trunk/lib/lucene-core-2.4-dev.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-core-2.4-dev.jar?rev=660172&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/trunk/lib/lucene-core-2.4-dev.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lucene/solr/trunk/lib/lucene-highlighter-2.4-dev.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-highlighter-2.4-dev.jar?rev=660172&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/trunk/lib/lucene-highlighter-2.4-dev.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lucene/solr/trunk/lib/lucene-queries-2.4-dev.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-queries-2.4-dev.jar?rev=660172&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/trunk/lib/lucene-queries-2.4-dev.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lucene/solr/trunk/lib/lucene-snowball-2.4-dev.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-snowball-2.4-dev.jar?rev=660172&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/trunk/lib/lucene-snowball-2.4-dev.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lucene/solr/trunk/lib/lucene-spellchecker-2.4-dev.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-spellchecker-2.4-dev.jar?rev=660172&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/trunk/lib/lucene-spellchecker-2.4-dev.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: lucene/solr/trunk/src/test/org/apache/solr/handler/SpellCheckerRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/org/apache/solr/handler/SpellCheckerRequestHandlerTest.java?rev=660172&r1=660171&r2=660172&view=diff
==============================================================================
--- lucene/solr/trunk/src/test/org/apache/solr/handler/SpellCheckerRequestHandlerTest.java (original)
+++ lucene/solr/trunk/src/test/org/apache/solr/handler/SpellCheckerRequestHandlerTest.java Mon May 26 05:03:01 2008
@@ -231,7 +231,7 @@
             ,"//int[@name='numDocs'][.=10]"
             ,"//lst[@name='cat']"
             ,"//lst[@name='cat']/int[@name='frequency'][.>0]"
-            ,"//lst[@name='cat']/lst[@name='suggestions' and count(lst)=0]"
+            ,"//lst[@name='cat']/lst[@name='suggestions']/lst[@name='cat']/int[@name='frequency'][.>0]"
             );
     
  
@@ -256,24 +256,26 @@
 
     lrf.args.put("sp.query.accuracy",".2");
     assertQ("Failed to spell check",
-            req("cat")
+            req("cap")
             ,"//int[@name='numDocs'][.=10]"
-            ,"//lst[@name='cat']"
-            ,"//lst[@name='cat']/int[@name='frequency'][.>0]"
-            ,"//lst[@name='cat']/lst[@name='suggestions']/lst[@name='cart']/int[@name='frequency'][.>0]"
-            ,"//lst[@name='cat']/lst[@name='suggestions']/lst[@name='cot']/int[@name='frequency'][.>0]"
-            ,"//lst[@name='cat']/lst[@name='suggestions']/lst[@name='cod']/int[@name='frequency'][.>0]"
-            ,"//lst[@name='cat']/lst[@name='suggestions']/lst[@name='carp']/int[@name='frequency'][.>0]"
+            ,"//lst[@name='cap']"
+            ,"//lst[@name='cap']/int[@name='frequency'][.=0]"
+            ,"//lst[@name='cap']/lst[@name='suggestions']/lst[@name='cat']/int[@name='frequency'][.>0]"
+            ,"//lst[@name='cap']/lst[@name='suggestions']/lst[@name='cart']/int[@name='frequency'][.>0]"
+            ,"//lst[@name='cap']/lst[@name='suggestions']/lst[@name='carp']/int[@name='frequency'][.>0]"
+            ,"//lst[@name='cap']/lst[@name='suggestions']/lst[@name='cot']/int[@name='frequency'][.>0]"
+            ,"//lst[@name='cap']/lst[@name='suggestions']/lst[@name='cod']/int[@name='frequency'][.>0]"
+            ,"//lst[@name='cap']/lst[@name='suggestions']/lst[@name='cant']/int[@name='frequency'][.>0]"
             );
 
     lrf.args.put("sp.query.suggestionCount", "2");
     lrf.args.put("sp.query.accuracy",".2");
     assertQ("Failed to spell check",
-            req("cat")
-            ,"//lst[@name='cat']"
-            ,"//lst[@name='cat']/int[@name='frequency'][.>0]"
-            ,"//lst[@name='cat']/lst[@name='suggestions']/lst[@name='cart']"
-            ,"//lst[@name='cat']/lst[@name='suggestions']/lst[@name='cot']"
+            req("cap")
+            ,"//lst[@name='cap']"
+            ,"//lst[@name='cap']/int[@name='frequency'][.=0]"
+            ,"//lst[@name='cap']/lst[@name='suggestions']/lst[@name='carp']"
+            ,"//lst[@name='cap']/lst[@name='suggestions']/lst[@name='cat']"
             );
 
     /* The following is the generated XML response for the next query with three words:
@@ -309,21 +311,20 @@
     lrf.args.put("sp.query.suggestionCount", "2");
     lrf.args.put("sp.query.accuracy",".2");
     assertQ("Failed to spell check",
-        req("cat cart carp")
-        ,"//lst[@name='cat']"
-        ,"//lst[@name='cat']/int[@name='frequency'][.>0]"
-        ,"//lst[@name='cat']/lst[@name='suggestions']/lst[@name='cart']"
-        ,"//lst[@name='cat']/lst[@name='suggestions']/lst[@name='cot']"
+        req("cad cart carm")
+        ,"//lst[@name='cad']"
+        ,"//lst[@name='cad']/int[@name='frequency'][.=0]"
+        ,"//lst[@name='cad']/lst[@name='suggestions']/lst[@name='cat']"
+        ,"//lst[@name='cad']/lst[@name='suggestions']/lst[@name='cod']"
 
         ,"//lst[@name='cart']"
         ,"//lst[@name='cart']/int[@name='frequency'][.>0]"
-        ,"//lst[@name='cart']/lst/lst[1]"
-        ,"//lst[@name='cart']/lst/lst[2]"
+        
 
-        ,"//lst[@name='carp']"
-        ,"//lst[@name='carp']/int[@name='frequency'][.>0]"
-        ,"//lst[@name='carp']/lst[@name='suggestions']/lst[@name='cart']"
-        ,"//lst[@name='carp']/lst[@name='suggestions']/lst[@name='corn']"
+        ,"//lst[@name='carm']"
+        ,"//lst[@name='carm']/int[@name='frequency'][.=0]"
+        ,"//lst[@name='carm']/lst[@name='suggestions']/lst[@name='cart']"
+        ,"//lst[@name='carm']/lst[@name='suggestions']/lst[@name='carp']"
 
     );
 



Re: svn commit: r660172 - in /lucene/solr/trunk: lib/ src/test/org/apache/solr/handler/

Posted by Erik Hatcher <er...@ehatchersolutions.com>.
Yes, I was also a bit squeamish with that commit.  Keeping a release  
(or at least a well known stable) version of Lucene in Solr is  
important.  We don't want the index file format, for example,  
changing out from under users in an unsupported (by Lucene standards)  
way.

I'm not sure what changed between the versions of Lucene that Otis  
overwrote, but if it includes index file format changes that may  
change before 2.4 final, then I think I'm -1 on this upgrade.

	Erik

On May 26, 2008, at 2:15 PM, Chris Hostetter wrote:

>
> I know i'm a little late to this party, but is anyone else a little
> worried about reving the Lucene Jars to 2.4-dev if we plan on  
> releasing
> 1.3 soon?
>
> I'm not squimish about releasing Solr using "trunk" jars of Lucene  
> when
> they "soak" in the Solr nightlies fora while, but upgrading to  
> trunk jars
> close to a release doesn't sit right in my stomach.
>
> :     lucene/solr/trunk/lib/lucene-analyzers-2.4-dev.jar   (with  
> props)
> :     lucene/solr/trunk/lib/lucene-core-2.4-dev.jar   (with props)
> :     lucene/solr/trunk/lib/lucene-highlighter-2.4-dev.jar   (with  
> props)
> :     lucene/solr/trunk/lib/lucene-queries-2.4-dev.jar   (with props)
> :     lucene/solr/trunk/lib/lucene-snowball-2.4-dev.jar   (with props)
> :     lucene/solr/trunk/lib/lucene-spellchecker-2.4-dev.jar   (with  
> props)
>
>
> -Hoss


Re: svn commit: r660172 - in /lucene/solr/trunk: lib/ src/test/org/apache/solr/handler/

Posted by Chris Hostetter <ho...@fucit.org>.
I know i'm a little late to this party, but is anyone else a little 
worried about reving the Lucene Jars to 2.4-dev if we plan on releasing 
1.3 soon?

I'm not squimish about releasing Solr using "trunk" jars of Lucene when 
they "soak" in the Solr nightlies fora while, but upgrading to trunk jars 
close to a release doesn't sit right in my stomach.

:     lucene/solr/trunk/lib/lucene-analyzers-2.4-dev.jar   (with props)
:     lucene/solr/trunk/lib/lucene-core-2.4-dev.jar   (with props)
:     lucene/solr/trunk/lib/lucene-highlighter-2.4-dev.jar   (with props)
:     lucene/solr/trunk/lib/lucene-queries-2.4-dev.jar   (with props)
:     lucene/solr/trunk/lib/lucene-snowball-2.4-dev.jar   (with props)
:     lucene/solr/trunk/lib/lucene-spellchecker-2.4-dev.jar   (with props)


-Hoss