Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-2114: fix parsing error in hsin function 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@995267 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Grant Ingersoll 2010-09-08 22:29:32 +00:00
parent 9dd3bebcfb
commit 77f39ebc0f
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -466,6 +466,8 @@ Bug Fixes
prevent an exception in one facet command from affecting another prevent an exception in one facet command from affecting another
facet command. (yonik) facet command. (yonik)
* SOLR-2114: Fixed parsing error in hsin function. The function signature has changed slightly. (gsingers)
Other Changes Other Changes
---------------------- ----------------------

10
solr/src/java/org/apache/solr/search/ValueSourceParser.java
View File

@ -241,12 +241,17 @@ public abstract class ValueSourceParser implements NamedListInitializedPlugin {
public ValueSource parse(FunctionQParser fp) throws ParseException { public ValueSource parse(FunctionQParser fp) throws ParseException {
double radius = fp.parseDouble(); double radius = fp.parseDouble();
//SOLR-2114, make the convert flag required, since the parser doesn't support much in the way of lookahead or the ability to convert a String into a ValueSource
boolean convert = Boolean.parseBoolean(fp.parseArg());
MultiValueSource pv1; MultiValueSource pv1;
MultiValueSource pv2; MultiValueSource pv2;
ValueSource one = fp.parseValueSource(); ValueSource one = fp.parseValueSource();
ValueSource two = fp.parseValueSource(); ValueSource two = fp.parseValueSource();
if (fp.hasMoreArguments()) { if (fp.hasMoreArguments()) {
List<ValueSource> s1 = new ArrayList<ValueSource>(); List<ValueSource> s1 = new ArrayList<ValueSource>();
s1.add(one); s1.add(one);
s1.add(two); s1.add(two);
@ -267,10 +272,7 @@ public abstract class ValueSourceParser implements NamedListInitializedPlugin {
"Input must either be 2 MultiValueSources, or there must be 4 ValueSources"); "Input must either be 2 MultiValueSources, or there must be 4 ValueSources");
} }
} }
boolean convert = false;
if (fp.hasMoreArguments()){
convert = Boolean.parseBoolean(fp.parseArg());
}
return new HaversineFunction(pv1, pv2, radius, convert); return new HaversineFunction(pv1, pv2, radius, convert);
} }
}); });

17
solr/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java
View File

@ -44,15 +44,17 @@ public class DistanceFunctionTest extends SolrTestCaseJ4 {
assertU(adoc("id", "4", "x_td", String.valueOf(Math.PI / 4), "y_td", String.valueOf(Math.PI / 4), "gh_s", GeoHashUtils.encode(32.7693246, -81.9289094))); assertU(adoc("id", "4", "x_td", String.valueOf(Math.PI / 4), "y_td", String.valueOf(Math.PI / 4), "gh_s", GeoHashUtils.encode(32.7693246, -81.9289094)));
assertU(adoc("id", "5", "x_td", "45.0", "y_td", "45.0", assertU(adoc("id", "5", "x_td", "45.0", "y_td", "45.0",
"gh_s", GeoHashUtils.encode(32.7693246, -81.9289094))); "gh_s", GeoHashUtils.encode(32.7693246, -81.9289094)));
assertU(adoc("id", "6", "point_hash", "32.5, -79.0")); assertU(adoc("id", "6", "point_hash", "32.5, -79.0", "point", "32.5, -79.0"));
assertU(adoc("id", "7", "point_hash", "32.6, -78.0")); assertU(adoc("id", "7", "point_hash", "32.6, -78.0", "point", "32.6, -78.0"));
assertU(commit()); assertU(commit());
//Get the haversine distance between the point 0,0 and the docs above assuming a radius of 1 //Get the haversine distance between the point 0,0 and the docs above assuming a radius of 1
assertQ(req("fl", "*,score", "q", "{!func}hsin(1, x_td, y_td, 0, 0)", "fq", "id:1"), "//float[@name='score']='0.0'"); assertQ(req("fl", "*,score", "q", "{!func}hsin(1, false, x_td, y_td, 0, 0)", "fq", "id:1"), "//float[@name='score']='0.0'");
assertQ(req("fl", "*,score", "q", "{!func}hsin(1, x_td, y_td, 0, 0)", "fq", "id:2"), "//float[@name='score']='" + (float) (Math.PI / 2) + "'"); assertQ(req("fl", "*,score", "q", "{!func}hsin(1, false, x_td, y_td, 0, 0)", "fq", "id:2"), "//float[@name='score']='" + (float) (Math.PI / 2) + "'");
assertQ(req("fl", "*,score", "q", "{!func}hsin(1, x_td, y_td, 0, 0)", "fq", "id:3"), "//float[@name='score']='" + (float) (Math.PI / 2) + "'"); assertQ(req("fl", "*,score", "q", "{!func}hsin(1, false, x_td, y_td, 0, 0)", "fq", "id:3"), "//float[@name='score']='" + (float) (Math.PI / 2) + "'");
assertQ(req("fl", "*,score", "q", "{!func}hsin(1, x_td, y_td, 0, 0)", "fq", "id:4"), "//float[@name='score']='1.0471976'"); assertQ(req("fl", "*,score", "q", "{!func}hsin(1, false, x_td, y_td, 0, 0)", "fq", "id:4"), "//float[@name='score']='1.0471976'");
assertQ(req("fl", "*,score", "q", "{!func}hsin(1, x_td, y_td, 0, 0, true)", "fq", "id:5"), "//float[@name='score']='1.0471976'"); assertQ(req("fl", "*,score", "q", "{!func}hsin(1, true, x_td, y_td, 0, 0)", "fq", "id:5"), "//float[@name='score']='1.0471976'");
//SOLR-2114
assertQ(req("fl", "*,score", "q", "{!func}hsin(6371.009, true, point, vector(0, 0))", "fq", "id:6"), "//float[@name='score']='8977.814'");
//Geo Hash Haversine //Geo Hash Haversine
//Can verify here: http://www.movable-type.co.uk/scripts/latlong.html, but they use a slightly different radius for the earth, so just be close //Can verify here: http://www.movable-type.co.uk/scripts/latlong.html, but they use a slightly different radius for the earth, so just be close
@ -67,6 +69,7 @@ public class DistanceFunctionTest extends SolrTestCaseJ4 {
assertQ(req("fl", "*,score", "q", "{!func}ghhsin(" + DistanceUtils.EARTH_MEAN_RADIUS_KM + ", gh_s, geohash(32, -79))", "fq", "id:1"), "//float[@name='score']='122.171875'"); assertQ(req("fl", "*,score", "q", "{!func}ghhsin(" + DistanceUtils.EARTH_MEAN_RADIUS_KM + ", gh_s, geohash(32, -79))", "fq", "id:1"), "//float[@name='score']='122.171875'");
} }
@Test @Test