You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/12/13 19:39:11 UTC
svn commit: r1213844 [5/5] - in /lucene/dev/trunk: ./ lucene/
lucene/contrib/memory/src/java/org/apache/lucene/index/memory/
lucene/contrib/misc/src/java/org/apache/lucene/document/
lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/rege...
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java?rev=1213844&r1=1213843&r2=1213844&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java Tue Dec 13 18:39:06 2011
@@ -17,7 +17,7 @@ package org.apache.solr.search.function.
*/
-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.spatial.DistanceUtils;
@@ -55,9 +55,9 @@ public class GeohashHaversineFunction ex
}
@Override
- public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
- final DocValues gh1DV = geoHash1.getValues(context, readerContext);
- final DocValues gh2DV = geoHash2.getValues(context, readerContext);
+ public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ final FunctionValues gh1DV = geoHash1.getValues(context, readerContext);
+ final FunctionValues gh2DV = geoHash2.getValues(context, readerContext);
return new DoubleDocValues(this) {
@Override
@@ -75,7 +75,7 @@ public class GeohashHaversineFunction ex
};
}
- protected double distance(int doc, DocValues gh1DV, DocValues gh2DV) {
+ protected double distance(int doc, FunctionValues gh1DV, FunctionValues gh2DV) {
double result = 0;
String h1 = gh1DV.strVal(doc);
String h2 = gh2DV.strVal(doc);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java?rev=1213844&r1=1213843&r2=1213844&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java Tue Dec 13 18:39:06 2011
@@ -17,7 +17,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.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
import org.apache.lucene.queries.function.valuesource.ConstNumberSource;
@@ -198,9 +198,9 @@ public class HaversineConstFunction exte
}
@Override
- public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
- final DocValues latVals = latSource.getValues(context, readerContext);
- final DocValues lonVals = lonSource.getValues(context, readerContext);
+ public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ final FunctionValues latVals = latSource.getValues(context, readerContext);
+ final FunctionValues lonVals = lonSource.getValues(context, readerContext);
final double latCenterRad = this.latCenter * DistanceUtils.DEGREES_TO_RADIANS;
final double lonCenterRad = this.lonCenter * DistanceUtils.DEGREES_TO_RADIANS;
final double latCenterRad_cos = this.latCenterRad_cos;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/HaversineFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/HaversineFunction.java?rev=1213844&r1=1213843&r2=1213844&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/HaversineFunction.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/HaversineFunction.java Tue Dec 13 18:39:06 2011
@@ -17,7 +17,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.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
import org.apache.lucene.queries.function.valuesource.MultiValueSource;
@@ -70,7 +70,7 @@ public class HaversineFunction extends V
* @param p2DV
* @return The haversine distance formula
*/
- protected double distance(int doc, DocValues p1DV, DocValues p2DV) {
+ protected double distance(int doc, FunctionValues p1DV, FunctionValues p2DV) {
double[] p1D = new double[2];
double[] p2D = new double[2];
@@ -96,10 +96,10 @@ public class HaversineFunction extends V
@Override
- public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
- final DocValues vals1 = p1.getValues(context, readerContext);
+ public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ final FunctionValues vals1 = p1.getValues(context, readerContext);
- final DocValues vals2 = p2.getValues(context, readerContext);
+ final FunctionValues vals2 = p2.getValues(context, readerContext);
return new DoubleDocValues(this) {
@Override
public double doubleVal(int doc) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java?rev=1213844&r1=1213843&r2=1213844&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java Tue Dec 13 18:39:06 2011
@@ -16,7 +16,7 @@ package org.apache.solr.search.function.
* limitations under the License.
*/
-import org.apache.lucene.queries.function.DocValues;
+import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.valuesource.MultiValueSource;
import org.apache.lucene.spatial.DistanceUtils;
@@ -43,7 +43,7 @@ public class SquaredEuclideanFunction ex
* @param doc The doc to score
*/
@Override
- protected double distance(int doc, DocValues dv1, DocValues dv2) {
+ protected double distance(int doc, FunctionValues dv1, FunctionValues dv2) {
double[] vals1 = new double[source1.dimension()];
double[] vals2 = new double[source1.dimension()];
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java?rev=1213844&r1=1213843&r2=1213844&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java Tue Dec 13 18:39:06 2011
@@ -18,7 +18,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.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
import org.apache.lucene.search.spell.StringDistance;
@@ -49,9 +49,9 @@ public class StringDistanceFunction exte
}
@Override
- public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
- final DocValues str1DV = str1.getValues(context, readerContext);
- final DocValues str2DV = str2.getValues(context, readerContext);
+ public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ final FunctionValues str1DV = str1.getValues(context, readerContext);
+ final FunctionValues str2DV = str2.getValues(context, readerContext);
return new FloatDocValues(this) {
@Override
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java?rev=1213844&r1=1213843&r2=1213844&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java Tue Dec 13 18:39:06 2011
@@ -17,7 +17,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.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
import org.apache.lucene.queries.function.valuesource.MultiValueSource;
@@ -69,7 +69,7 @@ public class VectorDistanceFunction exte
* @param dv2 The values from the second MultiValueSource
* @return The distance
*/
- protected double distance(int doc, DocValues dv1, DocValues dv2) {
+ protected double distance(int doc, FunctionValues dv1, FunctionValues dv2) {
//Handle some special cases:
double[] vals1 = new double[source1.dimension()];
double[] vals2 = new double[source1.dimension()];
@@ -79,11 +79,11 @@ public class VectorDistanceFunction exte
}
@Override
- public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
+ public FunctionValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
- final DocValues vals1 = source1.getValues(context, readerContext);
+ final FunctionValues vals1 = source1.getValues(context, readerContext);
- final DocValues vals2 = source2.getValues(context, readerContext);
+ final FunctionValues vals2 = source2.getValues(context, readerContext);
return new DoubleDocValues(this) {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/DummyValueSourceParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/DummyValueSourceParser.java?rev=1213844&r1=1213843&r2=1213844&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/DummyValueSourceParser.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/DummyValueSourceParser.java Tue Dec 13 18:39:06 2011
@@ -16,7 +16,7 @@ package org.apache.solr.core;
* limitations under the License.
*/
-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.valuesource.SimpleFloatFunction;
import org.apache.lucene.queryparser.classic.ParseException;
@@ -47,7 +47,7 @@ public class DummyValueSourceParser exte
}
@Override
- protected float func(int doc, DocValues vals) {
+ protected float func(int doc, FunctionValues vals) {
float result = 0;
return result;
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java?rev=1213844&r1=1213843&r2=1213844&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java Tue Dec 13 18:39:06 2011
@@ -18,7 +18,7 @@ package org.apache.solr.search;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader.ReaderContext;
-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;
import org.apache.solr.SolrTestCaseJ4;
@@ -53,7 +53,7 @@ public class TestIndexSearcher extends S
AtomicReaderContext[] leaves = ReaderUtil.leaves(topReaderContext);
int idx = ReaderUtil.subIndex(doc, leaves);
AtomicReaderContext leaf = leaves[idx];
- DocValues vals = vs.getValues(context, leaf);
+ FunctionValues vals = vs.getValues(context, leaf);
return vals.strVal(doc-leaf.docBase);
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/function/NvlValueSourceParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/function/NvlValueSourceParser.java?rev=1213844&r1=1213843&r2=1213844&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/function/NvlValueSourceParser.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/function/NvlValueSourceParser.java Tue Dec 13 18:39:06 2011
@@ -17,7 +17,7 @@
package org.apache.solr.search.function;
-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.valuesource.SimpleFloatFunction;
import org.apache.lucene.queryparser.classic.ParseException;
@@ -57,7 +57,7 @@ public class NvlValueSourceParser extend
}
@Override
- protected float func(int doc, DocValues vals) {
+ protected float func(int doc, FunctionValues vals) {
float v = vals.floatVal(doc);
if (v == nvlFloatValue) {
return nvl;