honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refacto package name from facets to facet (make more sense when facet will be easily pluggable)

This commit is contained in:
kimchy 2010-10-25 18:49:29 +02:00
parent 0a0ac35792
commit 5966d2005d
78 changed files with 223 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/elasticsearch/src/main/java/org/elasticsearch/action/search/SearchResponse.java
View File

@ -26,7 +26,7 @@ import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentBuilderString; import org.elasticsearch.common.xcontent.XContentBuilderString;
import org.elasticsearch.search.SearchHits; import org.elasticsearch.search.SearchHits;
import org.elasticsearch.search.facets.Facets; import org.elasticsearch.search.facet.Facets;
import org.elasticsearch.search.internal.InternalSearchResponse; import org.elasticsearch.search.internal.InternalSearchResponse;
import java.io.IOException; import java.io.IOException;

2
modules/elasticsearch/src/main/java/org/elasticsearch/client/action/search/SearchRequestBuilder.java
View File

@ -31,7 +31,7 @@ import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.index.query.xcontent.XContentQueryBuilder; import org.elasticsearch.index.query.xcontent.XContentQueryBuilder;
import org.elasticsearch.search.Scroll; import org.elasticsearch.search.Scroll;
import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.elasticsearch.search.facets.AbstractFacetBuilder; import org.elasticsearch.search.facet.AbstractFacetBuilder;
import org.elasticsearch.search.highlight.HighlightBuilder; import org.elasticsearch.search.highlight.HighlightBuilder;
import org.elasticsearch.search.sort.SortBuilder; import org.elasticsearch.search.sort.SortBuilder;
import org.elasticsearch.search.sort.SortOrder; import org.elasticsearch.search.sort.SortOrder;

2
modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchModule.java
View File

@ -23,7 +23,7 @@ import org.elasticsearch.common.inject.AbstractModule;
import org.elasticsearch.search.action.SearchServiceTransportAction; import org.elasticsearch.search.action.SearchServiceTransportAction;
import org.elasticsearch.search.controller.SearchPhaseController; import org.elasticsearch.search.controller.SearchPhaseController;
import org.elasticsearch.search.dfs.DfsPhase; import org.elasticsearch.search.dfs.DfsPhase;
import org.elasticsearch.search.facets.FacetsPhase; import org.elasticsearch.search.facet.FacetsPhase;
import org.elasticsearch.search.fetch.FetchPhase; import org.elasticsearch.search.fetch.FetchPhase;
import org.elasticsearch.search.highlight.HighlightPhase; import org.elasticsearch.search.highlight.HighlightPhase;
import org.elasticsearch.search.query.QueryPhase; import org.elasticsearch.search.query.QueryPhase;

2
modules/elasticsearch/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java
View File

@ -30,7 +30,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.index.query.xcontent.XContentQueryBuilder; import org.elasticsearch.index.query.xcontent.XContentQueryBuilder;
import org.elasticsearch.search.facets.AbstractFacetBuilder; import org.elasticsearch.search.facet.AbstractFacetBuilder;
import org.elasticsearch.search.highlight.HighlightBuilder; import org.elasticsearch.search.highlight.HighlightBuilder;
import org.elasticsearch.search.sort.SortBuilder; import org.elasticsearch.search.sort.SortBuilder;
import org.elasticsearch.search.sort.SortBuilders; import org.elasticsearch.search.sort.SortBuilders;

6
modules/elasticsearch/src/main/java/org/elasticsearch/search/controller/SearchPhaseController.java
View File

@ -30,9 +30,9 @@ import org.elasticsearch.common.trove.ExtTObjectIntHasMap;
import org.elasticsearch.search.SearchShardTarget; import org.elasticsearch.search.SearchShardTarget;
import org.elasticsearch.search.dfs.AggregatedDfs; import org.elasticsearch.search.dfs.AggregatedDfs;
import org.elasticsearch.search.dfs.DfsSearchResult; import org.elasticsearch.search.dfs.DfsSearchResult;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import org.elasticsearch.search.facets.internal.InternalFacet; import org.elasticsearch.search.facet.internal.InternalFacet;
import org.elasticsearch.search.facets.internal.InternalFacets; import org.elasticsearch.search.facet.internal.InternalFacets;
import org.elasticsearch.search.fetch.FetchSearchResult; import org.elasticsearch.search.fetch.FetchSearchResult;
import org.elasticsearch.search.fetch.FetchSearchResultProvider; import org.elasticsearch.search.fetch.FetchSearchResultProvider;
import org.elasticsearch.search.internal.InternalSearchHit; import org.elasticsearch.search.internal.InternalSearchHit;

2
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/AbstractFacetBuilder.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/AbstractFacetBuilder.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets; package org.elasticsearch.search.facet;
import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;

16
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/Facet.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/Facet.java
View File

@ -17,16 +17,16 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets; package org.elasticsearch.search.facet;
import org.elasticsearch.ElasticSearchIllegalArgumentException; import org.elasticsearch.ElasticSearchIllegalArgumentException;
import org.elasticsearch.search.facets.filter.FilterFacet; import org.elasticsearch.search.facet.filter.FilterFacet;
import org.elasticsearch.search.facets.geodistance.GeoDistanceFacet; import org.elasticsearch.search.facet.geodistance.GeoDistanceFacet;
import org.elasticsearch.search.facets.histogram.HistogramFacet; import org.elasticsearch.search.facet.histogram.HistogramFacet;
import org.elasticsearch.search.facets.query.QueryFacet; import org.elasticsearch.search.facet.query.QueryFacet;
import org.elasticsearch.search.facets.range.RangeFacet; import org.elasticsearch.search.facet.range.RangeFacet;
import org.elasticsearch.search.facets.statistical.StatisticalFacet; import org.elasticsearch.search.facet.statistical.StatisticalFacet;
import org.elasticsearch.search.facets.terms.TermsFacet; import org.elasticsearch.search.facet.terms.TermsFacet;
/** /**
* A search facet. * A search facet.

22
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/FacetBuilders.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetBuilders.java
View File

@ -17,20 +17,20 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets; package org.elasticsearch.search.facet;
import org.elasticsearch.index.query.xcontent.XContentFilterBuilder; import org.elasticsearch.index.query.xcontent.XContentFilterBuilder;
import org.elasticsearch.index.query.xcontent.XContentQueryBuilder; import org.elasticsearch.index.query.xcontent.XContentQueryBuilder;
import org.elasticsearch.search.facets.filter.FilterFacetBuilder; import org.elasticsearch.search.facet.filter.FilterFacetBuilder;
import org.elasticsearch.search.facets.geodistance.GeoDistanceFacetBuilder; import org.elasticsearch.search.facet.geodistance.GeoDistanceFacetBuilder;
import org.elasticsearch.search.facets.histogram.HistogramFacetBuilder; import org.elasticsearch.search.facet.histogram.HistogramFacetBuilder;
import org.elasticsearch.search.facets.histogram.HistogramScriptFacetBuilder; import org.elasticsearch.search.facet.histogram.HistogramScriptFacetBuilder;
import org.elasticsearch.search.facets.query.QueryFacetBuilder; import org.elasticsearch.search.facet.query.QueryFacetBuilder;
import org.elasticsearch.search.facets.range.RangeFacetBuilder; import org.elasticsearch.search.facet.range.RangeFacetBuilder;
import org.elasticsearch.search.facets.range.RangeScriptFacetBuilder; import org.elasticsearch.search.facet.range.RangeScriptFacetBuilder;
import org.elasticsearch.search.facets.statistical.StatisticalFacetBuilder; import org.elasticsearch.search.facet.statistical.StatisticalFacetBuilder;
import org.elasticsearch.search.facets.statistical.StatisticalScriptFacetBuilder; import org.elasticsearch.search.facet.statistical.StatisticalScriptFacetBuilder;
import org.elasticsearch.search.facets.terms.TermsFacetBuilder; import org.elasticsearch.search.facet.terms.TermsFacetBuilder;
/** /**
* @author kimchy (shay.banon) * @author kimchy (shay.banon)

2
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/FacetPhaseExecutionException.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetPhaseExecutionException.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets; package org.elasticsearch.search.facet;
import org.elasticsearch.ElasticSearchException; import org.elasticsearch.ElasticSearchException;

2
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/Facets.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/Facets.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets; package org.elasticsearch.search.facet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

20
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/FacetsParseElement.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetsParseElement.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets; package org.elasticsearch.search.facet;
import org.apache.lucene.search.Filter; import org.apache.lucene.search.Filter;
import org.elasticsearch.common.collect.ImmutableMap; import org.elasticsearch.common.collect.ImmutableMap;
@ -27,15 +27,15 @@ import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.query.xcontent.XContentIndexQueryParser; import org.elasticsearch.index.query.xcontent.XContentIndexQueryParser;
import org.elasticsearch.search.SearchParseElement; import org.elasticsearch.search.SearchParseElement;
import org.elasticsearch.search.SearchParseException; import org.elasticsearch.search.SearchParseException;
import org.elasticsearch.search.facets.collector.FacetCollector; import org.elasticsearch.search.facet.collector.FacetCollector;
import org.elasticsearch.search.facets.collector.FacetCollectorParser; import org.elasticsearch.search.facet.collector.FacetCollectorParser;
import org.elasticsearch.search.facets.filter.FilterFacetCollectorParser; import org.elasticsearch.search.facet.filter.FilterFacetCollectorParser;
import org.elasticsearch.search.facets.geodistance.GeoDistanceFacetCollectorParser; import org.elasticsearch.search.facet.geodistance.GeoDistanceFacetCollectorParser;
import org.elasticsearch.search.facets.histogram.HistogramFacetCollectorParser; import org.elasticsearch.search.facet.histogram.HistogramFacetCollectorParser;
import org.elasticsearch.search.facets.query.QueryFacetCollectorParser; import org.elasticsearch.search.facet.query.QueryFacetCollectorParser;
import org.elasticsearch.search.facets.range.RangeFacetCollectorParser; import org.elasticsearch.search.facet.range.RangeFacetCollectorParser;
import org.elasticsearch.search.facets.statistical.StatisticalFacetCollectorParser; import org.elasticsearch.search.facet.statistical.StatisticalFacetCollectorParser;
import org.elasticsearch.search.facets.terms.TermsFacetCollectorParser; import org.elasticsearch.search.facet.terms.TermsFacetCollectorParser;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;
import java.util.List; import java.util.List;

6
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/FacetsPhase.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetsPhase.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets; package org.elasticsearch.search.facet;
import org.apache.lucene.search.*; import org.apache.lucene.search.*;
import org.elasticsearch.ElasticSearchException; import org.elasticsearch.ElasticSearchException;
@ -29,8 +29,8 @@ import org.elasticsearch.common.lucene.search.XBooleanFilter;
import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.DocumentMapper;
import org.elasticsearch.search.SearchParseElement; import org.elasticsearch.search.SearchParseElement;
import org.elasticsearch.search.SearchPhase; import org.elasticsearch.search.SearchPhase;
import org.elasticsearch.search.facets.collector.FacetCollector; import org.elasticsearch.search.facet.collector.FacetCollector;
import org.elasticsearch.search.facets.internal.InternalFacets; import org.elasticsearch.search.facet.internal.InternalFacets;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;
import org.elasticsearch.search.query.QueryPhaseExecutionException; import org.elasticsearch.search.query.QueryPhaseExecutionException;

4
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/SearchContextFacets.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/SearchContextFacets.java
View File

@ -17,9 +17,9 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets; package org.elasticsearch.search.facet;
import org.elasticsearch.search.facets.collector.FacetCollector; import org.elasticsearch.search.facet.collector.FacetCollector;
import java.util.List; import java.util.List;

4
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/collector/FacetCollector.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/collector/FacetCollector.java
View File

@ -17,11 +17,11 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.collector; package org.elasticsearch.search.facet.collector;
import org.apache.lucene.search.Collector; import org.apache.lucene.search.Collector;
import org.apache.lucene.search.Filter; import org.apache.lucene.search.Filter;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
/** /**
* @author kimchy (shay.banon) * @author kimchy (shay.banon)

2
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/collector/FacetCollectorParser.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/collector/FacetCollectorParser.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.collector; package org.elasticsearch.search.facet.collector;
import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;

4
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/filter/FilterFacet.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/filter/FilterFacet.java
View File

@ -17,9 +17,9 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.filter; package org.elasticsearch.search.facet.filter;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
/** /**
* A query facets returns the count (number of hits) for a facet based on a query. * A query facets returns the count (number of hits) for a facet based on a query.

4
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/filter/FilterFacetBuilder.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/filter/FilterFacetBuilder.java
View File

@ -17,12 +17,12 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.filter; package org.elasticsearch.search.facet.filter;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.index.query.xcontent.XContentFilterBuilder; import org.elasticsearch.index.query.xcontent.XContentFilterBuilder;
import org.elasticsearch.search.builder.SearchSourceBuilderException; import org.elasticsearch.search.builder.SearchSourceBuilderException;
import org.elasticsearch.search.facets.AbstractFacetBuilder; import org.elasticsearch.search.facet.AbstractFacetBuilder;
import java.io.IOException; import java.io.IOException;

6
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/filter/FilterFacetCollector.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/filter/FilterFacetCollector.java
View File

@ -17,15 +17,15 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.filter; package org.elasticsearch.search.facet.filter;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.Filter; import org.apache.lucene.search.Filter;
import org.elasticsearch.common.lucene.docset.DocSet; import org.elasticsearch.common.lucene.docset.DocSet;
import org.elasticsearch.common.lucene.docset.DocSets; import org.elasticsearch.common.lucene.docset.DocSets;
import org.elasticsearch.index.cache.filter.FilterCache; import org.elasticsearch.index.cache.filter.FilterCache;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import org.elasticsearch.search.facets.support.AbstractFacetCollector; import org.elasticsearch.search.facet.support.AbstractFacetCollector;
import java.io.IOException; import java.io.IOException;

6
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/filter/FilterFacetCollectorParser.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/filter/FilterFacetCollectorParser.java
View File

@ -17,13 +17,13 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.filter; package org.elasticsearch.search.facet.filter;
import org.apache.lucene.search.Filter; import org.apache.lucene.search.Filter;
import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.query.xcontent.XContentIndexQueryParser; import org.elasticsearch.index.query.xcontent.XContentIndexQueryParser;
import org.elasticsearch.search.facets.collector.FacetCollector; import org.elasticsearch.search.facet.collector.FacetCollector;
import org.elasticsearch.search.facets.collector.FacetCollectorParser; import org.elasticsearch.search.facet.collector.FacetCollectorParser;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;
import java.io.IOException; import java.io.IOException;

6
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/filter/InternalFilterFacet.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/filter/InternalFilterFacet.java
View File

@ -17,14 +17,14 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.filter; package org.elasticsearch.search.facet.filter;
import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentBuilderString; import org.elasticsearch.common.xcontent.XContentBuilderString;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import org.elasticsearch.search.facets.internal.InternalFacet; import org.elasticsearch.search.facet.internal.InternalFacet;
import java.io.IOException; import java.io.IOException;

4
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/geodistance/GeoDistanceFacet.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/geodistance/GeoDistanceFacet.java
View File

@ -17,10 +17,10 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.geodistance; package org.elasticsearch.search.facet.geodistance;
import org.elasticsearch.common.unit.DistanceUnit; import org.elasticsearch.common.unit.DistanceUnit;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import java.util.List; import java.util.List;

4
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/geodistance/GeoDistanceFacetBuilder.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/geodistance/GeoDistanceFacetBuilder.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.geodistance; package org.elasticsearch.search.facet.geodistance;
import org.elasticsearch.common.collect.Lists; import org.elasticsearch.common.collect.Lists;
import org.elasticsearch.common.collect.Maps; import org.elasticsearch.common.collect.Maps;
@ -26,7 +26,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.index.query.xcontent.XContentFilterBuilder; import org.elasticsearch.index.query.xcontent.XContentFilterBuilder;
import org.elasticsearch.index.search.geo.GeoDistance; import org.elasticsearch.index.search.geo.GeoDistance;
import org.elasticsearch.search.builder.SearchSourceBuilderException; import org.elasticsearch.search.builder.SearchSourceBuilderException;
import org.elasticsearch.search.facets.AbstractFacetBuilder; import org.elasticsearch.search.facet.AbstractFacetBuilder;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;

8
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/geodistance/GeoDistanceFacetCollector.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/geodistance/GeoDistanceFacetCollector.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.geodistance; package org.elasticsearch.search.facet.geodistance;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.elasticsearch.common.unit.DistanceUnit; import org.elasticsearch.common.unit.DistanceUnit;
@ -26,9 +26,9 @@ import org.elasticsearch.index.mapper.MapperService;
import org.elasticsearch.index.mapper.xcontent.geo.GeoPointFieldData; import org.elasticsearch.index.mapper.xcontent.geo.GeoPointFieldData;
import org.elasticsearch.index.mapper.xcontent.geo.GeoPointFieldDataType; import org.elasticsearch.index.mapper.xcontent.geo.GeoPointFieldDataType;
import org.elasticsearch.index.search.geo.GeoDistance; import org.elasticsearch.index.search.geo.GeoDistance;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import org.elasticsearch.search.facets.FacetPhaseExecutionException; import org.elasticsearch.search.facet.FacetPhaseExecutionException;
import org.elasticsearch.search.facets.support.AbstractFacetCollector; import org.elasticsearch.search.facet.support.AbstractFacetCollector;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;
import java.io.IOException; import java.io.IOException;

8
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/geodistance/GeoDistanceFacetCollectorParser.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/geodistance/GeoDistanceFacetCollectorParser.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.geodistance; package org.elasticsearch.search.facet.geodistance;
import org.elasticsearch.common.collect.Lists; import org.elasticsearch.common.collect.Lists;
import org.elasticsearch.common.thread.ThreadLocals; import org.elasticsearch.common.thread.ThreadLocals;
@ -26,9 +26,9 @@ import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.mapper.xcontent.geo.GeoPointFieldMapper; import org.elasticsearch.index.mapper.xcontent.geo.GeoPointFieldMapper;
import org.elasticsearch.index.search.geo.GeoDistance; import org.elasticsearch.index.search.geo.GeoDistance;
import org.elasticsearch.index.search.geo.GeoHashUtils; import org.elasticsearch.index.search.geo.GeoHashUtils;
import org.elasticsearch.search.facets.FacetPhaseExecutionException; import org.elasticsearch.search.facet.FacetPhaseExecutionException;
import org.elasticsearch.search.facets.collector.FacetCollector; import org.elasticsearch.search.facet.collector.FacetCollector;
import org.elasticsearch.search.facets.collector.FacetCollectorParser; import org.elasticsearch.search.facet.collector.FacetCollectorParser;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;
import java.io.IOException; import java.io.IOException;

6
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/geodistance/InternalGeoDistanceFacet.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/geodistance/InternalGeoDistanceFacet.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.geodistance; package org.elasticsearch.search.facet.geodistance;
import org.elasticsearch.common.collect.ImmutableList; import org.elasticsearch.common.collect.ImmutableList;
import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamInput;
@ -25,8 +25,8 @@ import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.unit.DistanceUnit; import org.elasticsearch.common.unit.DistanceUnit;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentBuilderString; import org.elasticsearch.common.xcontent.XContentBuilderString;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import org.elasticsearch.search.facets.internal.InternalFacet; import org.elasticsearch.search.facet.internal.InternalFacet;
import java.io.IOException; import java.io.IOException;
import java.util.Iterator; import java.util.Iterator;

2
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/geodistance/ScriptGeoDistanceFacetCollector.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/geodistance/ScriptGeoDistanceFacetCollector.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.geodistance; package org.elasticsearch.search.facet.geodistance;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.elasticsearch.common.unit.DistanceUnit; import org.elasticsearch.common.unit.DistanceUnit;

6
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/geodistance/ValueGeoDistanceFacetCollector.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/geodistance/ValueGeoDistanceFacetCollector.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.geodistance; package org.elasticsearch.search.facet.geodistance;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.elasticsearch.common.unit.DistanceUnit; import org.elasticsearch.common.unit.DistanceUnit;
@ -26,8 +26,8 @@ import org.elasticsearch.index.field.data.NumericFieldData;
import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.FieldMapper;
import org.elasticsearch.index.mapper.xcontent.geo.GeoPoint; import org.elasticsearch.index.mapper.xcontent.geo.GeoPoint;
import org.elasticsearch.index.search.geo.GeoDistance; import org.elasticsearch.index.search.geo.GeoDistance;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import org.elasticsearch.search.facets.FacetPhaseExecutionException; import org.elasticsearch.search.facet.FacetPhaseExecutionException;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;
import java.io.IOException; import java.io.IOException;

4
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/histogram/HistogramFacet.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/HistogramFacet.java
View File

@ -17,10 +17,10 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.histogram; package org.elasticsearch.search.facet.histogram;
import org.elasticsearch.ElasticSearchIllegalArgumentException; import org.elasticsearch.ElasticSearchIllegalArgumentException;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;

4
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/histogram/HistogramFacetBuilder.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/HistogramFacetBuilder.java
View File

@ -17,12 +17,12 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.histogram; package org.elasticsearch.search.facet.histogram;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.index.query.xcontent.XContentFilterBuilder; import org.elasticsearch.index.query.xcontent.XContentFilterBuilder;
import org.elasticsearch.search.builder.SearchSourceBuilderException; import org.elasticsearch.search.builder.SearchSourceBuilderException;
import org.elasticsearch.search.facets.AbstractFacetBuilder; import org.elasticsearch.search.facet.AbstractFacetBuilder;
import java.io.IOException; import java.io.IOException;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;

8
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/histogram/HistogramFacetCollector.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/HistogramFacetCollector.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.histogram; package org.elasticsearch.search.facet.histogram;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.elasticsearch.common.trove.TLongDoubleHashMap; import org.elasticsearch.common.trove.TLongDoubleHashMap;
@ -27,9 +27,9 @@ import org.elasticsearch.index.field.data.FieldDataType;
import org.elasticsearch.index.field.data.NumericFieldData; import org.elasticsearch.index.field.data.NumericFieldData;
import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.FieldMapper;
import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.MapperService;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import org.elasticsearch.search.facets.FacetPhaseExecutionException; import org.elasticsearch.search.facet.FacetPhaseExecutionException;
import org.elasticsearch.search.facets.support.AbstractFacetCollector; import org.elasticsearch.search.facet.support.AbstractFacetCollector;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;
import java.io.IOException; import java.io.IOException;

8
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/histogram/HistogramFacetCollectorParser.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/HistogramFacetCollectorParser.java
View File

@ -17,13 +17,13 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.histogram; package org.elasticsearch.search.facet.histogram;
import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.search.facets.FacetPhaseExecutionException; import org.elasticsearch.search.facet.FacetPhaseExecutionException;
import org.elasticsearch.search.facets.collector.FacetCollector; import org.elasticsearch.search.facet.collector.FacetCollector;
import org.elasticsearch.search.facets.collector.FacetCollectorParser; import org.elasticsearch.search.facet.collector.FacetCollectorParser;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;
import java.io.IOException; import java.io.IOException;

4
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/histogram/HistogramScriptFacetBuilder.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/HistogramScriptFacetBuilder.java
View File

@ -17,13 +17,13 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.histogram; package org.elasticsearch.search.facet.histogram;
import org.elasticsearch.common.collect.Maps; import org.elasticsearch.common.collect.Maps;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.index.query.xcontent.XContentFilterBuilder; import org.elasticsearch.index.query.xcontent.XContentFilterBuilder;
import org.elasticsearch.search.builder.SearchSourceBuilderException; import org.elasticsearch.search.builder.SearchSourceBuilderException;
import org.elasticsearch.search.facets.AbstractFacetBuilder; import org.elasticsearch.search.facet.AbstractFacetBuilder;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;

6
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/histogram/InternalHistogramFacet.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/InternalHistogramFacet.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.histogram; package org.elasticsearch.search.facet.histogram;
import org.elasticsearch.common.collect.ImmutableList; import org.elasticsearch.common.collect.ImmutableList;
import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamInput;
@ -28,8 +28,8 @@ import org.elasticsearch.common.trove.TLongLongHashMap;
import org.elasticsearch.common.trove.TLongLongIterator; import org.elasticsearch.common.trove.TLongLongIterator;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentBuilderString; import org.elasticsearch.common.xcontent.XContentBuilderString;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import org.elasticsearch.search.facets.internal.InternalFacet; import org.elasticsearch.search.facet.internal.InternalFacet;
import java.io.IOException; import java.io.IOException;
import java.util.Collection; import java.util.Collection;

8
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/histogram/KeyValueHistogramFacetCollector.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/KeyValueHistogramFacetCollector.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.histogram; package org.elasticsearch.search.facet.histogram;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.elasticsearch.common.trove.TLongDoubleHashMap; import org.elasticsearch.common.trove.TLongDoubleHashMap;
@ -27,9 +27,9 @@ import org.elasticsearch.index.field.data.FieldDataType;
import org.elasticsearch.index.field.data.NumericFieldData; import org.elasticsearch.index.field.data.NumericFieldData;
import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.FieldMapper;
import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.MapperService;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import org.elasticsearch.search.facets.FacetPhaseExecutionException; import org.elasticsearch.search.facet.FacetPhaseExecutionException;
import org.elasticsearch.search.facets.support.AbstractFacetCollector; import org.elasticsearch.search.facet.support.AbstractFacetCollector;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;
import java.io.IOException; import java.io.IOException;

6
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/histogram/ScriptHistogramFacetCollector.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/ScriptHistogramFacetCollector.java
View File

@ -17,14 +17,14 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.histogram; package org.elasticsearch.search.facet.histogram;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.elasticsearch.common.trove.TLongDoubleHashMap; import org.elasticsearch.common.trove.TLongDoubleHashMap;
import org.elasticsearch.common.trove.TLongLongHashMap; import org.elasticsearch.common.trove.TLongLongHashMap;
import org.elasticsearch.script.search.SearchScript; import org.elasticsearch.script.search.SearchScript;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import org.elasticsearch.search.facets.support.AbstractFacetCollector; import org.elasticsearch.search.facet.support.AbstractFacetCollector;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;
import java.io.IOException; import java.io.IOException;

4
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/internal/InternalFacet.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/internal/InternalFacet.java
View File

@ -17,11 +17,11 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.internal; package org.elasticsearch.search.facet.internal;
import org.elasticsearch.common.io.stream.Streamable; import org.elasticsearch.common.io.stream.Streamable;
import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
/** /**
* @author kimchy (shay.banon) * @author kimchy (shay.banon)

20
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/internal/InternalFacets.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/internal/InternalFacets.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.internal; package org.elasticsearch.search.facet.internal;
import org.elasticsearch.common.collect.ImmutableList; import org.elasticsearch.common.collect.ImmutableList;
import org.elasticsearch.common.collect.ImmutableMap; import org.elasticsearch.common.collect.ImmutableMap;
@ -28,15 +28,15 @@ import org.elasticsearch.common.io.stream.Streamable;
import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentBuilderString; import org.elasticsearch.common.xcontent.XContentBuilderString;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import org.elasticsearch.search.facets.Facets; import org.elasticsearch.search.facet.Facets;
import org.elasticsearch.search.facets.filter.InternalFilterFacet; import org.elasticsearch.search.facet.filter.InternalFilterFacet;
import org.elasticsearch.search.facets.geodistance.InternalGeoDistanceFacet; import org.elasticsearch.search.facet.geodistance.InternalGeoDistanceFacet;
import org.elasticsearch.search.facets.histogram.InternalHistogramFacet; import org.elasticsearch.search.facet.histogram.InternalHistogramFacet;
import org.elasticsearch.search.facets.query.InternalQueryFacet; import org.elasticsearch.search.facet.query.InternalQueryFacet;
import org.elasticsearch.search.facets.range.InternalRangeFacet; import org.elasticsearch.search.facet.range.InternalRangeFacet;
import org.elasticsearch.search.facets.statistical.InternalStatisticalFacet; import org.elasticsearch.search.facet.statistical.InternalStatisticalFacet;
import org.elasticsearch.search.facets.terms.InternalTermsFacet; import org.elasticsearch.search.facet.terms.InternalTermsFacet;
import java.io.IOException; import java.io.IOException;
import java.util.Iterator; import java.util.Iterator;

6
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/query/InternalQueryFacet.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/query/InternalQueryFacet.java
View File

@ -17,14 +17,14 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.query; package org.elasticsearch.search.facet.query;
import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentBuilderString; import org.elasticsearch.common.xcontent.XContentBuilderString;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import org.elasticsearch.search.facets.internal.InternalFacet; import org.elasticsearch.search.facet.internal.InternalFacet;
import java.io.IOException; import java.io.IOException;

4
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/query/QueryFacet.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/query/QueryFacet.java
View File

@ -17,9 +17,9 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.query; package org.elasticsearch.search.facet.query;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
/** /**
* A query facets returns the count (number of hits) for a facet based on a query. * A query facets returns the count (number of hits) for a facet based on a query.

4
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/query/QueryFacetBuilder.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/query/QueryFacetBuilder.java
View File

@ -17,13 +17,13 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.query; package org.elasticsearch.search.facet.query;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.index.query.xcontent.XContentFilterBuilder; import org.elasticsearch.index.query.xcontent.XContentFilterBuilder;
import org.elasticsearch.index.query.xcontent.XContentQueryBuilder; import org.elasticsearch.index.query.xcontent.XContentQueryBuilder;
import org.elasticsearch.search.builder.SearchSourceBuilderException; import org.elasticsearch.search.builder.SearchSourceBuilderException;
import org.elasticsearch.search.facets.AbstractFacetBuilder; import org.elasticsearch.search.facet.AbstractFacetBuilder;
import java.io.IOException; import java.io.IOException;

6
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/query/QueryFacetCollector.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/query/QueryFacetCollector.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.query; package org.elasticsearch.search.facet.query;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.Filter; import org.apache.lucene.search.Filter;
@ -26,8 +26,8 @@ import org.apache.lucene.search.QueryWrapperFilter;
import org.elasticsearch.common.lucene.docset.DocSet; import org.elasticsearch.common.lucene.docset.DocSet;
import org.elasticsearch.common.lucene.docset.DocSets; import org.elasticsearch.common.lucene.docset.DocSets;
import org.elasticsearch.index.cache.filter.FilterCache; import org.elasticsearch.index.cache.filter.FilterCache;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import org.elasticsearch.search.facets.support.AbstractFacetCollector; import org.elasticsearch.search.facet.support.AbstractFacetCollector;
import java.io.IOException; import java.io.IOException;

6
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/query/QueryFacetCollectorParser.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/query/QueryFacetCollectorParser.java
View File

@ -17,13 +17,13 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.query; package org.elasticsearch.search.facet.query;
import org.apache.lucene.search.Query; import org.apache.lucene.search.Query;
import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.query.xcontent.XContentIndexQueryParser; import org.elasticsearch.index.query.xcontent.XContentIndexQueryParser;
import org.elasticsearch.search.facets.collector.FacetCollector; import org.elasticsearch.search.facet.collector.FacetCollector;
import org.elasticsearch.search.facets.collector.FacetCollectorParser; import org.elasticsearch.search.facet.collector.FacetCollectorParser;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;
/** /**

6
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/range/InternalRangeFacet.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/range/InternalRangeFacet.java
View File

@ -17,15 +17,15 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.range; package org.elasticsearch.search.facet.range;
import org.elasticsearch.common.collect.ImmutableList; import org.elasticsearch.common.collect.ImmutableList;
import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentBuilderString; import org.elasticsearch.common.xcontent.XContentBuilderString;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import org.elasticsearch.search.facets.internal.InternalFacet; import org.elasticsearch.search.facet.internal.InternalFacet;
import java.io.IOException; import java.io.IOException;
import java.util.Iterator; import java.util.Iterator;

8
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/range/KeyValueRangeFacetCollector.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/range/KeyValueRangeFacetCollector.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.range; package org.elasticsearch.search.facet.range;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.elasticsearch.index.cache.field.data.FieldDataCache; import org.elasticsearch.index.cache.field.data.FieldDataCache;
@ -25,9 +25,9 @@ import org.elasticsearch.index.field.data.FieldDataType;
import org.elasticsearch.index.field.data.NumericFieldData; import org.elasticsearch.index.field.data.NumericFieldData;
import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.FieldMapper;
import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.MapperService;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import org.elasticsearch.search.facets.FacetPhaseExecutionException; import org.elasticsearch.search.facet.FacetPhaseExecutionException;
import org.elasticsearch.search.facets.support.AbstractFacetCollector; import org.elasticsearch.search.facet.support.AbstractFacetCollector;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;
import java.io.IOException; import java.io.IOException;

4
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/range/RangeFacet.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/range/RangeFacet.java
View File

@ -17,9 +17,9 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.range; package org.elasticsearch.search.facet.range;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import java.util.List; import java.util.List;

4
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/range/RangeFacetBuilder.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/range/RangeFacetBuilder.java
View File

@ -17,13 +17,13 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.range; package org.elasticsearch.search.facet.range;
import org.elasticsearch.common.collect.Lists; import org.elasticsearch.common.collect.Lists;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.index.query.xcontent.XContentFilterBuilder; import org.elasticsearch.index.query.xcontent.XContentFilterBuilder;
import org.elasticsearch.search.builder.SearchSourceBuilderException; import org.elasticsearch.search.builder.SearchSourceBuilderException;
import org.elasticsearch.search.facets.AbstractFacetBuilder; import org.elasticsearch.search.facet.AbstractFacetBuilder;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;

8
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/range/RangeFacetCollector.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/range/RangeFacetCollector.java
View File

@ -17,16 +17,16 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.range; package org.elasticsearch.search.facet.range;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.elasticsearch.index.cache.field.data.FieldDataCache; import org.elasticsearch.index.cache.field.data.FieldDataCache;
import org.elasticsearch.index.field.data.FieldDataType; import org.elasticsearch.index.field.data.FieldDataType;
import org.elasticsearch.index.field.data.NumericFieldData; import org.elasticsearch.index.field.data.NumericFieldData;
import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.MapperService;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import org.elasticsearch.search.facets.FacetPhaseExecutionException; import org.elasticsearch.search.facet.FacetPhaseExecutionException;
import org.elasticsearch.search.facets.support.AbstractFacetCollector; import org.elasticsearch.search.facet.support.AbstractFacetCollector;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;
import java.io.IOException; import java.io.IOException;

8
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/range/RangeFacetCollectorParser.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/range/RangeFacetCollectorParser.java
View File

@ -17,14 +17,14 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.range; package org.elasticsearch.search.facet.range;
import org.elasticsearch.common.collect.Lists; import org.elasticsearch.common.collect.Lists;
import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.FieldMapper;
import org.elasticsearch.search.facets.FacetPhaseExecutionException; import org.elasticsearch.search.facet.FacetPhaseExecutionException;
import org.elasticsearch.search.facets.collector.FacetCollector; import org.elasticsearch.search.facet.collector.FacetCollector;
import org.elasticsearch.search.facets.collector.FacetCollectorParser; import org.elasticsearch.search.facet.collector.FacetCollectorParser;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;
import java.io.IOException; import java.io.IOException;

4
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/range/RangeScriptFacetBuilder.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/range/RangeScriptFacetBuilder.java
View File

@ -17,14 +17,14 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.range; package org.elasticsearch.search.facet.range;
import org.elasticsearch.common.collect.Lists; import org.elasticsearch.common.collect.Lists;
import org.elasticsearch.common.collect.Maps; import org.elasticsearch.common.collect.Maps;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.index.query.xcontent.XContentFilterBuilder; import org.elasticsearch.index.query.xcontent.XContentFilterBuilder;
import org.elasticsearch.search.builder.SearchSourceBuilderException; import org.elasticsearch.search.builder.SearchSourceBuilderException;
import org.elasticsearch.search.facets.AbstractFacetBuilder; import org.elasticsearch.search.facet.AbstractFacetBuilder;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;

6
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/range/ScriptRangeFacetCollector.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/range/ScriptRangeFacetCollector.java
View File

@ -17,12 +17,12 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.range; package org.elasticsearch.search.facet.range;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.elasticsearch.script.search.SearchScript; import org.elasticsearch.script.search.SearchScript;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import org.elasticsearch.search.facets.support.AbstractFacetCollector; import org.elasticsearch.search.facet.support.AbstractFacetCollector;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;
import java.io.IOException; import java.io.IOException;

6
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/statistical/InternalStatisticalFacet.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/statistical/InternalStatisticalFacet.java
View File

@ -17,14 +17,14 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.statistical; package org.elasticsearch.search.facet.statistical;
import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentBuilderString; import org.elasticsearch.common.xcontent.XContentBuilderString;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import org.elasticsearch.search.facets.internal.InternalFacet; import org.elasticsearch.search.facet.internal.InternalFacet;
import java.io.IOException; import java.io.IOException;

6
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/statistical/ScriptStatisticalFacetCollector.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/statistical/ScriptStatisticalFacetCollector.java
View File

@ -17,12 +17,12 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.statistical; package org.elasticsearch.search.facet.statistical;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.elasticsearch.script.search.SearchScript; import org.elasticsearch.script.search.SearchScript;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import org.elasticsearch.search.facets.support.AbstractFacetCollector; import org.elasticsearch.search.facet.support.AbstractFacetCollector;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;
import java.io.IOException; import java.io.IOException;

4
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/statistical/StatisticalFacet.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/statistical/StatisticalFacet.java
View File

@ -17,9 +17,9 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.statistical; package org.elasticsearch.search.facet.statistical;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
/** /**
* Numeric statistical information. * Numeric statistical information.

4
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/statistical/StatisticalFacetBuilder.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/statistical/StatisticalFacetBuilder.java
View File

@ -17,12 +17,12 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.statistical; package org.elasticsearch.search.facet.statistical;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.index.query.xcontent.XContentFilterBuilder; import org.elasticsearch.index.query.xcontent.XContentFilterBuilder;
import org.elasticsearch.search.builder.SearchSourceBuilderException; import org.elasticsearch.search.builder.SearchSourceBuilderException;
import org.elasticsearch.search.facets.AbstractFacetBuilder; import org.elasticsearch.search.facet.AbstractFacetBuilder;
import java.io.IOException; import java.io.IOException;

8
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/statistical/StatisticalFacetCollector.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/statistical/StatisticalFacetCollector.java
View File

@ -17,16 +17,16 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.statistical; package org.elasticsearch.search.facet.statistical;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.elasticsearch.index.cache.field.data.FieldDataCache; import org.elasticsearch.index.cache.field.data.FieldDataCache;
import org.elasticsearch.index.field.data.FieldDataType; import org.elasticsearch.index.field.data.FieldDataType;
import org.elasticsearch.index.field.data.NumericFieldData; import org.elasticsearch.index.field.data.NumericFieldData;
import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.MapperService;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import org.elasticsearch.search.facets.FacetPhaseExecutionException; import org.elasticsearch.search.facet.FacetPhaseExecutionException;
import org.elasticsearch.search.facets.support.AbstractFacetCollector; import org.elasticsearch.search.facet.support.AbstractFacetCollector;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;
import java.io.IOException; import java.io.IOException;

8
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/statistical/StatisticalFacetCollectorParser.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/statistical/StatisticalFacetCollectorParser.java
View File

@ -17,14 +17,14 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.statistical; package org.elasticsearch.search.facet.statistical;
import org.elasticsearch.common.collect.Lists; import org.elasticsearch.common.collect.Lists;
import org.elasticsearch.common.thread.ThreadLocals; import org.elasticsearch.common.thread.ThreadLocals;
import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.search.facets.FacetPhaseExecutionException; import org.elasticsearch.search.facet.FacetPhaseExecutionException;
import org.elasticsearch.search.facets.collector.FacetCollector; import org.elasticsearch.search.facet.collector.FacetCollector;
import org.elasticsearch.search.facets.collector.FacetCollectorParser; import org.elasticsearch.search.facet.collector.FacetCollectorParser;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;
import java.io.IOException; import java.io.IOException;

8
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/statistical/StatisticalFieldsFacetCollector.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/statistical/StatisticalFieldsFacetCollector.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.statistical; package org.elasticsearch.search.facet.statistical;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.elasticsearch.common.Strings; import org.elasticsearch.common.Strings;
@ -25,9 +25,9 @@ import org.elasticsearch.index.cache.field.data.FieldDataCache;
import org.elasticsearch.index.field.data.FieldDataType; import org.elasticsearch.index.field.data.FieldDataType;
import org.elasticsearch.index.field.data.NumericFieldData; import org.elasticsearch.index.field.data.NumericFieldData;
import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.FieldMapper;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import org.elasticsearch.search.facets.FacetPhaseExecutionException; import org.elasticsearch.search.facet.FacetPhaseExecutionException;
import org.elasticsearch.search.facets.support.AbstractFacetCollector; import org.elasticsearch.search.facet.support.AbstractFacetCollector;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;
import java.io.IOException; import java.io.IOException;

4
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/statistical/StatisticalScriptFacetBuilder.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/statistical/StatisticalScriptFacetBuilder.java
View File

@ -17,13 +17,13 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.statistical; package org.elasticsearch.search.facet.statistical;
import org.elasticsearch.common.collect.Maps; import org.elasticsearch.common.collect.Maps;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.index.query.xcontent.XContentFilterBuilder; import org.elasticsearch.index.query.xcontent.XContentFilterBuilder;
import org.elasticsearch.search.builder.SearchSourceBuilderException; import org.elasticsearch.search.builder.SearchSourceBuilderException;
import org.elasticsearch.search.facets.AbstractFacetBuilder; import org.elasticsearch.search.facet.AbstractFacetBuilder;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;

4
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/support/AbstractFacetCollector.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/support/AbstractFacetCollector.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.support; package org.elasticsearch.search.facet.support;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.Filter; import org.apache.lucene.search.Filter;
@ -26,7 +26,7 @@ import org.elasticsearch.common.collect.ImmutableList;
import org.elasticsearch.common.lucene.docset.DocSet; import org.elasticsearch.common.lucene.docset.DocSet;
import org.elasticsearch.common.lucene.docset.DocSets; import org.elasticsearch.common.lucene.docset.DocSets;
import org.elasticsearch.common.lucene.search.AndFilter; import org.elasticsearch.common.lucene.search.AndFilter;
import org.elasticsearch.search.facets.collector.FacetCollector; import org.elasticsearch.search.facet.collector.FacetCollector;
import java.io.IOException; import java.io.IOException;

6
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/terms/IndexNameFacetCollector.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/IndexNameFacetCollector.java
View File

@ -17,12 +17,12 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.terms; package org.elasticsearch.search.facet.terms;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.elasticsearch.common.collect.Sets; import org.elasticsearch.common.collect.Sets;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import org.elasticsearch.search.facets.support.AbstractFacetCollector; import org.elasticsearch.search.facet.support.AbstractFacetCollector;
import java.io.IOException; import java.io.IOException;

6
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/terms/InternalTermsFacet.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/InternalTermsFacet.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.terms; package org.elasticsearch.search.facet.terms;
import org.elasticsearch.common.collect.BoundedTreeSet; import org.elasticsearch.common.collect.BoundedTreeSet;
import org.elasticsearch.common.collect.ImmutableList; import org.elasticsearch.common.collect.ImmutableList;
@ -28,8 +28,8 @@ import org.elasticsearch.common.trove.TObjectIntHashMap;
import org.elasticsearch.common.trove.TObjectIntIterator; import org.elasticsearch.common.trove.TObjectIntIterator;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentBuilderString; import org.elasticsearch.common.xcontent.XContentBuilderString;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import org.elasticsearch.search.facets.internal.InternalFacet; import org.elasticsearch.search.facet.internal.InternalFacet;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;

4
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/terms/TermsFacet.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/TermsFacet.java
View File

@ -17,10 +17,10 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.terms; package org.elasticsearch.search.facet.terms;
import org.elasticsearch.ElasticSearchIllegalArgumentException; import org.elasticsearch.ElasticSearchIllegalArgumentException;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;

4
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/terms/TermsFacetBuilder.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/TermsFacetBuilder.java
View File

@ -17,14 +17,14 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.terms; package org.elasticsearch.search.facet.terms;
import org.elasticsearch.common.collect.Maps; import org.elasticsearch.common.collect.Maps;
import org.elasticsearch.common.regex.Regex; import org.elasticsearch.common.regex.Regex;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.index.query.xcontent.XContentFilterBuilder; import org.elasticsearch.index.query.xcontent.XContentFilterBuilder;
import org.elasticsearch.search.builder.SearchSourceBuilderException; import org.elasticsearch.search.builder.SearchSourceBuilderException;
import org.elasticsearch.search.facets.AbstractFacetBuilder; import org.elasticsearch.search.facet.AbstractFacetBuilder;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;

6
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/terms/TermsFacetCollector.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/TermsFacetCollector.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.terms; package org.elasticsearch.search.facet.terms;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.elasticsearch.common.collect.BoundedTreeSet; import org.elasticsearch.common.collect.BoundedTreeSet;
@ -32,8 +32,8 @@ import org.elasticsearch.index.field.data.FieldData;
import org.elasticsearch.index.field.data.FieldDataType; import org.elasticsearch.index.field.data.FieldDataType;
import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.MapperService;
import org.elasticsearch.script.search.SearchScript; import org.elasticsearch.script.search.SearchScript;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import org.elasticsearch.search.facets.support.AbstractFacetCollector; import org.elasticsearch.search.facet.support.AbstractFacetCollector;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;
import java.io.IOException; import java.io.IOException;

6
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/terms/TermsFacetCollectorParser.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/TermsFacetCollectorParser.java
View File

@ -17,14 +17,14 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.terms; package org.elasticsearch.search.facet.terms;
import org.elasticsearch.common.collect.ImmutableSet; import org.elasticsearch.common.collect.ImmutableSet;
import org.elasticsearch.common.collect.Lists; import org.elasticsearch.common.collect.Lists;
import org.elasticsearch.common.regex.Regex; import org.elasticsearch.common.regex.Regex;
import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.search.facets.collector.FacetCollector; import org.elasticsearch.search.facet.collector.FacetCollector;
import org.elasticsearch.search.facets.collector.FacetCollectorParser; import org.elasticsearch.search.facet.collector.FacetCollectorParser;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;
import java.io.IOException; import java.io.IOException;

6
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/terms/TermsFieldsFacetCollector.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/TermsFieldsFacetCollector.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.terms; package org.elasticsearch.search.facet.terms;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.elasticsearch.common.collect.BoundedTreeSet; import org.elasticsearch.common.collect.BoundedTreeSet;
@ -31,8 +31,8 @@ import org.elasticsearch.index.field.data.FieldData;
import org.elasticsearch.index.field.data.FieldDataType; import org.elasticsearch.index.field.data.FieldDataType;
import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.MapperService;
import org.elasticsearch.script.search.SearchScript; import org.elasticsearch.script.search.SearchScript;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import org.elasticsearch.search.facets.support.AbstractFacetCollector; import org.elasticsearch.search.facet.support.AbstractFacetCollector;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;
import java.io.IOException; import java.io.IOException;

6
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/terms/TermsScriptFieldFacetCollector.java → modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/terms/TermsScriptFieldFacetCollector.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.search.facets.terms; package org.elasticsearch.search.facet.terms;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.elasticsearch.common.collect.BoundedTreeSet; import org.elasticsearch.common.collect.BoundedTreeSet;
@ -28,8 +28,8 @@ import org.elasticsearch.common.trove.TObjectIntHashMap;
import org.elasticsearch.common.trove.TObjectIntIterator; import org.elasticsearch.common.trove.TObjectIntIterator;
import org.elasticsearch.index.field.data.FieldData; import org.elasticsearch.index.field.data.FieldData;
import org.elasticsearch.script.search.SearchScript; import org.elasticsearch.script.search.SearchScript;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facet.Facet;
import org.elasticsearch.search.facets.support.AbstractFacetCollector; import org.elasticsearch.search.facet.support.AbstractFacetCollector;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;
import java.io.IOException; import java.io.IOException;

4
modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/InternalSearchResponse.java
View File

@ -25,8 +25,8 @@ import org.elasticsearch.common.io.stream.Streamable;
import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.search.SearchHits; import org.elasticsearch.search.SearchHits;
import org.elasticsearch.search.facets.Facets; import org.elasticsearch.search.facet.Facets;
import org.elasticsearch.search.facets.internal.InternalFacets; import org.elasticsearch.search.facet.internal.InternalFacets;
import java.io.IOException; import java.io.IOException;

2
modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/SearchContext.java
View File

@ -41,7 +41,7 @@ import org.elasticsearch.script.search.ScriptSearchLookup;
import org.elasticsearch.search.Scroll; import org.elasticsearch.search.Scroll;
import org.elasticsearch.search.SearchShardTarget; import org.elasticsearch.search.SearchShardTarget;
import org.elasticsearch.search.dfs.DfsSearchResult; import org.elasticsearch.search.dfs.DfsSearchResult;
import org.elasticsearch.search.facets.SearchContextFacets; import org.elasticsearch.search.facet.SearchContextFacets;
import org.elasticsearch.search.fetch.FetchSearchResult; import org.elasticsearch.search.fetch.FetchSearchResult;
import org.elasticsearch.search.fetch.script.ScriptFieldsContext; import org.elasticsearch.search.fetch.script.ScriptFieldsContext;
import org.elasticsearch.search.highlight.SearchContextHighlight; import org.elasticsearch.search.highlight.SearchContextHighlight;

2
modules/elasticsearch/src/main/java/org/elasticsearch/search/query/QueryPhase.java
View File

@ -32,7 +32,7 @@ import org.elasticsearch.indices.TypeMissingException;
import org.elasticsearch.search.SearchParseElement; import org.elasticsearch.search.SearchParseElement;
import org.elasticsearch.search.SearchParseException; import org.elasticsearch.search.SearchParseException;
import org.elasticsearch.search.SearchPhase; import org.elasticsearch.search.SearchPhase;
import org.elasticsearch.search.facets.FacetsPhase; import org.elasticsearch.search.facet.FacetsPhase;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;
import org.elasticsearch.search.sort.SortParseElement; import org.elasticsearch.search.sort.SortParseElement;

4
modules/elasticsearch/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java
View File

@ -24,8 +24,8 @@ import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.io.stream.Streamable; import org.elasticsearch.common.io.stream.Streamable;
import org.elasticsearch.search.SearchShardTarget; import org.elasticsearch.search.SearchShardTarget;
import org.elasticsearch.search.facets.Facets; import org.elasticsearch.search.facet.Facets;
import org.elasticsearch.search.facets.internal.InternalFacets; import org.elasticsearch.search.facet.internal.InternalFacets;
import java.io.IOException; import java.io.IOException;

4
modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/SingleInstanceEmbeddedSearchTests.java
View File

@ -32,8 +32,8 @@ import org.elasticsearch.search.controller.SearchPhaseController;
import org.elasticsearch.search.controller.ShardDoc; import org.elasticsearch.search.controller.ShardDoc;
import org.elasticsearch.search.dfs.AggregatedDfs; import org.elasticsearch.search.dfs.AggregatedDfs;
import org.elasticsearch.search.dfs.DfsSearchResult; import org.elasticsearch.search.dfs.DfsSearchResult;
import org.elasticsearch.search.facets.FacetBuilders; import org.elasticsearch.search.facet.FacetBuilders;
import org.elasticsearch.search.facets.query.QueryFacet; import org.elasticsearch.search.facet.query.QueryFacet;
import org.elasticsearch.search.fetch.FetchSearchRequest; import org.elasticsearch.search.fetch.FetchSearchRequest;
import org.elasticsearch.search.fetch.FetchSearchResult; import org.elasticsearch.search.fetch.FetchSearchResult;
import org.elasticsearch.search.fetch.QueryFetchSearchResult; import org.elasticsearch.search.fetch.QueryFetchSearchResult;

4
modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/TransportTwoServersSearchTests.java
View File

@ -30,8 +30,8 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.search.Scroll; import org.elasticsearch.search.Scroll;
import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.elasticsearch.search.facets.FacetBuilders; import org.elasticsearch.search.facet.FacetBuilders;
import org.elasticsearch.search.facets.query.QueryFacet; import org.elasticsearch.search.facet.query.QueryFacet;
import org.elasticsearch.search.sort.SortOrder; import org.elasticsearch.search.sort.SortOrder;
import org.elasticsearch.test.integration.AbstractNodesTests; import org.elasticsearch.test.integration.AbstractNodesTests;
import org.testng.annotations.AfterClass; import org.testng.annotations.AfterClass;

4
modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/TwoInstanceEmbeddedSearchTests.java
View File

@ -36,8 +36,8 @@ import org.elasticsearch.search.controller.SearchPhaseController;
import org.elasticsearch.search.controller.ShardDoc; import org.elasticsearch.search.controller.ShardDoc;
import org.elasticsearch.search.dfs.AggregatedDfs; import org.elasticsearch.search.dfs.AggregatedDfs;
import org.elasticsearch.search.dfs.DfsSearchResult; import org.elasticsearch.search.dfs.DfsSearchResult;
import org.elasticsearch.search.facets.FacetBuilders; import org.elasticsearch.search.facet.FacetBuilders;
import org.elasticsearch.search.facets.query.QueryFacet; import org.elasticsearch.search.facet.query.QueryFacet;
import org.elasticsearch.search.fetch.FetchSearchRequest; import org.elasticsearch.search.fetch.FetchSearchRequest;
import org.elasticsearch.search.fetch.FetchSearchResult; import org.elasticsearch.search.fetch.FetchSearchResult;
import org.elasticsearch.search.fetch.QueryFetchSearchResult; import org.elasticsearch.search.fetch.QueryFetchSearchResult;

4
modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/TwoInstanceUnbalancedShardsEmbeddedSearchTests.java
View File

@ -40,7 +40,7 @@ import org.elasticsearch.search.controller.SearchPhaseController;
import org.elasticsearch.search.controller.ShardDoc; import org.elasticsearch.search.controller.ShardDoc;
import org.elasticsearch.search.dfs.AggregatedDfs; import org.elasticsearch.search.dfs.AggregatedDfs;
import org.elasticsearch.search.dfs.DfsSearchResult; import org.elasticsearch.search.dfs.DfsSearchResult;
import org.elasticsearch.search.facets.query.QueryFacet; import org.elasticsearch.search.facet.query.QueryFacet;
import org.elasticsearch.search.fetch.FetchSearchRequest; import org.elasticsearch.search.fetch.FetchSearchRequest;
import org.elasticsearch.search.fetch.FetchSearchResult; import org.elasticsearch.search.fetch.FetchSearchResult;
import org.elasticsearch.search.fetch.QueryFetchSearchResult; import org.elasticsearch.search.fetch.QueryFetchSearchResult;
@ -66,7 +66,7 @@ import static org.elasticsearch.common.collect.Maps.*;
import static org.elasticsearch.common.unit.TimeValue.*; import static org.elasticsearch.common.unit.TimeValue.*;
import static org.elasticsearch.index.query.xcontent.QueryBuilders.*; import static org.elasticsearch.index.query.xcontent.QueryBuilders.*;
import static org.elasticsearch.search.builder.SearchSourceBuilder.*; import static org.elasticsearch.search.builder.SearchSourceBuilder.*;
import static org.elasticsearch.search.facets.FacetBuilders.*; import static org.elasticsearch.search.facet.FacetBuilders.*;
import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.MatcherAssert.*;
import static org.hamcrest.Matchers.*; import static org.hamcrest.Matchers.*;

14
modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/facets/SimpleFacetsTests.java → modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsTests.java
View File

@ -17,18 +17,18 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.test.integration.search.facets; package org.elasticsearch.test.integration.search.facet;
import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.search.SearchType; import org.elasticsearch.action.search.SearchType;
import org.elasticsearch.action.search.ShardSearchFailure; import org.elasticsearch.action.search.ShardSearchFailure;
import org.elasticsearch.client.Client; import org.elasticsearch.client.Client;
import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.search.facets.filter.FilterFacet; import org.elasticsearch.search.facet.filter.FilterFacet;
import org.elasticsearch.search.facets.histogram.HistogramFacet; import org.elasticsearch.search.facet.histogram.HistogramFacet;
import org.elasticsearch.search.facets.range.RangeFacet; import org.elasticsearch.search.facet.range.RangeFacet;
import org.elasticsearch.search.facets.statistical.StatisticalFacet; import org.elasticsearch.search.facet.statistical.StatisticalFacet;
import org.elasticsearch.search.facets.terms.TermsFacet; import org.elasticsearch.search.facet.terms.TermsFacet;
import org.elasticsearch.test.integration.AbstractNodesTests; import org.elasticsearch.test.integration.AbstractNodesTests;
import org.testng.annotations.AfterClass; import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeClass;
@ -39,7 +39,7 @@ import java.util.concurrent.TimeUnit;
import static org.elasticsearch.common.xcontent.XContentFactory.*; import static org.elasticsearch.common.xcontent.XContentFactory.*;
import static org.elasticsearch.index.query.xcontent.FilterBuilders.*; import static org.elasticsearch.index.query.xcontent.FilterBuilders.*;
import static org.elasticsearch.index.query.xcontent.QueryBuilders.*; import static org.elasticsearch.index.query.xcontent.QueryBuilders.*;
import static org.elasticsearch.search.facets.FacetBuilders.*; import static org.elasticsearch.search.facet.FacetBuilders.*;
import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.MatcherAssert.*;
import static org.hamcrest.Matchers.*; import static org.hamcrest.Matchers.*;

0
modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/facets/SimpleFacetsTests.yml → modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsTests.yml
View File

4
modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/geo/GeoDistanceFacetTests.java
View File

@ -23,7 +23,7 @@ import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.client.Client; import org.elasticsearch.client.Client;
import org.elasticsearch.common.unit.DistanceUnit; import org.elasticsearch.common.unit.DistanceUnit;
import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.search.facets.geodistance.GeoDistanceFacet; import org.elasticsearch.search.facet.geodistance.GeoDistanceFacet;
import org.elasticsearch.test.integration.AbstractNodesTests; import org.elasticsearch.test.integration.AbstractNodesTests;
import org.testng.annotations.AfterClass; import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeClass;
@ -31,7 +31,7 @@ import org.testng.annotations.Test;
import static org.elasticsearch.common.xcontent.XContentFactory.*; import static org.elasticsearch.common.xcontent.XContentFactory.*;
import static org.elasticsearch.index.query.xcontent.QueryBuilders.*; import static org.elasticsearch.index.query.xcontent.QueryBuilders.*;
import static org.elasticsearch.search.facets.FacetBuilders.*; import static org.elasticsearch.search.facet.FacetBuilders.*;
import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.MatcherAssert.*;
import static org.hamcrest.Matchers.*; import static org.hamcrest.Matchers.*;