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

SOLR-1297: fix for more deep function 

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@917547 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Koji Sekiguchi 2010-03-01 14:27:45 +00:00
parent 4aa3cad3ee
commit 6efeb6196f
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/apache/solr/search/QueryParsing.java
View File

@ -264,7 +264,7 @@ public class QueryParsing {
needOrder = false;
}
}
} else if (chars[i] == '(' && functionDepth == 0) {
} else if (chars[i] == '(' && functionDepth >= 0) {
buffer.append(chars[i]);
functionDepth++;
} else if (chars[i] == ')' && functionDepth > 0) {

6
src/test/org/apache/solr/search/QueryParsingTest.java
View File

@ -100,6 +100,12 @@ public class QueryParsingTest extends AbstractSolrTestCase {
//Not thrilled about the fragility of string matching here, but...
//the value sources get wrapped, so the out field is different than the input
assertEquals(flds[0].getField(), "pow(float(weight),const(2.0))");
//test functions (more deep)
sort = QueryParsing.parseSort("sum(product(r_f,sum(d_f,t_f,1)),a_f) asc", schema);
flds = sort.getSort();
assertEquals(flds[0].getType(), SortField.CUSTOM);
assertEquals(flds[0].getField(), "sum(product(float(r_f),sum(float(d_f),float(t_f),const(1.0))),float(a_f))");
sort = QueryParsing.parseSort("pow(weight, 2) desc", schema);
flds = sort.getSort();