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 2013/09/15 05:42:16 UTC
svn commit: r1523394 - in /lucene/dev/branches/lucene5207:
dev-tools/idea/lucene/expressions/ dev-tools/maven/lucene/expressions/
lucene/core/src/test/org/apache/lucene/search/
lucene/expressions/src/java/org/apache/lucene/expressions/
lucene/expressio...
Author: rmuir
Date: Sun Sep 15 03:42:15 2013
New Revision: 1523394
URL: http://svn.apache.org/r1523394
Log:
LUCENE-5207: simplify
Added:
lucene/dev/branches/lucene5207/lucene/licenses/asm-commons-4.1.jar.sha1 (with props)
lucene/dev/branches/lucene5207/lucene/licenses/asm-commons-LICENSE-BSD_LIKE.txt (with props)
lucene/dev/branches/lucene5207/lucene/licenses/asm-commons-NOTICE.txt (with props)
Modified:
lucene/dev/branches/lucene5207/dev-tools/idea/lucene/expressions/expressions.iml (props changed)
lucene/dev/branches/lucene5207/dev-tools/maven/lucene/expressions/pom.xml.template (props changed)
lucene/dev/branches/lucene5207/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java
lucene/dev/branches/lucene5207/lucene/expressions/src/java/org/apache/lucene/expressions/ExpressionFunctionValues.java
lucene/dev/branches/lucene5207/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java
Modified: lucene/dev/branches/lucene5207/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5207/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java?rev=1523394&r1=1523393&r2=1523394&view=diff
==============================================================================
--- lucene/dev/branches/lucene5207/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java (original)
+++ lucene/dev/branches/lucene5207/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java Sun Sep 15 03:42:15 2013
@@ -126,19 +126,19 @@ public class TestSearchAfter extends Luc
}
void assertQuery(Query query, Filter filter, Sort sort) throws Exception {
- int maxDoc = searcher.getIndexReader().maxDoc();
+ int size = _TestUtil.nextInt(random(), 1, searcher.getIndexReader().maxDoc());
TopDocs all;
- int pageSize = _TestUtil.nextInt(random(), 1, maxDoc*2);
+ int pageSize = _TestUtil.nextInt(random(), 1, size*2);
if (VERBOSE) {
System.out.println("\nassertQuery: query=" + query + " filter=" + filter + " sort=" + sort + " pageSize=" + pageSize);
}
final boolean doMaxScore = random().nextBoolean();
if (sort == null) {
- all = searcher.search(query, filter, maxDoc);
+ all = searcher.search(query, filter, size);
} else if (sort == Sort.RELEVANCE) {
- all = searcher.search(query, filter, maxDoc, sort, true, doMaxScore);
+ all = searcher.search(query, filter, size, sort, true, doMaxScore);
} else {
- all = searcher.search(query, filter, maxDoc, sort);
+ all = searcher.search(query, filter, size, sort);
}
if (VERBOSE) {
System.out.println(" all.totalHits=" + all.totalHits);
Modified: lucene/dev/branches/lucene5207/lucene/expressions/src/java/org/apache/lucene/expressions/ExpressionFunctionValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5207/lucene/expressions/src/java/org/apache/lucene/expressions/ExpressionFunctionValues.java?rev=1523394&r1=1523393&r2=1523394&view=diff
==============================================================================
--- lucene/dev/branches/lucene5207/lucene/expressions/src/java/org/apache/lucene/expressions/ExpressionFunctionValues.java (original)
+++ lucene/dev/branches/lucene5207/lucene/expressions/src/java/org/apache/lucene/expressions/ExpressionFunctionValues.java Sun Sep 15 03:42:15 2013
@@ -53,12 +53,7 @@ class ExpressionFunctionValues extends F
}
@Override
- public String toString(int document) {
- if (currentDocument != document) {
- currentDocument = document;
- currentValue = expression.evaluate(document, functionValues);
- }
-
- return "ExpressionFunctionValues(" + document + ": " + currentValue + ")";
+ public String toString(int document) {
+ return "ExpressionFunctionValues(" + document + ": " + objectVal(document) + ")";
}
}
Modified: lucene/dev/branches/lucene5207/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5207/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java?rev=1523394&r1=1523393&r2=1523394&view=diff
==============================================================================
--- lucene/dev/branches/lucene5207/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java (original)
+++ lucene/dev/branches/lucene5207/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java Sun Sep 15 03:42:15 2013
@@ -104,7 +104,7 @@ public class TestExpressionSorts extends
bq.add(new TermQuery(new Term("english", "one")), BooleanClause.Occur.SHOULD);
bq.add(new TermQuery(new Term("oddeven", "even")), BooleanClause.Occur.SHOULD);
assertQuery(bq, null);
- // force out of order
+ // force in order
bq.add(new TermQuery(new Term("english", "two")), BooleanClause.Occur.SHOULD);
bq.setMinimumNumberShouldMatch(2);
assertQuery(bq, null);
Added: lucene/dev/branches/lucene5207/lucene/licenses/asm-commons-4.1.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5207/lucene/licenses/asm-commons-4.1.jar.sha1?rev=1523394&view=auto
==============================================================================
--- lucene/dev/branches/lucene5207/lucene/licenses/asm-commons-4.1.jar.sha1 (added)
+++ lucene/dev/branches/lucene5207/lucene/licenses/asm-commons-4.1.jar.sha1 Sun Sep 15 03:42:15 2013
@@ -0,0 +1 @@
+f8b86f4ee6e02082f63a658e00eb5506821253c6
Added: lucene/dev/branches/lucene5207/lucene/licenses/asm-commons-LICENSE-BSD_LIKE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5207/lucene/licenses/asm-commons-LICENSE-BSD_LIKE.txt?rev=1523394&view=auto
==============================================================================
--- lucene/dev/branches/lucene5207/lucene/licenses/asm-commons-LICENSE-BSD_LIKE.txt (added)
+++ lucene/dev/branches/lucene5207/lucene/licenses/asm-commons-LICENSE-BSD_LIKE.txt Sun Sep 15 03:42:15 2013
@@ -0,0 +1,26 @@
+Copyright (c) 2012 France Télécom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
Added: lucene/dev/branches/lucene5207/lucene/licenses/asm-commons-NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5207/lucene/licenses/asm-commons-NOTICE.txt?rev=1523394&view=auto
==============================================================================
--- lucene/dev/branches/lucene5207/lucene/licenses/asm-commons-NOTICE.txt (added)
+++ lucene/dev/branches/lucene5207/lucene/licenses/asm-commons-NOTICE.txt Sun Sep 15 03:42:15 2013
@@ -0,0 +1 @@
+