lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rm...@apache.org
Subject svn commit: r1213426 [1/2] - in /lucene/dev/branches/lucene3622: modules/grouping/src/java/org/apache/lucene/search/grouping/function/ modules/queries/src/java/org/apache/lucene/queries/function/ modules/queries/src/java/org/apache/lucene/queries/funct...
Date Mon, 12 Dec 2011 20:33:29 GMT
Author: rmuir
Date: Mon Dec 12 20:33:26 2011
New Revision: 1213426

URL: http://svn.apache.org/viewvc?rev=1213426&view=rev
Log:
LUCENE-3622: function DocValues -> FunctionValues

Added:
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/FunctionValues.java
      - copied, changed from r1213408, lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/DocValues.java
Removed:
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/DocValues.java
Modified:
    lucene/dev/branches/lucene3622/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupHeadsCollector.java
    lucene/dev/branches/lucene3622/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupsCollector.java
    lucene/dev/branches/lucene3622/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionFirstPassGroupingCollector.java
    lucene/dev/branches/lucene3622/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/ValueSource.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/BoolDocValues.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/DoubleDocValues.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/FloatDocValues.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/IntDocValues.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/LongDocValues.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StrDocValues.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StringIndexDocValues.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/BytesRefFieldSource.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstValueSource.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DefFunction.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DivFloatFunction.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleConstValueSource.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DualFloatFunction.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LinearFloatFunction.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxFloatFunction.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MinFloatFunction.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFunction.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumericIndexDocValueSource.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/PowFloatFunction.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ProductFloatFunction.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/RangeMapFloatFunction.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReciprocalFloatFunction.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReverseOrdFieldSource.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ShortFieldSource.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleBoolFunction.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleFloatFunction.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SumFloatFunction.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TotalTermFreqValueSource.java
    lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/VectorValueSource.java
    lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/response/transform/ValueSourceAugmenter.java
    lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/schema/BoolField.java
    lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/schema/DateField.java
    lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/schema/LatLonType.java
    lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/schema/RandomSortField.java
    lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/schema/SortableDoubleField.java
    lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/schema/SortableFloatField.java
    lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/schema/SortableIntField.java
    lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/schema/SortableLongField.java
    lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/schema/StrFieldSource.java
    lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java
    lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java
    lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java
    lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/search/function/distance/GeohashFunction.java
    lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java
    lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java
    lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/search/function/distance/HaversineFunction.java
    lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java
    lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java
    lucene/dev/branches/lucene3622/solr/core/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java
    lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/core/DummyValueSourceParser.java
    lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java
    lucene/dev/branches/lucene3622/solr/core/src/test/org/apache/solr/search/function/NvlValueSourceParser.java

Modified: lucene/dev/branches/lucene3622/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupHeadsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupHeadsCollector.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupHeadsCollector.java (original)
+++ lucene/dev/branches/lucene3622/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupHeadsCollector.java Mon Dec 12 20:33:26 2011
@@ -18,7 +18,7 @@ package org.apache.lucene.search.groupin
  */
 
 import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.search.FieldComparator;
 import org.apache.lucene.search.Scorer;
@@ -45,7 +45,7 @@ public class FunctionAllGroupHeadsCollec
   private final Map<MutableValue, GroupHead> groups;
   private final Sort sortWithinGroup;
 
-  private DocValues.ValueFiller filler;
+  private FunctionValues.ValueFiller filler;
   private MutableValue mval;
   private IndexReader.AtomicReaderContext readerContext;
   private Scorer scorer;
@@ -105,7 +105,7 @@ public class FunctionAllGroupHeadsCollec
 
   public void setNextReader(IndexReader.AtomicReaderContext context) throws IOException {
     this.readerContext = context;
-    DocValues docValues = groupBy.getValues(vsContext, context);
+    FunctionValues docValues = groupBy.getValues(vsContext, context);
     filler = docValues.getValueFiller();
     mval = filler.getValue();
 

Modified: lucene/dev/branches/lucene3622/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupsCollector.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupsCollector.java (original)
+++ lucene/dev/branches/lucene3622/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupsCollector.java Mon Dec 12 20:33:26 2011
@@ -18,7 +18,7 @@ package org.apache.lucene.search.groupin
  */
 
 import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.search.grouping.AbstractAllGroupsCollector;
 import org.apache.lucene.util.mutable.MutableValue;
@@ -36,7 +36,7 @@ import java.util.TreeSet;
  * the most relevant document of a group.
  *
  * <p/>
- * Implementation detail: Uses {@link ValueSource} and {@link DocValues} to retrieve the
+ * Implementation detail: Uses {@link ValueSource} and {@link FunctionValues} to retrieve the
  * field values to group by.
  *
  * @lucene.experimental
@@ -47,7 +47,7 @@ public class FunctionAllGroupsCollector 
   private final ValueSource groupBy;
   private final SortedSet<MutableValue> groups = new TreeSet<MutableValue>();
 
-  private DocValues.ValueFiller filler;
+  private FunctionValues.ValueFiller filler;
   private MutableValue mval;
 
   /**
@@ -79,7 +79,7 @@ public class FunctionAllGroupsCollector 
    * {@inheritDoc}
    */
   public void setNextReader(IndexReader.AtomicReaderContext context) throws IOException {
-    DocValues docValues = groupBy.getValues(vsContext, context);
+    FunctionValues docValues = groupBy.getValues(vsContext, context);
     filler = docValues.getValueFiller();
     mval = filler.getValue();
   }

Modified: lucene/dev/branches/lucene3622/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionFirstPassGroupingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionFirstPassGroupingCollector.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionFirstPassGroupingCollector.java (original)
+++ lucene/dev/branches/lucene3622/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionFirstPassGroupingCollector.java Mon Dec 12 20:33:26 2011
@@ -18,7 +18,7 @@ package org.apache.lucene.search.groupin
  */
 
 import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.search.Sort;
 import org.apache.lucene.search.grouping.AbstractFirstPassGroupingCollector;
@@ -38,8 +38,8 @@ public class FunctionFirstPassGroupingCo
   private final ValueSource groupByVS;
   private final Map vsContext;
 
-  private DocValues docValues;
-  private DocValues.ValueFiller filler;
+  private FunctionValues docValues;
+  private FunctionValues.ValueFiller filler;
   private MutableValue mval;
 
   /**

Modified: lucene/dev/branches/lucene3622/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java (original)
+++ lucene/dev/branches/lucene3622/modules/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java Mon Dec 12 20:33:26 2011
@@ -18,7 +18,7 @@ package org.apache.lucene.search.groupin
  */
 
 import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.search.Sort;
 import org.apache.lucene.search.grouping.AbstractSecondPassGroupingCollector;
@@ -41,7 +41,7 @@ public class FunctionSecondPassGroupingC
   private final ValueSource groupByVS;
   private final Map vsContext;
 
-  private DocValues.ValueFiller filler;
+  private FunctionValues.ValueFiller filler;
   private MutableValue mval;
 
   /**
@@ -77,7 +77,7 @@ public class FunctionSecondPassGroupingC
    */
   public void setNextReader(IndexReader.AtomicReaderContext readerContext) throws IOException {
     super.setNextReader(readerContext);
-    DocValues docValues = groupByVS.getValues(vsContext, readerContext);
+    FunctionValues docValues = groupByVS.getValues(vsContext, readerContext);
     filler = docValues.getValueFiller();
     mval = filler.getValue();
   }

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java Mon Dec 12 20:33:26 2011
@@ -108,7 +108,7 @@ public class BoostedQuery extends Query 
       if (!subQueryExpl.isMatch()) {
         return subQueryExpl;
       }
-      DocValues vals = boostVal.getValues(fcontext, readerContext);
+      FunctionValues vals = boostVal.getValues(fcontext, readerContext);
       float sc = subQueryExpl.getValue() * vals.floatVal(doc);
       Explanation res = new ComplexExplanation(
         true, sc, BoostedQuery.this.toString() + ", product of:");
@@ -123,7 +123,7 @@ public class BoostedQuery extends Query 
     private final BoostedQuery.BoostedWeight weight;
     private final float qWeight;
     private final Scorer scorer;
-    private final DocValues vals;
+    private final FunctionValues vals;
     private final AtomicReaderContext readerContext;
 
     private CustomScorer(AtomicReaderContext readerContext, BoostedQuery.BoostedWeight w, float qWeight,

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java Mon Dec 12 20:33:26 2011
@@ -106,7 +106,7 @@ public class FunctionQuery extends Query
     final int maxDoc;
     final float qWeight;
     int doc=-1;
-    final DocValues vals;
+    final FunctionValues vals;
     final Bits liveDocs;
 
     public AllScorer(AtomicReaderContext context, Bits acceptDocs, FunctionWeight w, float qWeight) throws IOException {

Copied: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/FunctionValues.java (from r1213408, lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/DocValues.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/FunctionValues.java?p2=lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/FunctionValues.java&p1=lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/DocValues.java&r1=1213408&r2=1213426&rev=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/DocValues.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/FunctionValues.java Mon Dec 12 20:33:26 2011
@@ -30,13 +30,13 @@ import org.apache.lucene.util.mutable.Mu
  *
  */
 
-// DocValues is distinct from ValueSource because
+// FunctionValues is distinct from ValueSource because
 // there needs to be an object created at query evaluation time that
 // is not referenced by the query itself because:
 // - Query objects should be MT safe
 // - For caching, Query objects are often used as keys... you don't
 //   want the Query carrying around big objects
-public abstract class DocValues {
+public abstract class FunctionValues {
 
   public byte byteVal(int doc) { throw new UnsupportedOperationException(); }
   public short shortVal(int doc) { throw new UnsupportedOperationException(); }
@@ -65,7 +65,7 @@ public abstract class DocValues {
 
   /** Native Java Object representation of the value */
   public Object objectVal(int doc) {
-    // most DocValues are functions, so by default return a Float()
+    // most FunctionValues are functions, so by default return a Float()
     return floatVal(doc);
   }
 

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/ValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/ValueSource.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/ValueSource.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/ValueSource.java Mon Dec 12 20:33:26 2011
@@ -33,7 +33,7 @@ import java.util.IdentityHashMap;
 import java.util.Map;
 
 /**
- * Instantiates {@link DocValues} for a particular reader.
+ * Instantiates {@link FunctionValues} for a particular reader.
  * <br>
  * Often used when creating a {@link FunctionQuery}.
  *
@@ -45,7 +45,7 @@ public abstract class ValueSource implem
    * Gets the values for this reader and the context that was previously
    * passed to createWeight()
    */
-  public abstract DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException;
+  public abstract FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException;
 
   @Override
   public abstract boolean equals(Object o);
@@ -129,12 +129,12 @@ public abstract class ValueSource implem
 
   /**
    * Implement a {@link org.apache.lucene.search.FieldComparator} that works
-   * off of the {@link DocValues} for a ValueSource
+   * off of the {@link FunctionValues} for a ValueSource
    * instead of the normal Lucene FieldComparator that works off of a FieldCache.
    */
   class ValueSourceComparator extends FieldComparator<Double> {
     private final double[] values;
-    private DocValues docVals;
+    private FunctionValues docVals;
     private double bottom;
     private Map fcontext;
 

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java Mon Dec 12 20:33:26 2011
@@ -28,11 +28,11 @@ public class ValueSourceScorer extends S
   protected IndexReader reader;
   private int doc = -1;
   protected final int maxDoc;
-  protected final DocValues values;
+  protected final FunctionValues values;
   protected boolean checkDeletes;
   private final Bits liveDocs;
 
-  protected ValueSourceScorer(IndexReader reader, DocValues values) {
+  protected ValueSourceScorer(IndexReader reader, FunctionValues values) {
     super(null);
     this.reader = reader;
     this.maxDoc = reader.maxDoc();

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/BoolDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/BoolDocValues.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/BoolDocValues.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/BoolDocValues.java Mon Dec 12 20:33:26 2011
@@ -1,12 +1,12 @@
 package org.apache.lucene.queries.function.docvalues;
 
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.util.mutable.MutableValue;
 import org.apache.lucene.util.mutable.MutableValueBool;
 
 
-public abstract class BoolDocValues extends DocValues {
+public abstract class BoolDocValues extends FunctionValues {
   protected final ValueSource vs;
 
   public BoolDocValues(ValueSource vs) {

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/DoubleDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/DoubleDocValues.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/DoubleDocValues.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/DoubleDocValues.java Mon Dec 12 20:33:26 2011
@@ -1,11 +1,11 @@
 package org.apache.lucene.queries.function.docvalues;
 
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.util.mutable.MutableValue;
 import org.apache.lucene.util.mutable.MutableValueDouble;
 
-public abstract class DoubleDocValues extends DocValues {
+public abstract class DoubleDocValues extends FunctionValues {
   protected final ValueSource vs;
 
   public DoubleDocValues(ValueSource vs) {

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/FloatDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/FloatDocValues.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/FloatDocValues.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/FloatDocValues.java Mon Dec 12 20:33:26 2011
@@ -1,11 +1,11 @@
 package org.apache.lucene.queries.function.docvalues;
 
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.util.mutable.MutableValue;
 import org.apache.lucene.util.mutable.MutableValueFloat;
 
-public abstract class FloatDocValues extends DocValues {
+public abstract class FloatDocValues extends FunctionValues {
   protected final ValueSource vs;
 
   public FloatDocValues(ValueSource vs) {

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/IntDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/IntDocValues.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/IntDocValues.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/IntDocValues.java Mon Dec 12 20:33:26 2011
@@ -1,12 +1,12 @@
 package org.apache.lucene.queries.function.docvalues;
 
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.util.mutable.MutableValue;
 import org.apache.lucene.util.mutable.MutableValueInt;
 
 
-public abstract class IntDocValues extends DocValues {
+public abstract class IntDocValues extends FunctionValues {
   protected final ValueSource vs;
 
   public IntDocValues(ValueSource vs) {

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/LongDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/LongDocValues.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/LongDocValues.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/LongDocValues.java Mon Dec 12 20:33:26 2011
@@ -1,12 +1,12 @@
 package org.apache.lucene.queries.function.docvalues;
 
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.util.mutable.MutableValue;
 import org.apache.lucene.util.mutable.MutableValueLong;
 
 
-public abstract class LongDocValues extends DocValues {
+public abstract class LongDocValues extends FunctionValues {
   protected final ValueSource vs;
 
   public LongDocValues(ValueSource vs) {

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StrDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StrDocValues.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StrDocValues.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StrDocValues.java Mon Dec 12 20:33:26 2011
@@ -1,11 +1,11 @@
 package org.apache.lucene.queries.function.docvalues;
 
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.util.mutable.MutableValue;
 import org.apache.lucene.util.mutable.MutableValueStr;
 
-public abstract class StrDocValues extends DocValues {
+public abstract class StrDocValues extends FunctionValues {
   protected final ValueSource vs;
 
   public StrDocValues(ValueSource vs) {

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StringIndexDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StringIndexDocValues.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StringIndexDocValues.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StringIndexDocValues.java Mon Dec 12 20:33:26 2011
@@ -17,7 +17,7 @@
 
 package org.apache.lucene.queries.function.docvalues;
 
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.queries.function.ValueSourceScorer;
 import org.apache.lucene.search.FieldCache;
@@ -32,9 +32,9 @@ import org.apache.lucene.util.mutable.Mu
 import java.io.IOException;
 
 /** Internal class, subject to change.
- *  Serves as base class for DocValues based on StringIndex 
+ *  Serves as base class for FunctionValues based on StringIndex 
  **/
-public abstract class StringIndexDocValues extends DocValues {
+public abstract class StringIndexDocValues extends FunctionValues {
   protected final FieldCache.DocTermsIndex termsIndex;
   protected final ValueSource vs;
   protected final MutableValueStr val = new MutableValueStr();
@@ -158,7 +158,7 @@ public abstract class StringIndexDocValu
     public StringIndexException(final String fieldName,
                                 final RuntimeException cause) {
       super("Can't initialize StringIndex to generate (function) " +
-              "DocValues for field: " + fieldName, cause);
+              "FunctionValues for field: " + fieldName, cause);
     }
   }
 

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java Mon Dec 12 20:33:26 2011
@@ -20,7 +20,7 @@ import java.io.IOException;
 import java.util.Map;
 
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.search.FieldCache;
 
 /**
@@ -50,10 +50,10 @@ public class ByteFieldSource extends Fie
   }
 
   @Override
-  public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+  public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
     final byte[] arr = cache.getBytes(readerContext.reader, field, parser, false);
     
-    return new DocValues() {
+    return new FunctionValues() {
       @Override
       public byte byteVal(int doc) {
         return arr[doc];

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/BytesRefFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/BytesRefFieldSource.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/BytesRefFieldSource.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/BytesRefFieldSource.java Mon Dec 12 20:33:26 2011
@@ -18,7 +18,7 @@ package org.apache.lucene.queries.functi
  */
 
 import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.docvalues.StringIndexDocValues;
 import org.apache.lucene.queries.function.ValueSource; //javadoc
 
@@ -26,7 +26,7 @@ import java.io.IOException;
 import java.util.Map;
 
 /**
- * An implementation for retrieving {@link DocValues} instances for string based fields.
+ * An implementation for retrieving {@link FunctionValues} instances for string based fields.
  */
 public class BytesRefFieldSource extends FieldCacheSource {
 
@@ -35,7 +35,7 @@ public class BytesRefFieldSource extends
   }
 
   @Override
-  public DocValues getValues(Map context, IndexReader.AtomicReaderContext readerContext) throws IOException {
+  public FunctionValues getValues(Map context, IndexReader.AtomicReaderContext readerContext) throws IOException {
     return new StringIndexDocValues(this, readerContext, field) {
 
       @Override

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstValueSource.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstValueSource.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstValueSource.java Mon Dec 12 20:33:26 2011
@@ -18,7 +18,7 @@
 package org.apache.lucene.queries.function.valuesource;
 
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.docvalues.FloatDocValues;
 
 import java.io.IOException;
@@ -42,7 +42,7 @@ public class ConstValueSource extends Co
   }
 
   @Override
-  public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+  public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
     return new FloatDocValues(this) {
       @Override
       public float floatVal(int doc) {

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DefFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DefFunction.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DefFunction.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DefFunction.java Mon Dec 12 20:33:26 2011
@@ -17,7 +17,7 @@ package org.apache.lucene.queries.functi
  */
 
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.util.BytesRef;
@@ -39,15 +39,15 @@ public class DefFunction extends MultiFu
 
 
   @Override
-  public DocValues getValues(Map fcontext, AtomicReaderContext readerContext) throws IOException {
+  public FunctionValues getValues(Map fcontext, AtomicReaderContext readerContext) throws IOException {
 
 
     return new Values(valsArr(sources, fcontext, readerContext)) {
       final int upto = valsArr.length - 1;
 
-      private DocValues get(int doc) {
+      private FunctionValues get(int doc) {
         for (int i=0; i<upto; i++) {
-          DocValues vals = valsArr[i];
+          FunctionValues vals = valsArr[i];
           if (vals.exists(doc)) {
             return vals;
           }
@@ -108,7 +108,7 @@ public class DefFunction extends MultiFu
       @Override
       public boolean exists(int doc) {
         // return true if any source is exists?
-        for (DocValues vals : valsArr) {
+        for (FunctionValues vals : valsArr) {
           if (vals.exists(doc)) {
             return true;
           }

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DivFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DivFloatFunction.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DivFloatFunction.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DivFloatFunction.java Mon Dec 12 20:33:26 2011
@@ -17,7 +17,7 @@
 
 package org.apache.lucene.queries.function.valuesource;
 
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 
 /** Function to divide "a" by "b"
@@ -37,7 +37,7 @@ public class DivFloatFunction extends Du
   }
 
   @Override
-  protected float func(int doc, DocValues aVals, DocValues bVals) {
+  protected float func(int doc, FunctionValues aVals, FunctionValues bVals) {
     return aVals.floatVal(doc) / bVals.floatVal(doc);
   }
 }

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java Mon Dec 12 20:33:26 2011
@@ -19,7 +19,7 @@ package org.apache.lucene.queries.functi
 
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
 import org.apache.lucene.index.Term;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
 import org.apache.lucene.queries.function.docvalues.IntDocValues;
@@ -146,7 +146,7 @@ public class DocFreqValueSource extends 
   }
 
   @Override
-  public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+  public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
     IndexSearcher searcher = (IndexSearcher)context.get("searcher");
     int docfreq = searcher.getIndexReader().docFreq(new Term(indexedField, indexedBytes));
     return new ConstIntDocValues(docfreq, this);

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleConstValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleConstValueSource.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleConstValueSource.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleConstValueSource.java Mon Dec 12 20:33:26 2011
@@ -18,7 +18,7 @@
 package org.apache.lucene.queries.function.valuesource;
 
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
 
 import java.io.IOException;
@@ -41,7 +41,7 @@ public class DoubleConstValueSource exte
   }
 
   @Override
-  public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+  public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
     return new DoubleDocValues(this) {
       @Override
       public float floatVal(int doc) {

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java Mon Dec 12 20:33:26 2011
@@ -22,7 +22,7 @@ import java.util.Map;
 
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
 import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSourceScorer;
 import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
 import org.apache.lucene.search.FieldCache;
@@ -56,7 +56,7 @@ public class DoubleFieldSource extends F
   }
 
   @Override
-  public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+  public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
     final double[] arr = cache.getDoubles(readerContext.reader, field, parser, true);
     final Bits valid = cache.getDocsWithField(readerContext.reader, field);
     return new DoubleDocValues(this) {

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DualFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DualFloatFunction.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DualFloatFunction.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DualFloatFunction.java Mon Dec 12 20:33:26 2011
@@ -18,7 +18,7 @@
 package org.apache.lucene.queries.function.valuesource;
 
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.queries.function.docvalues.FloatDocValues;
 import org.apache.lucene.search.IndexSearcher;
@@ -40,7 +40,7 @@ public abstract class DualFloatFunction 
   }
 
   protected abstract String name();
-  protected abstract float func(int doc, DocValues aVals, DocValues bVals);
+  protected abstract float func(int doc, FunctionValues aVals, FunctionValues bVals);
 
   @Override
   public String description() {
@@ -48,9 +48,9 @@ public abstract class DualFloatFunction 
   }
 
   @Override
-  public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
-    final DocValues aVals =  a.getValues(context, readerContext);
-    final DocValues bVals =  b.getValues(context, readerContext);
+  public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+    final FunctionValues aVals =  a.getValues(context, readerContext);
+    final FunctionValues bVals =  b.getValues(context, readerContext);
     return new FloatDocValues(this) {
       @Override
       public float floatVal(int doc) {

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java Mon Dec 12 20:33:26 2011
@@ -21,7 +21,7 @@ import java.io.IOException;
 import java.util.Map;
 
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.docvalues.FloatDocValues;
 import org.apache.lucene.search.FieldCache;
 import org.apache.lucene.util.Bits;
@@ -54,7 +54,7 @@ public class FloatFieldSource extends Fi
   }
 
   @Override
-  public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+  public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
     final float[] arr = cache.getFloats(readerContext.reader, field, parser, true);
     final Bits valid = cache.getDocsWithField(readerContext.reader, field);
 

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java Mon Dec 12 20:33:26 2011
@@ -19,7 +19,7 @@ package org.apache.lucene.queries.functi
 
 import org.apache.lucene.index.*;
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.similarities.Similarity;
 import org.apache.lucene.search.similarities.TFIDFSimilarity;
@@ -40,7 +40,7 @@ public class IDFValueSource extends DocF
   }
 
   @Override
-  public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+  public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
     IndexSearcher searcher = (IndexSearcher)context.get("searcher");
     Similarity sim = searcher.getSimilarityProvider().get(field);
     if (!(sim instanceof TFIDFSimilarity)) {

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java Mon Dec 12 20:33:26 2011
@@ -19,7 +19,7 @@ package org.apache.lucene.queries.functi
 
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.search.Explanation;
 import org.apache.lucene.search.IndexSearcher;
@@ -43,12 +43,12 @@ public class IfFunction extends BoolFunc
   }
 
   @Override
-  public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
-    final DocValues ifVals = ifSource.getValues(context, readerContext);
-    final DocValues trueVals = trueSource.getValues(context, readerContext);
-    final DocValues falseVals = falseSource.getValues(context, readerContext);
+  public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+    final FunctionValues ifVals = ifSource.getValues(context, readerContext);
+    final FunctionValues trueVals = trueSource.getValues(context, readerContext);
+    final FunctionValues falseVals = falseSource.getValues(context, readerContext);
 
-    return new DocValues() {
+    return new FunctionValues() {
       @Override
       public byte byteVal(int doc) {
         return ifVals.boolVal(doc) ? trueVals.byteVal(doc) : falseVals.byteVal(doc);

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java Mon Dec 12 20:33:26 2011
@@ -22,7 +22,7 @@ import java.util.Map;
 
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
 import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSourceScorer;
 import org.apache.lucene.queries.function.docvalues.IntDocValues;
 import org.apache.lucene.search.FieldCache;
@@ -56,7 +56,7 @@ public class IntFieldSource extends Fiel
 
 
   @Override
-  public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+  public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
     final int[] arr = cache.getInts(readerContext.reader, field, parser, true);
     final Bits valid = cache.getDocsWithField(readerContext.reader, field);
     

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java Mon Dec 12 20:33:26 2011
@@ -22,7 +22,7 @@ import java.util.Map;
 
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.docvalues.IntDocValues;
 import org.apache.lucene.search.FieldCache.DocTerms;
 import org.apache.lucene.util.BytesRef;
@@ -50,7 +50,7 @@ public class JoinDocFreqValueSource exte
   }
 
   @Override
-  public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException
+  public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException
   {
     final DocTerms terms = cache.getTerms(readerContext.reader, field, true );
     final IndexReader top = ReaderUtil.getTopLevelContext(readerContext).reader;

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LinearFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LinearFloatFunction.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LinearFloatFunction.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LinearFloatFunction.java Mon Dec 12 20:33:26 2011
@@ -18,7 +18,7 @@
 package org.apache.lucene.queries.function.valuesource;
 
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.queries.function.docvalues.FloatDocValues;
 import org.apache.lucene.search.IndexSearcher;
@@ -51,8 +51,8 @@ public class LinearFloatFunction extends
   }
 
   @Override
-  public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
-    final DocValues vals =  source.getValues(context, readerContext);
+  public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+    final FunctionValues vals =  source.getValues(context, readerContext);
     return new FloatDocValues(this) {
       @Override
       public float floatVal(int doc) {

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java Mon Dec 12 20:33:26 2011
@@ -17,7 +17,7 @@ package org.apache.lucene.queries.functi
  */
 
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.queries.function.docvalues.StrDocValues;
 import org.apache.lucene.util.BytesRef;
@@ -45,7 +45,7 @@ public class LiteralValueSource extends 
   }
 
   @Override
-  public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+  public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
 
     return new StrDocValues(this) {
       @Override

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java Mon Dec 12 20:33:26 2011
@@ -22,7 +22,7 @@ import java.util.Map;
 
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
 import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSourceScorer;
 import org.apache.lucene.queries.function.docvalues.LongDocValues;
 import org.apache.lucene.search.FieldCache;
@@ -65,7 +65,7 @@ public class LongFieldSource extends Fie
   }
 
   @Override
-  public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+  public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
     final long[] arr = cache.getLongs(readerContext.reader, field, parser, true);
     final Bits valid = cache.getDocsWithField(readerContext.reader, field);
     

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java Mon Dec 12 20:33:26 2011
@@ -17,7 +17,7 @@
 package org.apache.lucene.queries.function.valuesource;
 
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.search.IndexSearcher;
 
@@ -40,7 +40,7 @@ public class MaxDocValueSource extends V
   }
 
   @Override
-  public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+  public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
     IndexSearcher searcher = (IndexSearcher)context.get("searcher");
     return new ConstIntDocValues(searcher.getIndexReader().maxDoc(), this);
   }

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxFloatFunction.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxFloatFunction.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxFloatFunction.java Mon Dec 12 20:33:26 2011
@@ -17,7 +17,7 @@
 
 package org.apache.lucene.queries.function.valuesource;
 
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 
 /**
@@ -34,10 +34,10 @@ public class MaxFloatFunction extends Mu
   }
 
   @Override
-  protected float func(int doc, DocValues[] valsArr) {
+  protected float func(int doc, FunctionValues[] valsArr) {
     boolean first = true;
     float val = 0.0f;
-    for (DocValues vals : valsArr) {
+    for (FunctionValues vals : valsArr) {
       if (first) {
         first = false;
         val = vals.floatVal(doc);

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MinFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MinFloatFunction.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MinFloatFunction.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MinFloatFunction.java Mon Dec 12 20:33:26 2011
@@ -17,7 +17,7 @@
 
 package org.apache.lucene.queries.function.valuesource;
 
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 
 /**
@@ -34,10 +34,10 @@ public class MinFloatFunction extends Mu
   }
 
   @Override
-  protected float func(int doc, DocValues[] valsArr) {
+  protected float func(int doc, FunctionValues[] valsArr) {
     boolean first = true;
     float val = 0.0f;
-    for (DocValues vals : valsArr) {
+    for (FunctionValues vals : valsArr) {
       if (first) {
         first = false;
         val = vals.floatVal(doc);

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java Mon Dec 12 20:33:26 2011
@@ -18,7 +18,7 @@
 package org.apache.lucene.queries.function.valuesource;
 
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.queries.function.docvalues.BoolDocValues;
 import org.apache.lucene.search.IndexSearcher;
@@ -37,11 +37,11 @@ public abstract class MultiBoolFunction 
 
   protected abstract String name();
 
-  protected abstract boolean func(int doc, DocValues[] vals);
+  protected abstract boolean func(int doc, FunctionValues[] vals);
 
   @Override
   public BoolDocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
-    final DocValues[] vals =  new DocValues[sources.size()];
+    final FunctionValues[] vals =  new FunctionValues[sources.size()];
     int i=0;
     for (ValueSource source : sources) {
       vals[i++] = source.getValues(context, readerContext);
@@ -58,7 +58,7 @@ public abstract class MultiBoolFunction 
         StringBuilder sb = new StringBuilder(name());
         sb.append('(');
         boolean first = true;
-        for (DocValues dv : vals) {
+        for (FunctionValues dv : vals) {
           if (first) {
             first = false;
           } else {

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java Mon Dec 12 20:33:26 2011
@@ -17,7 +17,7 @@ package org.apache.lucene.queries.functi
  */
 
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.queries.function.docvalues.FloatDocValues;
 import org.apache.lucene.search.IndexSearcher;
@@ -39,7 +39,7 @@ public abstract class MultiFloatFunction
   }
 
   abstract protected String name();
-  abstract protected float func(int doc, DocValues[] valsArr);
+  abstract protected float func(int doc, FunctionValues[] valsArr);
 
   @Override
   public String description() {
@@ -59,8 +59,8 @@ public abstract class MultiFloatFunction
   }
 
   @Override
-  public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
-    final DocValues[] valsArr = new DocValues[sources.length];
+  public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+    final FunctionValues[] valsArr = new FunctionValues[sources.length];
     for (int i=0; i<sources.length; i++) {
       valsArr[i] = sources[i].getValues(context, readerContext);
     }
@@ -75,7 +75,7 @@ public abstract class MultiFloatFunction
         StringBuilder sb = new StringBuilder();
         sb.append(name()).append('(');
         boolean firstTime=true;
-        for (DocValues vals : valsArr) {
+        for (FunctionValues vals : valsArr) {
           if (firstTime) {
             firstTime=false;
           } else {

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFunction.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFunction.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFunction.java Mon Dec 12 20:33:26 2011
@@ -17,7 +17,7 @@ package org.apache.lucene.queries.functi
  */
 
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.util.BytesRef;
@@ -58,8 +58,8 @@ public abstract class MultiFunction exte
     return sb.toString();
   }
 
-  public static DocValues[] valsArr(List<ValueSource> sources, Map fcontext, AtomicReaderContext readerContext) throws IOException {
-    final DocValues[] valsArr = new DocValues[sources.size()];
+  public static FunctionValues[] valsArr(List<ValueSource> sources, Map fcontext, AtomicReaderContext readerContext) throws IOException {
+    final FunctionValues[] valsArr = new FunctionValues[sources.size()];
     int i=0;
     for (ValueSource source : sources) {
       valsArr[i++] = source.getValues(fcontext, readerContext);
@@ -67,10 +67,10 @@ public abstract class MultiFunction exte
     return valsArr;
   }
 
-  public class Values extends DocValues {
-    final DocValues[] valsArr;
+  public class Values extends FunctionValues {
+    final FunctionValues[] valsArr;
 
-    public Values(DocValues[] valsArr) {
+    public Values(FunctionValues[] valsArr) {
       this.valsArr = valsArr;
     }
 
@@ -87,11 +87,11 @@ public abstract class MultiFunction exte
   }
 
 
-  public static String toString(String name, DocValues[] valsArr, int doc) {
+  public static String toString(String name, FunctionValues[] valsArr, int doc) {
     StringBuilder sb = new StringBuilder();
     sb.append(name).append('(');
     boolean firstTime=true;
-    for (DocValues vals : valsArr) {
+    for (FunctionValues vals : valsArr) {
       if (firstTime) {
         firstTime=false;
       } else {

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java Mon Dec 12 20:33:26 2011
@@ -18,7 +18,7 @@
 package org.apache.lucene.queries.function.valuesource;
 
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.queries.function.docvalues.FloatDocValues;
 import org.apache.lucene.search.IndexSearcher;
@@ -49,7 +49,7 @@ public class NormValueSource extends Val
   }
 
   @Override
-  public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+  public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
     IndexSearcher searcher = (IndexSearcher)context.get("searcher");
     Similarity sim = searcher.getSimilarityProvider().get(field);
     if (!(sim instanceof TFIDFSimilarity)) {

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java Mon Dec 12 20:33:26 2011
@@ -17,7 +17,7 @@
 package org.apache.lucene.queries.function.valuesource;
 
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.util.ReaderUtil;
 
@@ -35,7 +35,7 @@ public class NumDocsValueSource extends 
   }
 
   @Override
-  public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+  public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
     // Searcher has no numdocs so we must use the reader instead
     return new ConstIntDocValues(ReaderUtil.getTopLevelContext(readerContext).reader.numDocs(), this);
   }

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumericIndexDocValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumericIndexDocValueSource.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumericIndexDocValueSource.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumericIndexDocValueSource.java Mon Dec 12 20:33:26 2011
@@ -22,13 +22,13 @@ import java.util.Map;
 import org.apache.lucene.index.DocValues.Source;
 import org.apache.lucene.index.DocValues.Type;
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 
 /**
- * Expert: obtains numeric field values from a {@link DocValues} field.
+ * Expert: obtains numeric field values from a {@link FunctionValues} field.
  * This {@link ValueSource} is compatible with all numerical
- * {@link DocValues}
+ * {@link FunctionValues}
  * 
  * @lucene.experimental
  * 
@@ -42,7 +42,7 @@ public class NumericIndexDocValueSource 
   }
 
   @Override
-  public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+  public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
     final Source source = readerContext.reader.docValues(field)
         .getSource();
     Type type = source.type();
@@ -50,7 +50,7 @@ public class NumericIndexDocValueSource 
     case FLOAT_32:
     case FLOAT_64:
       // TODO (chrism) Change to use FloatDocValues and IntDocValues
-      return new DocValues() {
+      return new FunctionValues() {
 
         @Override
         public String toString(int doc) {
@@ -64,7 +64,7 @@ public class NumericIndexDocValueSource 
       };
 
     case VAR_INTS:
-      return new DocValues() {
+      return new FunctionValues() {
         @Override
         public String toString(int doc) {
           return "float: [" + floatVal(doc) + "]";
@@ -113,6 +113,6 @@ public class NumericIndexDocValueSource 
 
   @Override
   public String toString() {
-    return "DocValues float(" + field + ')';
+    return "FunctionValues float(" + field + ')';
   }
 }

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java Mon Dec 12 20:33:26 2011
@@ -19,7 +19,7 @@ package org.apache.lucene.queries.functi
 
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.queries.function.docvalues.IntDocValues;
 import org.apache.lucene.search.FieldCache;
@@ -62,7 +62,7 @@ public class OrdFieldSource extends Valu
 
 
   @Override
-  public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+  public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
     final int off = readerContext.docBase;
     final IndexReader topReader = ReaderUtil.getTopLevelContext(readerContext).reader;
     final FieldCache.DocTermsIndex sindex = FieldCache.DEFAULT.getTermsIndex(topReader, field);

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/PowFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/PowFloatFunction.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/PowFloatFunction.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/PowFloatFunction.java Mon Dec 12 20:33:26 2011
@@ -17,7 +17,7 @@
 
 package org.apache.lucene.queries.function.valuesource;
 
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 
 /** Function to raise the base "a" to the power "b"
@@ -37,7 +37,7 @@ public class PowFloatFunction extends Du
   }
 
   @Override
-  protected float func(int doc, DocValues aVals, DocValues bVals) {
+  protected float func(int doc, FunctionValues aVals, FunctionValues bVals) {
     return (float)Math.pow(aVals.floatVal(doc), bVals.floatVal(doc));
   }
 }

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ProductFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ProductFloatFunction.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ProductFloatFunction.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ProductFloatFunction.java Mon Dec 12 20:33:26 2011
@@ -17,7 +17,7 @@
 
 package org.apache.lucene.queries.function.valuesource;
 
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 
 /**
@@ -34,9 +34,9 @@ public class ProductFloatFunction extend
   }
 
   @Override
-  protected float func(int doc, DocValues[] valsArr) {
+  protected float func(int doc, FunctionValues[] valsArr) {
     float val = 1.0f;
-    for (DocValues vals : valsArr) {
+    for (FunctionValues vals : valsArr) {
       val *= vals.floatVal(doc);
     }
     return val;

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java Mon Dec 12 20:33:26 2011
@@ -18,7 +18,7 @@
 package org.apache.lucene.queries.function.valuesource;
 
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.queries.function.docvalues.FloatDocValues;
 import org.apache.lucene.search.*;
@@ -51,7 +51,7 @@ public class QueryValueSource extends Va
   }
 
   @Override
-  public DocValues getValues(Map fcontext, AtomicReaderContext readerContext) throws IOException {
+  public FunctionValues getValues(Map fcontext, AtomicReaderContext readerContext) throws IOException {
     return new QueryDocValues(this, readerContext, fcontext);
   }
 
@@ -193,8 +193,8 @@ class QueryDocValues extends FloatDocVal
   public ValueFiller getValueFiller() {
     //
     // TODO: if we want to support more than one value-filler or a value-filler in conjunction with
-    // the DocValues, then members like "scorer" should be per ValueFiller instance.
-    // Or we can say that the user should just instantiate multiple DocValues.
+    // the FunctionValues, then members like "scorer" should be per ValueFiller instance.
+    // Or we can say that the user should just instantiate multiple FunctionValues.
     //
     return new ValueFiller() {
       private final MutableValueFloat mval = new MutableValueFloat();

Modified: lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/RangeMapFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/RangeMapFloatFunction.java?rev=1213426&r1=1213425&r2=1213426&view=diff
==============================================================================
--- lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/RangeMapFloatFunction.java (original)
+++ lucene/dev/branches/lucene3622/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/RangeMapFloatFunction.java Mon Dec 12 20:33:26 2011
@@ -18,7 +18,7 @@
 package org.apache.lucene.queries.function.valuesource;
 
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.queries.function.docvalues.FloatDocValues;
 import org.apache.lucene.search.IndexSearcher;
@@ -55,8 +55,8 @@ public class RangeMapFloatFunction exten
   }
 
   @Override
-  public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
-    final DocValues vals =  source.getValues(context, readerContext);
+  public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+    final FunctionValues vals =  source.getValues(context, readerContext);
     return new FloatDocValues(this) {
       @Override
       public float floatVal(int doc) {



Mime
View raw message