From a993ae9032337ca8d5b2c7a4d58bf41a6f5053f5 Mon Sep 17 00:00:00 2001 From: Christopher John Male Date: Tue, 28 Jun 2011 23:32:27 +0000 Subject: [PATCH] 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 --- .../queries/function/docvalues}/BoolDocValues.java | 2 +- .../queries/function/docvalues}/DoubleDocValues.java | 2 +- .../queries/function/docvalues}/FloatDocValues.java | 2 +- .../queries/function/docvalues}/IntDocValues.java | 2 +- .../queries/function/docvalues}/LongDocValues.java | 2 +- .../queries/function/docvalues}/StrDocValues.java | 2 +- .../function/docvalues}/StringIndexDocValues.java | 2 +- .../queries/function/valuesource}/BoolFunction.java | 2 +- .../function/valuesource}/ByteFieldSource.java | 2 +- .../function/valuesource}/ConstNumberSource.java | 2 +- .../function/valuesource}/ConstValueSource.java | 3 ++- .../queries/function/valuesource}/DefFunction.java | 2 +- .../function/valuesource}/DivFloatFunction.java | 2 +- .../function/valuesource}/DocFreqValueSource.java | 5 +++-- .../valuesource}/DoubleConstValueSource.java | 3 ++- .../function/valuesource}/DoubleFieldSource.java | 3 ++- .../function/valuesource}/DualFloatFunction.java | 3 ++- .../function/valuesource}/FieldCacheSource.java | 2 +- .../function/valuesource}/FloatFieldSource.java | 3 ++- .../function/valuesource}/IDFValueSource.java | 2 +- .../queries/function/valuesource}/IfFunction.java | 2 +- .../function/valuesource}/IntFieldSource.java | 3 ++- .../valuesource}/JoinDocFreqValueSource.java | 6 +++--- .../function/valuesource}/LinearFloatFunction.java | 3 ++- .../function/valuesource}/LiteralValueSource.java | 3 ++- .../function/valuesource}/LongFieldSource.java | 3 ++- .../function/valuesource}/MaxDocValueSource.java | 2 +- .../function/valuesource}/MultiBoolFunction.java | 3 ++- .../function/valuesource}/MultiFloatFunction.java | 3 ++- .../queries/function/valuesource}/MultiFunction.java | 2 +- .../function/valuesource}/MultiValueSource.java | 2 +- .../function/valuesource}/NormValueSource.java | 3 ++- .../function/valuesource}/NumDocsValueSource.java | 2 +- .../valuesource}/NumericFieldCacheSource.java | 2 +- .../function/valuesource}/OrdFieldSource.java | 3 ++- .../function/valuesource}/PowFloatFunction.java | 2 +- .../function/valuesource}/ProductFloatFunction.java | 2 +- .../function/valuesource}/QueryValueSource.java | 12 ++++++------ .../function/valuesource}/RangeMapFloatFunction.java | 3 ++- .../valuesource}/ReciprocalFloatFunction.java | 3 ++- .../function/valuesource}/ReverseOrdFieldSource.java | 3 ++- .../function/valuesource}/ScaleFloatFunction.java | 3 ++- .../function/valuesource}/ShortFieldSource.java | 2 +- .../function/valuesource}/SimpleBoolFunction.java | 3 ++- .../function/valuesource}/SimpleFloatFunction.java | 3 ++- .../function/valuesource}/SingleFunction.java | 2 +- .../function/valuesource}/SumFloatFunction.java | 2 +- .../queries/function/valuesource}/TFValueSource.java | 6 +++--- .../function/valuesource}/TermFreqValueSource.java | 6 +++--- .../function/valuesource}/VectorValueSource.java | 3 +-- solr/src/java/org/apache/solr/schema/BoolField.java | 2 ++ solr/src/java/org/apache/solr/schema/ByteField.java | 2 +- solr/src/java/org/apache/solr/schema/DateField.java | 2 ++ .../src/java/org/apache/solr/schema/DoubleField.java | 2 +- solr/src/java/org/apache/solr/schema/FloatField.java | 2 +- .../java/org/apache/solr/schema/GeoHashField.java | 2 +- solr/src/java/org/apache/solr/schema/IntField.java | 2 +- solr/src/java/org/apache/solr/schema/LatLonType.java | 2 +- solr/src/java/org/apache/solr/schema/LongField.java | 2 +- solr/src/java/org/apache/solr/schema/PointType.java | 2 +- .../java/org/apache/solr/schema/RandomSortField.java | 2 +- solr/src/java/org/apache/solr/schema/ShortField.java | 2 +- .../org/apache/solr/schema/SortableDoubleField.java | 4 ++-- .../org/apache/solr/schema/SortableFloatField.java | 4 ++-- .../org/apache/solr/schema/SortableIntField.java | 4 ++-- .../org/apache/solr/schema/SortableLongField.java | 4 ++-- .../java/org/apache/solr/schema/StrFieldSource.java | 4 ++-- solr/src/java/org/apache/solr/schema/TrieField.java | 4 ++++ .../org/apache/solr/search/BoostQParserPlugin.java | 5 +++-- .../solr/search/ExtendedDismaxQParserPlugin.java | 4 ++-- .../java/org/apache/solr/search/FunctionQParser.java | 1 + .../solr/search/FunctionRangeQParserPlugin.java | 1 + solr/src/java/org/apache/solr/search/Grouping.java | 2 +- .../java/org/apache/solr/search/QueryParsing.java | 2 +- .../java/org/apache/solr/search/ReturnFields.java | 2 +- .../org/apache/solr/search/ValueSourceParser.java | 4 ++++ .../apache/solr/search/function/FileFloatSource.java | 1 + .../function/distance/GeohashHaversineFunction.java | 2 +- .../function/distance/HaversineConstFunction.java | 5 +++++ .../search/function/distance/HaversineFunction.java | 4 ++-- .../function/distance/SquaredEuclideanFunction.java | 2 +- .../function/distance/StringDistanceFunction.java | 2 +- .../function/distance/VectorDistanceFunction.java | 4 ++-- .../org/apache/solr/core/DummyValueSourceParser.java | 2 +- .../solr/search/function/NvlValueSourceParser.java | 1 + 85 files changed, 139 insertions(+), 98 deletions(-) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/docvalues}/BoolDocValues.java (96%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/docvalues}/DoubleDocValues.java (96%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/docvalues}/FloatDocValues.java (96%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/docvalues}/IntDocValues.java (96%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/docvalues}/LongDocValues.java (96%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/docvalues}/StrDocValues.java (95%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/docvalues}/StringIndexDocValues.java (98%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/BoolFunction.java (94%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/ByteFieldSource.java (97%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/ConstNumberSource.java (95%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/ConstValueSource.java (95%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/DefFunction.java (98%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/DivFloatFunction.java (96%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/DocFreqValueSource.java (95%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/DoubleConstValueSource.java (95%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/DoubleFieldSource.java (97%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/DualFloatFunction.java (95%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/FieldCacheSource.java (96%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/FloatFieldSource.java (95%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/IDFValueSource.java (97%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/IfFunction.java (98%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/IntFieldSource.java (97%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/JoinDocFreqValueSource.java (92%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/LinearFloatFunction.java (95%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/LiteralValueSource.java (95%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/LongFieldSource.java (97%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/MaxDocValueSource.java (97%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/MultiBoolFunction.java (96%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/MultiFloatFunction.java (96%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/MultiFunction.java (98%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/MultiValueSource.java (95%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/NormValueSource.java (95%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/NumDocsValueSource.java (96%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/NumericFieldCacheSource.java (96%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/OrdFieldSource.java (97%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/PowFloatFunction.java (96%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/ProductFloatFunction.java (96%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/QueryValueSource.java (92%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/RangeMapFloatFunction.java (96%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/ReciprocalFloatFunction.java (96%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/ReverseOrdFieldSource.java (96%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/ScaleFloatFunction.java (97%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/ShortFieldSource.java (97%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/SimpleBoolFunction.java (95%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/SimpleFloatFunction.java (93%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/SingleFunction.java (96%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/SumFloatFunction.java (96%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/TFValueSource.java (93%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/TermFreqValueSource.java (93%) rename {solr/src/java/org/apache/solr/search/function => modules/queries/src/java/org/apache/lucene/queries/function/valuesource}/VectorValueSource.java (98%) diff --git a/solr/src/java/org/apache/solr/search/function/BoolDocValues.java b/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/BoolDocValues.java similarity index 96% rename from solr/src/java/org/apache/solr/search/function/BoolDocValues.java rename to modules/queries/src/java/org/apache/lucene/queries/function/docvalues/BoolDocValues.java index 97cc3a0730b..f9582958d7e 100644 --- a/solr/src/java/org/apache/solr/search/function/BoolDocValues.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/BoolDocValues.java @@ -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.MutableValueBool; diff --git a/solr/src/java/org/apache/solr/search/function/DoubleDocValues.java b/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/DoubleDocValues.java similarity index 96% rename from solr/src/java/org/apache/solr/search/function/DoubleDocValues.java rename to modules/queries/src/java/org/apache/lucene/queries/function/docvalues/DoubleDocValues.java index 1bb1ce6906d..292af4c65b6 100644 --- a/solr/src/java/org/apache/solr/search/function/DoubleDocValues.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/DoubleDocValues.java @@ -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.MutableValueDouble; diff --git a/solr/src/java/org/apache/solr/search/function/FloatDocValues.java b/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/FloatDocValues.java similarity index 96% rename from solr/src/java/org/apache/solr/search/function/FloatDocValues.java rename to modules/queries/src/java/org/apache/lucene/queries/function/docvalues/FloatDocValues.java index 55a9da7e417..312de6b27fa 100644 --- a/solr/src/java/org/apache/solr/search/function/FloatDocValues.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/FloatDocValues.java @@ -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.MutableValueFloat; diff --git a/solr/src/java/org/apache/solr/search/function/IntDocValues.java b/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/IntDocValues.java similarity index 96% rename from solr/src/java/org/apache/solr/search/function/IntDocValues.java rename to modules/queries/src/java/org/apache/lucene/queries/function/docvalues/IntDocValues.java index 26aeca31fe4..dd1e1b3a5a7 100644 --- a/solr/src/java/org/apache/solr/search/function/IntDocValues.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/IntDocValues.java @@ -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.MutableValueInt; diff --git a/solr/src/java/org/apache/solr/search/function/LongDocValues.java b/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/LongDocValues.java similarity index 96% rename from solr/src/java/org/apache/solr/search/function/LongDocValues.java rename to modules/queries/src/java/org/apache/lucene/queries/function/docvalues/LongDocValues.java index 352594119cd..8fbe1d96399 100644 --- a/solr/src/java/org/apache/solr/search/function/LongDocValues.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/LongDocValues.java @@ -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.MutableValueLong; diff --git a/solr/src/java/org/apache/solr/search/function/StrDocValues.java b/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StrDocValues.java similarity index 95% rename from solr/src/java/org/apache/solr/search/function/StrDocValues.java rename to modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StrDocValues.java index 556b4034272..57e7a34751f 100644 --- a/solr/src/java/org/apache/solr/search/function/StrDocValues.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StrDocValues.java @@ -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.MutableValueStr; diff --git a/solr/src/java/org/apache/solr/search/function/StringIndexDocValues.java b/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StringIndexDocValues.java similarity index 98% rename from solr/src/java/org/apache/solr/search/function/StringIndexDocValues.java rename to modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StringIndexDocValues.java index 3051775ca1f..d00eb75f088 100755 --- a/solr/src/java/org/apache/solr/search/function/StringIndexDocValues.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StringIndexDocValues.java @@ -15,7 +15,7 @@ * 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.MutableValueStr; diff --git a/solr/src/java/org/apache/solr/search/function/BoolFunction.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/BoolFunction.java similarity index 94% rename from solr/src/java/org/apache/solr/search/function/BoolFunction.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/BoolFunction.java index 782b2fb75c6..93f1e288d70 100644 --- a/solr/src/java/org/apache/solr/search/function/BoolFunction.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/BoolFunction.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.search.function; +package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.queries.function.ValueSource; diff --git a/solr/src/java/org/apache/solr/search/function/ByteFieldSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java similarity index 97% rename from solr/src/java/org/apache/solr/search/function/ByteFieldSource.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java index 111f4060497..8a136f27731 100644 --- a/solr/src/java/org/apache/solr/search/function/ByteFieldSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java @@ -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 * contributor license agreements. See the NOTICE file distributed with diff --git a/solr/src/java/org/apache/solr/search/function/ConstNumberSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstNumberSource.java similarity index 95% rename from solr/src/java/org/apache/solr/search/function/ConstNumberSource.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstNumberSource.java index 859b567cb81..425ce5210b6 100755 --- a/solr/src/java/org/apache/solr/search/function/ConstNumberSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstNumberSource.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.search.function; +package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.queries.function.ValueSource; diff --git a/solr/src/java/org/apache/solr/search/function/ConstValueSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstValueSource.java similarity index 95% rename from solr/src/java/org/apache/solr/search/function/ConstValueSource.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstValueSource.java index 2e886393829..869469577f1 100755 --- a/solr/src/java/org/apache/solr/search/function/ConstValueSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstValueSource.java @@ -15,10 +15,11 @@ * 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.queries.function.DocValues; +import org.apache.lucene.queries.function.docvalues.FloatDocValues; import java.io.IOException; import java.util.Map; diff --git a/solr/src/java/org/apache/solr/search/function/DefFunction.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DefFunction.java similarity index 98% rename from solr/src/java/org/apache/solr/search/function/DefFunction.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DefFunction.java index f7d4ceb51bd..1b133a1c1b7 100644 --- a/solr/src/java/org/apache/solr/search/function/DefFunction.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DefFunction.java @@ -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 * contributor license agreements. See the NOTICE file distributed with diff --git a/solr/src/java/org/apache/solr/search/function/DivFloatFunction.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DivFloatFunction.java similarity index 96% rename from solr/src/java/org/apache/solr/search/function/DivFloatFunction.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DivFloatFunction.java index 59de812f816..23e4fe992ff 100755 --- a/solr/src/java/org/apache/solr/search/function/DivFloatFunction.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DivFloatFunction.java @@ -15,7 +15,7 @@ * 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.ValueSource; diff --git a/solr/src/java/org/apache/solr/search/function/DocFreqValueSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java similarity index 95% rename from solr/src/java/org/apache/solr/search/function/DocFreqValueSource.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java index 1cce8a68bb5..6a76f327e12 100755 --- a/solr/src/java/org/apache/solr/search/function/DocFreqValueSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java @@ -15,15 +15,16 @@ * 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.Term; import org.apache.lucene.queries.function.DocValues; 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.util.BytesRef; -import org.apache.solr.search.*; import java.io.IOException; import java.util.Map; diff --git a/solr/src/java/org/apache/solr/search/function/DoubleConstValueSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleConstValueSource.java similarity index 95% rename from solr/src/java/org/apache/solr/search/function/DoubleConstValueSource.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleConstValueSource.java index b6a5f0dcd6d..35f33621dca 100755 --- a/solr/src/java/org/apache/solr/search/function/DoubleConstValueSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleConstValueSource.java @@ -15,10 +15,11 @@ * 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.queries.function.DocValues; +import org.apache.lucene.queries.function.docvalues.DoubleDocValues; import java.io.IOException; import java.util.Map; diff --git a/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java similarity index 97% rename from solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java index 57bcc0a22cb..fb5c441e64c 100644 --- a/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java @@ -15,7 +15,7 @@ * 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.MutableValueDouble; @@ -23,6 +23,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.queries.function.DocValues; 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.search.cache.DoubleValuesCreator; import org.apache.lucene.search.cache.CachedArray.DoubleValues; diff --git a/solr/src/java/org/apache/solr/search/function/DualFloatFunction.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DualFloatFunction.java similarity index 95% rename from solr/src/java/org/apache/solr/search/function/DualFloatFunction.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DualFloatFunction.java index 1cb170bb81a..3d2f12c982d 100755 --- a/solr/src/java/org/apache/solr/search/function/DualFloatFunction.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DualFloatFunction.java @@ -15,11 +15,12 @@ * 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.queries.function.DocValues; import org.apache.lucene.queries.function.ValueSource; +import org.apache.lucene.queries.function.docvalues.FloatDocValues; import org.apache.lucene.search.IndexSearcher; import java.io.IOException; diff --git a/solr/src/java/org/apache/solr/search/function/FieldCacheSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FieldCacheSource.java similarity index 96% rename from solr/src/java/org/apache/solr/search/function/FieldCacheSource.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FieldCacheSource.java index a48961b6b2f..20944ee1c89 100644 --- a/solr/src/java/org/apache/solr/search/function/FieldCacheSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FieldCacheSource.java @@ -15,7 +15,7 @@ * 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.search.FieldCache; diff --git a/solr/src/java/org/apache/solr/search/function/FloatFieldSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java similarity index 95% rename from solr/src/java/org/apache/solr/search/function/FloatFieldSource.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java index 33794ba796e..87a5db54204 100644 --- a/solr/src/java/org/apache/solr/search/function/FloatFieldSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.search.function; +package org.apache.lucene.queries.function.valuesource; import java.io.IOException; 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.index.IndexReader.AtomicReaderContext; 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.search.cache.FloatValuesCreator; import org.apache.lucene.search.cache.CachedArray.FloatValues; diff --git a/solr/src/java/org/apache/solr/search/function/IDFValueSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java similarity index 97% rename from solr/src/java/org/apache/solr/search/function/IDFValueSource.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java index 99d4fe32723..23ccd22cd89 100755 --- a/solr/src/java/org/apache/solr/search/function/IDFValueSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java @@ -15,7 +15,7 @@ * 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.IndexReader.AtomicReaderContext; diff --git a/solr/src/java/org/apache/solr/search/function/IfFunction.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java similarity index 98% rename from solr/src/java/org/apache/solr/search/function/IfFunction.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java index 296af74b14d..ee47a697e06 100644 --- a/solr/src/java/org/apache/solr/search/function/IfFunction.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java @@ -15,7 +15,7 @@ * 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.AtomicReaderContext; diff --git a/solr/src/java/org/apache/solr/search/function/IntFieldSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java similarity index 97% rename from solr/src/java/org/apache/solr/search/function/IntFieldSource.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java index 609580f3e37..d9498d3915f 100644 --- a/solr/src/java/org/apache/solr/search/function/IntFieldSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java @@ -15,7 +15,7 @@ * 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.MutableValueInt; @@ -23,6 +23,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.queries.function.DocValues; 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.search.cache.IntValuesCreator; import org.apache.lucene.search.cache.CachedArray.IntValues; diff --git a/solr/src/java/org/apache/solr/search/function/JoinDocFreqValueSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java similarity index 92% rename from solr/src/java/org/apache/solr/search/function/JoinDocFreqValueSource.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java index f37aa22141b..8cd775455bc 100644 --- a/solr/src/java/org/apache/solr/search/function/JoinDocFreqValueSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.search.function; +package org.apache.lucene.queries.function.valuesource; import java.io.IOException; import java.util.Map; @@ -23,10 +23,10 @@ import java.util.Map; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader.AtomicReaderContext; 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.util.BytesRef; import org.apache.lucene.util.ReaderUtil; -import org.apache.solr.common.SolrException; /** * Use a field value and find the Document Frequency within another field. @@ -68,7 +68,7 @@ public class JoinDocFreqValueSource extends FieldCacheSource { return v; } 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); } } }; diff --git a/solr/src/java/org/apache/solr/search/function/LinearFloatFunction.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LinearFloatFunction.java similarity index 95% rename from solr/src/java/org/apache/solr/search/function/LinearFloatFunction.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LinearFloatFunction.java index b120a9ab341..01edb26d740 100644 --- a/solr/src/java/org/apache/solr/search/function/LinearFloatFunction.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LinearFloatFunction.java @@ -15,11 +15,12 @@ * 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.queries.function.DocValues; import org.apache.lucene.queries.function.ValueSource; +import org.apache.lucene.queries.function.docvalues.FloatDocValues; import org.apache.lucene.search.IndexSearcher; import java.io.IOException; diff --git a/solr/src/java/org/apache/solr/search/function/LiteralValueSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java similarity index 95% rename from solr/src/java/org/apache/solr/search/function/LiteralValueSource.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java index 2b76fd30f88..d4eed850c85 100644 --- a/solr/src/java/org/apache/solr/search/function/LiteralValueSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java @@ -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 * 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.queries.function.DocValues; import org.apache.lucene.queries.function.ValueSource; +import org.apache.lucene.queries.function.docvalues.StrDocValues; import org.apache.lucene.util.BytesRef; import java.util.Map; diff --git a/solr/src/java/org/apache/solr/search/function/LongFieldSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java similarity index 97% rename from solr/src/java/org/apache/solr/search/function/LongFieldSource.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java index 6e5ada491ce..3b3bb000897 100644 --- a/solr/src/java/org/apache/solr/search/function/LongFieldSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java @@ -15,7 +15,7 @@ * 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.MutableValueLong; @@ -23,6 +23,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.queries.function.DocValues; 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.search.cache.LongValuesCreator; import org.apache.lucene.search.cache.CachedArray.LongValues; diff --git a/solr/src/java/org/apache/solr/search/function/MaxDocValueSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java similarity index 97% rename from solr/src/java/org/apache/solr/search/function/MaxDocValueSource.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java index 908693fffff..d0c448b61fa 100755 --- a/solr/src/java/org/apache/solr/search/function/MaxDocValueSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * 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.queries.function.DocValues; diff --git a/solr/src/java/org/apache/solr/search/function/MultiBoolFunction.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java similarity index 96% rename from solr/src/java/org/apache/solr/search/function/MultiBoolFunction.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java index 002f787c77c..9292a190186 100644 --- a/solr/src/java/org/apache/solr/search/function/MultiBoolFunction.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java @@ -15,11 +15,12 @@ * 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.queries.function.DocValues; import org.apache.lucene.queries.function.ValueSource; +import org.apache.lucene.queries.function.docvalues.BoolDocValues; import org.apache.lucene.search.IndexSearcher; import java.io.IOException; diff --git a/solr/src/java/org/apache/solr/search/function/MultiFloatFunction.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java similarity index 96% rename from solr/src/java/org/apache/solr/search/function/MultiFloatFunction.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java index 3b93933a415..369ae1c4ad2 100644 --- a/solr/src/java/org/apache/solr/search/function/MultiFloatFunction.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java @@ -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 * 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.queries.function.DocValues; import org.apache.lucene.queries.function.ValueSource; +import org.apache.lucene.queries.function.docvalues.FloatDocValues; import org.apache.lucene.search.IndexSearcher; import java.util.Map; diff --git a/solr/src/java/org/apache/solr/search/function/MultiFunction.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFunction.java similarity index 98% rename from solr/src/java/org/apache/solr/search/function/MultiFunction.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFunction.java index 89b93d60fa8..73ffd215110 100644 --- a/solr/src/java/org/apache/solr/search/function/MultiFunction.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFunction.java @@ -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 * contributor license agreements. See the NOTICE file distributed with diff --git a/solr/src/java/org/apache/solr/search/function/MultiValueSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiValueSource.java similarity index 95% rename from solr/src/java/org/apache/solr/search/function/MultiValueSource.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiValueSource.java index ed90b84d9cd..13c899f6833 100644 --- a/solr/src/java/org/apache/solr/search/function/MultiValueSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiValueSource.java @@ -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 * contributor license agreements. See the NOTICE file distributed with diff --git a/solr/src/java/org/apache/solr/search/function/NormValueSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java similarity index 95% rename from solr/src/java/org/apache/solr/search/function/NormValueSource.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java index 8e44de719d6..5a515ad48c9 100755 --- a/solr/src/java/org/apache/solr/search/function/NormValueSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java @@ -15,11 +15,12 @@ * 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.queries.function.DocValues; 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.Similarity; import java.io.IOException; diff --git a/solr/src/java/org/apache/solr/search/function/NumDocsValueSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java similarity index 96% rename from solr/src/java/org/apache/solr/search/function/NumDocsValueSource.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java index cb5cbc8f687..768ade0031c 100755 --- a/solr/src/java/org/apache/solr/search/function/NumDocsValueSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * 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.queries.function.DocValues; diff --git a/solr/src/java/org/apache/solr/search/function/NumericFieldCacheSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumericFieldCacheSource.java similarity index 96% rename from solr/src/java/org/apache/solr/search/function/NumericFieldCacheSource.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumericFieldCacheSource.java index f7fde5cdd8b..c0b17de19e7 100644 --- a/solr/src/java/org/apache/solr/search/function/NumericFieldCacheSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/NumericFieldCacheSource.java @@ -15,7 +15,7 @@ * 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.CachedArrayCreator; diff --git a/solr/src/java/org/apache/solr/search/function/OrdFieldSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java similarity index 97% rename from solr/src/java/org/apache/solr/search/function/OrdFieldSource.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java index 9b54f6d3ce2..431bc86b0ec 100644 --- a/solr/src/java/org/apache/solr/search/function/OrdFieldSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java @@ -15,7 +15,7 @@ * 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.MutableValueInt; @@ -23,6 +23,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.queries.function.DocValues; 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.util.ReaderUtil; diff --git a/solr/src/java/org/apache/solr/search/function/PowFloatFunction.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/PowFloatFunction.java similarity index 96% rename from solr/src/java/org/apache/solr/search/function/PowFloatFunction.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/PowFloatFunction.java index c9acfb64312..ec2ae94391b 100755 --- a/solr/src/java/org/apache/solr/search/function/PowFloatFunction.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/PowFloatFunction.java @@ -15,7 +15,7 @@ * 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.ValueSource; diff --git a/solr/src/java/org/apache/solr/search/function/ProductFloatFunction.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ProductFloatFunction.java similarity index 96% rename from solr/src/java/org/apache/solr/search/function/ProductFloatFunction.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ProductFloatFunction.java index 1d831bba33c..5aa02540cd1 100755 --- a/solr/src/java/org/apache/solr/search/function/ProductFloatFunction.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ProductFloatFunction.java @@ -15,7 +15,7 @@ * 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.ValueSource; diff --git a/solr/src/java/org/apache/solr/search/function/QueryValueSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java similarity index 92% rename from solr/src/java/org/apache/solr/search/function/QueryValueSource.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java index dff0d0359f7..78423717581 100755 --- a/solr/src/java/org/apache/solr/search/function/QueryValueSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java @@ -15,7 +15,7 @@ * 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.MutableValueFloat; @@ -23,10 +23,10 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.queries.function.DocValues; 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.Weight.ScorerContext; import org.apache.lucene.util.ReaderUtil; -import org.apache.solr.common.SolrException; import java.io.IOException; import java.util.Map; @@ -144,7 +144,7 @@ class QueryDocValues extends FloatDocValues { // a match! return scorer.score(); } 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! return true; } 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 { return exists(doc) ? scorer.score() : null; } 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; return; } 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); } } }; diff --git a/solr/src/java/org/apache/solr/search/function/RangeMapFloatFunction.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/RangeMapFloatFunction.java similarity index 96% rename from solr/src/java/org/apache/solr/search/function/RangeMapFloatFunction.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/RangeMapFloatFunction.java index 3217be1ea07..95203a727af 100755 --- a/solr/src/java/org/apache/solr/search/function/RangeMapFloatFunction.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/RangeMapFloatFunction.java @@ -15,11 +15,12 @@ * 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.queries.function.DocValues; import org.apache.lucene.queries.function.ValueSource; +import org.apache.lucene.queries.function.docvalues.FloatDocValues; import org.apache.lucene.search.IndexSearcher; import java.io.IOException; diff --git a/solr/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReciprocalFloatFunction.java similarity index 96% rename from solr/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReciprocalFloatFunction.java index 9e64037a568..98596e66dca 100644 --- a/solr/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReciprocalFloatFunction.java @@ -15,11 +15,12 @@ * 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.queries.function.DocValues; import org.apache.lucene.queries.function.ValueSource; +import org.apache.lucene.queries.function.docvalues.FloatDocValues; import org.apache.lucene.search.IndexSearcher; import java.io.IOException; diff --git a/solr/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReverseOrdFieldSource.java similarity index 96% rename from solr/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReverseOrdFieldSource.java index 33b391c108a..d3d886147c1 100644 --- a/solr/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ReverseOrdFieldSource.java @@ -15,12 +15,13 @@ * 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.AtomicReaderContext; import org.apache.lucene.queries.function.DocValues; 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.util.ReaderUtil; diff --git a/solr/src/java/org/apache/solr/search/function/ScaleFloatFunction.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java similarity index 97% rename from solr/src/java/org/apache/solr/search/function/ScaleFloatFunction.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java index 1d5ef6cfe78..6e2330a006b 100755 --- a/solr/src/java/org/apache/solr/search/function/ScaleFloatFunction.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java @@ -15,11 +15,12 @@ * 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.queries.function.DocValues; 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.util.ReaderUtil; diff --git a/solr/src/java/org/apache/solr/search/function/ShortFieldSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ShortFieldSource.java similarity index 97% rename from solr/src/java/org/apache/solr/search/function/ShortFieldSource.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ShortFieldSource.java index 51934ef2710..2284175cf5a 100644 --- a/solr/src/java/org/apache/solr/search/function/ShortFieldSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/ShortFieldSource.java @@ -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 * contributor license agreements. See the NOTICE file distributed with diff --git a/solr/src/java/org/apache/solr/search/function/SimpleBoolFunction.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleBoolFunction.java similarity index 95% rename from solr/src/java/org/apache/solr/search/function/SimpleBoolFunction.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleBoolFunction.java index cc1f22d5374..10fb3bb5384 100644 --- a/solr/src/java/org/apache/solr/search/function/SimpleBoolFunction.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleBoolFunction.java @@ -15,11 +15,12 @@ * 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.queries.function.DocValues; import org.apache.lucene.queries.function.ValueSource; +import org.apache.lucene.queries.function.docvalues.BoolDocValues; import org.apache.lucene.search.IndexSearcher; import java.io.IOException; diff --git a/solr/src/java/org/apache/solr/search/function/SimpleFloatFunction.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleFloatFunction.java similarity index 93% rename from solr/src/java/org/apache/solr/search/function/SimpleFloatFunction.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleFloatFunction.java index 080f3e56dfe..174f5d34c36 100755 --- a/solr/src/java/org/apache/solr/search/function/SimpleFloatFunction.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleFloatFunction.java @@ -15,11 +15,12 @@ * 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.queries.function.DocValues; import org.apache.lucene.queries.function.ValueSource; +import org.apache.lucene.queries.function.docvalues.FloatDocValues; import java.io.IOException; import java.util.Map; diff --git a/solr/src/java/org/apache/solr/search/function/SingleFunction.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SingleFunction.java similarity index 96% rename from solr/src/java/org/apache/solr/search/function/SingleFunction.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SingleFunction.java index 860d8a388a8..2e95e4cb56f 100755 --- a/solr/src/java/org/apache/solr/search/function/SingleFunction.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SingleFunction.java @@ -15,7 +15,7 @@ * 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.search.IndexSearcher; diff --git a/solr/src/java/org/apache/solr/search/function/SumFloatFunction.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SumFloatFunction.java similarity index 96% rename from solr/src/java/org/apache/solr/search/function/SumFloatFunction.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SumFloatFunction.java index f64cd465eba..19cf94248c6 100755 --- a/solr/src/java/org/apache/solr/search/function/SumFloatFunction.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/SumFloatFunction.java @@ -15,7 +15,7 @@ * 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.ValueSource; diff --git a/solr/src/java/org/apache/solr/search/function/TFValueSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java similarity index 93% rename from solr/src/java/org/apache/solr/search/function/TFValueSource.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java index 66d7f279835..d868456f8c5 100755 --- a/solr/src/java/org/apache/solr/search/function/TFValueSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java @@ -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 @@ -20,11 +20,11 @@ package org.apache.solr.search.function; import org.apache.lucene.index.*; import org.apache.lucene.index.IndexReader.AtomicReaderContext; 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.IndexSearcher; import org.apache.lucene.search.Similarity; import org.apache.lucene.util.BytesRef; -import org.apache.solr.common.SolrException; import java.io.IOException; import java.util.Map; @@ -103,7 +103,7 @@ public class TFValueSource extends TermFreqValueSource { // a match! return similarity.tf(docs.freq()); } 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); } } }; diff --git a/solr/src/java/org/apache/solr/search/function/TermFreqValueSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java similarity index 93% rename from solr/src/java/org/apache/solr/search/function/TermFreqValueSource.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java index 2b94e49b879..b6e53aa9ea3 100755 --- a/solr/src/java/org/apache/solr/search/function/TermFreqValueSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java @@ -15,14 +15,14 @@ * 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.IndexReader.AtomicReaderContext; 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.util.BytesRef; -import org.apache.solr.common.SolrException; import java.io.IOException; import java.util.Map; @@ -100,7 +100,7 @@ public class TermFreqValueSource extends DocFreqValueSource { // a match! return docs.freq(); } 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); } } }; diff --git a/solr/src/java/org/apache/solr/search/function/VectorValueSource.java b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/VectorValueSource.java similarity index 98% rename from solr/src/java/org/apache/solr/search/function/VectorValueSource.java rename to modules/queries/src/java/org/apache/lucene/queries/function/valuesource/VectorValueSource.java index b57592f024d..d53c262a451 100644 --- a/solr/src/java/org/apache/solr/search/function/VectorValueSource.java +++ b/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/VectorValueSource.java @@ -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 * 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.ValueSource; import org.apache.lucene.search.IndexSearcher; -import org.apache.solr.search.function.MultiValueSource; import java.io.IOException; import java.util.List; diff --git a/solr/src/java/org/apache/solr/schema/BoolField.java b/solr/src/java/org/apache/solr/schema/BoolField.java index a4e800b544d..a57b101035e 100644 --- a/solr/src/java/org/apache/solr/schema/BoolField.java +++ b/solr/src/java/org/apache/solr/schema/BoolField.java @@ -22,6 +22,8 @@ import org.apache.lucene.common.mutable.MutableValueBool; import org.apache.lucene.index.IndexReader; import org.apache.lucene.queries.function.DocValues; 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.SortField; import org.apache.lucene.util.BytesRef; diff --git a/solr/src/java/org/apache/solr/schema/ByteField.java b/solr/src/java/org/apache/solr/schema/ByteField.java index 2cc16641f32..ec35f53a067 100644 --- a/solr/src/java/org/apache/solr/schema/ByteField.java +++ b/solr/src/java/org/apache/solr/schema/ByteField.java @@ -18,13 +18,13 @@ package org.apache.solr.schema; import org.apache.lucene.document.Fieldable; 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.cache.ByteValuesCreator; import org.apache.lucene.search.cache.CachedArrayCreator; import org.apache.solr.response.TextResponseWriter; import org.apache.solr.search.QParser; -import org.apache.solr.search.function.ByteFieldSource; import java.io.IOException; import java.util.Map; diff --git a/solr/src/java/org/apache/solr/schema/DateField.java b/solr/src/java/org/apache/solr/schema/DateField.java index 7b9f9cc72c8..edf3abda053 100644 --- a/solr/src/java/org/apache/solr/schema/DateField.java +++ b/solr/src/java/org/apache/solr/schema/DateField.java @@ -21,6 +21,8 @@ import org.apache.lucene.document.Fieldable; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.queries.function.DocValues; 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.SortField; import org.apache.lucene.search.TermRangeQuery; diff --git a/solr/src/java/org/apache/solr/schema/DoubleField.java b/solr/src/java/org/apache/solr/schema/DoubleField.java index 324ec17364e..178263333f5 100644 --- a/solr/src/java/org/apache/solr/schema/DoubleField.java +++ b/solr/src/java/org/apache/solr/schema/DoubleField.java @@ -19,12 +19,12 @@ package org.apache.solr.schema; import org.apache.lucene.document.Fieldable; 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.cache.CachedArrayCreator; import org.apache.lucene.search.cache.DoubleValuesCreator; import org.apache.solr.response.TextResponseWriter; import org.apache.solr.search.QParser; -import org.apache.solr.search.function.DoubleFieldSource; import java.io.IOException; import java.util.Map; diff --git a/solr/src/java/org/apache/solr/schema/FloatField.java b/solr/src/java/org/apache/solr/schema/FloatField.java index 0921b471632..59be59ac691 100644 --- a/solr/src/java/org/apache/solr/schema/FloatField.java +++ b/solr/src/java/org/apache/solr/schema/FloatField.java @@ -18,11 +18,11 @@ package org.apache.solr.schema; 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.cache.CachedArrayCreator; import org.apache.lucene.search.cache.FloatValuesCreator; import org.apache.solr.search.QParser; -import org.apache.solr.search.function.FloatFieldSource; import org.apache.lucene.document.Fieldable; import org.apache.solr.response.TextResponseWriter; diff --git a/solr/src/java/org/apache/solr/schema/GeoHashField.java b/solr/src/java/org/apache/solr/schema/GeoHashField.java index 8ead0de5cba..f28878ca95c 100644 --- a/solr/src/java/org/apache/solr/schema/GeoHashField.java +++ b/solr/src/java/org/apache/solr/schema/GeoHashField.java @@ -19,6 +19,7 @@ package org.apache.solr.schema; import org.apache.lucene.document.Fieldable; 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.SortField; 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.SolrConstantScoreQuery; 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.distance.GeohashHaversineFunction; diff --git a/solr/src/java/org/apache/solr/schema/IntField.java b/solr/src/java/org/apache/solr/schema/IntField.java index d37a36f6178..f52b7f9cc6d 100644 --- a/solr/src/java/org/apache/solr/schema/IntField.java +++ b/solr/src/java/org/apache/solr/schema/IntField.java @@ -18,11 +18,11 @@ package org.apache.solr.schema; 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.cache.CachedArrayCreator; import org.apache.lucene.search.cache.IntValuesCreator; import org.apache.solr.search.QParser; -import org.apache.solr.search.function.IntFieldSource; import org.apache.lucene.document.Fieldable; import org.apache.solr.response.TextResponseWriter; diff --git a/solr/src/java/org/apache/solr/schema/LatLonType.java b/solr/src/java/org/apache/solr/schema/LatLonType.java index d32aa3b3814..1782fa945b4 100644 --- a/solr/src/java/org/apache/solr/schema/LatLonType.java +++ b/solr/src/java/org/apache/solr/schema/LatLonType.java @@ -22,6 +22,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.ValueSource; +import org.apache.lucene.queries.function.valuesource.VectorValueSource; import org.apache.lucene.search.*; import org.apache.lucene.spatial.DistanceUtils; 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.search.QParser; import org.apache.solr.search.SpatialOptions; -import org.apache.solr.search.function.VectorValueSource; import java.io.IOException; import java.util.ArrayList; diff --git a/solr/src/java/org/apache/solr/schema/LongField.java b/solr/src/java/org/apache/solr/schema/LongField.java index 32861eba972..6a2e1e5945c 100644 --- a/solr/src/java/org/apache/solr/schema/LongField.java +++ b/solr/src/java/org/apache/solr/schema/LongField.java @@ -19,12 +19,12 @@ package org.apache.solr.schema; import org.apache.lucene.document.Fieldable; 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.cache.CachedArrayCreator; import org.apache.lucene.search.cache.LongValuesCreator; import org.apache.solr.response.TextResponseWriter; import org.apache.solr.search.QParser; -import org.apache.solr.search.function.LongFieldSource; import java.io.IOException; import java.util.Map; diff --git a/solr/src/java/org/apache/solr/schema/PointType.java b/solr/src/java/org/apache/solr/schema/PointType.java index 9208706c279..9cfbfb27557 100644 --- a/solr/src/java/org/apache/solr/schema/PointType.java +++ b/solr/src/java/org/apache/solr/schema/PointType.java @@ -20,6 +20,7 @@ package org.apache.solr.schema; import org.apache.lucene.document.Field; import org.apache.lucene.document.Fieldable; 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.BooleanQuery; 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.search.QParser; import org.apache.solr.search.SpatialOptions; -import org.apache.solr.search.function.VectorValueSource; import java.io.IOException; import java.util.Map; diff --git a/solr/src/java/org/apache/solr/schema/RandomSortField.java b/solr/src/java/org/apache/solr/schema/RandomSortField.java index 992eed55b08..9b756240fb8 100644 --- a/solr/src/java/org/apache/solr/schema/RandomSortField.java +++ b/solr/src/java/org/apache/solr/schema/RandomSortField.java @@ -25,11 +25,11 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.ValueSource; +import org.apache.lucene.queries.function.docvalues.IntDocValues; import org.apache.lucene.search.*; import org.apache.lucene.util.ReaderUtil; import org.apache.solr.response.TextResponseWriter; 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. diff --git a/solr/src/java/org/apache/solr/schema/ShortField.java b/solr/src/java/org/apache/solr/schema/ShortField.java index c7edada8306..523760cf4b4 100644 --- a/solr/src/java/org/apache/solr/schema/ShortField.java +++ b/solr/src/java/org/apache/solr/schema/ShortField.java @@ -18,13 +18,13 @@ package org.apache.solr.schema; import org.apache.lucene.document.Fieldable; 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.cache.CachedArrayCreator; import org.apache.lucene.search.cache.ShortValuesCreator; import org.apache.solr.response.TextResponseWriter; import org.apache.solr.search.QParser; -import org.apache.solr.search.function.ShortFieldSource; import java.io.IOException; import java.util.Map; diff --git a/solr/src/java/org/apache/solr/schema/SortableDoubleField.java b/solr/src/java/org/apache/solr/schema/SortableDoubleField.java index 95fd101a863..3e9bffe5a64 100644 --- a/solr/src/java/org/apache/solr/schema/SortableDoubleField.java +++ b/solr/src/java/org/apache/solr/schema/SortableDoubleField.java @@ -21,12 +21,12 @@ import org.apache.lucene.common.mutable.MutableValue; import org.apache.lucene.common.mutable.MutableValueDouble; import org.apache.lucene.queries.function.DocValues; 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.util.BytesRef; import org.apache.lucene.util.CharsRef; 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.index.IndexReader.AtomicReaderContext; import org.apache.solr.util.NumberUtils; diff --git a/solr/src/java/org/apache/solr/schema/SortableFloatField.java b/solr/src/java/org/apache/solr/schema/SortableFloatField.java index ad9ac339fd1..fac243d2270 100644 --- a/solr/src/java/org/apache/solr/schema/SortableFloatField.java +++ b/solr/src/java/org/apache/solr/schema/SortableFloatField.java @@ -21,12 +21,12 @@ import org.apache.lucene.common.mutable.MutableValue; import org.apache.lucene.common.mutable.MutableValueFloat; import org.apache.lucene.queries.function.DocValues; 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.util.BytesRef; import org.apache.lucene.util.CharsRef; 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.index.IndexReader.AtomicReaderContext; import org.apache.solr.util.NumberUtils; diff --git a/solr/src/java/org/apache/solr/schema/SortableIntField.java b/solr/src/java/org/apache/solr/schema/SortableIntField.java index 576068cc780..2bd5e4a335b 100644 --- a/solr/src/java/org/apache/solr/schema/SortableIntField.java +++ b/solr/src/java/org/apache/solr/schema/SortableIntField.java @@ -21,12 +21,12 @@ import org.apache.lucene.common.mutable.MutableValue; import org.apache.lucene.common.mutable.MutableValueInt; import org.apache.lucene.queries.function.DocValues; 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.util.BytesRef; import org.apache.lucene.util.CharsRef; 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.index.IndexReader.AtomicReaderContext; import org.apache.solr.util.NumberUtils; diff --git a/solr/src/java/org/apache/solr/schema/SortableLongField.java b/solr/src/java/org/apache/solr/schema/SortableLongField.java index d86d2dff60e..66b46737725 100644 --- a/solr/src/java/org/apache/solr/schema/SortableLongField.java +++ b/solr/src/java/org/apache/solr/schema/SortableLongField.java @@ -21,12 +21,12 @@ import org.apache.lucene.common.mutable.MutableValue; import org.apache.lucene.common.mutable.MutableValueLong; import org.apache.lucene.queries.function.DocValues; 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.util.BytesRef; import org.apache.lucene.util.CharsRef; 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.index.IndexReader.AtomicReaderContext; import org.apache.solr.util.NumberUtils; diff --git a/solr/src/java/org/apache/solr/schema/StrFieldSource.java b/solr/src/java/org/apache/solr/schema/StrFieldSource.java index da80ad6fa23..b02d0783c14 100755 --- a/solr/src/java/org/apache/solr/schema/StrFieldSource.java +++ b/solr/src/java/org/apache/solr/schema/StrFieldSource.java @@ -19,8 +19,8 @@ package org.apache.solr.schema; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.queries.function.DocValues; -import org.apache.solr.search.function.FieldCacheSource; -import org.apache.solr.search.function.StringIndexDocValues; +import org.apache.lucene.queries.function.docvalues.StringIndexDocValues; +import org.apache.lucene.queries.function.valuesource.FieldCacheSource; import java.io.IOException; import java.util.Map; diff --git a/solr/src/java/org/apache/solr/schema/TrieField.java b/solr/src/java/org/apache/solr/schema/TrieField.java index 1c4adc62dce..d30cb537010 100644 --- a/solr/src/java/org/apache/solr/schema/TrieField.java +++ b/solr/src/java/org/apache/solr/schema/TrieField.java @@ -22,6 +22,10 @@ import org.apache.lucene.document.Fieldable; import org.apache.lucene.document.Field; import org.apache.lucene.document.NumericField; 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.cache.CachedArrayCreator; import org.apache.lucene.search.cache.DoubleValuesCreator; diff --git a/solr/src/java/org/apache/solr/search/BoostQParserPlugin.java b/solr/src/java/org/apache/solr/search/BoostQParserPlugin.java index a9832e61f20..3e7bb142547 100755 --- a/solr/src/java/org/apache/solr/search/BoostQParserPlugin.java +++ b/solr/src/java/org/apache/solr/search/BoostQParserPlugin.java @@ -18,13 +18,13 @@ package org.apache.solr.search; import org.apache.lucene.queries.function.FunctionQuery; 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.search.Query; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.NamedList; import org.apache.solr.request.SolrQueryRequest; 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. @@ -34,7 +34,8 @@ import org.apache.solr.search.function.QueryValueSource; * The query to be boosted may be of any type. * *

Example: {!boost b=recip(ms(NOW,mydatefield),3.16e-11,1,1)}foo 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 static String NAME = "boost"; diff --git a/solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java b/solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java index 857222d14be..44480ecf6c5 100755 --- a/solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java +++ b/solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java @@ -24,6 +24,8 @@ package org.apache.solr.search; import org.apache.lucene.queries.function.FunctionQuery; 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.QueryParser; 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.search.QueryUtils; 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.analysis.*; diff --git a/solr/src/java/org/apache/solr/search/FunctionQParser.java b/solr/src/java/org/apache/solr/search/FunctionQParser.java index 312599cb8b4..d7ef606f23e 100755 --- a/solr/src/java/org/apache/solr/search/FunctionQParser.java +++ b/solr/src/java/org/apache/solr/search/FunctionQParser.java @@ -18,6 +18,7 @@ package org.apache.solr.search; 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.queryParser.ParseException; import org.apache.lucene.search.Query; import org.apache.solr.common.params.SolrParams; diff --git a/solr/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java b/solr/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java index 1e55271cea6..11be0969613 100755 --- a/solr/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java +++ b/solr/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java @@ -21,6 +21,7 @@ import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.FunctionQuery; import org.apache.lucene.queries.function.ValueSource; 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.search.*; import org.apache.solr.common.params.SolrParams; diff --git a/solr/src/java/org/apache/solr/search/Grouping.java b/solr/src/java/org/apache/solr/search/Grouping.java index b2bd8ada996..5079286a12c 100755 --- a/solr/src/java/org/apache/solr/search/Grouping.java +++ b/solr/src/java/org/apache/solr/search/Grouping.java @@ -24,6 +24,7 @@ import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.FunctionQuery; 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.search.*; 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.request.SolrQueryRequest; import org.apache.solr.schema.*; -import org.apache.solr.search.function.QueryValueSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/solr/src/java/org/apache/solr/search/QueryParsing.java b/solr/src/java/org/apache/solr/search/QueryParsing.java index 0ad984a7b31..4ccfd0ea2b6 100644 --- a/solr/src/java/org/apache/solr/search/QueryParsing.java +++ b/solr/src/java/org/apache/solr/search/QueryParsing.java @@ -19,6 +19,7 @@ package org.apache.solr.search; import org.apache.lucene.index.Term; 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.QueryParser.Operator; 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.IndexSchema; import org.apache.solr.schema.SchemaField; -import org.apache.solr.search.function.QueryValueSource; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; diff --git a/solr/src/java/org/apache/solr/search/ReturnFields.java b/solr/src/java/org/apache/solr/search/ReturnFields.java index c71d2c319e2..03aaa4b98c4 100644 --- a/solr/src/java/org/apache/solr/search/ReturnFields.java +++ b/solr/src/java/org/apache/solr/search/ReturnFields.java @@ -21,6 +21,7 @@ import java.util.*; import org.apache.commons.io.FilenameUtils; import org.apache.lucene.queries.function.FunctionQuery; 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.search.Query; 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.TransformerFactory; import org.apache.solr.response.transform.ValueSourceAugmenter; -import org.apache.solr.search.function.QueryValueSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/solr/src/java/org/apache/solr/search/ValueSourceParser.java b/solr/src/java/org/apache/solr/search/ValueSourceParser.java index a8f3b7eab5a..19055cdccf2 100755 --- a/solr/src/java/org/apache/solr/search/ValueSourceParser.java +++ b/solr/src/java/org/apache/solr/search/ValueSourceParser.java @@ -20,6 +20,10 @@ import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.Term; import org.apache.lucene.queries.function.DocValues; 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.search.Query; import org.apache.lucene.search.IndexSearcher; diff --git a/solr/src/java/org/apache/solr/search/function/FileFloatSource.java b/solr/src/java/org/apache/solr/search/function/FileFloatSource.java index 8675aee526b..55bee03648c 100755 --- a/solr/src/java/org/apache/solr/search/function/FileFloatSource.java +++ b/solr/src/java/org/apache/solr/search/function/FileFloatSource.java @@ -35,6 +35,7 @@ import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.ReaderContext; import org.apache.lucene.queries.function.DocValues; 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.ReaderUtil; import org.apache.solr.core.SolrCore; diff --git a/solr/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java b/solr/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java index 725e8fffa7f..ca80dbb0d83 100644 --- a/solr/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java +++ b/solr/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java @@ -19,8 +19,8 @@ package org.apache.solr.search.function.distance; import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.ValueSource; +import org.apache.lucene.queries.function.docvalues.DoubleDocValues; import org.apache.lucene.spatial.DistanceUtils; -import org.apache.solr.search.function.DoubleDocValues; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.spatial.geohash.GeoHashUtils; diff --git a/solr/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java b/solr/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java index d97f605a296..dba15ddeb20 100755 --- a/solr/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java +++ b/solr/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java @@ -19,6 +19,11 @@ package org.apache.solr.search.function.distance; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.queries.function.DocValues; 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.search.IndexSearcher; import org.apache.lucene.spatial.DistanceUtils; diff --git a/solr/src/java/org/apache/solr/search/function/distance/HaversineFunction.java b/solr/src/java/org/apache/solr/search/function/distance/HaversineFunction.java index 7e3fcfa97fe..1febdaf19f1 100644 --- a/solr/src/java/org/apache/solr/search/function/distance/HaversineFunction.java +++ b/solr/src/java/org/apache/solr/search/function/distance/HaversineFunction.java @@ -19,11 +19,11 @@ package org.apache.solr.search.function.distance; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.queries.function.DocValues; 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.spatial.DistanceUtils; 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.util.Map; diff --git a/solr/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java b/solr/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java index 9102af08ce0..ad9cdb82375 100644 --- a/solr/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java +++ b/solr/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java @@ -17,8 +17,8 @@ package org.apache.solr.search.function.distance; */ import org.apache.lucene.queries.function.DocValues; +import org.apache.lucene.queries.function.valuesource.MultiValueSource; import org.apache.lucene.spatial.DistanceUtils; -import org.apache.solr.search.function.MultiValueSource; /** diff --git a/solr/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java b/solr/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java index ed4ee68017b..33ce4830591 100644 --- a/solr/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java +++ b/solr/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java @@ -20,8 +20,8 @@ package org.apache.solr.search.function.distance; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.queries.function.DocValues; 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.solr.search.function.FloatDocValues; import java.io.IOException; import java.util.Map; diff --git a/solr/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java b/solr/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java index 66d657e35ed..f550577ef50 100644 --- a/solr/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java +++ b/solr/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java @@ -19,11 +19,11 @@ package org.apache.solr.search.function.distance; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.queries.function.DocValues; 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.spatial.DistanceUtils; 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.util.Map; diff --git a/solr/src/test/org/apache/solr/core/DummyValueSourceParser.java b/solr/src/test/org/apache/solr/core/DummyValueSourceParser.java index c1f263c4ad2..4e714dd79b6 100644 --- a/solr/src/test/org/apache/solr/core/DummyValueSourceParser.java +++ b/solr/src/test/org/apache/solr/core/DummyValueSourceParser.java @@ -18,11 +18,11 @@ package org.apache.solr.core; import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.ValueSource; +import org.apache.lucene.queries.function.valuesource.SimpleFloatFunction; import org.apache.lucene.queryParser.ParseException; import org.apache.solr.common.util.NamedList; import org.apache.solr.search.FunctionQParser; import org.apache.solr.search.ValueSourceParser; -import org.apache.solr.search.function.SimpleFloatFunction; /** diff --git a/solr/src/test/org/apache/solr/search/function/NvlValueSourceParser.java b/solr/src/test/org/apache/solr/search/function/NvlValueSourceParser.java index 303b284d501..726c548a7c6 100755 --- a/solr/src/test/org/apache/solr/search/function/NvlValueSourceParser.java +++ b/solr/src/test/org/apache/solr/search/function/NvlValueSourceParser.java @@ -19,6 +19,7 @@ package org.apache.solr.search.function; import org.apache.lucene.queries.function.DocValues; import org.apache.lucene.queries.function.ValueSource; +import org.apache.lucene.queries.function.valuesource.SimpleFloatFunction; import org.apache.lucene.queryParser.ParseException; import org.apache.solr.common.util.NamedList; import org.apache.solr.search.FunctionQParser;