svn commit: r1200735 - in /lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs: DefaultTermVectorsReader.java ParallelArrayTermVectorMapper.java TermVectorsReader.java

[rm...@apache.org]

Author: rmuir
Date: Fri Nov 11 04:24:50 2011
New Revision: 1200735

URL: http://svn.apache.org/viewvc?rev=1200735&view=rev
Log:
LUCENE-2621: move sugar implementation up to abstract class

Modified:
    lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/DefaultTermVectorsReader.java
    lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/ParallelArrayTermVectorMapper.java
    lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/TermVectorsReader.java

Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/DefaultTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/DefaultTermVectorsReader.java?rev=1200735&r1=1200734&r2=1200735&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/DefaultTermVectorsReader.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/DefaultTermVectorsReader.java Fri Nov 11 04:24:50 2011
@@ -278,24 +278,6 @@ public class DefaultTermVectorsReader ex
     }
   }
 
-
-
-  /**
-   * Retrieve the term vector for the given document and field
-   * @param docNum The document number to retrieve the vector for
-   * @param field The field within the document to retrieve
-   * @return The TermFreqVector for the document and field or null if there is no termVector for this field.
-   * @throws IOException if there is an error reading the term vector files
-   */
-  @Override
-  public TermFreqVector get(int docNum, String field) throws IOException {
-    // Check if no term vectors are available for this segment at all
-    ParallelArrayTermVectorMapper mapper = new ParallelArrayTermVectorMapper();
-    get(docNum, field, mapper);
-
-    return mapper.materializeVector();
-  }
-
   // Reads the String[] fields; you have to pre-seek tvd to
   // the right point
   private String[] readFields(int fieldCount) throws IOException {

Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/ParallelArrayTermVectorMapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/ParallelArrayTermVectorMapper.java?rev=1200735&r1=1200734&r2=1200735&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/ParallelArrayTermVectorMapper.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/ParallelArrayTermVectorMapper.java Fri Nov 11 04:24:50 2011
@@ -23,7 +23,7 @@ import org.apache.lucene.index.TermVecto
 import org.apache.lucene.util.BytesRef;
 
 /**
- * Used by {@link DefaultTermVectorsReader} to retrieve term vectors.
+ * Used by {@link TermVectorsReader#get(int, String)} to retrieve term vectors.
  */
 // Models the existing parallel array structure
 public class ParallelArrayTermVectorMapper extends TermVectorMapper {

Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/TermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/TermVectorsReader.java?rev=1200735&r1=1200734&r2=1200735&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/TermVectorsReader.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/TermVectorsReader.java Fri Nov 11 04:24:50 2011
@@ -31,10 +31,25 @@ import org.apache.lucene.index.TermVecto
 public abstract class TermVectorsReader implements Cloneable,Closeable {
   // TODO: can we consolidate all these get's?
   public abstract TermFreqVector[] get(int doc) throws IOException;
-  public abstract TermFreqVector get(int doc, String field) throws IOException;
   
   public abstract void get(int doc, TermVectorMapper mapper) throws IOException;
   public abstract void get(int doc, String field, TermVectorMapper mapper) throws IOException;
 
   public abstract TermVectorsReader clone();
+
+  /**
+   * Retrieve the term vector for the given document and field
+   * @param docNum The document number to retrieve the vector for
+   * @param field The field within the document to retrieve
+   * @return The TermFreqVector for the document and field or null if there is no termVector for this field.
+   * @throws IOException if there is an error reading the term vector files
+   */
+  // TODO: does this method belong here? This seems like sugar...
+  public TermFreqVector get(int doc, String field) throws IOException {
+    // Check if no term vectors are available for this segment at all
+    ParallelArrayTermVectorMapper mapper = new ParallelArrayTermVectorMapper();
+    get(doc, field, mapper);
+
+    return mapper.materializeVector();
+  }
 }