Apache/lucene
1
0
Fork 0
mirror of https://github.com/apache/lucene.git synced 2025-02-27 21:09:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

move FunctionQuery and ConstantScorePrefixQuery to solr package

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/incubator/solr/trunk@374526 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2006-02-02 22:06:28 +00:00
parent 1a56b86b6d
commit bf82fb1970
26 changed files with 129 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/apache/solr/schema/BCDIntField.java
View File

@ -17,7 +17,7 @@
package org.apache.solr.schema;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.function.ValueSource;
import org.apache.solr.search.function.ValueSource;
import org.apache.lucene.document.Field;
import org.apache.solr.util.BCDUtils;
import org.apache.solr.request.XMLWriter;

4
src/java/org/apache/solr/schema/BoolField.java
View File

@ -17,8 +17,8 @@
package org.apache.solr.schema;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.function.ValueSource;
import org.apache.lucene.search.function.OrdFieldSource;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.OrdFieldSource;
import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;

4
src/java/org/apache/solr/schema/DateField.java
View File

@ -20,8 +20,8 @@ import org.apache.solr.core.SolrException;
import org.apache.solr.request.XMLWriter;
import org.apache.lucene.document.Field;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.function.ValueSource;
import org.apache.lucene.search.function.OrdFieldSource;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.OrdFieldSource;
import java.util.Map;
import java.io.IOException;

4
src/java/org/apache/solr/schema/DoubleField.java
View File

@ -17,8 +17,8 @@
package org.apache.solr.schema;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.function.ValueSource;
import org.apache.lucene.search.function.FloatFieldSource;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.FloatFieldSource;
import org.apache.lucene.document.Field;
import org.apache.solr.request.XMLWriter;

4
src/java/org/apache/solr/schema/FieldType.java
View File

@ -22,8 +22,8 @@ import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.Token;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.function.ValueSource;
import org.apache.lucene.search.function.OrdFieldSource;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.OrdFieldSource;
import org.apache.solr.search.Sorting;
import org.apache.solr.request.XMLWriter;

4
src/java/org/apache/solr/schema/FloatField.java
View File

@ -17,8 +17,8 @@
package org.apache.solr.schema;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.function.ValueSource;
import org.apache.lucene.search.function.FloatFieldSource;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.FloatFieldSource;
import org.apache.lucene.document.Field;
import org.apache.solr.request.XMLWriter;

4
src/java/org/apache/solr/schema/IntField.java
View File

@ -17,8 +17,8 @@
package org.apache.solr.schema;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.function.ValueSource;
import org.apache.lucene.search.function.IntFieldSource;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.IntFieldSource;
import org.apache.lucene.document.Field;
import org.apache.solr.request.XMLWriter;

4
src/java/org/apache/solr/schema/LongField.java
View File

@ -17,8 +17,8 @@
package org.apache.solr.schema;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.function.ValueSource;
import org.apache.lucene.search.function.IntFieldSource;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.IntFieldSource;
import org.apache.lucene.document.Field;
import org.apache.solr.request.XMLWriter;

6
src/java/org/apache/solr/schema/SortableDoubleField.java
View File

@ -18,9 +18,9 @@ package org.apache.solr.schema;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.function.ValueSource;
import org.apache.lucene.search.function.FieldCacheSource;
import org.apache.lucene.search.function.DocValues;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.FieldCacheSource;
import org.apache.solr.search.function.DocValues;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
import org.apache.solr.util.NumberUtils;

6
src/java/org/apache/solr/schema/SortableFloatField.java
View File

@ -18,9 +18,9 @@ package org.apache.solr.schema;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.function.ValueSource;
import org.apache.lucene.search.function.FieldCacheSource;
import org.apache.lucene.search.function.DocValues;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.FieldCacheSource;
import org.apache.solr.search.function.DocValues;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
import org.apache.solr.util.NumberUtils;

6
src/java/org/apache/solr/schema/SortableIntField.java
View File

@ -18,9 +18,9 @@ package org.apache.solr.schema;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.function.ValueSource;
import org.apache.lucene.search.function.FieldCacheSource;
import org.apache.lucene.search.function.DocValues;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.FieldCacheSource;
import org.apache.solr.search.function.DocValues;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
import org.apache.solr.util.NumberUtils;

6
src/java/org/apache/solr/schema/SortableLongField.java
View File

@ -18,9 +18,9 @@ package org.apache.solr.schema;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.function.ValueSource;
import org.apache.lucene.search.function.FieldCacheSource;
import org.apache.lucene.search.function.DocValues;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.FieldCacheSource;
import org.apache.solr.search.function.DocValues;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
import org.apache.solr.util.NumberUtils;

4
src/lucene_extras/org/apache/lucene/search/ConstantScorePrefixQuery.java → src/java/org/apache/solr/search/ConstantScorePrefixQuery.java
View File

@ -14,10 +14,12 @@
* limitations under the License.
*/
package org.apache.lucene.search;
package org.apache.solr.search;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.ConstantScoreQuery;
import java.io.IOException;

174
src/lucene_extras/org/apache/lucene/search/PrefixFilter.java → src/java/org/apache/solr/search/PrefixFilter.java
View File

@ -1,95 +1,79 @@
/**
* Copyright 2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.lucene.search;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermDocs;
import org.apache.lucene.index.TermEnum;
import java.util.BitSet;
import java.io.IOException;
/**
* @author yonik
* @version $Id: PrefixFilter.java,v 1.1 2005/06/10 05:47:32 yonik Exp $
*/
public class PrefixFilter extends Filter {
protected final Term prefix;
PrefixFilter(Term prefix) {
this.prefix = prefix;
}
Term getPrefix() { return prefix; }
public BitSet bits(IndexReader reader) throws IOException {
final BitSet bitSet = new BitSet(reader.maxDoc());
new PrefixGenerator(prefix) {
public void handleDoc(int doc) {
bitSet.set(doc);
}
}.generate(reader);
return bitSet;
}
}
// keep this protected until I decide if it's a good way
// to separate id generation from collection (or should
// I just reuse hitcollector???)
interface IdGenerator {
public void generate(IndexReader reader) throws IOException;
public void handleDoc(int doc);
}
abstract class PrefixGenerator implements IdGenerator {
protected final Term prefix;
PrefixGenerator(Term prefix) {
this.prefix = prefix;
}
public void generate(IndexReader reader) throws IOException {
TermEnum enumerator = reader.terms(prefix);
TermDocs termDocs = reader.termDocs();
try {
String prefixText = prefix.text();
String prefixField = prefix.field();
do {
Term term = enumerator.term();
if (term != null &&
term.text().startsWith(prefixText) &&
term.field() == prefixField)
{
termDocs.seek(term);
while (termDocs.next()) {
handleDoc(termDocs.doc());
}
} else {
break;
}
} while (enumerator.next());
} finally {
termDocs.close();
enumerator.close();
}
}
}
package org.apache.solr.search;
import org.apache.lucene.search.Filter;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.TermEnum;
import org.apache.lucene.index.TermDocs;
import java.util.BitSet;
import java.io.IOException;
/**
* @author yonik
* @version $Id: PrefixFilter.java,v 1.1 2005/06/10 05:47:32 yonik Exp $
*/
public class PrefixFilter extends Filter {
protected final Term prefix;
PrefixFilter(Term prefix) {
this.prefix = prefix;
}
Term getPrefix() { return prefix; }
public BitSet bits(IndexReader reader) throws IOException {
final BitSet bitSet = new BitSet(reader.maxDoc());
new PrefixGenerator(prefix) {
public void handleDoc(int doc) {
bitSet.set(doc);
}
}.generate(reader);
return bitSet;
}
}
// keep this protected until I decide if it's a good way
// to separate id generation from collection (or should
// I just reuse hitcollector???)
interface IdGenerator {
public void generate(IndexReader reader) throws IOException;
public void handleDoc(int doc);
}
abstract class PrefixGenerator implements IdGenerator {
protected final Term prefix;
PrefixGenerator(Term prefix) {
this.prefix = prefix;
}
public void generate(IndexReader reader) throws IOException {
TermEnum enumerator = reader.terms(prefix);
TermDocs termDocs = reader.termDocs();
try {
String prefixText = prefix.text();
String prefixField = prefix.field();
do {
Term term = enumerator.term();
if (term != null &&
term.text().startsWith(prefixText) &&
term.field() == prefixField)
{
termDocs.seek(term);
while (termDocs.next()) {
handleDoc(termDocs.doc());
}
} else {
break;
}
} while (enumerator.next());
} finally {
termDocs.close();
enumerator.close();
}
}
}

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

@ -17,7 +17,7 @@
package org.apache.solr.search;
import org.apache.lucene.search.*;
import org.apache.lucene.search.function.*;
import org.apache.solr.search.function.*;
import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.Term;

2
src/lucene_extras/org/apache/lucene/search/function/DocValues.java → src/java/org/apache/solr/search/function/DocValues.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.apache.lucene.search.function;
package org.apache.solr.search.function;
import org.apache.lucene.search.Explanation;

2
src/lucene_extras/org/apache/lucene/search/function/FieldCacheSource.java → src/java/org/apache/solr/search/function/FieldCacheSource.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.apache.lucene.search.function;
package org.apache.solr.search.function;
import org.apache.lucene.search.FieldCache;

5
src/lucene_extras/org/apache/lucene/search/function/FloatFieldSource.java → src/java/org/apache/solr/search/function/FloatFieldSource.java
View File

@ -14,11 +14,10 @@
* limitations under the License.
*/
package org.apache.lucene.search.function;
package org.apache.solr.search.function;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.function.DocValues;
import org.apache.lucene.search.function.ValueSource;
import org.apache.solr.search.function.DocValues;
import org.apache.lucene.search.FieldCache;
import java.io.IOException;

2
src/lucene_extras/org/apache/lucene/search/function/FunctionQuery.java → src/java/org/apache/solr/search/function/FunctionQuery.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.apache.lucene.search.function;
package org.apache.solr.search.function;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.*;

5
src/lucene_extras/org/apache/lucene/search/function/IntFieldSource.java → src/java/org/apache/solr/search/function/IntFieldSource.java
View File

@ -14,11 +14,10 @@
* limitations under the License.
*/
package org.apache.lucene.search.function;
package org.apache.solr.search.function;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.function.DocValues;
import org.apache.lucene.search.function.ValueSource;
import org.apache.solr.search.function.DocValues;
import org.apache.lucene.search.FieldCache;
import java.io.IOException;

2
src/lucene_extras/org/apache/lucene/search/function/LinearFloatFunction.java → src/java/org/apache/solr/search/function/LinearFloatFunction.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.apache.lucene.search.function;
package org.apache.solr.search.function;
import org.apache.lucene.index.IndexReader;

6
src/lucene_extras/org/apache/lucene/search/function/OrdFieldSource.java → src/java/org/apache/solr/search/function/OrdFieldSource.java
View File

@ -14,11 +14,11 @@
* limitations under the License.
*/
package org.apache.lucene.search.function;
package org.apache.solr.search.function;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.function.DocValues;
import org.apache.lucene.search.function.ValueSource;
import org.apache.solr.search.function.DocValues;
import org.apache.solr.search.function.ValueSource;
import org.apache.lucene.search.FieldCache;
import java.io.IOException;

4
src/lucene_extras/org/apache/lucene/search/function/ReciprocalFloatFunction.java → src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.apache.lucene.search.function;
package org.apache.solr.search.function;
import org.apache.lucene.index.IndexReader;
@ -22,7 +22,7 @@ import java.io.IOException;
/**
* <code>ReciprocalFloatFunction</code> implements a reciprocal function f(x) = a/(mx+b), based on
* the float value of a field as exported by {@link org.apache.lucene.search.function.ValueSource}.
* the float value of a field as exported by {@link org.apache.solr.search.function.ValueSource}.
* <br>
*
* When a and b are equal, and x>=0, this function has a maximum value of 1 that drops as x increases.

6
src/lucene_extras/org/apache/lucene/search/function/ReverseOrdFieldSource.java → src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java
View File

@ -14,11 +14,11 @@
* limitations under the License.
*/
package org.apache.lucene.search.function;
package org.apache.solr.search.function;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.function.DocValues;
import org.apache.lucene.search.function.ValueSource;
import org.apache.solr.search.function.DocValues;
import org.apache.solr.search.function.ValueSource;
import org.apache.lucene.search.FieldCache;
import java.io.IOException;

6
src/lucene_extras/org/apache/lucene/search/function/ValueSource.java → src/java/org/apache/solr/search/function/ValueSource.java
View File

@ -14,16 +14,16 @@
* limitations under the License.
*/
package org.apache.lucene.search.function;
package org.apache.solr.search.function;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.function.DocValues;
import org.apache.solr.search.function.DocValues;
import java.io.IOException;
import java.io.Serializable;
/**
* Instantiates {@link org.apache.lucene.search.function.DocValues} for a particular reader.
* Instantiates {@link org.apache.solr.search.function.DocValues} for a particular reader.
* <br>
* Often used when creating a {@link FunctionQuery}.
*

BIN
src/lucene_extras/org/apache/lucene/search/function/function.zip
View File

Binary file not shown.