lucene-solr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yo...@apache.org
Subject svn commit: r809010 - in /lucene/solr/trunk: ./ lib/ src/java/org/apache/solr/search/function/
Date Fri, 28 Aug 2009 19:58:20 GMT
Author: yonik
Date: Fri Aug 28 19:58:19 2009
New Revision: 809010

URL: http://svn.apache.org/viewvc?rev=809010&view=rev
Log:
upgrade to lucene-2.9-rc2

Added:
    lucene/solr/trunk/lib/lucene-analyzers-2.9.0-rc2.jar   (with props)
    lucene/solr/trunk/lib/lucene-core-2.9.0-rc2.jar   (with props)
    lucene/solr/trunk/lib/lucene-highlighter-2.9.0-rc2.jar   (with props)
    lucene/solr/trunk/lib/lucene-memory-2.9.0-rc2.jar   (with props)
    lucene/solr/trunk/lib/lucene-misc-2.9.0-rc2.jar   (with props)
    lucene/solr/trunk/lib/lucene-queries-2.9.0-rc2.jar   (with props)
    lucene/solr/trunk/lib/lucene-snowball-2.9.0-rc2.jar   (with props)
    lucene/solr/trunk/lib/lucene-spellchecker-2.9.0-rc2.jar   (with props)
Removed:
    lucene/solr/trunk/lib/lucene-analyzers-2.9-dev.jar
    lucene/solr/trunk/lib/lucene-core-2.9-dev.jar
    lucene/solr/trunk/lib/lucene-highlighter-2.9-dev.jar
    lucene/solr/trunk/lib/lucene-memory-2.9-dev.jar
    lucene/solr/trunk/lib/lucene-misc-2.9-dev.jar
    lucene/solr/trunk/lib/lucene-queries-2.9-dev.jar
    lucene/solr/trunk/lib/lucene-snowball-2.9-dev.jar
    lucene/solr/trunk/lib/lucene-spellchecker-2.9-dev.jar
Modified:
    lucene/solr/trunk/CHANGES.txt
    lucene/solr/trunk/src/java/org/apache/solr/search/function/BoostedQuery.java
    lucene/solr/trunk/src/java/org/apache/solr/search/function/FunctionQuery.java

Modified: lucene/solr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=809010&r1=809009&r2=809010&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Fri Aug 28 19:58:19 2009
@@ -50,7 +50,7 @@
 
 Versions of Major Components
 ----------------------------
-Apache Lucene 2.9-dev r804692
+Apache Lucene 2.9.0-rc2
 Apache Tika 0.4
 
 Detailed Change List

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

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

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

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

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

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

Added: lucene/solr/trunk/lib/lucene-memory-2.9.0-rc2.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-memory-2.9.0-rc2.jar?rev=809010&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/trunk/lib/lucene-memory-2.9.0-rc2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lucene/solr/trunk/lib/lucene-misc-2.9.0-rc2.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-misc-2.9.0-rc2.jar?rev=809010&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/trunk/lib/lucene-misc-2.9.0-rc2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

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

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

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

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

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

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

Modified: lucene/solr/trunk/src/java/org/apache/solr/search/function/BoostedQuery.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/search/function/BoostedQuery.java?rev=809010&r1=809009&r2=809010&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/search/function/BoostedQuery.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/search/function/BoostedQuery.java Fri Aug 28
19:58:19 2009
@@ -52,7 +52,7 @@
     q.extractTerms(terms);
   }
 
-  protected Weight createWeight(Searcher searcher) throws IOException {
+  public Weight createWeight(Searcher searcher) throws IOException {
     return new BoostedQuery.BoostedWeight(searcher);
   }
 
@@ -73,30 +73,34 @@
       return getBoost();
     }
 
+    @Override
     public float sumOfSquaredWeights() throws IOException {
       float sum = qWeight.sumOfSquaredWeights();
       sum *= getBoost() * getBoost();
       return sum ;
     }
 
+    @Override
     public void normalize(float norm) {
       norm *= getBoost();
       qWeight.normalize(norm);
     }
 
+    @Override
     public Scorer scorer(IndexReader reader, boolean scoreDocsInOrder, boolean topScorer)
throws IOException {
       Scorer subQueryScorer = qWeight.scorer(reader, true, false);
       return new BoostedQuery.CustomScorer(getSimilarity(searcher), searcher, reader, this,
subQueryScorer, boostVal);
     }
 
-    public Explanation explain(Searcher searcher, IndexReader reader, int doc) throws IOException
{
+    @Override
+    public Explanation explain(IndexReader reader, int doc) throws IOException {
       SolrIndexReader topReader = (SolrIndexReader)reader;
       SolrIndexReader[] subReaders = topReader.getLeafReaders();
       int[] offsets = topReader.getLeafOffsets();
       int readerPos = SolrIndexReader.readerIndex(doc, offsets);
       int readerBase = offsets[readerPos];
 
-      Explanation subQueryExpl = qWeight.explain(searcher,reader,doc);
+      Explanation subQueryExpl = qWeight.explain(reader,doc);
       if (!subQueryExpl.isMatch()) {
         return subQueryExpl;
       }
@@ -157,7 +161,7 @@
     }
 
     public Explanation explain(int doc) throws IOException {
-      Explanation subQueryExpl = weight.qWeight.explain(searcher,reader,doc);
+      Explanation subQueryExpl = weight.qWeight.explain(reader,doc);
       if (!subQueryExpl.isMatch()) {
         return subQueryExpl;
       }

Modified: lucene/solr/trunk/src/java/org/apache/solr/search/function/FunctionQuery.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/search/function/FunctionQuery.java?rev=809010&r1=809009&r2=809010&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/search/function/FunctionQuery.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/search/function/FunctionQuery.java Fri Aug
28 19:58:19 2009
@@ -63,7 +63,6 @@
       this.searcher = searcher;
     }
 
-
     public Query getQuery() {
       return FunctionQuery.this;
     }
@@ -72,21 +71,25 @@
       return queryWeight;
     }
 
+    @Override
     public float sumOfSquaredWeights() throws IOException {
       queryWeight = getBoost();
       return queryWeight * queryWeight;
     }
 
+    @Override
     public void normalize(float norm) {
       this.queryNorm = norm;
       queryWeight *= this.queryNorm;
     }
 
+    @Override
     public Scorer scorer(IndexReader reader, boolean scoreDocsInOrder, boolean topScorer)
throws IOException {
       return new AllScorer(getSimilarity(searcher), reader, this);
     }
 
-    public Explanation explain(Searcher searcher, IndexReader reader, int doc) throws IOException
{
+    @Override
+    public Explanation explain(IndexReader reader, int doc) throws IOException {
       SolrIndexReader topReader = (SolrIndexReader)reader;
       SolrIndexReader[] subReaders = topReader.getLeafReaders();
       int[] offsets = topReader.getLeafOffsets();
@@ -194,7 +197,7 @@
   }
 
 
-  protected Weight createWeight(Searcher searcher) {
+  public Weight createWeight(Searcher searcher) {
     return new FunctionQuery.FunctionWeight(searcher);
   }
 



Mime
View raw message