You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2013/01/07 19:03:54 UTC

svn commit: r1429927 - in /lucene/dev/trunk: lucene/CHANGES.txt lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java

Author: rmuir
Date: Mon Jan  7 18:03:54 2013
New Revision: 1429927

URL: http://svn.apache.org/viewvc?rev=1429927&view=rev
Log:
LUCENE-4663: IndexSearcher.document should not be final

Modified:
    lucene/dev/trunk/lucene/CHANGES.txt
    lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java

Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1429927&r1=1429926&r2=1429927&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Mon Jan  7 18:03:54 2013
@@ -206,6 +206,10 @@ API Changes
   create your fst with finish(), and then call pack() to get another FST.
   Instead just pass true for doPackFST to Builder and finish() returns a packed FST.
   (Robert Muir)
+
+* LUCENE-4663: Deprecate IndexSearcher.document(int, Set). This was not intended
+  to be final, nor named document(). Use IndexSearcher.doc(int, Set) instead.
+  (Robert Muir)
   
 Bug Fixes
 

Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java?rev=1429927&r1=1429926&r2=1429927&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java Mon Jan  7 18:03:54 2013
@@ -201,7 +201,7 @@ public class IndexSearcher {
    * Sugar for <code>.getIndexReader().document(docID, fieldsToLoad)</code>
    * @see IndexReader#document(int, Set) 
    */
-  public final StoredDocument document(int docID, Set<String> fieldsToLoad) throws IOException {
+  public StoredDocument doc(int docID, Set<String> fieldsToLoad) throws IOException {
     return reader.document(docID, fieldsToLoad);
   }
 

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java?rev=1429927&r1=1429926&r2=1429927&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java Mon Jan  7 18:03:54 2013
@@ -570,6 +570,7 @@ public class SolrIndexSearcher extends I
    * filter is provided, only the provided fields will be loaded (the 
    * remainder will be available lazily).
    */
+  @Override
   public StoredDocument doc(int i, Set<String> fields) throws IOException {
     
     StoredDocument d;