You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by sh...@apache.org on 2009/04/24 11:46:49 UTC
svn commit: r768240 - in /lucene/solr/trunk: ./ lib/
src/java/org/apache/solr/schema/ src/java/org/apache/solr/search/
Author: shalin
Date: Fri Apr 24 09:46:49 2009
New Revision: 768240
URL: http://svn.apache.org/viewvc?rev=768240&view=rev
Log:
Upgraded to Lucene 2.9-dev r768228
Fixes for changes in trie introduced with LUCENE-1602
Implemented SolrIndexSearcher#search(Weight, Filter, Collector) to fix compile error
Modified:
lucene/solr/trunk/CHANGES.txt
lucene/solr/trunk/lib/lucene-analyzers-2.9-dev.jar
lucene/solr/trunk/lib/lucene-core-2.9-dev.jar
lucene/solr/trunk/lib/lucene-highlighter-2.9-dev.jar
lucene/solr/trunk/lib/lucene-memory-2.9-dev.jar
lucene/solr/trunk/lib/lucene-queries-2.9-dev.jar
lucene/solr/trunk/lib/lucene-snowball-2.9-dev.jar
lucene/solr/trunk/lib/lucene-spellchecker-2.9-dev.jar
lucene/solr/trunk/src/java/org/apache/solr/schema/TrieField.java
lucene/solr/trunk/src/java/org/apache/solr/search/SolrIndexSearcher.java
Modified: lucene/solr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=768240&r1=768239&r2=768240&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Fri Apr 24 09:46:49 2009
@@ -402,6 +402,8 @@
26. SOLR-804: Added Lucene's misc contrib JAR (rev 764281). (gsingers)
+27. Upgraded to Lucene 2.9-dev r768228 (shalin)
+
Build
----------------------
1. SOLR-776: Added in ability to sign artifacts via Ant for releases (gsingers)
Modified: lucene/solr/trunk/lib/lucene-analyzers-2.9-dev.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-analyzers-2.9-dev.jar?rev=768240&r1=768239&r2=768240&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/solr/trunk/lib/lucene-core-2.9-dev.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-core-2.9-dev.jar?rev=768240&r1=768239&r2=768240&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/solr/trunk/lib/lucene-highlighter-2.9-dev.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-highlighter-2.9-dev.jar?rev=768240&r1=768239&r2=768240&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/solr/trunk/lib/lucene-memory-2.9-dev.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-memory-2.9-dev.jar?rev=768240&r1=768239&r2=768240&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/solr/trunk/lib/lucene-queries-2.9-dev.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-queries-2.9-dev.jar?rev=768240&r1=768239&r2=768240&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/solr/trunk/lib/lucene-snowball-2.9-dev.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-snowball-2.9-dev.jar?rev=768240&r1=768239&r2=768240&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/solr/trunk/lib/lucene-spellchecker-2.9-dev.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-spellchecker-2.9-dev.jar?rev=768240&r1=768239&r2=768240&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/solr/trunk/src/java/org/apache/solr/schema/TrieField.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/schema/TrieField.java?rev=768240&r1=768239&r2=768240&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/schema/TrieField.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/schema/TrieField.java Fri Apr 24 09:46:49 2009
@@ -17,12 +17,10 @@
package org.apache.solr.schema;
import org.apache.lucene.document.Fieldable;
-import org.apache.lucene.search.Filter;
-import org.apache.lucene.search.SortField;
import org.apache.lucene.search.Query;
-import org.apache.lucene.search.ConstantScoreQuery;
-import org.apache.lucene.search.trie.IntTrieRangeFilter;
-import org.apache.lucene.search.trie.LongTrieRangeFilter;
+import org.apache.lucene.search.SortField;
+import org.apache.lucene.search.trie.IntTrieRangeQuery;
+import org.apache.lucene.search.trie.LongTrieRangeQuery;
import org.apache.lucene.search.trie.TrieUtils;
import org.apache.solr.analysis.*;
import org.apache.solr.common.SolrException;
@@ -42,9 +40,7 @@
* link. The possible number of terms increases dramatically with higher precision steps (factor 2^precisionStep). For
* the fast range search to work, trie fields must be indexed.
* <p/>
- * Trie fields are <b>not</b> sortable in numerical order. Also, they cannot be used in function queries. If one needs
- * sorting as well as fast range search, one should create a copy field specifically for sorting. Same workaround is
- * suggested for using trie fields in function queries as well.
+ * Trie fields are sortable in numerical order and can be used in function queries.
* <p/>
* Note that if you use a precisionStep of 32 for int/float and 64 for long/double, then multiple terms will not be
* generated, range search will be no faster than any other number field, but sorting will be possible.
@@ -171,39 +167,39 @@
Query query = null;
switch (type) {
case INTEGER:
- query = new IntTrieRangeFilter(field, precisionStep,
+ query = new IntTrieRangeQuery(field, precisionStep,
min == null ? null : Integer.parseInt(min),
max == null ? null : Integer.parseInt(max),
- minInclusive, maxInclusive).asQuery();
+ minInclusive, maxInclusive);
break;
case FLOAT:
- query = new IntTrieRangeFilter(field, precisionStep,
+ query = new IntTrieRangeQuery(field, precisionStep,
min == null ? null : TrieUtils.floatToSortableInt(Float.parseFloat(min)),
max == null ? null : TrieUtils.floatToSortableInt(Float.parseFloat(max)),
- minInclusive, maxInclusive).asQuery();
+ minInclusive, maxInclusive);
break;
case LONG:
- query = new LongTrieRangeFilter(field, precisionStep,
+ query = new LongTrieRangeQuery(field, precisionStep,
min == null ? null : Long.parseLong(min),
max == null ? null : Long.parseLong(max),
- minInclusive, maxInclusive).asQuery();
+ minInclusive, maxInclusive);
break;
case DOUBLE:
- query = new LongTrieRangeFilter(field, precisionStep,
+ query = new LongTrieRangeQuery(field, precisionStep,
min == null ? null : TrieUtils.doubleToSortableLong(Double.parseDouble(min)),
max == null ? null : TrieUtils.doubleToSortableLong(Double.parseDouble(max)),
- minInclusive, maxInclusive).asQuery();
+ minInclusive, maxInclusive);
break;
case DATE:
- query = new LongTrieRangeFilter(field, precisionStep,
+ query = new LongTrieRangeQuery(field, precisionStep,
min == null ? null : dateField.parseMath(null, min).getTime(),
max == null ? null : dateField.parseMath(null, max).getTime(),
- minInclusive, maxInclusive).asQuery();
+ minInclusive, maxInclusive);
break;
default:
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Unknown type for trie field");
}
-
+
return query;
}
Modified: lucene/solr/trunk/src/java/org/apache/solr/search/SolrIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/search/SolrIndexSearcher.java?rev=768240&r1=768239&r2=768240&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/search/SolrIndexSearcher.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/search/SolrIndexSearcher.java Fri Apr 24 09:46:49 2009
@@ -497,6 +497,10 @@
searcher.search(weight, filter, hitCollector);
}
+ public void search(Weight weight, Filter filter, Collector collector) throws IOException {
+ searcher.search(weight, filter, collector);
+ }
+
public Query rewrite(Query original) throws IOException {
return searcher.rewrite(original);
}