You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2019/06/28 12:09:41 UTC
[lucene-solr] branch master updated: LUCENE-8856: Promote intervals
queries from sandbox to queries module
This is an automated email from the ASF dual-hosted git repository.
romseygeek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/master by this push:
new 46cc24d LUCENE-8856: Promote intervals queries from sandbox to queries module
46cc24d is described below
commit 46cc24d77eca458ae90f2cd5428f62581bfd8f7b
Author: Alan Woodward <ro...@apache.org>
AuthorDate: Wed Jun 26 11:24:05 2019 +0100
LUCENE-8856: Promote intervals queries from sandbox to queries module
---
lucene/CHANGES.txt | 3 +
.../queries}/intervals/BlockIntervalsSource.java | 2 +-
.../queries}/intervals/CachingMatchesIterator.java | 2 +-
.../lucene/queries}/intervals/ConjunctionDISI.java | 2 +-
.../intervals/ConjunctionIntervalIterator.java | 2 +-
.../intervals/ConjunctionIntervalsSource.java | 2 +-
.../intervals/ContainedByIntervalsSource.java | 2 +-
.../intervals/ContainingIntervalsSource.java | 2 +-
.../intervals/DifferenceIntervalsSource.java | 2 +-
.../queries}/intervals/DisiPriorityQueue.java | 2 +-
.../lucene/queries}/intervals/DisiWrapper.java | 2 +-
.../intervals/DisjunctionDISIApproximation.java | 2 +-
.../intervals/DisjunctionIntervalsSource.java | 2 +-
.../lucene/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 +-
.../lucene/queries}/intervals/IntervalFilter.java | 2 +-
.../queries}/intervals/IntervalIterator.java | 2 +-
.../lucene/queries}/intervals/IntervalMatches.java | 2 +-
.../intervals/IntervalMatchesIterator.java | 2 +-
.../lucene/queries}/intervals/IntervalQuery.java | 2 +-
.../queries}/intervals/IntervalScoreFunction.java | 2 +-
.../lucene/queries}/intervals/IntervalScorer.java | 2 +-
.../lucene/queries}/intervals/Intervals.java | 2 +-
.../lucene/queries}/intervals/IntervalsSource.java | 2 +-
.../MinimizingConjunctionMatchesIterator.java | 2 +-
.../MinimumShouldMatchIntervalsSource.java | 2 +-
.../intervals/MultiTermIntervalsSource.java | 2 +-
.../intervals/NonOverlappingIntervalsSource.java | 2 +-
.../intervals/NotContainedByIntervalsSource.java | 2 +-
.../intervals/NotContainingIntervalsSource.java | 2 +-
.../queries}/intervals/OffsetIntervalsSource.java | 2 +-
.../queries}/intervals/OrderedIntervalsSource.java | 2 +-
.../intervals/OverlappingIntervalsSource.java | 2 +-
.../PayloadFilteredTermIntervalsSource.java | 2 +-
.../queries}/intervals/RelativeIterator.java | 2 +-
.../queries}/intervals/TermIntervalsSource.java | 2 +-
.../intervals/UnorderedIntervalsSource.java | 2 +-
.../lucene/queries/intervals/package-info.java | 68 ++++++++++++++++++++++
.../intervals/TestDisjunctionRewrites.java | 4 +-
.../queries}/intervals/TestIntervalQuery.java | 2 +-
.../lucene/queries}/intervals/TestIntervals.java | 2 +-
.../intervals/TestPayloadFilteredInterval.java | 2 +-
.../queries}/intervals/TestSimplifications.java | 2 +-
.../lucene/search/intervals/package-info.java | 68 ----------------------
48 files changed, 117 insertions(+), 114 deletions(-)
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 5ad98f3..abff75f 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 07de202..10ece7a 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 d522412..aa67897 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 d290e52..45bd224 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 8efe4e4..bc58d9c 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 6463dd5..bdfb55c 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 3a9a05e..d95b25a 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 5b7d431..24a4b58 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 9dca19e..7ca3cb7 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 0be96ab..1dc066b 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 483c626..a2f8e09 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 d4e8e79..fdf3b58 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 5e81d99..67d6f6f 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 3fb7889..39bd97a 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 843b113..60c0022 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 0ea60d6..00eb866 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 2384458..05ecc4c 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 b552848..321cd39 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 f9e0c51..94cba9a 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 dcb59bc..bd4e2bc 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 305f56c..b97ce05 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 24424d2..433371f 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 55482e3..2c3d31d 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 6b6450d..4bbfd68 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 855b398..9adc442 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 18b8899..62cde4c 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 cfe132a..3c1ee49 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 caf8fae..ae23978 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 2460be8..2a7490c 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 6f5a28d..4ceb8f2 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 0be0168..0f8262b 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 4358532..8824ccd 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 cb4beef..3910aec 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 769cfe7..49d73db 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 b10a71f..180999e 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 5569983..e736a59 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 0ad74dc..a674043 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 4e747ff..25e4da5 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 ece14eb..fc2ca64 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 e85e0f7..5ec9161 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 aaf0184..2af850e 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 0000000..2781236
--- /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.
+ */
+
+/**
+ * <h2>Intervals queries</h2>
+ *
+ * This package contains experimental classes to search over intervals within fields
+ *
+ * <h2>IntervalsSource</h2>
+ *
+ * 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
+ *
+ * <h3>Basic intervals</h3>
+ *
+ * <ul>
+ * <li>{@link org.apache.lucene.queries.intervals.Intervals#term(String)} — Represents a single term</li>
+ * <li>{@link org.apache.lucene.queries.intervals.Intervals#phrase(java.lang.String...)} — Represents a phrase</li>
+ * <li>{@link org.apache.lucene.queries.intervals.Intervals#ordered(IntervalsSource...)}
+ * — Represents an interval over an ordered set of terms or intervals</li>
+ * <li>{@link org.apache.lucene.queries.intervals.Intervals#unordered(IntervalsSource...)}
+ * — Represents an interval over an unordered set of terms or intervals</li>
+ * <li>{@link org.apache.lucene.queries.intervals.Intervals#or(IntervalsSource...)}
+ * — Represents the disjunction of a set of terms or intervals</li>
+ * </ul>
+ *
+ * <h3>Filters</h3>
+ *
+ * <ul>
+ * <li>{@link org.apache.lucene.queries.intervals.Intervals#maxwidth(int, IntervalsSource)}
+ * — Filters out intervals that are larger than a set width</li>
+ * <li>{@link org.apache.lucene.queries.intervals.Intervals#maxgaps(int, IntervalsSource)}
+ * — Filters out intervals that have more than a set number of gaps between their constituent sub-intervals</li>
+ * <li>{@link org.apache.lucene.queries.intervals.Intervals#containedBy(IntervalsSource, IntervalsSource)}
+ * — Returns intervals that are contained by another interval</li>
+ * <li>{@link org.apache.lucene.queries.intervals.Intervals#notContainedBy(IntervalsSource, IntervalsSource)}
+ * — Returns intervals that are *not* contained by another interval</li>
+ * <li>{@link org.apache.lucene.queries.intervals.Intervals#containing(IntervalsSource, IntervalsSource)}
+ * — Returns intervals that contain another interval</li>
+ * <li>{@link org.apache.lucene.queries.intervals.Intervals#notContaining(IntervalsSource, IntervalsSource)}
+ * — Returns intervals that do not contain another interval</li>
+ * <li>{@link org.apache.lucene.queries.intervals.Intervals#nonOverlapping(IntervalsSource, IntervalsSource)}
+ * — Returns intervals that do not overlap with another interval</li>
+ * <li>{@link org.apache.lucene.queries.intervals.Intervals#notWithin(IntervalsSource, int, IntervalsSource)}
+ * — Returns intervals that do not appear within a set number of positions of another interval</li>
+ * </ul>
+ *
+ * <h2>IntervalQuery</h2>
+ *
+ * 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 3301a45..88d4235 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 61757b1..0f18446 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 2130514..a2d1eb8 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 8d22088..5b27c07 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 c97dfbb..b54c2a1 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 cfcd9e7..0000000
--- 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.
- */
-
-/**
- * <h2>Intervals queries</h2>
- *
- * This package contains experimental classes to search over intervals within fields
- *
- * <h2>IntervalsSource</h2>
- *
- * 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
- *
- * <h3>Basic intervals</h3>
- *
- * <ul>
- * <li>{@link org.apache.lucene.search.intervals.Intervals#term(String)} — Represents a single term</li>
- * <li>{@link org.apache.lucene.search.intervals.Intervals#phrase(java.lang.String...)} — Represents a phrase</li>
- * <li>{@link org.apache.lucene.search.intervals.Intervals#ordered(org.apache.lucene.search.intervals.IntervalsSource...)}
- * — Represents an interval over an ordered set of terms or intervals</li>
- * <li>{@link org.apache.lucene.search.intervals.Intervals#unordered(org.apache.lucene.search.intervals.IntervalsSource...)}
- * — Represents an interval over an unordered set of terms or intervals</li>
- * <li>{@link org.apache.lucene.search.intervals.Intervals#or(org.apache.lucene.search.intervals.IntervalsSource...)}
- * — Represents the disjunction of a set of terms or intervals</li>
- * </ul>
- *
- * <h3>Filters</h3>
- *
- * <ul>
- * <li>{@link org.apache.lucene.search.intervals.Intervals#maxwidth(int, org.apache.lucene.search.intervals.IntervalsSource)}
- * — Filters out intervals that are larger than a set width</li>
- * <li>{@link org.apache.lucene.search.intervals.Intervals#maxgaps(int, org.apache.lucene.search.intervals.IntervalsSource)}
- * — Filters out intervals that have more than a set number of gaps between their constituent sub-intervals</li>
- * <li>{@link org.apache.lucene.search.intervals.Intervals#containedBy(org.apache.lucene.search.intervals.IntervalsSource, org.apache.lucene.search.intervals.IntervalsSource)}
- * — Returns intervals that are contained by another interval</li>
- * <li>{@link org.apache.lucene.search.intervals.Intervals#notContainedBy(org.apache.lucene.search.intervals.IntervalsSource, org.apache.lucene.search.intervals.IntervalsSource)}
- * — Returns intervals that are *not* contained by another interval</li>
- * <li>{@link org.apache.lucene.search.intervals.Intervals#containing(org.apache.lucene.search.intervals.IntervalsSource, org.apache.lucene.search.intervals.IntervalsSource)}
- * — Returns intervals that contain another interval</li>
- * <li>{@link org.apache.lucene.search.intervals.Intervals#notContaining(org.apache.lucene.search.intervals.IntervalsSource, org.apache.lucene.search.intervals.IntervalsSource)}
- * — Returns intervals that do not contain another interval</li>
- * <li>{@link org.apache.lucene.search.intervals.Intervals#nonOverlapping(org.apache.lucene.search.intervals.IntervalsSource, org.apache.lucene.search.intervals.IntervalsSource)}
- * — Returns intervals that do not overlap with another interval</li>
- * <li>{@link org.apache.lucene.search.intervals.Intervals#notWithin(org.apache.lucene.search.intervals.IntervalsSource, int, org.apache.lucene.search.intervals.IntervalsSource)}
- * — Returns intervals that do not appear within a set number of positions of another interval</li>
- * </ul>
- *
- * <h2>IntervalQuery</h2>
- *
- * 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