From 46cc24d77eca458ae90f2cd5428f62581bfd8f7b Mon Sep 17 00:00:00 2001 From: Alan Woodward Date: Wed, 26 Jun 2019 11:24:05 +0100 Subject: [PATCH] LUCENE-8856: Promote intervals queries from sandbox to queries module --- lucene/CHANGES.txt | 3 + .../intervals/BlockIntervalsSource.java | 2 +- .../intervals/CachingMatchesIterator.java | 2 +- .../queries}/intervals/ConjunctionDISI.java | 2 +- .../ConjunctionIntervalIterator.java | 2 +- .../intervals/ConjunctionIntervalsSource.java | 2 +- .../intervals/ContainedByIntervalsSource.java | 2 +- .../intervals/ContainingIntervalsSource.java | 2 +- .../intervals/DifferenceIntervalsSource.java | 2 +- .../queries}/intervals/DisiPriorityQueue.java | 2 +- .../queries}/intervals/DisiWrapper.java | 2 +- .../DisjunctionDISIApproximation.java | 2 +- .../intervals/DisjunctionIntervalsSource.java | 2 +- .../queries}/intervals/Disjunctions.java | 2 +- .../intervals/ExtendedIntervalIterator.java | 2 +- .../intervals/ExtendedIntervalsSource.java | 2 +- .../intervals/FilteredIntervalsSource.java | 2 +- .../intervals/FilteringIntervalIterator.java | 2 +- .../intervals/FixedFieldIntervalsSource.java | 2 +- .../queries}/intervals/IntervalFilter.java | 2 +- .../queries}/intervals/IntervalIterator.java | 2 +- .../queries}/intervals/IntervalMatches.java | 2 +- .../intervals/IntervalMatchesIterator.java | 2 +- .../queries}/intervals/IntervalQuery.java | 2 +- .../intervals/IntervalScoreFunction.java | 2 +- .../queries}/intervals/IntervalScorer.java | 2 +- .../lucene/queries}/intervals/Intervals.java | 2 +- .../queries}/intervals/IntervalsSource.java | 2 +- .../MinimizingConjunctionMatchesIterator.java | 2 +- .../MinimumShouldMatchIntervalsSource.java | 2 +- .../intervals/MultiTermIntervalsSource.java | 2 +- .../NonOverlappingIntervalsSource.java | 2 +- .../NotContainedByIntervalsSource.java | 2 +- .../NotContainingIntervalsSource.java | 2 +- .../intervals/OffsetIntervalsSource.java | 2 +- .../intervals/OrderedIntervalsSource.java | 2 +- .../intervals/OverlappingIntervalsSource.java | 2 +- .../PayloadFilteredTermIntervalsSource.java | 2 +- .../queries}/intervals/RelativeIterator.java | 2 +- .../intervals/TermIntervalsSource.java | 2 +- .../intervals/UnorderedIntervalsSource.java | 2 +- .../queries/intervals/package-info.java | 68 +++++++++++++++++++ .../intervals/TestDisjunctionRewrites.java | 4 +- .../queries}/intervals/TestIntervalQuery.java | 2 +- .../queries}/intervals/TestIntervals.java | 2 +- .../TestPayloadFilteredInterval.java | 2 +- .../intervals/TestSimplifications.java | 2 +- .../lucene/search/intervals/package-info.java | 68 ------------------- 48 files changed, 117 insertions(+), 114 deletions(-) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/BlockIntervalsSource.java (98%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/CachingMatchesIterator.java (98%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/ConjunctionDISI.java (98%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/ConjunctionIntervalIterator.java (97%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/ConjunctionIntervalsSource.java (99%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/ContainedByIntervalsSource.java (98%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/ContainingIntervalsSource.java (98%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/DifferenceIntervalsSource.java (98%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/DisiPriorityQueue.java (98%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/DisiWrapper.java (97%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/DisjunctionDISIApproximation.java (97%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/DisjunctionIntervalsSource.java (99%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/Disjunctions.java (98%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/ExtendedIntervalIterator.java (98%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/ExtendedIntervalsSource.java (98%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/FilteredIntervalsSource.java (99%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/FilteringIntervalIterator.java (97%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/FixedFieldIntervalsSource.java (98%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/IntervalFilter.java (97%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/IntervalIterator.java (98%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/IntervalMatches.java (98%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/IntervalMatchesIterator.java (96%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/IntervalQuery.java (99%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/IntervalScoreFunction.java (99%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/IntervalScorer.java (98%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/Intervals.java (99%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/IntervalsSource.java (98%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/MinimizingConjunctionMatchesIterator.java (98%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/MinimumShouldMatchIntervalsSource.java (99%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/MultiTermIntervalsSource.java (98%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/NonOverlappingIntervalsSource.java (98%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/NotContainedByIntervalsSource.java (98%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/NotContainingIntervalsSource.java (98%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/OffsetIntervalsSource.java (99%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/OrderedIntervalsSource.java (99%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/OverlappingIntervalsSource.java (98%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/PayloadFilteredTermIntervalsSource.java (99%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/RelativeIterator.java (97%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/TermIntervalsSource.java (99%) rename lucene/{sandbox/src/java/org/apache/lucene/search => queries/src/java/org/apache/lucene/queries}/intervals/UnorderedIntervalsSource.java (99%) create mode 100644 lucene/queries/src/java/org/apache/lucene/queries/intervals/package-info.java rename lucene/{sandbox/src/test/org/apache/lucene/search => queries/src/test/org/apache/lucene/queries}/intervals/TestDisjunctionRewrites.java (98%) rename lucene/{sandbox/src/test/org/apache/lucene/search => queries/src/test/org/apache/lucene/queries}/intervals/TestIntervalQuery.java (99%) rename lucene/{sandbox/src/test/org/apache/lucene/search => queries/src/test/org/apache/lucene/queries}/intervals/TestIntervals.java (99%) rename lucene/{sandbox/src/test/org/apache/lucene/search => queries/src/test/org/apache/lucene/queries}/intervals/TestPayloadFilteredInterval.java (98%) rename lucene/{sandbox/src/test/org/apache/lucene/search => queries/src/test/org/apache/lucene/queries}/intervals/TestSimplifications.java (98%) delete mode 100644 lucene/sandbox/src/java/org/apache/lucene/search/intervals/package-info.java diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index 5ad98f3219f..abff75fae78 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -47,6 +47,9 @@ API Changes and apply to all queries, rather than only booleans. (Atri Sharma, Adrien Grand, Alan Woodward) +* LUCENE-8856: Intervals queries have moved from the sandbox to the queries + module. (Alan Woodward) + New Features * LUCENE-8815: Provide a DoubleValues implementation for retrieving the value of features without diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/BlockIntervalsSource.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/BlockIntervalsSource.java similarity index 98% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/BlockIntervalsSource.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/BlockIntervalsSource.java index 07de202d69d..10ece7ab764 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/BlockIntervalsSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/BlockIntervalsSource.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/CachingMatchesIterator.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/CachingMatchesIterator.java similarity index 98% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/CachingMatchesIterator.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/CachingMatchesIterator.java index d522412bc2e..aa678974b87 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/CachingMatchesIterator.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/CachingMatchesIterator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/ConjunctionDISI.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/ConjunctionDISI.java similarity index 98% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/ConjunctionDISI.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/ConjunctionDISI.java index d290e525af0..45bd2247f31 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/ConjunctionDISI.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/ConjunctionDISI.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/ConjunctionIntervalIterator.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/ConjunctionIntervalIterator.java similarity index 97% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/ConjunctionIntervalIterator.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/ConjunctionIntervalIterator.java index 8efe4e43b55..bc58d9ca672 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/ConjunctionIntervalIterator.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/ConjunctionIntervalIterator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; import java.util.List; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/ConjunctionIntervalsSource.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/ConjunctionIntervalsSource.java similarity index 99% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/ConjunctionIntervalsSource.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/ConjunctionIntervalsSource.java index 6463dd5dcf8..bdfb55c9b54 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/ConjunctionIntervalsSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/ConjunctionIntervalsSource.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/ContainedByIntervalsSource.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/ContainedByIntervalsSource.java similarity index 98% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/ContainedByIntervalsSource.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/ContainedByIntervalsSource.java index 3a9a05efa9f..d95b25a7da2 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/ContainedByIntervalsSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/ContainedByIntervalsSource.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; import java.util.Arrays; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/ContainingIntervalsSource.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/ContainingIntervalsSource.java similarity index 98% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/ContainingIntervalsSource.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/ContainingIntervalsSource.java index 5b7d431d4ab..24a4b587486 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/ContainingIntervalsSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/ContainingIntervalsSource.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; import java.util.Arrays; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/DifferenceIntervalsSource.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/DifferenceIntervalsSource.java similarity index 98% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/DifferenceIntervalsSource.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/DifferenceIntervalsSource.java index 9dca19e2e7c..7ca3cb78a1e 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/DifferenceIntervalsSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/DifferenceIntervalsSource.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/DisiPriorityQueue.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/DisiPriorityQueue.java similarity index 98% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/DisiPriorityQueue.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/DisiPriorityQueue.java index 0be96ab9d46..1dc066b592f 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/DisiPriorityQueue.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/DisiPriorityQueue.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.util.Arrays; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/DisiWrapper.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/DisiWrapper.java similarity index 97% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/DisiWrapper.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/DisiWrapper.java index 483c6268cf2..a2f8e098821 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/DisiWrapper.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/DisiWrapper.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import org.apache.lucene.search.DocIdSetIterator; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/DisjunctionDISIApproximation.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/DisjunctionDISIApproximation.java similarity index 97% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/DisjunctionDISIApproximation.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/DisjunctionDISIApproximation.java index d4e8e79a180..fdf3b585ad7 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/DisjunctionDISIApproximation.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/DisjunctionDISIApproximation.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/DisjunctionIntervalsSource.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/DisjunctionIntervalsSource.java similarity index 99% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/DisjunctionIntervalsSource.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/DisjunctionIntervalsSource.java index 5e81d99c783..67d6f6fbf6b 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/DisjunctionIntervalsSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/DisjunctionIntervalsSource.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/Disjunctions.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/Disjunctions.java similarity index 98% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/Disjunctions.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/Disjunctions.java index 3fb78890855..39bd97a01c4 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/Disjunctions.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/Disjunctions.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.util.ArrayList; import java.util.Collections; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/ExtendedIntervalIterator.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/ExtendedIntervalIterator.java similarity index 98% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/ExtendedIntervalIterator.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/ExtendedIntervalIterator.java index 843b113a802..60c00228cc3 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/ExtendedIntervalIterator.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/ExtendedIntervalIterator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/ExtendedIntervalsSource.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/ExtendedIntervalsSource.java similarity index 98% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/ExtendedIntervalsSource.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/ExtendedIntervalsSource.java index 0ea60d6b6ca..00eb8668058 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/ExtendedIntervalsSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/ExtendedIntervalsSource.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; import java.util.Collection; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/FilteredIntervalsSource.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/FilteredIntervalsSource.java similarity index 99% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/FilteredIntervalsSource.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/FilteredIntervalsSource.java index 23844583767..05ecc4c143f 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/FilteredIntervalsSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/FilteredIntervalsSource.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; import java.util.Collection; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/FilteringIntervalIterator.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/FilteringIntervalIterator.java similarity index 97% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/FilteringIntervalIterator.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/FilteringIntervalIterator.java index b552848179a..321cd39f7ec 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/FilteringIntervalIterator.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/FilteringIntervalIterator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; import java.util.Arrays; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/FixedFieldIntervalsSource.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/FixedFieldIntervalsSource.java similarity index 98% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/FixedFieldIntervalsSource.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/FixedFieldIntervalsSource.java index f9e0c51944c..94cba9a2b82 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/FixedFieldIntervalsSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/FixedFieldIntervalsSource.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; import java.util.Collection; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalFilter.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/IntervalFilter.java similarity index 97% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalFilter.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/IntervalFilter.java index dcb59bccc12..bd4e2bce5e1 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalFilter.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/IntervalFilter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; import java.util.Objects; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalIterator.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/IntervalIterator.java similarity index 98% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalIterator.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/IntervalIterator.java index 305f56cf42b..b97ce05231e 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalIterator.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/IntervalIterator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalMatches.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/IntervalMatches.java similarity index 98% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalMatches.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/IntervalMatches.java index 24424d21591..433371f90b2 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalMatches.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/IntervalMatches.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalMatchesIterator.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/IntervalMatchesIterator.java similarity index 96% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalMatchesIterator.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/IntervalMatchesIterator.java index 55482e38cc3..2c3d31d81c3 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalMatchesIterator.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/IntervalMatchesIterator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import org.apache.lucene.search.MatchesIterator; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalQuery.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/IntervalQuery.java similarity index 99% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalQuery.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/IntervalQuery.java index 6b6450d945b..4bbfd6838da 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalQuery.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/IntervalQuery.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; import java.util.Objects; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalScoreFunction.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/IntervalScoreFunction.java similarity index 99% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalScoreFunction.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/IntervalScoreFunction.java index 855b398545c..9adc442be46 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalScoreFunction.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/IntervalScoreFunction.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.util.Objects; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalScorer.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/IntervalScorer.java similarity index 98% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalScorer.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/IntervalScorer.java index 18b88994fc8..62cde4ccb1a 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalScorer.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/IntervalScorer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/Intervals.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/Intervals.java similarity index 99% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/Intervals.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/Intervals.java index cfe132a221a..3c1ee49d527 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/Intervals.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/Intervals.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.util.Arrays; import java.util.List; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalsSource.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/IntervalsSource.java similarity index 98% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalsSource.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/IntervalsSource.java index caf8fae2a99..ae23978f1c6 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalsSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/IntervalsSource.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; import java.util.Collection; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/MinimizingConjunctionMatchesIterator.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/MinimizingConjunctionMatchesIterator.java similarity index 98% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/MinimizingConjunctionMatchesIterator.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/MinimizingConjunctionMatchesIterator.java index 2460be8d659..2a7490c996d 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/MinimizingConjunctionMatchesIterator.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/MinimizingConjunctionMatchesIterator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/MinimumShouldMatchIntervalsSource.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/MinimumShouldMatchIntervalsSource.java similarity index 99% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/MinimumShouldMatchIntervalsSource.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/MinimumShouldMatchIntervalsSource.java index 6f5a28d06f8..4ceb8f23b6d 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/MinimumShouldMatchIntervalsSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/MinimumShouldMatchIntervalsSource.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/MultiTermIntervalsSource.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/MultiTermIntervalsSource.java similarity index 98% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/MultiTermIntervalsSource.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/MultiTermIntervalsSource.java index 0be01689a41..0f8262b28f3 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/MultiTermIntervalsSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/MultiTermIntervalsSource.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/NonOverlappingIntervalsSource.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/NonOverlappingIntervalsSource.java similarity index 98% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/NonOverlappingIntervalsSource.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/NonOverlappingIntervalsSource.java index 43585321d7e..8824ccd6c91 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/NonOverlappingIntervalsSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/NonOverlappingIntervalsSource.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; import java.util.Collection; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/NotContainedByIntervalsSource.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/NotContainedByIntervalsSource.java similarity index 98% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/NotContainedByIntervalsSource.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/NotContainedByIntervalsSource.java index cb4beef2aa7..3910aec8274 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/NotContainedByIntervalsSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/NotContainedByIntervalsSource.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; import java.util.Collection; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/NotContainingIntervalsSource.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/NotContainingIntervalsSource.java similarity index 98% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/NotContainingIntervalsSource.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/NotContainingIntervalsSource.java index 769cfe7e4f3..49d73dbcf3a 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/NotContainingIntervalsSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/NotContainingIntervalsSource.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; import java.util.Collection; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/OffsetIntervalsSource.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/OffsetIntervalsSource.java similarity index 99% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/OffsetIntervalsSource.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/OffsetIntervalsSource.java index b10a71fafc4..180999eb3fa 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/OffsetIntervalsSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/OffsetIntervalsSource.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; import java.util.Collection; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/OrderedIntervalsSource.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/OrderedIntervalsSource.java similarity index 99% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/OrderedIntervalsSource.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/OrderedIntervalsSource.java index 5569983f164..e736a59be59 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/OrderedIntervalsSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/OrderedIntervalsSource.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/OverlappingIntervalsSource.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/OverlappingIntervalsSource.java similarity index 98% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/OverlappingIntervalsSource.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/OverlappingIntervalsSource.java index 0ad74dc68a6..a67404384f5 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/OverlappingIntervalsSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/OverlappingIntervalsSource.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; import java.util.Arrays; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/PayloadFilteredTermIntervalsSource.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/PayloadFilteredTermIntervalsSource.java similarity index 99% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/PayloadFilteredTermIntervalsSource.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/PayloadFilteredTermIntervalsSource.java index 4e747ff96cd..25e4da5d9c4 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/PayloadFilteredTermIntervalsSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/PayloadFilteredTermIntervalsSource.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; import java.util.Collection; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/RelativeIterator.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/RelativeIterator.java similarity index 97% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/RelativeIterator.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/RelativeIterator.java index ece14eb3c07..fc2ca64f617 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/RelativeIterator.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/RelativeIterator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/TermIntervalsSource.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/TermIntervalsSource.java similarity index 99% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/TermIntervalsSource.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/TermIntervalsSource.java index e85e0f7ba7d..5ec916126bf 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/TermIntervalsSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/TermIntervalsSource.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; import java.util.Collection; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/UnorderedIntervalsSource.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/UnorderedIntervalsSource.java similarity index 99% rename from lucene/sandbox/src/java/org/apache/lucene/search/intervals/UnorderedIntervalsSource.java rename to lucene/queries/src/java/org/apache/lucene/queries/intervals/UnorderedIntervalsSource.java index aaf0184d27b..2af850ee7f5 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/UnorderedIntervalsSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/UnorderedIntervalsSource.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/intervals/package-info.java b/lucene/queries/src/java/org/apache/lucene/queries/intervals/package-info.java new file mode 100644 index 00000000000..2781236e0f9 --- /dev/null +++ b/lucene/queries/src/java/org/apache/lucene/queries/intervals/package-info.java @@ -0,0 +1,68 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + *

Intervals queries

+ * + * This package contains experimental classes to search over intervals within fields + * + *

IntervalsSource

+ * + * The {@link org.apache.lucene.queries.intervals.IntervalsSource} class can be used to construct proximity + * relationships between terms and intervals. They can be built using static methods + * in the {@link org.apache.lucene.queries.intervals.Intervals} class + * + *

Basic intervals

+ * + * + * + *

Filters

+ * + * + * + *

IntervalQuery

+ * + * An {@link org.apache.lucene.queries.intervals.IntervalQuery} takes a field name and an {@link org.apache.lucene.queries.intervals.IntervalsSource}, + * and matches all documents that contain intervals defined by the source in that field. + */ +package org.apache.lucene.queries.intervals; \ No newline at end of file diff --git a/lucene/sandbox/src/test/org/apache/lucene/search/intervals/TestDisjunctionRewrites.java b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestDisjunctionRewrites.java similarity index 98% rename from lucene/sandbox/src/test/org/apache/lucene/search/intervals/TestDisjunctionRewrites.java rename to lucene/queries/src/test/org/apache/lucene/queries/intervals/TestDisjunctionRewrites.java index 3301a45040a..88d4235cba3 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/search/intervals/TestDisjunctionRewrites.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestDisjunctionRewrites.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import org.apache.lucene.util.LuceneTestCase; -import static org.apache.lucene.search.intervals.Intervals.*; +import static org.apache.lucene.queries.intervals.Intervals.*; public class TestDisjunctionRewrites extends LuceneTestCase { diff --git a/lucene/sandbox/src/test/org/apache/lucene/search/intervals/TestIntervalQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalQuery.java similarity index 99% rename from lucene/sandbox/src/test/org/apache/lucene/search/intervals/TestIntervalQuery.java rename to lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalQuery.java index 61757b1b496..0f18446ce38 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/search/intervals/TestIntervalQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalQuery.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; diff --git a/lucene/sandbox/src/test/org/apache/lucene/search/intervals/TestIntervals.java b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervals.java similarity index 99% rename from lucene/sandbox/src/test/org/apache/lucene/search/intervals/TestIntervals.java rename to lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervals.java index 2130514941c..a2d1eb8ccf5 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/search/intervals/TestIntervals.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervals.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import java.io.IOException; diff --git a/lucene/sandbox/src/test/org/apache/lucene/search/intervals/TestPayloadFilteredInterval.java b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestPayloadFilteredInterval.java similarity index 98% rename from lucene/sandbox/src/test/org/apache/lucene/search/intervals/TestPayloadFilteredInterval.java rename to lucene/queries/src/test/org/apache/lucene/queries/intervals/TestPayloadFilteredInterval.java index 8d22088cb55..5b27c0795e8 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/search/intervals/TestPayloadFilteredInterval.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestPayloadFilteredInterval.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockTokenizer; diff --git a/lucene/sandbox/src/test/org/apache/lucene/search/intervals/TestSimplifications.java b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestSimplifications.java similarity index 98% rename from lucene/sandbox/src/test/org/apache/lucene/search/intervals/TestSimplifications.java rename to lucene/queries/src/test/org/apache/lucene/queries/intervals/TestSimplifications.java index c97dfbb9946..b54c2a1b56b 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/search/intervals/TestSimplifications.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestSimplifications.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.search.intervals; +package org.apache.lucene.queries.intervals; import org.apache.lucene.util.LuceneTestCase; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/package-info.java b/lucene/sandbox/src/java/org/apache/lucene/search/intervals/package-info.java deleted file mode 100644 index cfcd9e7125b..00000000000 --- a/lucene/sandbox/src/java/org/apache/lucene/search/intervals/package-info.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - *

Intervals queries

- * - * This package contains experimental classes to search over intervals within fields - * - *

IntervalsSource

- * - * The {@link org.apache.lucene.search.intervals.IntervalsSource} class can be used to construct proximity - * relationships between terms and intervals. They can be built using static methods - * in the {@link org.apache.lucene.search.intervals.Intervals} class - * - *

Basic intervals

- * - * - * - *

Filters

- * - * - * - *

IntervalQuery

- * - * An {@link org.apache.lucene.search.intervals.IntervalQuery} takes a field name and an {@link org.apache.lucene.search.intervals.IntervalsSource}, - * and matches all documents that contain intervals defined by the source in that field. - */ -package org.apache.lucene.search.intervals; \ No newline at end of file