Return-Path: Delivered-To: apmail-lucene-solr-commits-archive@minotaur.apache.org Received: (qmail 39452 invoked from network); 1 Mar 2010 14:28:08 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 1 Mar 2010 14:28:08 -0000 Received: (qmail 12316 invoked by uid 500); 1 Mar 2010 14:28:07 -0000 Delivered-To: apmail-lucene-solr-commits-archive@lucene.apache.org Received: (qmail 12230 invoked by uid 500); 1 Mar 2010 14:28:07 -0000 Mailing-List: contact solr-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: solr-dev@lucene.apache.org Delivered-To: mailing list solr-commits@lucene.apache.org Received: (qmail 11992 invoked by uid 99); 1 Mar 2010 14:28:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Mar 2010 14:28:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Mar 2010 14:28:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CF9AE238890A; Mon, 1 Mar 2010 14:27:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r917547 - in /lucene/solr/trunk/src: java/org/apache/solr/search/QueryParsing.java test/org/apache/solr/search/QueryParsingTest.java Date: Mon, 01 Mar 2010 14:27:45 -0000 To: solr-commits@lucene.apache.org From: koji@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100301142745.CF9AE238890A@eris.apache.org> Author: koji Date: Mon Mar 1 14:27:45 2010 New Revision: 917547 URL: http://svn.apache.org/viewvc?rev=917547&view=rev Log: SOLR-1297: fix for more deep function Modified: lucene/solr/trunk/src/java/org/apache/solr/search/QueryParsing.java lucene/solr/trunk/src/test/org/apache/solr/search/QueryParsingTest.java Modified: lucene/solr/trunk/src/java/org/apache/solr/search/QueryParsing.java URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/search/QueryParsing.java?rev=917547&r1=917546&r2=917547&view=diff ============================================================================== --- lucene/solr/trunk/src/java/org/apache/solr/search/QueryParsing.java (original) +++ lucene/solr/trunk/src/java/org/apache/solr/search/QueryParsing.java Mon Mar 1 14:27:45 2010 @@ -264,7 +264,7 @@ 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) { Modified: lucene/solr/trunk/src/test/org/apache/solr/search/QueryParsingTest.java URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/org/apache/solr/search/QueryParsingTest.java?rev=917547&r1=917546&r2=917547&view=diff ============================================================================== --- lucene/solr/trunk/src/test/org/apache/solr/search/QueryParsingTest.java (original) +++ lucene/solr/trunk/src/test/org/apache/solr/search/QueryParsingTest.java Mon Mar 1 14:27:45 2010 @@ -100,6 +100,12 @@ //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();