svn commit: r1140906 [1/2] - in /lucene/dev/trunk: modules/queries/src/java/org/apache/lucene/queries/function/docvalues/ modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ solr/src/java/org/apache/solr/schema/ solr/src/java/org/a...

[ch...@apache.org]

Author: chrism
Date: Tue Jun 28 23:32:27 2011
New Revision: 1140906

URL: http://svn.apache.org/viewvc?rev=1140906&view=rev
Log:
LUCENE-3249: Moved FunctionQuery impls to new Queries module

Added:
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/BoolDocValues.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/BoolDocValues.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/DoubleDocValues.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DoubleDocValues.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/FloatDocValues.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/FloatDocValues.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/IntDocValues.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/IntDocValues.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/LongDocValues.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/LongDocValues.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StrDocValues.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/StrDocValues.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StringIndexDocValues.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/StringIndexDocValues.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/BoolFunction.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/BoolFunction.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ByteFieldSource.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstNumberSource.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ConstNumberSource.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstValueSource.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ConstValueSource.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DefFunction.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DefFunction.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DivFloatFunction.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DivFloatFunction.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DocFreqValueSource.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleConstValueSource.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DoubleConstValueSource.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DualFloatFunction.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DualFloatFunction.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FieldCacheSource.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/FieldCacheSource.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/FloatFieldSource.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/IDFValueSource.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/IfFunction.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/IntFieldSource.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/JoinDocFreqValueSource.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LinearFloatFunction.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/LinearFloatFunction.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/LiteralValueSource.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/LongFieldSource.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/MaxDocValueSource.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/MultiBoolFunction.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/MultiFloatFunction.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFunction.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/MultiFunction.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiValueSource.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/MultiValueSource.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/NormValueSource.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/NumDocsValueSource.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumericFieldCacheSource.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/NumericFieldCacheSource.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/OrdFieldSource.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/PowFloatFunction.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/PowFloatFunction.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ProductFloatFunction.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ProductFloatFunction.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/QueryValueSource.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/RangeMapFloatFunction.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/RangeMapFloatFunction.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReciprocalFloatFunction.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReverseOrdFieldSource.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ScaleFloatFunction.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ShortFieldSource.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ShortFieldSource.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleBoolFunction.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/SimpleBoolFunction.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleFloatFunction.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/SimpleFloatFunction.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SingleFunction.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/SingleFunction.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SumFloatFunction.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/SumFloatFunction.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/TFValueSource.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/TermFreqValueSource.java
    lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/VectorValueSource.java
      - copied, changed from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/VectorValueSource.java
Removed:
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/BoolDocValues.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/BoolFunction.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ByteFieldSource.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ConstNumberSource.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ConstValueSource.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DefFunction.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DivFloatFunction.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DocFreqValueSource.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DoubleConstValueSource.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DoubleDocValues.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DualFloatFunction.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/FieldCacheSource.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/FloatDocValues.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/FloatFieldSource.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/IDFValueSource.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/IfFunction.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/IntDocValues.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/IntFieldSource.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/JoinDocFreqValueSource.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/LinearFloatFunction.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/LiteralValueSource.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/LongDocValues.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/LongFieldSource.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/MaxDocValueSource.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/MultiBoolFunction.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/MultiFloatFunction.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/MultiFunction.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/MultiValueSource.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/NormValueSource.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/NumDocsValueSource.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/NumericFieldCacheSource.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/OrdFieldSource.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/PowFloatFunction.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ProductFloatFunction.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/QueryValueSource.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/RangeMapFloatFunction.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ScaleFloatFunction.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ShortFieldSource.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/SimpleBoolFunction.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/SimpleFloatFunction.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/SingleFunction.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/StrDocValues.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/StringIndexDocValues.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/SumFloatFunction.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/TFValueSource.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/TermFreqValueSource.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/VectorValueSource.java
Modified:
    lucene/dev/trunk/solr/src/java/org/apache/solr/schema/BoolField.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ByteField.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/schema/DateField.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/schema/DoubleField.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/schema/FloatField.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/schema/GeoHashField.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/schema/IntField.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/schema/LatLonType.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/schema/LongField.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/schema/PointType.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/schema/RandomSortField.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ShortField.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableDoubleField.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableFloatField.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableIntField.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableLongField.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/schema/StrFieldSource.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/schema/TrieField.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/BoostQParserPlugin.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/FunctionQParser.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/Grouping.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/QueryParsing.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/ReturnFields.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/ValueSourceParser.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/FileFloatSource.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/distance/HaversineFunction.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java
    lucene/dev/trunk/solr/src/test/org/apache/solr/core/DummyValueSourceParser.java
    lucene/dev/trunk/solr/src/test/org/apache/solr/search/function/NvlValueSourceParser.java

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/BoolDocValues.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/BoolDocValues.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/BoolDocValues.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/BoolDocValues.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/BoolDocValues.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/BoolDocValues.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/BoolDocValues.java Tue Jun 28 23:32:27 2011
@@ -1,4 +1,4 @@
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.docvalues;
 
 import org.apache.lucene.common.mutable.MutableValue;
 import org.apache.lucene.common.mutable.MutableValueBool;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/DoubleDocValues.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DoubleDocValues.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/DoubleDocValues.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/DoubleDocValues.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DoubleDocValues.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DoubleDocValues.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/DoubleDocValues.java Tue Jun 28 23:32:27 2011
@@ -1,4 +1,4 @@
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.docvalues;
 
 import org.apache.lucene.common.mutable.MutableValue;
 import org.apache.lucene.common.mutable.MutableValueDouble;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/FloatDocValues.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/FloatDocValues.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/FloatDocValues.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/FloatDocValues.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/FloatDocValues.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/FloatDocValues.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/FloatDocValues.java Tue Jun 28 23:32:27 2011
@@ -1,4 +1,4 @@
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.docvalues;
 
 import org.apache.lucene.common.mutable.MutableValue;
 import org.apache.lucene.common.mutable.MutableValueFloat;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/IntDocValues.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/IntDocValues.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/IntDocValues.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/IntDocValues.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/IntDocValues.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/IntDocValues.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/IntDocValues.java Tue Jun 28 23:32:27 2011
@@ -1,4 +1,4 @@
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.docvalues;
 
 import org.apache.lucene.common.mutable.MutableValue;
 import org.apache.lucene.common.mutable.MutableValueInt;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/LongDocValues.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/LongDocValues.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/LongDocValues.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/LongDocValues.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/LongDocValues.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/LongDocValues.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/LongDocValues.java Tue Jun 28 23:32:27 2011
@@ -1,4 +1,4 @@
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.docvalues;
 
 import org.apache.lucene.common.mutable.MutableValue;
 import org.apache.lucene.common.mutable.MutableValueLong;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StrDocValues.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/StrDocValues.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StrDocValues.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StrDocValues.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/StrDocValues.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/StrDocValues.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StrDocValues.java Tue Jun 28 23:32:27 2011
@@ -1,4 +1,4 @@
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.docvalues;
 
 import org.apache.lucene.common.mutable.MutableValue;
 import org.apache.lucene.common.mutable.MutableValueStr;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StringIndexDocValues.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/StringIndexDocValues.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StringIndexDocValues.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StringIndexDocValues.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/StringIndexDocValues.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/StringIndexDocValues.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StringIndexDocValues.java Tue Jun 28 23:32:27 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.docvalues;
 
 import org.apache.lucene.common.mutable.MutableValue;
 import org.apache.lucene.common.mutable.MutableValueStr;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/BoolFunction.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/BoolFunction.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/BoolFunction.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/BoolFunction.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/BoolFunction.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/BoolFunction.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/BoolFunction.java Tue Jun 28 23:32:27 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 
 import org.apache.lucene.queries.function.ValueSource;
 

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ByteFieldSource.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ByteFieldSource.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ByteFieldSource.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java Tue Jun 28 23:32:27 2011
@@ -1,4 +1,4 @@
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstNumberSource.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ConstNumberSource.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstNumberSource.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstNumberSource.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ConstNumberSource.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ConstNumberSource.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstNumberSource.java Tue Jun 28 23:32:27 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 
 import org.apache.lucene.queries.function.ValueSource;
 

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstValueSource.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ConstValueSource.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstValueSource.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstValueSource.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ConstValueSource.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ConstValueSource.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstValueSource.java Tue Jun 28 23:32:27 2011
@@ -15,10 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+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.docvalues.FloatDocValues;
 
 import java.io.IOException;
 import java.util.Map;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DefFunction.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DefFunction.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DefFunction.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DefFunction.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DefFunction.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DefFunction.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DefFunction.java Tue Jun 28 23:32:27 2011
@@ -1,4 +1,4 @@
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DivFloatFunction.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DivFloatFunction.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DivFloatFunction.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DivFloatFunction.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DivFloatFunction.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DivFloatFunction.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DivFloatFunction.java Tue Jun 28 23:32:27 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 
 import org.apache.lucene.queries.function.DocValues;
 import org.apache.lucene.queries.function.ValueSource;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DocFreqValueSource.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DocFreqValueSource.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DocFreqValueSource.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java Tue Jun 28 23:32:27 2011
@@ -15,15 +15,16 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 
 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.ValueSource;
+import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
+import org.apache.lucene.queries.function.docvalues.IntDocValues;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.util.BytesRef;
-import org.apache.solr.search.*;
 
 import java.io.IOException;
 import java.util.Map;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleConstValueSource.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DoubleConstValueSource.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleConstValueSource.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleConstValueSource.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DoubleConstValueSource.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DoubleConstValueSource.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleConstValueSource.java Tue Jun 28 23:32:27 2011
@@ -15,10 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+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.docvalues.DoubleDocValues;
 
 import java.io.IOException;
 import java.util.Map;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java Tue Jun 28 23:32:27 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 
 import org.apache.lucene.common.mutable.MutableValue;
 import org.apache.lucene.common.mutable.MutableValueDouble;
@@ -23,6 +23,7 @@ import org.apache.lucene.index.IndexRead
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
 import org.apache.lucene.queries.function.DocValues;
 import org.apache.lucene.queries.function.ValueSourceScorer;
+import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
 import org.apache.lucene.util.Bits;
 import org.apache.lucene.search.cache.DoubleValuesCreator;
 import org.apache.lucene.search.cache.CachedArray.DoubleValues;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DualFloatFunction.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DualFloatFunction.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DualFloatFunction.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DualFloatFunction.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DualFloatFunction.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DualFloatFunction.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DualFloatFunction.java Tue Jun 28 23:32:27 2011
@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+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.ValueSource;
+import org.apache.lucene.queries.function.docvalues.FloatDocValues;
 import org.apache.lucene.search.IndexSearcher;
 
 import java.io.IOException;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FieldCacheSource.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/FieldCacheSource.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FieldCacheSource.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FieldCacheSource.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/FieldCacheSource.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/FieldCacheSource.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FieldCacheSource.java Tue Jun 28 23:32:27 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.search.FieldCache;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/FloatFieldSource.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/FloatFieldSource.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/FloatFieldSource.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java Tue Jun 28 23:32:27 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 
 import java.io.IOException;
 import java.util.Map;
@@ -24,6 +24,7 @@ import org.apache.lucene.common.mutable.
 import org.apache.lucene.common.mutable.MutableValueFloat;
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
 import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.docvalues.FloatDocValues;
 import org.apache.lucene.util.Bits;
 import org.apache.lucene.search.cache.FloatValuesCreator;
 import org.apache.lucene.search.cache.CachedArray.FloatValues;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/IDFValueSource.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/IDFValueSource.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/IDFValueSource.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java Tue Jun 28 23:32:27 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 
 import org.apache.lucene.index.*;
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/IfFunction.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/IfFunction.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/IfFunction.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java Tue Jun 28 23:32:27 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/IntFieldSource.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/IntFieldSource.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/IntFieldSource.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java Tue Jun 28 23:32:27 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 
 import org.apache.lucene.common.mutable.MutableValue;
 import org.apache.lucene.common.mutable.MutableValueInt;
@@ -23,6 +23,7 @@ import org.apache.lucene.index.IndexRead
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
 import org.apache.lucene.queries.function.DocValues;
 import org.apache.lucene.queries.function.ValueSourceScorer;
+import org.apache.lucene.queries.function.docvalues.IntDocValues;
 import org.apache.lucene.util.Bits;
 import org.apache.lucene.search.cache.IntValuesCreator;
 import org.apache.lucene.search.cache.CachedArray.IntValues;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/JoinDocFreqValueSource.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/JoinDocFreqValueSource.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/JoinDocFreqValueSource.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java Tue Jun 28 23:32:27 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 
 import java.io.IOException;
 import java.util.Map;
@@ -23,10 +23,10 @@ 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.docvalues.IntDocValues;
 import org.apache.lucene.search.FieldCache.DocTerms;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.ReaderUtil;
-import org.apache.solr.common.SolrException;
 
 /**
  * Use a field value and find the Document Frequency within another field.
@@ -68,7 +68,7 @@ public class JoinDocFreqValueSource exte
           return v;
         } 
         catch (IOException e) {
-          throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "caught exception in function "+description()+" : doc="+doc, e);
+          throw new RuntimeException("caught exception in function "+description()+" : doc="+doc, e);
         }
       }
     };

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LinearFloatFunction.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/LinearFloatFunction.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LinearFloatFunction.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LinearFloatFunction.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/LinearFloatFunction.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/LinearFloatFunction.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LinearFloatFunction.java Tue Jun 28 23:32:27 2011
@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+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.ValueSource;
+import org.apache.lucene.queries.function.docvalues.FloatDocValues;
 import org.apache.lucene.search.IndexSearcher;
 
 import java.io.IOException;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/LiteralValueSource.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/LiteralValueSource.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/LiteralValueSource.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java Tue Jun 28 23:32:27 2011
@@ -1,4 +1,4 @@
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -19,6 +19,7 @@ package org.apache.solr.search.function;
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
 import org.apache.lucene.queries.function.DocValues;
 import org.apache.lucene.queries.function.ValueSource;
+import org.apache.lucene.queries.function.docvalues.StrDocValues;
 import org.apache.lucene.util.BytesRef;
 
 import java.util.Map;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/LongFieldSource.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/LongFieldSource.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/LongFieldSource.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java Tue Jun 28 23:32:27 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 
 import org.apache.lucene.common.mutable.MutableValue;
 import org.apache.lucene.common.mutable.MutableValueLong;
@@ -23,6 +23,7 @@ import org.apache.lucene.index.IndexRead
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
 import org.apache.lucene.queries.function.DocValues;
 import org.apache.lucene.queries.function.ValueSourceScorer;
+import org.apache.lucene.queries.function.docvalues.LongDocValues;
 import org.apache.lucene.util.Bits;
 import org.apache.lucene.search.cache.LongValuesCreator;
 import org.apache.lucene.search.cache.CachedArray.LongValues;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/MaxDocValueSource.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/MaxDocValueSource.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/MaxDocValueSource.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java Tue Jun 28 23:32:27 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
 import org.apache.lucene.queries.function.DocValues;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/MultiBoolFunction.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/MultiBoolFunction.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/MultiBoolFunction.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java Tue Jun 28 23:32:27 2011
@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+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.ValueSource;
+import org.apache.lucene.queries.function.docvalues.BoolDocValues;
 import org.apache.lucene.search.IndexSearcher;
 
 import java.io.IOException;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/MultiFloatFunction.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/MultiFloatFunction.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/MultiFloatFunction.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java Tue Jun 28 23:32:27 2011
@@ -1,4 +1,4 @@
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -19,6 +19,7 @@ package org.apache.solr.search.function;
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
 import org.apache.lucene.queries.function.DocValues;
 import org.apache.lucene.queries.function.ValueSource;
+import org.apache.lucene.queries.function.docvalues.FloatDocValues;
 import org.apache.lucene.search.IndexSearcher;
 
 import java.util.Map;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFunction.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/MultiFunction.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFunction.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFunction.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/MultiFunction.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/MultiFunction.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFunction.java Tue Jun 28 23:32:27 2011
@@ -1,4 +1,4 @@
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiValueSource.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/MultiValueSource.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiValueSource.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiValueSource.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/MultiValueSource.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/MultiValueSource.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiValueSource.java Tue Jun 28 23:32:27 2011
@@ -1,4 +1,4 @@
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/NormValueSource.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/NormValueSource.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/NormValueSource.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java Tue Jun 28 23:32:27 2011
@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+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.ValueSource;
+import org.apache.lucene.queries.function.docvalues.FloatDocValues;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Similarity;
 import java.io.IOException;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/NumDocsValueSource.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/NumDocsValueSource.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/NumDocsValueSource.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java Tue Jun 28 23:32:27 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
 import org.apache.lucene.queries.function.DocValues;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumericFieldCacheSource.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/NumericFieldCacheSource.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumericFieldCacheSource.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumericFieldCacheSource.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/NumericFieldCacheSource.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/NumericFieldCacheSource.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumericFieldCacheSource.java Tue Jun 28 23:32:27 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 
 import org.apache.lucene.search.cache.CachedArray;
 import org.apache.lucene.search.cache.CachedArrayCreator;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/OrdFieldSource.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/OrdFieldSource.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/OrdFieldSource.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java Tue Jun 28 23:32:27 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 
 import org.apache.lucene.common.mutable.MutableValue;
 import org.apache.lucene.common.mutable.MutableValueInt;
@@ -23,6 +23,7 @@ import org.apache.lucene.index.IndexRead
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
 import org.apache.lucene.queries.function.DocValues;
 import org.apache.lucene.queries.function.ValueSource;
+import org.apache.lucene.queries.function.docvalues.IntDocValues;
 import org.apache.lucene.search.FieldCache;
 import org.apache.lucene.util.ReaderUtil;
 

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/PowFloatFunction.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/PowFloatFunction.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/PowFloatFunction.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/PowFloatFunction.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/PowFloatFunction.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/PowFloatFunction.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/PowFloatFunction.java Tue Jun 28 23:32:27 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 
 import org.apache.lucene.queries.function.DocValues;
 import org.apache.lucene.queries.function.ValueSource;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ProductFloatFunction.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ProductFloatFunction.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ProductFloatFunction.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ProductFloatFunction.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ProductFloatFunction.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ProductFloatFunction.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ProductFloatFunction.java Tue Jun 28 23:32:27 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 
 import org.apache.lucene.queries.function.DocValues;
 import org.apache.lucene.queries.function.ValueSource;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/QueryValueSource.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/QueryValueSource.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/QueryValueSource.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java Tue Jun 28 23:32:27 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 
 import org.apache.lucene.common.mutable.MutableValue;
 import org.apache.lucene.common.mutable.MutableValueFloat;
@@ -23,10 +23,10 @@ import org.apache.lucene.index.IndexRead
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
 import org.apache.lucene.queries.function.DocValues;
 import org.apache.lucene.queries.function.ValueSource;
+import org.apache.lucene.queries.function.docvalues.FloatDocValues;
 import org.apache.lucene.search.*;
 import org.apache.lucene.search.Weight.ScorerContext;
 import org.apache.lucene.util.ReaderUtil;
-import org.apache.solr.common.SolrException;
 
 import java.io.IOException;
 import java.util.Map;
@@ -144,7 +144,7 @@ class QueryDocValues extends FloatDocVal
       // a match!
       return scorer.score();
     } catch (IOException e) {
-      throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "caught exception in QueryDocVals("+q+") doc="+doc, e);
+      throw new RuntimeException("caught exception in QueryDocVals("+q+") doc="+doc, e);
     }
   }
 
@@ -175,7 +175,7 @@ class QueryDocValues extends FloatDocVal
       // a match!
       return true;
     } catch (IOException e) {
-      throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "caught exception in QueryDocVals("+q+") doc="+doc, e);
+      throw new RuntimeException("caught exception in QueryDocVals("+q+") doc="+doc, e);
     }
   }
 
@@ -184,7 +184,7 @@ class QueryDocValues extends FloatDocVal
      try {
        return exists(doc) ? scorer.score() : null;
      } catch (IOException e) {
-       throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "caught exception in QueryDocVals("+q+") doc="+doc, e);
+       throw new RuntimeException("caught exception in QueryDocVals("+q+") doc="+doc, e);
      }
    }
 
@@ -238,7 +238,7 @@ class QueryDocValues extends FloatDocVal
           mval.exists = true;
           return;
         } catch (IOException e) {
-          throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "caught exception in QueryDocVals("+q+") doc="+doc, e);
+          throw new RuntimeException("caught exception in QueryDocVals("+q+") doc="+doc, e);
         }
       }
     };

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/RangeMapFloatFunction.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/RangeMapFloatFunction.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/RangeMapFloatFunction.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/RangeMapFloatFunction.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/RangeMapFloatFunction.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/RangeMapFloatFunction.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/RangeMapFloatFunction.java Tue Jun 28 23:32:27 2011
@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+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.ValueSource;
+import org.apache.lucene.queries.function.docvalues.FloatDocValues;
 import org.apache.lucene.search.IndexSearcher;
 
 import java.io.IOException;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReciprocalFloatFunction.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReciprocalFloatFunction.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReciprocalFloatFunction.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReciprocalFloatFunction.java Tue Jun 28 23:32:27 2011
@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+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.ValueSource;
+import org.apache.lucene.queries.function.docvalues.FloatDocValues;
 import org.apache.lucene.search.IndexSearcher;
 
 import java.io.IOException;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReverseOrdFieldSource.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReverseOrdFieldSource.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReverseOrdFieldSource.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReverseOrdFieldSource.java Tue Jun 28 23:32:27 2011
@@ -15,12 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 
 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.ValueSource;
+import org.apache.lucene.queries.function.docvalues.IntDocValues;
 import org.apache.lucene.search.FieldCache;
 import org.apache.lucene.util.ReaderUtil;
 

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ScaleFloatFunction.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ScaleFloatFunction.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ScaleFloatFunction.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java Tue Jun 28 23:32:27 2011
@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+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.ValueSource;
+import org.apache.lucene.queries.function.docvalues.FloatDocValues;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.util.ReaderUtil;
 

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ShortFieldSource.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ShortFieldSource.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ShortFieldSource.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ShortFieldSource.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ShortFieldSource.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/ShortFieldSource.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ShortFieldSource.java Tue Jun 28 23:32:27 2011
@@ -1,4 +1,4 @@
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleBoolFunction.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/SimpleBoolFunction.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleBoolFunction.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleBoolFunction.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/SimpleBoolFunction.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/SimpleBoolFunction.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleBoolFunction.java Tue Jun 28 23:32:27 2011
@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+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.ValueSource;
+import org.apache.lucene.queries.function.docvalues.BoolDocValues;
 import org.apache.lucene.search.IndexSearcher;
 
 import java.io.IOException;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleFloatFunction.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/SimpleFloatFunction.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleFloatFunction.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleFloatFunction.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/SimpleFloatFunction.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/SimpleFloatFunction.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleFloatFunction.java Tue Jun 28 23:32:27 2011
@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+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.ValueSource;
+import org.apache.lucene.queries.function.docvalues.FloatDocValues;
 
 import java.io.IOException;
 import java.util.Map;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SingleFunction.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/SingleFunction.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SingleFunction.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SingleFunction.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/SingleFunction.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/SingleFunction.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SingleFunction.java Tue Jun 28 23:32:27 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.search.IndexSearcher;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SumFloatFunction.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/SumFloatFunction.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SumFloatFunction.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SumFloatFunction.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/SumFloatFunction.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/SumFloatFunction.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SumFloatFunction.java Tue Jun 28 23:32:27 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 
 import org.apache.lucene.queries.function.DocValues;
 import org.apache.lucene.queries.function.ValueSource;

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/TFValueSource.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/TFValueSource.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/TFValueSource.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java Tue Jun 28 23:32:27 2011
@@ -1,4 +1,4 @@
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,11 +20,11 @@ package org.apache.solr.search.function;
 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.docvalues.FloatDocValues;
 import org.apache.lucene.search.DocIdSetIterator;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Similarity;
 import org.apache.lucene.util.BytesRef;
-import org.apache.solr.common.SolrException;
 
 import java.io.IOException;
 import java.util.Map;
@@ -103,7 +103,7 @@ public class TFValueSource extends TermF
           // a match!
           return similarity.tf(docs.freq());
         } catch (IOException e) {
-          throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "caught exception in function "+description()+" : doc="+doc, e);
+          throw new RuntimeException("caught exception in function "+description()+" : doc="+doc, e);
         }
       }
     };

Copied: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java (from r1140876, lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/TermFreqValueSource.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java?p2=lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/TermFreqValueSource.java&r1=1140876&r2=1140906&rev=1140906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/TermFreqValueSource.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java Tue Jun 28 23:32:27 2011
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.solr.search.function;
+package org.apache.lucene.queries.function.valuesource;
 
 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.docvalues.IntDocValues;
 import org.apache.lucene.search.DocIdSetIterator;
 import org.apache.lucene.util.BytesRef;
-import org.apache.solr.common.SolrException;
 
 import java.io.IOException;
 import java.util.Map;
@@ -100,7 +100,7 @@ public class TermFreqValueSource extends
           // a match!
           return docs.freq();
         } catch (IOException e) {
-          throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "caught exception in function "+description()+" : doc="+doc, e);
+          throw new RuntimeException("caught exception in function "+description()+" : doc="+doc, e);
         }
       }
     };