From 3d6a9c35eca06d763e1418a514151172ba23bbea Mon Sep 17 00:00:00 2001 From: dwivedi Date: Tue, 12 Sep 2017 13:53:06 -0700 Subject: [PATCH 1/3] search package name correction. --- .../io/druid/query/search/{search => }/AllSearchQuerySpec.java | 0 .../java/io/druid/query/search/{search => }/AutoStrategy.java | 0 .../query/search/{search => }/ConciseBitmapDecisionHelper.java | 0 .../druid/query/search/{search => }/ContainsSearchQuerySpec.java | 0 .../druid/query/search/{search => }/FragmentSearchQuerySpec.java | 0 .../search/{search => }/InsensitiveContainsSearchQuerySpec.java | 0 .../io/druid/query/search/{search => }/RegexSearchQuerySpec.java | 0 .../query/search/{search => }/RoaringBitmapDecisionHelper.java | 0 .../main/java/io/druid/query/search/{search => }/SearchHit.java | 0 .../io/druid/query/search/{search => }/SearchQueryConfig.java | 0 .../query/search/{search => }/SearchQueryDecisionHelper.java | 0 .../io/druid/query/search/{search => }/SearchQueryExecutor.java | 0 .../java/io/druid/query/search/{search => }/SearchQuerySpec.java | 0 .../java/io/druid/query/search/{search => }/SearchSortSpec.java | 0 .../java/io/druid/query/search/{search => }/SearchStrategy.java | 0 .../io/druid/query/search/{search => }/UseIndexesStrategy.java | 0 16 files changed, 0 insertions(+), 0 deletions(-) rename processing/src/main/java/io/druid/query/search/{search => }/AllSearchQuerySpec.java (100%) rename processing/src/main/java/io/druid/query/search/{search => }/AutoStrategy.java (100%) rename processing/src/main/java/io/druid/query/search/{search => }/ConciseBitmapDecisionHelper.java (100%) rename processing/src/main/java/io/druid/query/search/{search => }/ContainsSearchQuerySpec.java (100%) rename processing/src/main/java/io/druid/query/search/{search => }/FragmentSearchQuerySpec.java (100%) rename processing/src/main/java/io/druid/query/search/{search => }/InsensitiveContainsSearchQuerySpec.java (100%) rename processing/src/main/java/io/druid/query/search/{search => }/RegexSearchQuerySpec.java (100%) rename processing/src/main/java/io/druid/query/search/{search => }/RoaringBitmapDecisionHelper.java (100%) rename processing/src/main/java/io/druid/query/search/{search => }/SearchHit.java (100%) rename processing/src/main/java/io/druid/query/search/{search => }/SearchQueryConfig.java (100%) rename processing/src/main/java/io/druid/query/search/{search => }/SearchQueryDecisionHelper.java (100%) rename processing/src/main/java/io/druid/query/search/{search => }/SearchQueryExecutor.java (100%) rename processing/src/main/java/io/druid/query/search/{search => }/SearchQuerySpec.java (100%) rename processing/src/main/java/io/druid/query/search/{search => }/SearchSortSpec.java (100%) rename processing/src/main/java/io/druid/query/search/{search => }/SearchStrategy.java (100%) rename processing/src/main/java/io/druid/query/search/{search => }/UseIndexesStrategy.java (100%) diff --git a/processing/src/main/java/io/druid/query/search/search/AllSearchQuerySpec.java b/processing/src/main/java/io/druid/query/search/AllSearchQuerySpec.java similarity index 100% rename from processing/src/main/java/io/druid/query/search/search/AllSearchQuerySpec.java rename to processing/src/main/java/io/druid/query/search/AllSearchQuerySpec.java diff --git a/processing/src/main/java/io/druid/query/search/search/AutoStrategy.java b/processing/src/main/java/io/druid/query/search/AutoStrategy.java similarity index 100% rename from processing/src/main/java/io/druid/query/search/search/AutoStrategy.java rename to processing/src/main/java/io/druid/query/search/AutoStrategy.java diff --git a/processing/src/main/java/io/druid/query/search/search/ConciseBitmapDecisionHelper.java b/processing/src/main/java/io/druid/query/search/ConciseBitmapDecisionHelper.java similarity index 100% rename from processing/src/main/java/io/druid/query/search/search/ConciseBitmapDecisionHelper.java rename to processing/src/main/java/io/druid/query/search/ConciseBitmapDecisionHelper.java diff --git a/processing/src/main/java/io/druid/query/search/search/ContainsSearchQuerySpec.java b/processing/src/main/java/io/druid/query/search/ContainsSearchQuerySpec.java similarity index 100% rename from processing/src/main/java/io/druid/query/search/search/ContainsSearchQuerySpec.java rename to processing/src/main/java/io/druid/query/search/ContainsSearchQuerySpec.java diff --git a/processing/src/main/java/io/druid/query/search/search/FragmentSearchQuerySpec.java b/processing/src/main/java/io/druid/query/search/FragmentSearchQuerySpec.java similarity index 100% rename from processing/src/main/java/io/druid/query/search/search/FragmentSearchQuerySpec.java rename to processing/src/main/java/io/druid/query/search/FragmentSearchQuerySpec.java diff --git a/processing/src/main/java/io/druid/query/search/search/InsensitiveContainsSearchQuerySpec.java b/processing/src/main/java/io/druid/query/search/InsensitiveContainsSearchQuerySpec.java similarity index 100% rename from processing/src/main/java/io/druid/query/search/search/InsensitiveContainsSearchQuerySpec.java rename to processing/src/main/java/io/druid/query/search/InsensitiveContainsSearchQuerySpec.java diff --git a/processing/src/main/java/io/druid/query/search/search/RegexSearchQuerySpec.java b/processing/src/main/java/io/druid/query/search/RegexSearchQuerySpec.java similarity index 100% rename from processing/src/main/java/io/druid/query/search/search/RegexSearchQuerySpec.java rename to processing/src/main/java/io/druid/query/search/RegexSearchQuerySpec.java diff --git a/processing/src/main/java/io/druid/query/search/search/RoaringBitmapDecisionHelper.java b/processing/src/main/java/io/druid/query/search/RoaringBitmapDecisionHelper.java similarity index 100% rename from processing/src/main/java/io/druid/query/search/search/RoaringBitmapDecisionHelper.java rename to processing/src/main/java/io/druid/query/search/RoaringBitmapDecisionHelper.java diff --git a/processing/src/main/java/io/druid/query/search/search/SearchHit.java b/processing/src/main/java/io/druid/query/search/SearchHit.java similarity index 100% rename from processing/src/main/java/io/druid/query/search/search/SearchHit.java rename to processing/src/main/java/io/druid/query/search/SearchHit.java diff --git a/processing/src/main/java/io/druid/query/search/search/SearchQueryConfig.java b/processing/src/main/java/io/druid/query/search/SearchQueryConfig.java similarity index 100% rename from processing/src/main/java/io/druid/query/search/search/SearchQueryConfig.java rename to processing/src/main/java/io/druid/query/search/SearchQueryConfig.java diff --git a/processing/src/main/java/io/druid/query/search/search/SearchQueryDecisionHelper.java b/processing/src/main/java/io/druid/query/search/SearchQueryDecisionHelper.java similarity index 100% rename from processing/src/main/java/io/druid/query/search/search/SearchQueryDecisionHelper.java rename to processing/src/main/java/io/druid/query/search/SearchQueryDecisionHelper.java diff --git a/processing/src/main/java/io/druid/query/search/search/SearchQueryExecutor.java b/processing/src/main/java/io/druid/query/search/SearchQueryExecutor.java similarity index 100% rename from processing/src/main/java/io/druid/query/search/search/SearchQueryExecutor.java rename to processing/src/main/java/io/druid/query/search/SearchQueryExecutor.java diff --git a/processing/src/main/java/io/druid/query/search/search/SearchQuerySpec.java b/processing/src/main/java/io/druid/query/search/SearchQuerySpec.java similarity index 100% rename from processing/src/main/java/io/druid/query/search/search/SearchQuerySpec.java rename to processing/src/main/java/io/druid/query/search/SearchQuerySpec.java diff --git a/processing/src/main/java/io/druid/query/search/search/SearchSortSpec.java b/processing/src/main/java/io/druid/query/search/SearchSortSpec.java similarity index 100% rename from processing/src/main/java/io/druid/query/search/search/SearchSortSpec.java rename to processing/src/main/java/io/druid/query/search/SearchSortSpec.java diff --git a/processing/src/main/java/io/druid/query/search/search/SearchStrategy.java b/processing/src/main/java/io/druid/query/search/SearchStrategy.java similarity index 100% rename from processing/src/main/java/io/druid/query/search/search/SearchStrategy.java rename to processing/src/main/java/io/druid/query/search/SearchStrategy.java diff --git a/processing/src/main/java/io/druid/query/search/search/UseIndexesStrategy.java b/processing/src/main/java/io/druid/query/search/UseIndexesStrategy.java similarity index 100% rename from processing/src/main/java/io/druid/query/search/search/UseIndexesStrategy.java rename to processing/src/main/java/io/druid/query/search/UseIndexesStrategy.java From 3b9482ccee280a077d0bde9a401de5d2629a5f24 Mon Sep 17 00:00:00 2001 From: dwivedi Date: Wed, 13 Sep 2017 11:08:21 -0700 Subject: [PATCH 2/3] Refactor search.search pkg to search. --- .../druid/benchmark/FilteredAggregatorBenchmark.java | 2 +- .../indexing/IncrementalIndexReadBenchmark.java | 2 +- .../io/druid/benchmark/query/SearchBenchmark.java | 6 +++--- .../query/DefaultGenericQueryMetricsFactory.java | 3 ++- processing/src/main/java/io/druid/query/Druids.java | 12 ++++++------ processing/src/main/java/io/druid/query/Query.java | 2 +- .../src/main/java/io/druid/query/QueryMetrics.java | 3 ++- .../extraction/SearchQuerySpecDimExtractionFn.java | 2 +- .../src/main/java/io/druid/query/filter/Filter.java | 3 ++- .../io/druid/query/filter/SearchQueryDimFilter.java | 2 +- .../io/druid/query/search/AllSearchQuerySpec.java | 2 +- .../java/io/druid/query/search/AutoStrategy.java | 2 +- .../query/search/BySegmentSearchResultValue.java | 1 - .../query/search/ConciseBitmapDecisionHelper.java | 2 +- .../druid/query/search/ContainsSearchQuerySpec.java | 2 +- .../search/{search => }/CursorOnlyStrategy.java | 3 +-- .../druid/query/search/FragmentSearchQuerySpec.java | 2 +- .../search/InsensitiveContainsSearchQuerySpec.java | 2 +- .../io/druid/query/search/RegexSearchQuerySpec.java | 2 +- .../query/search/RoaringBitmapDecisionHelper.java | 2 +- .../java/io/druid/query/search/SearchBinaryFn.java | 2 -- .../main/java/io/druid/query/search/SearchHit.java | 2 +- .../druid/query/search/{search => }/SearchQuery.java | 3 +-- .../io/druid/query/search/SearchQueryConfig.java | 2 +- .../query/search/SearchQueryDecisionHelper.java | 2 +- .../io/druid/query/search/SearchQueryExecutor.java | 2 +- .../query/search/SearchQueryQueryToolChest.java | 3 --- .../io/druid/query/search/SearchQueryRunner.java | 4 ---- .../druid/query/search/SearchQueryRunnerFactory.java | 1 - .../java/io/druid/query/search/SearchQuerySpec.java | 2 +- .../io/druid/query/search/SearchResultValue.java | 1 - .../java/io/druid/query/search/SearchSortSpec.java | 2 +- .../java/io/druid/query/search/SearchStrategy.java | 2 +- .../druid/query/search/SearchStrategySelector.java | 6 ------ .../io/druid/query/search/UseIndexesStrategy.java | 4 ++-- .../io/druid/segment/filter/SearchQueryFilter.java | 2 +- .../test/java/io/druid/query/TestQueryRunners.java | 2 +- .../query/aggregation/FilteredAggregatorTest.java | 2 +- .../SearchQuerySpecDimExtractionFnTest.java | 4 ++-- .../druid/query/filter/GetDimensionRangeSetTest.java | 2 +- .../druid/query/filter/SearchQueryDimFilterTest.java | 2 +- .../druid/query/groupby/GroupByQueryRunnerTest.java | 2 +- .../io/druid/query/search/RegexSearchQueryTest.java | 1 - .../io/druid/query/search/SearchBinaryFnTest.java | 2 -- .../query/search/SearchQueryQueryToolChestTest.java | 3 --- .../io/druid/query/search/SearchQueryRunnerTest.java | 5 ----- .../query/search/SearchQueryRunnerWithCaseTest.java | 6 ------ .../io/druid/query/search/SearchSortSpecTest.java | 2 -- .../src/test/java/io/druid/segment/AppendTest.java | 4 ++-- .../io/druid/segment/SchemalessTestFullTest.java | 4 ++-- .../io/druid/segment/SchemalessTestSimpleTest.java | 4 ++-- .../segment/filter/FloatAndDoubleFilteringTest.java | 2 +- .../io/druid/segment/filter/LongFilteringTest.java | 2 +- .../druid/segment/filter/SearchQueryFilterTest.java | 4 ++-- .../io/druid/segment/filter/TimeFilteringTest.java | 2 +- .../io/druid/guice/QueryRunnerFactoryModule.java | 2 +- .../java/io/druid/guice/QueryToolChestModule.java | 4 ++-- .../io/druid/client/CachingClusteredClientTest.java | 6 +++--- .../druid/server/coordination/ServerManagerTest.java | 2 +- 59 files changed, 65 insertions(+), 101 deletions(-) rename processing/src/main/java/io/druid/query/search/{search => }/CursorOnlyStrategy.java (98%) rename processing/src/main/java/io/druid/query/search/{search => }/SearchQuery.java (98%) diff --git a/benchmarks/src/main/java/io/druid/benchmark/FilteredAggregatorBenchmark.java b/benchmarks/src/main/java/io/druid/benchmark/FilteredAggregatorBenchmark.java index 87fa11c3ba32..fb398b9219f7 100644 --- a/benchmarks/src/main/java/io/druid/benchmark/FilteredAggregatorBenchmark.java +++ b/benchmarks/src/main/java/io/druid/benchmark/FilteredAggregatorBenchmark.java @@ -57,7 +57,7 @@ import io.druid.query.filter.RegexDimFilter; import io.druid.query.filter.SearchQueryDimFilter; import io.druid.query.ordering.StringComparators; -import io.druid.query.search.search.ContainsSearchQuerySpec; +import io.druid.query.search.ContainsSearchQuerySpec; import io.druid.query.spec.MultipleIntervalSegmentSpec; import io.druid.query.spec.QuerySegmentSpec; import io.druid.query.timeseries.TimeseriesQuery; diff --git a/benchmarks/src/main/java/io/druid/benchmark/indexing/IncrementalIndexReadBenchmark.java b/benchmarks/src/main/java/io/druid/benchmark/indexing/IncrementalIndexReadBenchmark.java index b61a46474dec..a355aa314b60 100644 --- a/benchmarks/src/main/java/io/druid/benchmark/indexing/IncrementalIndexReadBenchmark.java +++ b/benchmarks/src/main/java/io/druid/benchmark/indexing/IncrementalIndexReadBenchmark.java @@ -40,7 +40,7 @@ import io.druid.query.filter.RegexDimFilter; import io.druid.query.filter.SearchQueryDimFilter; import io.druid.query.ordering.StringComparators; -import io.druid.query.search.search.ContainsSearchQuerySpec; +import io.druid.query.search.ContainsSearchQuerySpec; import io.druid.segment.Cursor; import io.druid.segment.DimensionSelector; import io.druid.segment.VirtualColumns; diff --git a/benchmarks/src/main/java/io/druid/benchmark/query/SearchBenchmark.java b/benchmarks/src/main/java/io/druid/benchmark/query/SearchBenchmark.java index babe91f61d7e..aca3a465bf4e 100644 --- a/benchmarks/src/main/java/io/druid/benchmark/query/SearchBenchmark.java +++ b/benchmarks/src/main/java/io/druid/benchmark/query/SearchBenchmark.java @@ -63,9 +63,9 @@ import io.druid.query.search.SearchQueryRunnerFactory; import io.druid.query.search.SearchResultValue; import io.druid.query.search.SearchStrategySelector; -import io.druid.query.search.search.SearchHit; -import io.druid.query.search.search.SearchQuery; -import io.druid.query.search.search.SearchQueryConfig; +import io.druid.query.search.SearchHit; +import io.druid.query.search.SearchQuery; +import io.druid.query.search.SearchQueryConfig; import io.druid.query.spec.MultipleIntervalSegmentSpec; import io.druid.query.spec.QuerySegmentSpec; import io.druid.segment.IncrementalIndexSegment; diff --git a/processing/src/main/java/io/druid/query/DefaultGenericQueryMetricsFactory.java b/processing/src/main/java/io/druid/query/DefaultGenericQueryMetricsFactory.java index 3b03960196f9..da65dcaa7600 100644 --- a/processing/src/main/java/io/druid/query/DefaultGenericQueryMetricsFactory.java +++ b/processing/src/main/java/io/druid/query/DefaultGenericQueryMetricsFactory.java @@ -25,6 +25,7 @@ import io.druid.guice.LazySingleton; import io.druid.guice.annotations.Json; import io.druid.jackson.DefaultObjectMapper; +import io.druid.query.search.SearchQueryConfig; @LazySingleton public class DefaultGenericQueryMetricsFactory implements GenericQueryMetricsFactory @@ -35,7 +36,7 @@ public class DefaultGenericQueryMetricsFactory implements GenericQueryMetricsFac /** * Should be used only in tests, directly or indirectly (e. g. in {@link * io.druid.query.search.SearchQueryQueryToolChest#SearchQueryQueryToolChest( - * io.druid.query.search.search.SearchQueryConfig, IntervalChunkingQueryRunnerDecorator)}). + * SearchQueryConfig, IntervalChunkingQueryRunnerDecorator)}). */ @VisibleForTesting public static GenericQueryMetricsFactory instance() diff --git a/processing/src/main/java/io/druid/query/Druids.java b/processing/src/main/java/io/druid/query/Druids.java index 1d074d4efb9f..e09b86ea14a8 100644 --- a/processing/src/main/java/io/druid/query/Druids.java +++ b/processing/src/main/java/io/druid/query/Druids.java @@ -42,12 +42,12 @@ import io.druid.query.metadata.metadata.ColumnIncluderator; import io.druid.query.metadata.metadata.SegmentMetadataQuery; import io.druid.query.search.SearchResultValue; -import io.druid.query.search.search.ContainsSearchQuerySpec; -import io.druid.query.search.search.FragmentSearchQuerySpec; -import io.druid.query.search.search.InsensitiveContainsSearchQuerySpec; -import io.druid.query.search.search.SearchQuery; -import io.druid.query.search.search.SearchQuerySpec; -import io.druid.query.search.search.SearchSortSpec; +import io.druid.query.search.ContainsSearchQuerySpec; +import io.druid.query.search.FragmentSearchQuerySpec; +import io.druid.query.search.InsensitiveContainsSearchQuerySpec; +import io.druid.query.search.SearchQuery; +import io.druid.query.search.SearchQuerySpec; +import io.druid.query.search.SearchSortSpec; import io.druid.query.select.PagingSpec; import io.druid.query.select.SelectQuery; import io.druid.query.spec.LegacySegmentSpec; diff --git a/processing/src/main/java/io/druid/query/Query.java b/processing/src/main/java/io/druid/query/Query.java index 9e0d8a0f658d..5e421441d730 100644 --- a/processing/src/main/java/io/druid/query/Query.java +++ b/processing/src/main/java/io/druid/query/Query.java @@ -27,7 +27,7 @@ import io.druid.query.filter.DimFilter; import io.druid.query.groupby.GroupByQuery; import io.druid.query.metadata.metadata.SegmentMetadataQuery; -import io.druid.query.search.search.SearchQuery; +import io.druid.query.search.SearchQuery; import io.druid.query.select.SelectQuery; import io.druid.query.spec.QuerySegmentSpec; import io.druid.query.timeboundary.TimeBoundaryQuery; diff --git a/processing/src/main/java/io/druid/query/QueryMetrics.java b/processing/src/main/java/io/druid/query/QueryMetrics.java index 7eab88c5af1a..8f3fb7d939e9 100644 --- a/processing/src/main/java/io/druid/query/QueryMetrics.java +++ b/processing/src/main/java/io/druid/query/QueryMetrics.java @@ -22,6 +22,7 @@ import com.metamx.emitter.service.ServiceEmitter; import io.druid.collections.bitmap.BitmapFactory; import io.druid.query.filter.Filter; +import io.druid.query.search.SearchQuery; import org.joda.time.Interval; import java.util.List; @@ -110,7 +111,7 @@ * * Making subinterfaces of QueryMetrics for emitting custom dimensions and/or metrics for specific query types * ----------------------------------------------------------------------------------------------------------- - * If a query type (e. g. {@link io.druid.query.search.search.SearchQuery} (it's runners) needs to emit custom + * If a query type (e. g. {@link SearchQuery} (it's runners) needs to emit custom * dimensions and/or metrics which doesn't make sense for all other query types, the following steps should be executed: * 1. Create `interface SearchQueryMetrics extends QueryMetrics` (here and below "Search" is the query type) with * additional methods (see "Adding new methods" section above). diff --git a/processing/src/main/java/io/druid/query/extraction/SearchQuerySpecDimExtractionFn.java b/processing/src/main/java/io/druid/query/extraction/SearchQuerySpecDimExtractionFn.java index b80971ec2dbb..1f005523925b 100644 --- a/processing/src/main/java/io/druid/query/extraction/SearchQuerySpecDimExtractionFn.java +++ b/processing/src/main/java/io/druid/query/extraction/SearchQuerySpecDimExtractionFn.java @@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.base.Strings; -import io.druid.query.search.search.SearchQuerySpec; +import io.druid.query.search.SearchQuerySpec; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/filter/Filter.java b/processing/src/main/java/io/druid/query/filter/Filter.java index 9a8f68364226..c0561282bf57 100644 --- a/processing/src/main/java/io/druid/query/filter/Filter.java +++ b/processing/src/main/java/io/druid/query/filter/Filter.java @@ -22,6 +22,7 @@ import io.druid.collections.bitmap.ImmutableBitmap; import io.druid.query.BitmapResultFactory; import io.druid.query.DefaultBitmapResultFactory; +import io.druid.query.search.AutoStrategy; import io.druid.segment.ColumnSelector; import io.druid.segment.ColumnSelectorFactory; @@ -60,7 +61,7 @@ default ImmutableBitmap getBitmapIndex(BitmapIndexSelector selector) /** * Estimate selectivity of this filter. - * This method can be used for cost-based query planning like in {@link io.druid.query.search.search.AutoStrategy}. + * This method can be used for cost-based query planning like in {@link AutoStrategy}. * To avoid significant performance degradation for calculating the exact cost, * implementation of this method targets to achieve rapid selectivity estimation * with reasonable sacrifice of the accuracy. diff --git a/processing/src/main/java/io/druid/query/filter/SearchQueryDimFilter.java b/processing/src/main/java/io/druid/query/filter/SearchQueryDimFilter.java index fa6673d12e31..fb955cf49d8a 100644 --- a/processing/src/main/java/io/druid/query/filter/SearchQueryDimFilter.java +++ b/processing/src/main/java/io/druid/query/filter/SearchQueryDimFilter.java @@ -24,7 +24,7 @@ import com.google.common.collect.RangeSet; import io.druid.java.util.common.StringUtils; import io.druid.query.extraction.ExtractionFn; -import io.druid.query.search.search.SearchQuerySpec; +import io.druid.query.search.SearchQuerySpec; import io.druid.segment.filter.SearchQueryFilter; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/search/AllSearchQuerySpec.java b/processing/src/main/java/io/druid/query/search/AllSearchQuerySpec.java index 4f64561fe949..ebc4080fcb08 100644 --- a/processing/src/main/java/io/druid/query/search/AllSearchQuerySpec.java +++ b/processing/src/main/java/io/druid/query/search/AllSearchQuerySpec.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.search.search; +package io.druid.query.search; import javax.annotation.Nullable; diff --git a/processing/src/main/java/io/druid/query/search/AutoStrategy.java b/processing/src/main/java/io/druid/query/search/AutoStrategy.java index 235ad1a096dd..b3b692c298dd 100644 --- a/processing/src/main/java/io/druid/query/search/AutoStrategy.java +++ b/processing/src/main/java/io/druid/query/search/AutoStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.search.search; +package io.druid.query.search; import com.metamx.emitter.EmittingLogger; import io.druid.query.dimension.DimensionSpec; diff --git a/processing/src/main/java/io/druid/query/search/BySegmentSearchResultValue.java b/processing/src/main/java/io/druid/query/search/BySegmentSearchResultValue.java index 79ea5097f874..08f5f915a55e 100644 --- a/processing/src/main/java/io/druid/query/search/BySegmentSearchResultValue.java +++ b/processing/src/main/java/io/druid/query/search/BySegmentSearchResultValue.java @@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.druid.query.BySegmentResultValue; import io.druid.query.Result; -import io.druid.query.search.search.SearchHit; import org.joda.time.Interval; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/search/ConciseBitmapDecisionHelper.java b/processing/src/main/java/io/druid/query/search/ConciseBitmapDecisionHelper.java index c0239e34ac9e..e349d9d14237 100644 --- a/processing/src/main/java/io/druid/query/search/ConciseBitmapDecisionHelper.java +++ b/processing/src/main/java/io/druid/query/search/ConciseBitmapDecisionHelper.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.search.search; +package io.druid.query.search; public class ConciseBitmapDecisionHelper extends SearchQueryDecisionHelper { diff --git a/processing/src/main/java/io/druid/query/search/ContainsSearchQuerySpec.java b/processing/src/main/java/io/druid/query/search/ContainsSearchQuerySpec.java index 3ea9d0d0c70b..d9415a68edbc 100644 --- a/processing/src/main/java/io/druid/query/search/ContainsSearchQuerySpec.java +++ b/processing/src/main/java/io/druid/query/search/ContainsSearchQuerySpec.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.search.search; +package io.druid.query.search; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/processing/src/main/java/io/druid/query/search/search/CursorOnlyStrategy.java b/processing/src/main/java/io/druid/query/search/CursorOnlyStrategy.java similarity index 98% rename from processing/src/main/java/io/druid/query/search/search/CursorOnlyStrategy.java rename to processing/src/main/java/io/druid/query/search/CursorOnlyStrategy.java index 668b963d1972..33d05dde59bb 100644 --- a/processing/src/main/java/io/druid/query/search/search/CursorOnlyStrategy.java +++ b/processing/src/main/java/io/druid/query/search/CursorOnlyStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.search.search; +package io.druid.query.search; import com.google.common.collect.ImmutableList; import io.druid.java.util.common.guava.Accumulator; @@ -25,7 +25,6 @@ import io.druid.query.ColumnSelectorPlus; import io.druid.query.dimension.DimensionSpec; import io.druid.query.filter.Filter; -import io.druid.query.search.SearchQueryRunner; import io.druid.query.search.SearchQueryRunner.SearchColumnSelectorStrategy; import io.druid.segment.Cursor; import io.druid.segment.DimensionHandlerUtils; diff --git a/processing/src/main/java/io/druid/query/search/FragmentSearchQuerySpec.java b/processing/src/main/java/io/druid/query/search/FragmentSearchQuerySpec.java index 9798bd305607..c336aa97885f 100644 --- a/processing/src/main/java/io/druid/query/search/FragmentSearchQuerySpec.java +++ b/processing/src/main/java/io/druid/query/search/FragmentSearchQuerySpec.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.search.search; +package io.druid.query.search; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/processing/src/main/java/io/druid/query/search/InsensitiveContainsSearchQuerySpec.java b/processing/src/main/java/io/druid/query/search/InsensitiveContainsSearchQuerySpec.java index 92946529d20c..422720f6aace 100644 --- a/processing/src/main/java/io/druid/query/search/InsensitiveContainsSearchQuerySpec.java +++ b/processing/src/main/java/io/druid/query/search/InsensitiveContainsSearchQuerySpec.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.search.search; +package io.druid.query.search; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/processing/src/main/java/io/druid/query/search/RegexSearchQuerySpec.java b/processing/src/main/java/io/druid/query/search/RegexSearchQuerySpec.java index 085a1216bcc6..4a4691c51372 100644 --- a/processing/src/main/java/io/druid/query/search/RegexSearchQuerySpec.java +++ b/processing/src/main/java/io/druid/query/search/RegexSearchQuerySpec.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.search.search; +package io.druid.query.search; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/processing/src/main/java/io/druid/query/search/RoaringBitmapDecisionHelper.java b/processing/src/main/java/io/druid/query/search/RoaringBitmapDecisionHelper.java index 4ca2d98024d4..c3f5becfb3be 100644 --- a/processing/src/main/java/io/druid/query/search/RoaringBitmapDecisionHelper.java +++ b/processing/src/main/java/io/druid/query/search/RoaringBitmapDecisionHelper.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.search.search; +package io.druid.query.search; public class RoaringBitmapDecisionHelper extends SearchQueryDecisionHelper { diff --git a/processing/src/main/java/io/druid/query/search/SearchBinaryFn.java b/processing/src/main/java/io/druid/query/search/SearchBinaryFn.java index e05798a2b274..85578be9c4ff 100644 --- a/processing/src/main/java/io/druid/query/search/SearchBinaryFn.java +++ b/processing/src/main/java/io/druid/query/search/SearchBinaryFn.java @@ -25,8 +25,6 @@ import io.druid.java.util.common.granularity.Granularity; import io.druid.java.util.common.guava.nary.BinaryFn; import io.druid.query.Result; -import io.druid.query.search.search.SearchHit; -import io.druid.query.search.search.SearchSortSpec; import org.joda.time.DateTime; import java.util.Arrays; diff --git a/processing/src/main/java/io/druid/query/search/SearchHit.java b/processing/src/main/java/io/druid/query/search/SearchHit.java index 11b5d07b60ca..52e6692f989a 100644 --- a/processing/src/main/java/io/druid/query/search/SearchHit.java +++ b/processing/src/main/java/io/druid/query/search/SearchHit.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.search.search; +package io.druid.query.search; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/processing/src/main/java/io/druid/query/search/search/SearchQuery.java b/processing/src/main/java/io/druid/query/search/SearchQuery.java similarity index 98% rename from processing/src/main/java/io/druid/query/search/search/SearchQuery.java rename to processing/src/main/java/io/druid/query/search/SearchQuery.java index e351d64b029a..f9cd866e1f7f 100644 --- a/processing/src/main/java/io/druid/query/search/search/SearchQuery.java +++ b/processing/src/main/java/io/druid/query/search/SearchQuery.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.search.search; +package io.druid.query.search; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -32,7 +32,6 @@ import io.druid.query.dimension.DimensionSpec; import io.druid.query.filter.DimFilter; import io.druid.query.ordering.StringComparators; -import io.druid.query.search.SearchResultValue; import io.druid.query.spec.QuerySegmentSpec; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/search/SearchQueryConfig.java b/processing/src/main/java/io/druid/query/search/SearchQueryConfig.java index 5e2280c0df5d..2b1844c86833 100644 --- a/processing/src/main/java/io/druid/query/search/SearchQueryConfig.java +++ b/processing/src/main/java/io/druid/query/search/SearchQueryConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.search.search; +package io.druid.query.search; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/processing/src/main/java/io/druid/query/search/SearchQueryDecisionHelper.java b/processing/src/main/java/io/druid/query/search/SearchQueryDecisionHelper.java index fc965a432c6b..116ea0f971bf 100644 --- a/processing/src/main/java/io/druid/query/search/SearchQueryDecisionHelper.java +++ b/processing/src/main/java/io/druid/query/search/SearchQueryDecisionHelper.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.search.search; +package io.druid.query.search; public abstract class SearchQueryDecisionHelper { diff --git a/processing/src/main/java/io/druid/query/search/SearchQueryExecutor.java b/processing/src/main/java/io/druid/query/search/SearchQueryExecutor.java index 829550c7e7b9..38aef67b535c 100644 --- a/processing/src/main/java/io/druid/query/search/SearchQueryExecutor.java +++ b/processing/src/main/java/io/druid/query/search/SearchQueryExecutor.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.search.search; +package io.druid.query.search; import io.druid.query.dimension.DimensionSpec; import io.druid.segment.Segment; diff --git a/processing/src/main/java/io/druid/query/search/SearchQueryQueryToolChest.java b/processing/src/main/java/io/druid/query/search/SearchQueryQueryToolChest.java index 6e9aa50956a9..9dfa05d3f23b 100644 --- a/processing/src/main/java/io/druid/query/search/SearchQueryQueryToolChest.java +++ b/processing/src/main/java/io/druid/query/search/SearchQueryQueryToolChest.java @@ -52,9 +52,6 @@ import io.druid.query.aggregation.MetricManipulationFn; import io.druid.query.dimension.DimensionSpec; import io.druid.query.filter.DimFilter; -import io.druid.query.search.search.SearchHit; -import io.druid.query.search.search.SearchQuery; -import io.druid.query.search.search.SearchQueryConfig; import javax.annotation.Nullable; import java.nio.ByteBuffer; diff --git a/processing/src/main/java/io/druid/query/search/SearchQueryRunner.java b/processing/src/main/java/io/druid/query/search/SearchQueryRunner.java index fc849bacf25d..dcdcef9321e5 100644 --- a/processing/src/main/java/io/druid/query/search/SearchQueryRunner.java +++ b/processing/src/main/java/io/druid/query/search/SearchQueryRunner.java @@ -35,10 +35,6 @@ import io.druid.query.Result; import io.druid.query.dimension.ColumnSelectorStrategy; import io.druid.query.dimension.ColumnSelectorStrategyFactory; -import io.druid.query.search.search.SearchHit; -import io.druid.query.search.search.SearchQuery; -import io.druid.query.search.search.SearchQueryExecutor; -import io.druid.query.search.search.SearchQuerySpec; import io.druid.segment.ColumnValueSelector; import io.druid.segment.DimensionSelector; import io.druid.segment.DoubleColumnSelector; diff --git a/processing/src/main/java/io/druid/query/search/SearchQueryRunnerFactory.java b/processing/src/main/java/io/druid/query/search/SearchQueryRunnerFactory.java index 46093cf0739c..e03185e0f3fc 100644 --- a/processing/src/main/java/io/druid/query/search/SearchQueryRunnerFactory.java +++ b/processing/src/main/java/io/druid/query/search/SearchQueryRunnerFactory.java @@ -26,7 +26,6 @@ import io.druid.query.QueryToolChest; import io.druid.query.QueryWatcher; import io.druid.query.Result; -import io.druid.query.search.search.SearchQuery; import io.druid.segment.Segment; import java.util.concurrent.ExecutorService; diff --git a/processing/src/main/java/io/druid/query/search/SearchQuerySpec.java b/processing/src/main/java/io/druid/query/search/SearchQuerySpec.java index b3429a3c8cb0..4a1cbdc6b13e 100644 --- a/processing/src/main/java/io/druid/query/search/SearchQuerySpec.java +++ b/processing/src/main/java/io/druid/query/search/SearchQuerySpec.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.search.search; +package io.druid.query.search; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/processing/src/main/java/io/druid/query/search/SearchResultValue.java b/processing/src/main/java/io/druid/query/search/SearchResultValue.java index 0d6b41832563..711d831a4b63 100644 --- a/processing/src/main/java/io/druid/query/search/SearchResultValue.java +++ b/processing/src/main/java/io/druid/query/search/SearchResultValue.java @@ -21,7 +21,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import io.druid.query.search.search.SearchHit; import java.util.Iterator; import java.util.List; diff --git a/processing/src/main/java/io/druid/query/search/SearchSortSpec.java b/processing/src/main/java/io/druid/query/search/SearchSortSpec.java index b3e0f392122a..903d1206aec5 100644 --- a/processing/src/main/java/io/druid/query/search/SearchSortSpec.java +++ b/processing/src/main/java/io/druid/query/search/SearchSortSpec.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.search.search; +package io.druid.query.search; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/processing/src/main/java/io/druid/query/search/SearchStrategy.java b/processing/src/main/java/io/druid/query/search/SearchStrategy.java index 528a50faf06f..08db1796a79f 100644 --- a/processing/src/main/java/io/druid/query/search/SearchStrategy.java +++ b/processing/src/main/java/io/druid/query/search/SearchStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.search.search; +package io.druid.query.search; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; diff --git a/processing/src/main/java/io/druid/query/search/SearchStrategySelector.java b/processing/src/main/java/io/druid/query/search/SearchStrategySelector.java index b2c79d55f974..91e431737914 100644 --- a/processing/src/main/java/io/druid/query/search/SearchStrategySelector.java +++ b/processing/src/main/java/io/druid/query/search/SearchStrategySelector.java @@ -23,12 +23,6 @@ import com.google.inject.Inject; import com.metamx.emitter.EmittingLogger; import io.druid.java.util.common.ISE; -import io.druid.query.search.search.AutoStrategy; -import io.druid.query.search.search.CursorOnlyStrategy; -import io.druid.query.search.search.UseIndexesStrategy; -import io.druid.query.search.search.SearchQuery; -import io.druid.query.search.search.SearchQueryConfig; -import io.druid.query.search.search.SearchStrategy; public class SearchStrategySelector { diff --git a/processing/src/main/java/io/druid/query/search/UseIndexesStrategy.java b/processing/src/main/java/io/druid/query/search/UseIndexesStrategy.java index d755a87b6b63..2597747e8ec5 100644 --- a/processing/src/main/java/io/druid/query/search/UseIndexesStrategy.java +++ b/processing/src/main/java/io/druid/query/search/UseIndexesStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package io.druid.query.search.search; +package io.druid.query.search; import com.google.common.base.Preconditions; import com.google.common.base.Strings; @@ -32,7 +32,7 @@ import io.druid.query.extraction.IdentityExtractionFn; import io.druid.query.filter.BitmapIndexSelector; import io.druid.query.filter.Filter; -import io.druid.query.search.search.CursorOnlyStrategy.CursorBasedExecutor; +import io.druid.query.search.CursorOnlyStrategy.CursorBasedExecutor; import io.druid.segment.ColumnSelectorBitmapIndexSelector; import io.druid.segment.QueryableIndex; import io.druid.segment.Segment; diff --git a/processing/src/main/java/io/druid/segment/filter/SearchQueryFilter.java b/processing/src/main/java/io/druid/segment/filter/SearchQueryFilter.java index 8bc5ef683ecd..1d90a52d0d9b 100644 --- a/processing/src/main/java/io/druid/segment/filter/SearchQueryFilter.java +++ b/processing/src/main/java/io/druid/segment/filter/SearchQueryFilter.java @@ -27,7 +27,7 @@ import io.druid.query.filter.DruidFloatPredicate; import io.druid.query.filter.DruidLongPredicate; import io.druid.query.filter.DruidPredicateFactory; -import io.druid.query.search.search.SearchQuerySpec; +import io.druid.query.search.SearchQuerySpec; /** */ diff --git a/processing/src/test/java/io/druid/query/TestQueryRunners.java b/processing/src/test/java/io/druid/query/TestQueryRunners.java index a4f877a2f511..f74c0a6eca24 100644 --- a/processing/src/test/java/io/druid/query/TestQueryRunners.java +++ b/processing/src/test/java/io/druid/query/TestQueryRunners.java @@ -26,7 +26,7 @@ import io.druid.query.search.SearchQueryQueryToolChest; import io.druid.query.search.SearchQueryRunnerFactory; import io.druid.query.search.SearchStrategySelector; -import io.druid.query.search.search.SearchQueryConfig; +import io.druid.query.search.SearchQueryConfig; import io.druid.query.timeboundary.TimeBoundaryQueryRunnerFactory; import io.druid.query.timeseries.TimeseriesQueryEngine; import io.druid.query.timeseries.TimeseriesQueryQueryToolChest; diff --git a/processing/src/test/java/io/druid/query/aggregation/FilteredAggregatorTest.java b/processing/src/test/java/io/druid/query/aggregation/FilteredAggregatorTest.java index d9d4382ee821..d3ddb3640ca8 100644 --- a/processing/src/test/java/io/druid/query/aggregation/FilteredAggregatorTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/FilteredAggregatorTest.java @@ -38,7 +38,7 @@ import io.druid.query.filter.ValueMatcher; import io.druid.query.monomorphicprocessing.RuntimeShapeInspector; import io.druid.query.ordering.StringComparators; -import io.druid.query.search.search.ContainsSearchQuerySpec; +import io.druid.query.search.ContainsSearchQuerySpec; import io.druid.segment.ColumnSelectorFactory; import io.druid.segment.ColumnValueSelector; import io.druid.segment.DimensionSelector; diff --git a/processing/src/test/java/io/druid/query/extraction/SearchQuerySpecDimExtractionFnTest.java b/processing/src/test/java/io/druid/query/extraction/SearchQuerySpecDimExtractionFnTest.java index d0e7280f0a5b..6790547e7b55 100644 --- a/processing/src/test/java/io/druid/query/extraction/SearchQuerySpecDimExtractionFnTest.java +++ b/processing/src/test/java/io/druid/query/extraction/SearchQuerySpecDimExtractionFnTest.java @@ -23,8 +23,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import io.druid.jackson.DefaultObjectMapper; -import io.druid.query.search.search.FragmentSearchQuerySpec; -import io.druid.query.search.search.SearchQuerySpec; +import io.druid.query.search.FragmentSearchQuerySpec; +import io.druid.query.search.SearchQuerySpec; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/filter/GetDimensionRangeSetTest.java b/processing/src/test/java/io/druid/query/filter/GetDimensionRangeSetTest.java index 30bfe9bcb28b..1ba026c01b9b 100644 --- a/processing/src/test/java/io/druid/query/filter/GetDimensionRangeSetTest.java +++ b/processing/src/test/java/io/druid/query/filter/GetDimensionRangeSetTest.java @@ -27,7 +27,7 @@ import io.druid.js.JavaScriptConfig; import io.druid.query.extraction.IdentityExtractionFn; import io.druid.query.ordering.StringComparators; -import io.druid.query.search.search.ContainsSearchQuerySpec; +import io.druid.query.search.ContainsSearchQuerySpec; import io.druid.segment.column.Column; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/filter/SearchQueryDimFilterTest.java b/processing/src/test/java/io/druid/query/filter/SearchQueryDimFilterTest.java index fca7ddb43e04..03a9813bee89 100644 --- a/processing/src/test/java/io/druid/query/filter/SearchQueryDimFilterTest.java +++ b/processing/src/test/java/io/druid/query/filter/SearchQueryDimFilterTest.java @@ -21,7 +21,7 @@ import io.druid.java.util.common.StringUtils; import io.druid.query.extraction.RegexDimExtractionFn; -import io.druid.query.search.search.SearchQuerySpec; +import io.druid.query.search.SearchQuerySpec; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerTest.java b/processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerTest.java index 439dc6fc34ca..35ba74a9a39b 100644 --- a/processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerTest.java +++ b/processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerTest.java @@ -122,7 +122,7 @@ import io.druid.query.groupby.strategy.GroupByStrategyV2; import io.druid.query.lookup.LookupExtractionFn; import io.druid.query.ordering.StringComparators; -import io.druid.query.search.search.ContainsSearchQuerySpec; +import io.druid.query.search.ContainsSearchQuerySpec; import io.druid.query.spec.MultipleIntervalSegmentSpec; import io.druid.segment.TestHelper; import io.druid.segment.column.Column; diff --git a/processing/src/test/java/io/druid/query/search/RegexSearchQueryTest.java b/processing/src/test/java/io/druid/query/search/RegexSearchQueryTest.java index 223ed337b25a..3924ef7da015 100644 --- a/processing/src/test/java/io/druid/query/search/RegexSearchQueryTest.java +++ b/processing/src/test/java/io/druid/query/search/RegexSearchQueryTest.java @@ -21,7 +21,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.druid.jackson.DefaultObjectMapper; -import io.druid.query.search.search.RegexSearchQuerySpec; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/search/SearchBinaryFnTest.java b/processing/src/test/java/io/druid/query/search/SearchBinaryFnTest.java index 5ef096773bd8..0c08396fab17 100644 --- a/processing/src/test/java/io/druid/query/search/SearchBinaryFnTest.java +++ b/processing/src/test/java/io/druid/query/search/SearchBinaryFnTest.java @@ -24,8 +24,6 @@ import io.druid.java.util.common.granularity.Granularities; import io.druid.query.Result; import io.druid.query.ordering.StringComparators; -import io.druid.query.search.search.SearchHit; -import io.druid.query.search.search.SearchSortSpec; import org.joda.time.DateTime; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/search/SearchQueryQueryToolChestTest.java b/processing/src/test/java/io/druid/query/search/SearchQueryQueryToolChestTest.java index 988eeb516b6e..621a435f5e95 100644 --- a/processing/src/test/java/io/druid/query/search/SearchQueryQueryToolChestTest.java +++ b/processing/src/test/java/io/druid/query/search/SearchQueryQueryToolChestTest.java @@ -29,9 +29,6 @@ import io.druid.query.Druids; import io.druid.query.Result; import io.druid.query.TableDataSource; -import io.druid.query.search.search.FragmentSearchQuerySpec; -import io.druid.query.search.search.SearchHit; -import io.druid.query.search.search.SearchQuery; import io.druid.query.spec.MultipleIntervalSegmentSpec; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/query/search/SearchQueryRunnerTest.java b/processing/src/test/java/io/druid/query/search/SearchQueryRunnerTest.java index 95691ceaaa7d..5a3ed480256c 100644 --- a/processing/src/test/java/io/druid/query/search/SearchQueryRunnerTest.java +++ b/processing/src/test/java/io/druid/query/search/SearchQueryRunnerTest.java @@ -49,11 +49,6 @@ import io.druid.query.filter.SelectorDimFilter; import io.druid.query.lookup.LookupExtractionFn; import io.druid.query.ordering.StringComparators; -import io.druid.query.search.search.FragmentSearchQuerySpec; -import io.druid.query.search.search.SearchHit; -import io.druid.query.search.search.SearchQuery; -import io.druid.query.search.search.SearchQueryConfig; -import io.druid.query.search.search.SearchSortSpec; import io.druid.query.spec.MultipleIntervalSegmentSpec; import io.druid.segment.QueryableIndexSegment; import io.druid.segment.TestHelper; diff --git a/processing/src/test/java/io/druid/query/search/SearchQueryRunnerWithCaseTest.java b/processing/src/test/java/io/druid/query/search/SearchQueryRunnerWithCaseTest.java index a5ea8127f110..114d963acaaf 100644 --- a/processing/src/test/java/io/druid/query/search/SearchQueryRunnerWithCaseTest.java +++ b/processing/src/test/java/io/druid/query/search/SearchQueryRunnerWithCaseTest.java @@ -31,12 +31,6 @@ import io.druid.query.QueryPlus; import io.druid.query.QueryRunner; import io.druid.query.Result; -import io.druid.query.search.search.AutoStrategy; -import io.druid.query.search.search.CursorOnlyStrategy; -import io.druid.query.search.search.SearchHit; -import io.druid.query.search.search.SearchQuery; -import io.druid.query.search.search.SearchQueryConfig; -import io.druid.query.search.search.UseIndexesStrategy; import io.druid.segment.IncrementalIndexSegment; import io.druid.segment.QueryableIndex; import io.druid.segment.QueryableIndexSegment; diff --git a/processing/src/test/java/io/druid/query/search/SearchSortSpecTest.java b/processing/src/test/java/io/druid/query/search/SearchSortSpecTest.java index 09d75ee6d62a..046c76ec145d 100644 --- a/processing/src/test/java/io/druid/query/search/SearchSortSpecTest.java +++ b/processing/src/test/java/io/druid/query/search/SearchSortSpecTest.java @@ -22,8 +22,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.druid.jackson.DefaultObjectMapper; import io.druid.query.ordering.StringComparators; -import io.druid.query.search.search.SearchHit; -import io.druid.query.search.search.SearchSortSpec; import org.junit.Assert; import org.junit.Test; diff --git a/processing/src/test/java/io/druid/segment/AppendTest.java b/processing/src/test/java/io/druid/segment/AppendTest.java index 73ff071087b9..0f8a3a269cf0 100644 --- a/processing/src/test/java/io/druid/segment/AppendTest.java +++ b/processing/src/test/java/io/druid/segment/AppendTest.java @@ -45,8 +45,8 @@ import io.druid.query.aggregation.post.FieldAccessPostAggregator; import io.druid.query.filter.DimFilter; import io.druid.query.search.SearchResultValue; -import io.druid.query.search.search.SearchHit; -import io.druid.query.search.search.SearchQuery; +import io.druid.query.search.SearchHit; +import io.druid.query.search.SearchQuery; import io.druid.query.spec.MultipleIntervalSegmentSpec; import io.druid.query.spec.QuerySegmentSpec; import io.druid.query.timeboundary.TimeBoundaryQuery; diff --git a/processing/src/test/java/io/druid/segment/SchemalessTestFullTest.java b/processing/src/test/java/io/druid/segment/SchemalessTestFullTest.java index ea1391825d71..ed535a769dda 100644 --- a/processing/src/test/java/io/druid/segment/SchemalessTestFullTest.java +++ b/processing/src/test/java/io/druid/segment/SchemalessTestFullTest.java @@ -46,8 +46,8 @@ import io.druid.query.aggregation.post.ConstantPostAggregator; import io.druid.query.aggregation.post.FieldAccessPostAggregator; import io.druid.query.search.SearchResultValue; -import io.druid.query.search.search.SearchHit; -import io.druid.query.search.search.SearchQuery; +import io.druid.query.search.SearchHit; +import io.druid.query.search.SearchQuery; import io.druid.query.spec.MultipleIntervalSegmentSpec; import io.druid.query.spec.QuerySegmentSpec; import io.druid.query.timeboundary.TimeBoundaryQuery; diff --git a/processing/src/test/java/io/druid/segment/SchemalessTestSimpleTest.java b/processing/src/test/java/io/druid/segment/SchemalessTestSimpleTest.java index 69facab0d421..a5b0adc09808 100644 --- a/processing/src/test/java/io/druid/segment/SchemalessTestSimpleTest.java +++ b/processing/src/test/java/io/druid/segment/SchemalessTestSimpleTest.java @@ -42,8 +42,8 @@ import io.druid.query.aggregation.post.ConstantPostAggregator; import io.druid.query.aggregation.post.FieldAccessPostAggregator; import io.druid.query.search.SearchResultValue; -import io.druid.query.search.search.SearchHit; -import io.druid.query.search.search.SearchQuery; +import io.druid.query.search.SearchHit; +import io.druid.query.search.SearchQuery; import io.druid.query.spec.MultipleIntervalSegmentSpec; import io.druid.query.spec.QuerySegmentSpec; import io.druid.query.timeboundary.TimeBoundaryQuery; diff --git a/processing/src/test/java/io/druid/segment/filter/FloatAndDoubleFilteringTest.java b/processing/src/test/java/io/druid/segment/filter/FloatAndDoubleFilteringTest.java index b737be71623a..f20f7597724c 100644 --- a/processing/src/test/java/io/druid/segment/filter/FloatAndDoubleFilteringTest.java +++ b/processing/src/test/java/io/druid/segment/filter/FloatAndDoubleFilteringTest.java @@ -49,7 +49,7 @@ import io.druid.query.lookup.LookupExtractionFn; import io.druid.query.lookup.LookupExtractor; import io.druid.query.ordering.StringComparators; -import io.druid.query.search.search.ContainsSearchQuerySpec; +import io.druid.query.search.ContainsSearchQuerySpec; import io.druid.segment.IndexBuilder; import io.druid.segment.StorageAdapter; import io.druid.segment.incremental.IncrementalIndexSchema; diff --git a/processing/src/test/java/io/druid/segment/filter/LongFilteringTest.java b/processing/src/test/java/io/druid/segment/filter/LongFilteringTest.java index 8e621bb10f0e..a4a7b4a68b17 100644 --- a/processing/src/test/java/io/druid/segment/filter/LongFilteringTest.java +++ b/processing/src/test/java/io/druid/segment/filter/LongFilteringTest.java @@ -47,7 +47,7 @@ import io.druid.query.lookup.LookupExtractionFn; import io.druid.query.lookup.LookupExtractor; import io.druid.query.ordering.StringComparators; -import io.druid.query.search.search.ContainsSearchQuerySpec; +import io.druid.query.search.ContainsSearchQuerySpec; import io.druid.segment.IndexBuilder; import io.druid.segment.StorageAdapter; import io.druid.segment.incremental.IncrementalIndexSchema; diff --git a/processing/src/test/java/io/druid/segment/filter/SearchQueryFilterTest.java b/processing/src/test/java/io/druid/segment/filter/SearchQueryFilterTest.java index 49fd96b2b684..e3cf67ef6c13 100644 --- a/processing/src/test/java/io/druid/segment/filter/SearchQueryFilterTest.java +++ b/processing/src/test/java/io/druid/segment/filter/SearchQueryFilterTest.java @@ -34,8 +34,8 @@ import io.druid.query.extraction.ExtractionFn; import io.druid.query.extraction.JavaScriptExtractionFn; import io.druid.query.filter.SearchQueryDimFilter; -import io.druid.query.search.search.ContainsSearchQuerySpec; -import io.druid.query.search.search.SearchQuerySpec; +import io.druid.query.search.ContainsSearchQuerySpec; +import io.druid.query.search.SearchQuerySpec; import io.druid.segment.IndexBuilder; import io.druid.segment.StorageAdapter; import org.junit.AfterClass; diff --git a/processing/src/test/java/io/druid/segment/filter/TimeFilteringTest.java b/processing/src/test/java/io/druid/segment/filter/TimeFilteringTest.java index 4c8167049124..40780d33a23f 100644 --- a/processing/src/test/java/io/druid/segment/filter/TimeFilteringTest.java +++ b/processing/src/test/java/io/druid/segment/filter/TimeFilteringTest.java @@ -46,7 +46,7 @@ import io.druid.query.lookup.LookupExtractionFn; import io.druid.query.lookup.LookupExtractor; import io.druid.query.ordering.StringComparators; -import io.druid.query.search.search.ContainsSearchQuerySpec; +import io.druid.query.search.ContainsSearchQuerySpec; import io.druid.segment.IndexBuilder; import io.druid.segment.StorageAdapter; import io.druid.segment.column.Column; diff --git a/server/src/main/java/io/druid/guice/QueryRunnerFactoryModule.java b/server/src/main/java/io/druid/guice/QueryRunnerFactoryModule.java index 8a982601fec5..277b0d931931 100644 --- a/server/src/main/java/io/druid/guice/QueryRunnerFactoryModule.java +++ b/server/src/main/java/io/druid/guice/QueryRunnerFactoryModule.java @@ -33,7 +33,7 @@ import io.druid.query.metadata.SegmentMetadataQueryRunnerFactory; import io.druid.query.metadata.metadata.SegmentMetadataQuery; import io.druid.query.search.SearchQueryRunnerFactory; -import io.druid.query.search.search.SearchQuery; +import io.druid.query.search.SearchQuery; import io.druid.query.select.SelectQuery; import io.druid.query.select.SelectQueryRunnerFactory; import io.druid.query.timeboundary.TimeBoundaryQuery; diff --git a/server/src/main/java/io/druid/guice/QueryToolChestModule.java b/server/src/main/java/io/druid/guice/QueryToolChestModule.java index 3e4da18bb4d6..7b1dd4d73810 100644 --- a/server/src/main/java/io/druid/guice/QueryToolChestModule.java +++ b/server/src/main/java/io/druid/guice/QueryToolChestModule.java @@ -41,8 +41,8 @@ import io.druid.query.metadata.SegmentMetadataQueryQueryToolChest; import io.druid.query.metadata.metadata.SegmentMetadataQuery; import io.druid.query.search.SearchQueryQueryToolChest; -import io.druid.query.search.search.SearchQuery; -import io.druid.query.search.search.SearchQueryConfig; +import io.druid.query.search.SearchQuery; +import io.druid.query.search.SearchQueryConfig; import io.druid.query.select.SelectQuery; import io.druid.query.select.SelectQueryConfig; import io.druid.query.select.SelectQueryQueryToolChest; diff --git a/server/src/test/java/io/druid/client/CachingClusteredClientTest.java b/server/src/test/java/io/druid/client/CachingClusteredClientTest.java index 6c27ff86ddf4..f45018f8a402 100644 --- a/server/src/test/java/io/druid/client/CachingClusteredClientTest.java +++ b/server/src/test/java/io/druid/client/CachingClusteredClientTest.java @@ -103,9 +103,9 @@ import io.druid.query.ordering.StringComparators; import io.druid.query.search.SearchQueryQueryToolChest; import io.druid.query.search.SearchResultValue; -import io.druid.query.search.search.SearchHit; -import io.druid.query.search.search.SearchQuery; -import io.druid.query.search.search.SearchQueryConfig; +import io.druid.query.search.SearchHit; +import io.druid.query.search.SearchQuery; +import io.druid.query.search.SearchQueryConfig; import io.druid.query.select.EventHolder; import io.druid.query.select.PagingSpec; import io.druid.query.select.SelectQuery; diff --git a/server/src/test/java/io/druid/server/coordination/ServerManagerTest.java b/server/src/test/java/io/druid/server/coordination/ServerManagerTest.java index 33cf26e9dd95..e2fcbe53baf3 100644 --- a/server/src/test/java/io/druid/server/coordination/ServerManagerTest.java +++ b/server/src/test/java/io/druid/server/coordination/ServerManagerTest.java @@ -56,7 +56,7 @@ import io.druid.query.Result; import io.druid.query.aggregation.MetricManipulationFn; import io.druid.query.search.SearchResultValue; -import io.druid.query.search.search.SearchQuery; +import io.druid.query.search.SearchQuery; import io.druid.segment.AbstractSegment; import io.druid.segment.IndexIO; import io.druid.segment.QueryableIndex; From d53d15fb24cb05d3e76cf874ac2733014da1e9b1 Mon Sep 17 00:00:00 2001 From: Akash Dwivedi Date: Thu, 14 Sep 2017 11:50:44 -0700 Subject: [PATCH 3/3] remove unused import. --- .../java/io/druid/query/DefaultGenericQueryMetricsFactory.java | 3 +-- processing/src/main/java/io/druid/query/QueryMetrics.java | 3 +-- processing/src/main/java/io/druid/query/filter/Filter.java | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/processing/src/main/java/io/druid/query/DefaultGenericQueryMetricsFactory.java b/processing/src/main/java/io/druid/query/DefaultGenericQueryMetricsFactory.java index da65dcaa7600..f9b63921784d 100644 --- a/processing/src/main/java/io/druid/query/DefaultGenericQueryMetricsFactory.java +++ b/processing/src/main/java/io/druid/query/DefaultGenericQueryMetricsFactory.java @@ -25,7 +25,6 @@ import io.druid.guice.LazySingleton; import io.druid.guice.annotations.Json; import io.druid.jackson.DefaultObjectMapper; -import io.druid.query.search.SearchQueryConfig; @LazySingleton public class DefaultGenericQueryMetricsFactory implements GenericQueryMetricsFactory @@ -36,7 +35,7 @@ public class DefaultGenericQueryMetricsFactory implements GenericQueryMetricsFac /** * Should be used only in tests, directly or indirectly (e. g. in {@link * io.druid.query.search.SearchQueryQueryToolChest#SearchQueryQueryToolChest( - * SearchQueryConfig, IntervalChunkingQueryRunnerDecorator)}). + * io.druid.query.search.SearchQueryConfig, IntervalChunkingQueryRunnerDecorator)}). */ @VisibleForTesting public static GenericQueryMetricsFactory instance() diff --git a/processing/src/main/java/io/druid/query/QueryMetrics.java b/processing/src/main/java/io/druid/query/QueryMetrics.java index 8f3fb7d939e9..bc8731f683b2 100644 --- a/processing/src/main/java/io/druid/query/QueryMetrics.java +++ b/processing/src/main/java/io/druid/query/QueryMetrics.java @@ -22,7 +22,6 @@ import com.metamx.emitter.service.ServiceEmitter; import io.druid.collections.bitmap.BitmapFactory; import io.druid.query.filter.Filter; -import io.druid.query.search.SearchQuery; import org.joda.time.Interval; import java.util.List; @@ -111,7 +110,7 @@ * * Making subinterfaces of QueryMetrics for emitting custom dimensions and/or metrics for specific query types * ----------------------------------------------------------------------------------------------------------- - * If a query type (e. g. {@link SearchQuery} (it's runners) needs to emit custom + * If a query type (e. g. {@link io.druid.query.search.SearchQuery} (it's runners) needs to emit custom * dimensions and/or metrics which doesn't make sense for all other query types, the following steps should be executed: * 1. Create `interface SearchQueryMetrics extends QueryMetrics` (here and below "Search" is the query type) with * additional methods (see "Adding new methods" section above). diff --git a/processing/src/main/java/io/druid/query/filter/Filter.java b/processing/src/main/java/io/druid/query/filter/Filter.java index c0561282bf57..10da86ba0fe2 100644 --- a/processing/src/main/java/io/druid/query/filter/Filter.java +++ b/processing/src/main/java/io/druid/query/filter/Filter.java @@ -22,7 +22,6 @@ import io.druid.collections.bitmap.ImmutableBitmap; import io.druid.query.BitmapResultFactory; import io.druid.query.DefaultBitmapResultFactory; -import io.druid.query.search.AutoStrategy; import io.druid.segment.ColumnSelector; import io.druid.segment.ColumnSelectorFactory; @@ -61,7 +60,7 @@ default ImmutableBitmap getBitmapIndex(BitmapIndexSelector selector) /** * Estimate selectivity of this filter. - * This method can be used for cost-based query planning like in {@link AutoStrategy}. + * This method can be used for cost-based query planning like in {@link io.druid.query.search.AutoStrategy}. * To avoid significant performance degradation for calculating the exact cost, * implementation of this method targets to achieve rapid selectivity estimation * with reasonable sacrifice of the accuracy.