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

LUCENE-3249: Moved FunctionQuery impls to new Queries module 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1140906 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Christopher John Male 2011-06-28 23:32:27 +00:00
parent e5addc06d3
commit a993ae9032
85 changed files with 139 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/src/java/org/apache/solr/search/function/BoolDocValues.java → modules/queries/src/java/org/apache/lucene/queries/function/docvalues/BoolDocValues.java
View File

@ -1,4 +1,4 @@
package org.apache.solr.search.function; package org.apache.lucene.queries.function.docvalues;
import org.apache.lucene.common.mutable.MutableValue; import org.apache.lucene.common.mutable.MutableValue;
import org.apache.lucene.common.mutable.MutableValueBool; import org.apache.lucene.common.mutable.MutableValueBool;

2
solr/src/java/org/apache/solr/search/function/DoubleDocValues.java → modules/queries/src/java/org/apache/lucene/queries/function/docvalues/DoubleDocValues.java
View File

@ -1,4 +1,4 @@
package org.apache.solr.search.function; package org.apache.lucene.queries.function.docvalues;
import org.apache.lucene.common.mutable.MutableValue; import org.apache.lucene.common.mutable.MutableValue;
import org.apache.lucene.common.mutable.MutableValueDouble; import org.apache.lucene.common.mutable.MutableValueDouble;

2
solr/src/java/org/apache/solr/search/function/FloatDocValues.java → modules/queries/src/java/org/apache/lucene/queries/function/docvalues/FloatDocValues.java
View File

@ -1,4 +1,4 @@
package org.apache.solr.search.function; package org.apache.lucene.queries.function.docvalues;
import org.apache.lucene.common.mutable.MutableValue; import org.apache.lucene.common.mutable.MutableValue;
import org.apache.lucene.common.mutable.MutableValueFloat; import org.apache.lucene.common.mutable.MutableValueFloat;

2
solr/src/java/org/apache/solr/search/function/IntDocValues.java → modules/queries/src/java/org/apache/lucene/queries/function/docvalues/IntDocValues.java
View File

@ -1,4 +1,4 @@
package org.apache.solr.search.function; package org.apache.lucene.queries.function.docvalues;
import org.apache.lucene.common.mutable.MutableValue; import org.apache.lucene.common.mutable.MutableValue;
import org.apache.lucene.common.mutable.MutableValueInt; import org.apache.lucene.common.mutable.MutableValueInt;

2
solr/src/java/org/apache/solr/search/function/LongDocValues.java → modules/queries/src/java/org/apache/lucene/queries/function/docvalues/LongDocValues.java
View File

@ -1,4 +1,4 @@
package org.apache.solr.search.function; package org.apache.lucene.queries.function.docvalues;
import org.apache.lucene.common.mutable.MutableValue; import org.apache.lucene.common.mutable.MutableValue;
import org.apache.lucene.common.mutable.MutableValueLong; import org.apache.lucene.common.mutable.MutableValueLong;

2
solr/src/java/org/apache/solr/search/function/StrDocValues.java → modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StrDocValues.java
View File

@ -1,4 +1,4 @@
package org.apache.solr.search.function; package org.apache.lucene.queries.function.docvalues;
import org.apache.lucene.common.mutable.MutableValue; import org.apache.lucene.common.mutable.MutableValue;
import org.apache.lucene.common.mutable.MutableValueStr; import org.apache.lucene.common.mutable.MutableValueStr;

2
solr/src/java/org/apache/solr/search/function/StringIndexDocValues.java → modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StringIndexDocValues.java
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.docvalues;
import org.apache.lucene.common.mutable.MutableValue; import org.apache.lucene.common.mutable.MutableValue;
import org.apache.lucene.common.mutable.MutableValueStr; import org.apache.lucene.common.mutable.MutableValueStr;

2
solr/src/java/org/apache/solr/search/function/BoolFunction.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/BoolFunction.java
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;

2
solr/src/java/org/apache/solr/search/function/ByteFieldSource.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java
View File

@ -1,4 +1,4 @@
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
/** /**
* Licensed to the Apache Software Foundation (ASF) under one or more * Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with * contributor license agreements. See the NOTICE file distributed with

2
solr/src/java/org/apache/solr/search/function/ConstNumberSource.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstNumberSource.java
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;

3
solr/src/java/org/apache/solr/search/function/ConstValueSource.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstValueSource.java
View File

@ -15,10 +15,11 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;

2
solr/src/java/org/apache/solr/search/function/DefFunction.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DefFunction.java
View File

@ -1,4 +1,4 @@
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
/** /**
* Licensed to the Apache Software Foundation (ASF) under one or more * Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with * contributor license agreements. See the NOTICE file distributed with

2
solr/src/java/org/apache/solr/search/function/DivFloatFunction.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DivFloatFunction.java
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;

5
solr/src/java/org/apache/solr/search/function/DocFreqValueSource.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java
View File

@ -15,15 +15,16 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.Term; import org.apache.lucene.index.Term;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
import org.apache.lucene.queries.function.docvalues.IntDocValues;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRef;
import org.apache.solr.search.*;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;

3
solr/src/java/org/apache/solr/search/function/DoubleConstValueSource.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleConstValueSource.java
View File

@ -15,10 +15,11 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;

3
solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.common.mutable.MutableValue; import org.apache.lucene.common.mutable.MutableValue;
import org.apache.lucene.common.mutable.MutableValueDouble; import org.apache.lucene.common.mutable.MutableValueDouble;
@ -23,6 +23,7 @@ import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSourceScorer; import org.apache.lucene.queries.function.ValueSourceScorer;
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
import org.apache.lucene.util.Bits; import org.apache.lucene.util.Bits;
import org.apache.lucene.search.cache.DoubleValuesCreator; import org.apache.lucene.search.cache.DoubleValuesCreator;
import org.apache.lucene.search.cache.CachedArray.DoubleValues; import org.apache.lucene.search.cache.CachedArray.DoubleValues;

3
solr/src/java/org/apache/solr/search/function/DualFloatFunction.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DualFloatFunction.java
View File

@ -15,11 +15,12 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;
import java.io.IOException; import java.io.IOException;

2
solr/src/java/org/apache/solr/search/function/FieldCacheSource.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FieldCacheSource.java
View File

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

3
solr/src/java/org/apache/solr/search/function/FloatFieldSource.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;
@ -24,6 +24,7 @@ import org.apache.lucene.common.mutable.MutableValue;
import org.apache.lucene.common.mutable.MutableValueFloat; import org.apache.lucene.common.mutable.MutableValueFloat;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
import org.apache.lucene.util.Bits; import org.apache.lucene.util.Bits;
import org.apache.lucene.search.cache.FloatValuesCreator; import org.apache.lucene.search.cache.FloatValuesCreator;
import org.apache.lucene.search.cache.CachedArray.FloatValues; import org.apache.lucene.search.cache.CachedArray.FloatValues;

2
solr/src/java/org/apache/solr/search/function/IDFValueSource.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java
View File

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

2
solr/src/java/org/apache/solr/search/function/IfFunction.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java
View File

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

3
solr/src/java/org/apache/solr/search/function/IntFieldSource.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.common.mutable.MutableValue; import org.apache.lucene.common.mutable.MutableValue;
import org.apache.lucene.common.mutable.MutableValueInt; import org.apache.lucene.common.mutable.MutableValueInt;
@ -23,6 +23,7 @@ import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSourceScorer; import org.apache.lucene.queries.function.ValueSourceScorer;
import org.apache.lucene.queries.function.docvalues.IntDocValues;
import org.apache.lucene.util.Bits; import org.apache.lucene.util.Bits;
import org.apache.lucene.search.cache.IntValuesCreator; import org.apache.lucene.search.cache.IntValuesCreator;
import org.apache.lucene.search.cache.CachedArray.IntValues; import org.apache.lucene.search.cache.CachedArray.IntValues;

6
solr/src/java/org/apache/solr/search/function/JoinDocFreqValueSource.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;
@ -23,10 +23,10 @@ import java.util.Map;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.docvalues.IntDocValues;
import org.apache.lucene.search.FieldCache.DocTerms; import org.apache.lucene.search.FieldCache.DocTerms;
import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.ReaderUtil; import org.apache.lucene.util.ReaderUtil;
import org.apache.solr.common.SolrException;
/** /**
* Use a field value and find the Document Frequency within another field. * Use a field value and find the Document Frequency within another field.
@ -68,7 +68,7 @@ public class JoinDocFreqValueSource extends FieldCacheSource {
return v; return v;
} }
catch (IOException e) { catch (IOException e) {
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "caught exception in function "+description()+" : doc="+doc, e); throw new RuntimeException("caught exception in function "+description()+" : doc="+doc, e);
} }
} }
}; };

3
solr/src/java/org/apache/solr/search/function/LinearFloatFunction.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LinearFloatFunction.java
View File

@ -15,11 +15,12 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;
import java.io.IOException; import java.io.IOException;

3
solr/src/java/org/apache/solr/search/function/LiteralValueSource.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java
View File

@ -1,4 +1,4 @@
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
/** /**
* Licensed to the Apache Software Foundation (ASF) under one or more * Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with * contributor license agreements. See the NOTICE file distributed with
@ -19,6 +19,7 @@ package org.apache.solr.search.function;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.StrDocValues;
import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRef;
import java.util.Map; import java.util.Map;

3
solr/src/java/org/apache/solr/search/function/LongFieldSource.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.common.mutable.MutableValue; import org.apache.lucene.common.mutable.MutableValue;
import org.apache.lucene.common.mutable.MutableValueLong; import org.apache.lucene.common.mutable.MutableValueLong;
@ -23,6 +23,7 @@ import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSourceScorer; import org.apache.lucene.queries.function.ValueSourceScorer;
import org.apache.lucene.queries.function.docvalues.LongDocValues;
import org.apache.lucene.util.Bits; import org.apache.lucene.util.Bits;
import org.apache.lucene.search.cache.LongValuesCreator; import org.apache.lucene.search.cache.LongValuesCreator;
import org.apache.lucene.search.cache.CachedArray.LongValues; import org.apache.lucene.search.cache.CachedArray.LongValues;

2
solr/src/java/org/apache/solr/search/function/MaxDocValueSource.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;

3
solr/src/java/org/apache/solr/search/function/MultiBoolFunction.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java
View File

@ -15,11 +15,12 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.BoolDocValues;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;
import java.io.IOException; import java.io.IOException;

3
solr/src/java/org/apache/solr/search/function/MultiFloatFunction.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java
View File

@ -1,4 +1,4 @@
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
/** /**
* Licensed to the Apache Software Foundation (ASF) under one or more * Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with * contributor license agreements. See the NOTICE file distributed with
@ -19,6 +19,7 @@ package org.apache.solr.search.function;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;
import java.util.Map; import java.util.Map;

2
solr/src/java/org/apache/solr/search/function/MultiFunction.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFunction.java
View File

@ -1,4 +1,4 @@
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
/** /**
* Licensed to the Apache Software Foundation (ASF) under one or more * Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with * contributor license agreements. See the NOTICE file distributed with

2
solr/src/java/org/apache/solr/search/function/MultiValueSource.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiValueSource.java
View File

@ -1,4 +1,4 @@
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
/** /**
* Licensed to the Apache Software Foundation (ASF) under one or more * Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with * contributor license agreements. See the NOTICE file distributed with

3
solr/src/java/org/apache/solr/search/function/NormValueSource.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java
View File

@ -15,11 +15,12 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Similarity; import org.apache.lucene.search.Similarity;
import java.io.IOException; import java.io.IOException;

2
solr/src/java/org/apache/solr/search/function/NumDocsValueSource.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;

2
solr/src/java/org/apache/solr/search/function/NumericFieldCacheSource.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumericFieldCacheSource.java
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.search.cache.CachedArray; import org.apache.lucene.search.cache.CachedArray;
import org.apache.lucene.search.cache.CachedArrayCreator; import org.apache.lucene.search.cache.CachedArrayCreator;

3
solr/src/java/org/apache/solr/search/function/OrdFieldSource.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.common.mutable.MutableValue; import org.apache.lucene.common.mutable.MutableValue;
import org.apache.lucene.common.mutable.MutableValueInt; import org.apache.lucene.common.mutable.MutableValueInt;
@ -23,6 +23,7 @@ import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.IntDocValues;
import org.apache.lucene.search.FieldCache; import org.apache.lucene.search.FieldCache;
import org.apache.lucene.util.ReaderUtil; import org.apache.lucene.util.ReaderUtil;

2
solr/src/java/org/apache/solr/search/function/PowFloatFunction.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/PowFloatFunction.java
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;

2
solr/src/java/org/apache/solr/search/function/ProductFloatFunction.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ProductFloatFunction.java
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;

12
solr/src/java/org/apache/solr/search/function/QueryValueSource.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.common.mutable.MutableValue; import org.apache.lucene.common.mutable.MutableValue;
import org.apache.lucene.common.mutable.MutableValueFloat; import org.apache.lucene.common.mutable.MutableValueFloat;
@ -23,10 +23,10 @@ import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
import org.apache.lucene.search.*; import org.apache.lucene.search.*;
import org.apache.lucene.search.Weight.ScorerContext; import org.apache.lucene.search.Weight.ScorerContext;
import org.apache.lucene.util.ReaderUtil; import org.apache.lucene.util.ReaderUtil;
import org.apache.solr.common.SolrException;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;
@ -144,7 +144,7 @@ class QueryDocValues extends FloatDocValues {
// a match! // a match!
return scorer.score(); return scorer.score();
} catch (IOException e) { } catch (IOException e) {
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "caught exception in QueryDocVals("+q+") doc="+doc, e); throw new RuntimeException("caught exception in QueryDocVals("+q+") doc="+doc, e);
} }
} }
@ -175,7 +175,7 @@ class QueryDocValues extends FloatDocValues {
// a match! // a match!
return true; return true;
} catch (IOException e) { } catch (IOException e) {
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "caught exception in QueryDocVals("+q+") doc="+doc, e); throw new RuntimeException("caught exception in QueryDocVals("+q+") doc="+doc, e);
} }
} }
@ -184,7 +184,7 @@ class QueryDocValues extends FloatDocValues {
try { try {
return exists(doc) ? scorer.score() : null; return exists(doc) ? scorer.score() : null;
} catch (IOException e) { } catch (IOException e) {
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "caught exception in QueryDocVals("+q+") doc="+doc, e); throw new RuntimeException("caught exception in QueryDocVals("+q+") doc="+doc, e);
} }
} }
@ -238,7 +238,7 @@ class QueryDocValues extends FloatDocValues {
mval.exists = true; mval.exists = true;
return; return;
} catch (IOException e) { } catch (IOException e) {
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "caught exception in QueryDocVals("+q+") doc="+doc, e); throw new RuntimeException("caught exception in QueryDocVals("+q+") doc="+doc, e);
} }
} }
}; };

3
solr/src/java/org/apache/solr/search/function/RangeMapFloatFunction.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/RangeMapFloatFunction.java
View File

@ -15,11 +15,12 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;
import java.io.IOException; import java.io.IOException;

3
solr/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReciprocalFloatFunction.java
View File

@ -15,11 +15,12 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;
import java.io.IOException; import java.io.IOException;

3
solr/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReverseOrdFieldSource.java
View File

@ -15,12 +15,13 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.IntDocValues;
import org.apache.lucene.search.FieldCache; import org.apache.lucene.search.FieldCache;
import org.apache.lucene.util.ReaderUtil; import org.apache.lucene.util.ReaderUtil;

3
solr/src/java/org/apache/solr/search/function/ScaleFloatFunction.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java
View File

@ -15,11 +15,12 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.util.ReaderUtil; import org.apache.lucene.util.ReaderUtil;

2
solr/src/java/org/apache/solr/search/function/ShortFieldSource.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ShortFieldSource.java
View File

@ -1,4 +1,4 @@
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
/** /**
* Licensed to the Apache Software Foundation (ASF) under one or more * Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with * contributor license agreements. See the NOTICE file distributed with

3
solr/src/java/org/apache/solr/search/function/SimpleBoolFunction.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleBoolFunction.java
View File

@ -15,11 +15,12 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.BoolDocValues;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;
import java.io.IOException; import java.io.IOException;

3
solr/src/java/org/apache/solr/search/function/SimpleFloatFunction.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleFloatFunction.java
View File

@ -15,11 +15,12 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;

2
solr/src/java/org/apache/solr/search/function/SingleFunction.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SingleFunction.java
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;

2
solr/src/java/org/apache/solr/search/function/SumFloatFunction.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SumFloatFunction.java
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;

6
solr/src/java/org/apache/solr/search/function/TFValueSource.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java
View File

@ -1,4 +1,4 @@
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
/** /**
* Licensed to the Apache Software Foundation (ASF) under one or more * Licensed to the Apache Software Foundation (ASF) under one or more
@ -20,11 +20,11 @@ package org.apache.solr.search.function;
import org.apache.lucene.index.*; import org.apache.lucene.index.*;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Similarity; import org.apache.lucene.search.Similarity;
import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRef;
import org.apache.solr.common.SolrException;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;
@ -103,7 +103,7 @@ public class TFValueSource extends TermFreqValueSource {
// a match! // a match!
return similarity.tf(docs.freq()); return similarity.tf(docs.freq());
} catch (IOException e) { } catch (IOException e) {
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "caught exception in function "+description()+" : doc="+doc, e); throw new RuntimeException("caught exception in function "+description()+" : doc="+doc, e);
} }
} }
}; };

6
solr/src/java/org/apache/solr/search/function/TermFreqValueSource.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java
View File

@ -15,14 +15,14 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.*; import org.apache.lucene.index.*;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.docvalues.IntDocValues;
import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRef;
import org.apache.solr.common.SolrException;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;
@ -100,7 +100,7 @@ public class TermFreqValueSource extends DocFreqValueSource {
// a match! // a match!
return docs.freq(); return docs.freq();
} catch (IOException e) { } catch (IOException e) {
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "caught exception in function "+description()+" : doc="+doc, e); throw new RuntimeException("caught exception in function "+description()+" : doc="+doc, e);
} }
} }
}; };

3
solr/src/java/org/apache/solr/search/function/VectorValueSource.java → modules/queries/src/java/org/apache/lucene/queries/function/valuesource/VectorValueSource.java
View File

@ -1,4 +1,4 @@
package org.apache.solr.search.function; package org.apache.lucene.queries.function.valuesource;
/** /**
* Licensed to the Apache Software Foundation (ASF) under one or more * Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with * contributor license agreements. See the NOTICE file distributed with
@ -20,7 +20,6 @@ import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;
import org.apache.solr.search.function.MultiValueSource;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;

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

@ -22,6 +22,8 @@ import org.apache.lucene.common.mutable.MutableValueBool;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.BoolDocValues;
import org.apache.lucene.queries.function.valuesource.OrdFieldSource;
import org.apache.lucene.search.FieldCache; import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.SortField; import org.apache.lucene.search.SortField;
import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRef;

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

@ -18,13 +18,13 @@ package org.apache.solr.schema;
import org.apache.lucene.document.Fieldable; import org.apache.lucene.document.Fieldable;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.valuesource.ByteFieldSource;
import org.apache.lucene.search.SortField; import org.apache.lucene.search.SortField;
import org.apache.lucene.search.cache.ByteValuesCreator; import org.apache.lucene.search.cache.ByteValuesCreator;
import org.apache.lucene.search.cache.CachedArrayCreator; import org.apache.lucene.search.cache.CachedArrayCreator;
import org.apache.solr.response.TextResponseWriter; import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.search.QParser; import org.apache.solr.search.QParser;
import org.apache.solr.search.function.ByteFieldSource;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;

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

@ -21,6 +21,8 @@ import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.StringIndexDocValues;
import org.apache.lucene.queries.function.valuesource.FieldCacheSource;
import org.apache.lucene.search.Query; import org.apache.lucene.search.Query;
import org.apache.lucene.search.SortField; import org.apache.lucene.search.SortField;
import org.apache.lucene.search.TermRangeQuery; import org.apache.lucene.search.TermRangeQuery;

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

@ -19,12 +19,12 @@ package org.apache.solr.schema;
import org.apache.lucene.document.Fieldable; import org.apache.lucene.document.Fieldable;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.valuesource.DoubleFieldSource;
import org.apache.lucene.search.SortField; import org.apache.lucene.search.SortField;
import org.apache.lucene.search.cache.CachedArrayCreator; import org.apache.lucene.search.cache.CachedArrayCreator;
import org.apache.lucene.search.cache.DoubleValuesCreator; import org.apache.lucene.search.cache.DoubleValuesCreator;
import org.apache.solr.response.TextResponseWriter; import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.search.QParser; import org.apache.solr.search.QParser;
import org.apache.solr.search.function.DoubleFieldSource;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;

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

@ -18,11 +18,11 @@
package org.apache.solr.schema; package org.apache.solr.schema;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.valuesource.FloatFieldSource;
import org.apache.lucene.search.SortField; import org.apache.lucene.search.SortField;
import org.apache.lucene.search.cache.CachedArrayCreator; import org.apache.lucene.search.cache.CachedArrayCreator;
import org.apache.lucene.search.cache.FloatValuesCreator; import org.apache.lucene.search.cache.FloatValuesCreator;
import org.apache.solr.search.QParser; import org.apache.solr.search.QParser;
import org.apache.solr.search.function.FloatFieldSource;
import org.apache.lucene.document.Fieldable; import org.apache.lucene.document.Fieldable;
import org.apache.solr.response.TextResponseWriter; import org.apache.solr.response.TextResponseWriter;

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

@ -19,6 +19,7 @@ package org.apache.solr.schema;
import org.apache.lucene.document.Fieldable; import org.apache.lucene.document.Fieldable;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.valuesource.LiteralValueSource;
import org.apache.lucene.search.Query; import org.apache.lucene.search.Query;
import org.apache.lucene.search.SortField; import org.apache.lucene.search.SortField;
import org.apache.lucene.spatial.geohash.GeoHashUtils; import org.apache.lucene.spatial.geohash.GeoHashUtils;
@ -29,7 +30,6 @@ import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.search.QParser; import org.apache.solr.search.QParser;
import org.apache.solr.search.SolrConstantScoreQuery; import org.apache.solr.search.SolrConstantScoreQuery;
import org.apache.solr.search.SpatialOptions; import org.apache.solr.search.SpatialOptions;
import org.apache.solr.search.function.LiteralValueSource;
import org.apache.solr.search.function.ValueSourceRangeFilter; import org.apache.solr.search.function.ValueSourceRangeFilter;
import org.apache.solr.search.function.distance.GeohashHaversineFunction; import org.apache.solr.search.function.distance.GeohashHaversineFunction;

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

@ -18,11 +18,11 @@
package org.apache.solr.schema; package org.apache.solr.schema;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.valuesource.IntFieldSource;
import org.apache.lucene.search.SortField; import org.apache.lucene.search.SortField;
import org.apache.lucene.search.cache.CachedArrayCreator; import org.apache.lucene.search.cache.CachedArrayCreator;
import org.apache.lucene.search.cache.IntValuesCreator; import org.apache.lucene.search.cache.IntValuesCreator;
import org.apache.solr.search.QParser; import org.apache.solr.search.QParser;
import org.apache.solr.search.function.IntFieldSource;
import org.apache.lucene.document.Fieldable; import org.apache.lucene.document.Fieldable;
import org.apache.solr.response.TextResponseWriter; import org.apache.solr.response.TextResponseWriter;

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

@ -22,6 +22,7 @@ import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.valuesource.VectorValueSource;
import org.apache.lucene.search.*; import org.apache.lucene.search.*;
import org.apache.lucene.spatial.DistanceUtils; import org.apache.lucene.spatial.DistanceUtils;
import org.apache.lucene.spatial.tier.InvalidGeoException; import org.apache.lucene.spatial.tier.InvalidGeoException;
@ -30,7 +31,6 @@ import org.apache.solr.common.SolrException;
import org.apache.solr.response.TextResponseWriter; import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.search.QParser; import org.apache.solr.search.QParser;
import org.apache.solr.search.SpatialOptions; import org.apache.solr.search.SpatialOptions;
import org.apache.solr.search.function.VectorValueSource;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;

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

@ -19,12 +19,12 @@ package org.apache.solr.schema;
import org.apache.lucene.document.Fieldable; import org.apache.lucene.document.Fieldable;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.valuesource.LongFieldSource;
import org.apache.lucene.search.SortField; import org.apache.lucene.search.SortField;
import org.apache.lucene.search.cache.CachedArrayCreator; import org.apache.lucene.search.cache.CachedArrayCreator;
import org.apache.lucene.search.cache.LongValuesCreator; import org.apache.lucene.search.cache.LongValuesCreator;
import org.apache.solr.response.TextResponseWriter; import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.search.QParser; import org.apache.solr.search.QParser;
import org.apache.solr.search.function.LongFieldSource;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;

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

@ -20,6 +20,7 @@ package org.apache.solr.schema;
import org.apache.lucene.document.Field; import org.apache.lucene.document.Field;
import org.apache.lucene.document.Fieldable; import org.apache.lucene.document.Fieldable;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.valuesource.VectorValueSource;
import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.Query; import org.apache.lucene.search.Query;
@ -32,7 +33,6 @@ import org.apache.solr.common.params.SolrParams;
import org.apache.solr.response.TextResponseWriter; import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.search.QParser; import org.apache.solr.search.QParser;
import org.apache.solr.search.SpatialOptions; import org.apache.solr.search.SpatialOptions;
import org.apache.solr.search.function.VectorValueSource;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;

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

@ -25,11 +25,11 @@ import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.IntDocValues;
import org.apache.lucene.search.*; import org.apache.lucene.search.*;
import org.apache.lucene.util.ReaderUtil; import org.apache.lucene.util.ReaderUtil;
import org.apache.solr.response.TextResponseWriter; import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.search.QParser; import org.apache.solr.search.QParser;
import org.apache.solr.search.function.IntDocValues;
/** /**
* Utility Field used for random sorting. It should not be passed a value. * Utility Field used for random sorting. It should not be passed a value.

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

@ -18,13 +18,13 @@ package org.apache.solr.schema;
import org.apache.lucene.document.Fieldable; import org.apache.lucene.document.Fieldable;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.valuesource.ShortFieldSource;
import org.apache.lucene.search.SortField; import org.apache.lucene.search.SortField;
import org.apache.lucene.search.cache.CachedArrayCreator; import org.apache.lucene.search.cache.CachedArrayCreator;
import org.apache.lucene.search.cache.ShortValuesCreator; import org.apache.lucene.search.cache.ShortValuesCreator;
import org.apache.solr.response.TextResponseWriter; import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.search.QParser; import org.apache.solr.search.QParser;
import org.apache.solr.search.function.ShortFieldSource;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;

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

@ -21,12 +21,12 @@ import org.apache.lucene.common.mutable.MutableValue;
import org.apache.lucene.common.mutable.MutableValueDouble; import org.apache.lucene.common.mutable.MutableValueDouble;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.StringIndexDocValues;
import org.apache.lucene.queries.function.valuesource.FieldCacheSource;
import org.apache.lucene.search.SortField; import org.apache.lucene.search.SortField;
import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.CharsRef; import org.apache.lucene.util.CharsRef;
import org.apache.solr.search.QParser; import org.apache.solr.search.QParser;
import org.apache.solr.search.function.FieldCacheSource;
import org.apache.solr.search.function.StringIndexDocValues;
import org.apache.lucene.document.Fieldable; import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.solr.util.NumberUtils; import org.apache.solr.util.NumberUtils;

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

@ -21,12 +21,12 @@ import org.apache.lucene.common.mutable.MutableValue;
import org.apache.lucene.common.mutable.MutableValueFloat; import org.apache.lucene.common.mutable.MutableValueFloat;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.StringIndexDocValues;
import org.apache.lucene.queries.function.valuesource.FieldCacheSource;
import org.apache.lucene.search.SortField; import org.apache.lucene.search.SortField;
import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.CharsRef; import org.apache.lucene.util.CharsRef;
import org.apache.solr.search.QParser; import org.apache.solr.search.QParser;
import org.apache.solr.search.function.FieldCacheSource;
import org.apache.solr.search.function.StringIndexDocValues;
import org.apache.lucene.document.Fieldable; import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.solr.util.NumberUtils; import org.apache.solr.util.NumberUtils;

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

@ -21,12 +21,12 @@ import org.apache.lucene.common.mutable.MutableValue;
import org.apache.lucene.common.mutable.MutableValueInt; import org.apache.lucene.common.mutable.MutableValueInt;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.StringIndexDocValues;
import org.apache.lucene.queries.function.valuesource.FieldCacheSource;
import org.apache.lucene.search.SortField; import org.apache.lucene.search.SortField;
import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.CharsRef; import org.apache.lucene.util.CharsRef;
import org.apache.solr.search.QParser; import org.apache.solr.search.QParser;
import org.apache.solr.search.function.FieldCacheSource;
import org.apache.solr.search.function.StringIndexDocValues;
import org.apache.lucene.document.Fieldable; import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.solr.util.NumberUtils; import org.apache.solr.util.NumberUtils;

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

@ -21,12 +21,12 @@ import org.apache.lucene.common.mutable.MutableValue;
import org.apache.lucene.common.mutable.MutableValueLong; import org.apache.lucene.common.mutable.MutableValueLong;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.StringIndexDocValues;
import org.apache.lucene.queries.function.valuesource.FieldCacheSource;
import org.apache.lucene.search.SortField; import org.apache.lucene.search.SortField;
import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.CharsRef; import org.apache.lucene.util.CharsRef;
import org.apache.solr.search.QParser; import org.apache.solr.search.QParser;
import org.apache.solr.search.function.FieldCacheSource;
import org.apache.solr.search.function.StringIndexDocValues;
import org.apache.lucene.document.Fieldable; import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.solr.util.NumberUtils; import org.apache.solr.util.NumberUtils;

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

@ -19,8 +19,8 @@ package org.apache.solr.schema;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.solr.search.function.FieldCacheSource; import org.apache.lucene.queries.function.docvalues.StringIndexDocValues;
import org.apache.solr.search.function.StringIndexDocValues; import org.apache.lucene.queries.function.valuesource.FieldCacheSource;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;

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

@ -22,6 +22,10 @@ import org.apache.lucene.document.Fieldable;
import org.apache.lucene.document.Field; import org.apache.lucene.document.Field;
import org.apache.lucene.document.NumericField; import org.apache.lucene.document.NumericField;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.valuesource.DoubleFieldSource;
import org.apache.lucene.queries.function.valuesource.FloatFieldSource;
import org.apache.lucene.queries.function.valuesource.IntFieldSource;
import org.apache.lucene.queries.function.valuesource.LongFieldSource;
import org.apache.lucene.search.*; import org.apache.lucene.search.*;
import org.apache.lucene.search.cache.CachedArrayCreator; import org.apache.lucene.search.cache.CachedArrayCreator;
import org.apache.lucene.search.cache.DoubleValuesCreator; import org.apache.lucene.search.cache.DoubleValuesCreator;

5
solr/src/java/org/apache/solr/search/BoostQParserPlugin.java
View File

@ -18,13 +18,13 @@ package org.apache.solr.search;
import org.apache.lucene.queries.function.FunctionQuery; import org.apache.lucene.queries.function.FunctionQuery;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.valuesource.QueryValueSource;
import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.search.Query; import org.apache.lucene.search.Query;
import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.search.function.BoostedQuery; import org.apache.solr.search.function.BoostedQuery;
import org.apache.solr.search.function.QueryValueSource;
/** /**
* Create a boosted query from the input value. The main value is the query to be boosted. * Create a boosted query from the input value. The main value is the query to be boosted.
@ -34,7 +34,8 @@ import org.apache.solr.search.function.QueryValueSource;
* The query to be boosted may be of any type. * The query to be boosted may be of any type.
* *
* <p>Example: <code>{!boost b=recip(ms(NOW,mydatefield),3.16e-11,1,1)}foo</code> creates a query "foo" * <p>Example: <code>{!boost b=recip(ms(NOW,mydatefield),3.16e-11,1,1)}foo</code> creates a query "foo"
* which is boosted by the date boosting function referenced in {@link org.apache.solr.search.function.ReciprocalFloatFunction} * which is boosted by the date boosting function referenced in
* {@link org.apache.lucene.queries.function.valuesource.ReciprocalFloatFunction}
*/ */
public class BoostQParserPlugin extends QParserPlugin { public class BoostQParserPlugin extends QParserPlugin {
public static String NAME = "boost"; public static String NAME = "boost";

4
solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java
View File

@ -24,6 +24,8 @@ package org.apache.solr.search;
import org.apache.lucene.queries.function.FunctionQuery; import org.apache.lucene.queries.function.FunctionQuery;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.valuesource.ProductFloatFunction;
import org.apache.lucene.queries.function.valuesource.QueryValueSource;
import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.queryParser.QueryParser; import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.*; import org.apache.lucene.search.*;
@ -37,8 +39,6 @@ import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.schema.FieldType; import org.apache.solr.schema.FieldType;
import org.apache.solr.search.QueryUtils; import org.apache.solr.search.QueryUtils;
import org.apache.solr.search.function.BoostedQuery; import org.apache.solr.search.function.BoostedQuery;
import org.apache.solr.search.function.ProductFloatFunction;
import org.apache.solr.search.function.QueryValueSource;
import org.apache.solr.util.SolrPluginUtils; import org.apache.solr.util.SolrPluginUtils;
import org.apache.solr.analysis.*; import org.apache.solr.analysis.*;

1
solr/src/java/org/apache/solr/search/FunctionQParser.java
View File

@ -18,6 +18,7 @@ package org.apache.solr.search;
import org.apache.lucene.queries.function.FunctionQuery; import org.apache.lucene.queries.function.FunctionQuery;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.valuesource.*;
import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.search.Query; import org.apache.lucene.search.Query;
import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.params.SolrParams;

1
solr/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java
View File

@ -21,6 +21,7 @@ import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.FunctionQuery; import org.apache.lucene.queries.function.FunctionQuery;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.ValueSourceScorer; import org.apache.lucene.queries.function.ValueSourceScorer;
import org.apache.lucene.queries.function.valuesource.QueryValueSource;
import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.search.*; import org.apache.lucene.search.*;
import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.params.SolrParams;

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

@ -24,6 +24,7 @@ import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.FunctionQuery; import org.apache.lucene.queries.function.FunctionQuery;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.valuesource.QueryValueSource;
import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.search.*; import org.apache.lucene.search.*;
import org.apache.lucene.search.grouping.*; import org.apache.lucene.search.grouping.*;
@ -33,7 +34,6 @@ import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap; import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.schema.*; import org.apache.solr.schema.*;
import org.apache.solr.search.function.QueryValueSource;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

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

@ -19,6 +19,7 @@ package org.apache.solr.search;
import org.apache.lucene.index.Term; import org.apache.lucene.index.Term;
import org.apache.lucene.queries.function.FunctionQuery; import org.apache.lucene.queries.function.FunctionQuery;
import org.apache.lucene.queries.function.valuesource.QueryValueSource;
import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.queryParser.QueryParser.Operator; import org.apache.lucene.queryParser.QueryParser.Operator;
import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanClause;
@ -44,7 +45,6 @@ import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.schema.FieldType; import org.apache.solr.schema.FieldType;
import org.apache.solr.schema.IndexSchema; import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField; import org.apache.solr.schema.SchemaField;
import org.apache.solr.search.function.QueryValueSource;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;

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

@ -21,6 +21,7 @@ import java.util.*;
import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.FilenameUtils;
import org.apache.lucene.queries.function.FunctionQuery; import org.apache.lucene.queries.function.FunctionQuery;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.valuesource.QueryValueSource;
import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.search.Query; import org.apache.lucene.search.Query;
import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException;
@ -35,7 +36,6 @@ import org.apache.solr.response.transform.RenameFieldsTransformer;
import org.apache.solr.response.transform.ScoreAugmenter; import org.apache.solr.response.transform.ScoreAugmenter;
import org.apache.solr.response.transform.TransformerFactory; import org.apache.solr.response.transform.TransformerFactory;
import org.apache.solr.response.transform.ValueSourceAugmenter; import org.apache.solr.response.transform.ValueSourceAugmenter;
import org.apache.solr.search.function.QueryValueSource;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

4
solr/src/java/org/apache/solr/search/ValueSourceParser.java
View File

@ -20,6 +20,10 @@ import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.Term; import org.apache.lucene.index.Term;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.BoolDocValues;
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
import org.apache.lucene.queries.function.docvalues.LongDocValues;
import org.apache.lucene.queries.function.valuesource.*;
import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.search.Query; import org.apache.lucene.search.Query;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;

1
solr/src/java/org/apache/solr/search/function/FileFloatSource.java
View File

@ -35,6 +35,7 @@ import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader.ReaderContext; import org.apache.lucene.index.IndexReader.ReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.ReaderUtil; import org.apache.lucene.util.ReaderUtil;
import org.apache.solr.core.SolrCore; import org.apache.solr.core.SolrCore;

2
solr/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java
View File

@ -19,8 +19,8 @@ package org.apache.solr.search.function.distance;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
import org.apache.lucene.spatial.DistanceUtils; import org.apache.lucene.spatial.DistanceUtils;
import org.apache.solr.search.function.DoubleDocValues;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.spatial.geohash.GeoHashUtils; import org.apache.lucene.spatial.geohash.GeoHashUtils;

5
solr/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java
View File

@ -19,6 +19,11 @@ package org.apache.solr.search.function.distance;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
import org.apache.lucene.queries.function.valuesource.ConstNumberSource;
import org.apache.lucene.queries.function.valuesource.DoubleConstValueSource;
import org.apache.lucene.queries.function.valuesource.MultiValueSource;
import org.apache.lucene.queries.function.valuesource.VectorValueSource;
import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.spatial.DistanceUtils; import org.apache.lucene.spatial.DistanceUtils;

4
solr/src/java/org/apache/solr/search/function/distance/HaversineFunction.java
View File

@ -19,11 +19,11 @@ package org.apache.solr.search.function.distance;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
import org.apache.lucene.queries.function.valuesource.MultiValueSource;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.spatial.DistanceUtils; import org.apache.lucene.spatial.DistanceUtils;
import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException;
import org.apache.solr.search.function.DoubleDocValues;
import org.apache.solr.search.function.MultiValueSource;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;

2
solr/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java
View File

@ -17,8 +17,8 @@ package org.apache.solr.search.function.distance;
*/ */
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.valuesource.MultiValueSource;
import org.apache.lucene.spatial.DistanceUtils; import org.apache.lucene.spatial.DistanceUtils;
import org.apache.solr.search.function.MultiValueSource;
/** /**

2
solr/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java
View File

@ -20,8 +20,8 @@ package org.apache.solr.search.function.distance;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
import org.apache.lucene.search.spell.StringDistance; import org.apache.lucene.search.spell.StringDistance;
import org.apache.solr.search.function.FloatDocValues;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;

4
solr/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java
View File

@ -19,11 +19,11 @@ package org.apache.solr.search.function.distance;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
import org.apache.lucene.queries.function.valuesource.MultiValueSource;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.spatial.DistanceUtils; import org.apache.lucene.spatial.DistanceUtils;
import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException;
import org.apache.solr.search.function.DoubleDocValues;
import org.apache.solr.search.function.MultiValueSource;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;

2
solr/src/test/org/apache/solr/core/DummyValueSourceParser.java
View File

@ -18,11 +18,11 @@ package org.apache.solr.core;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.valuesource.SimpleFloatFunction;
import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.queryParser.ParseException;
import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.NamedList;
import org.apache.solr.search.FunctionQParser; import org.apache.solr.search.FunctionQParser;
import org.apache.solr.search.ValueSourceParser; import org.apache.solr.search.ValueSourceParser;
import org.apache.solr.search.function.SimpleFloatFunction;
/** /**

1
solr/src/test/org/apache/solr/search/function/NvlValueSourceParser.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.search.function;
import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.valuesource.SimpleFloatFunction;
import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.queryParser.ParseException;
import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.NamedList;
import org.apache.solr.search.FunctionQParser; import org.apache.solr.search.FunctionQParser;