diff --git a/processing/src/main/java/io/druid/query/CacheStrategy.java b/processing/src/main/java/io/druid/query/CacheStrategy.java index 737ed30ad5b..f77affcb5bf 100644 --- a/processing/src/main/java/io/druid/query/CacheStrategy.java +++ b/processing/src/main/java/io/druid/query/CacheStrategy.java @@ -35,7 +35,5 @@ public interface CacheStrategy> public Function pullFromCache(); - public int getCacheLimit(); - public Sequence mergeSequences(Sequence> seqOfSequences); } diff --git a/processing/src/main/java/io/druid/query/GroupByParallelQueryRunner.java b/processing/src/main/java/io/druid/query/GroupByParallelQueryRunner.java index a460cd68485..1edf07b94d4 100644 --- a/processing/src/main/java/io/druid/query/GroupByParallelQueryRunner.java +++ b/processing/src/main/java/io/druid/query/GroupByParallelQueryRunner.java @@ -84,30 +84,30 @@ public class GroupByParallelQueryRunner implements QueryRunner if (Iterables.isEmpty(queryables)) { log.warn("No queryables found."); } - ListenableFuture> futures = Futures.allAsList( + ListenableFuture> futures = Futures.allAsList( Lists.newArrayList( Iterables.transform( queryables, - new Function, ListenableFuture>() + new Function, ListenableFuture>() { @Override - public ListenableFuture apply(final QueryRunner input) + public ListenableFuture apply(final QueryRunner input) { return exec.submit( - new AbstractPrioritizedCallable(priority) + new AbstractPrioritizedCallable(priority) { @Override - public Boolean call() throws Exception + public Void call() throws Exception { try { if (bySegment) { input.run(queryParam) .accumulate(bySegmentAccumulatorPair.lhs, bySegmentAccumulatorPair.rhs); - return true; + } else { + input.run(queryParam).accumulate(indexAccumulatorPair.lhs, indexAccumulatorPair.rhs); } - input.run(queryParam).accumulate(indexAccumulatorPair.lhs, indexAccumulatorPair.rhs); - return true; + return null; } catch (QueryInterruptedException e) { throw Throwables.propagate(e); diff --git a/processing/src/main/java/io/druid/query/QueryConfig.java b/processing/src/main/java/io/druid/query/QueryConfig.java index 53d757f6c75..f5da67a39a1 100644 --- a/processing/src/main/java/io/druid/query/QueryConfig.java +++ b/processing/src/main/java/io/druid/query/QueryConfig.java @@ -29,16 +29,8 @@ public class QueryConfig @JsonProperty private Period chunkPeriod = new Period(); - @JsonProperty - private int maxResultsToCache = Integer.MAX_VALUE; - public Period getChunkPeriod() { return chunkPeriod; } - - public int getMaxResultsToCache() - { - return maxResultsToCache; - } } diff --git a/processing/src/main/java/io/druid/query/groupby/GroupByQueryConfig.java b/processing/src/main/java/io/druid/query/groupby/GroupByQueryConfig.java index 5e723a2ff23..0139e16742e 100644 --- a/processing/src/main/java/io/druid/query/groupby/GroupByQueryConfig.java +++ b/processing/src/main/java/io/druid/query/groupby/GroupByQueryConfig.java @@ -35,9 +35,6 @@ public class GroupByQueryConfig extends QueryConfig @JsonProperty private int maxResults = 500000; - @JsonProperty - private int maxResultsToCache = 10000; - public boolean isSingleThreaded() { return singleThreaded; @@ -57,10 +54,4 @@ public class GroupByQueryConfig extends QueryConfig { return maxResults; } - - @Override - public int getMaxResultsToCache() - { - return maxResultsToCache; - } } diff --git a/processing/src/main/java/io/druid/query/groupby/GroupByQueryQueryToolChest.java b/processing/src/main/java/io/druid/query/groupby/GroupByQueryQueryToolChest.java index d0ba9b603b1..88216281c4e 100644 --- a/processing/src/main/java/io/druid/query/groupby/GroupByQueryQueryToolChest.java +++ b/processing/src/main/java/io/druid/query/groupby/GroupByQueryQueryToolChest.java @@ -160,7 +160,22 @@ public class GroupByQueryQueryToolChest extends QueryToolChest postAggregate(final GroupByQuery query, IncrementalIndex index) { - return Sequences.simple(index.iterableWithPostAggregations(query.getPostAggregatorSpecs())); + return Sequences.map( + Sequences.simple(index.iterableWithPostAggregations(query.getPostAggregatorSpecs())), + new Function() + { + @Override + public Row apply(Row input) + { + final MapBasedRow row = (MapBasedRow) input; + return new MapBasedRow( + query.getGranularity() + .toDateTime(row.getTimestampFromEpoch()), + row.getEvent() + ); + } + } + ); } private IncrementalIndex makeIncrementalIndex(GroupByQuery query, Sequence rows) @@ -179,7 +194,6 @@ public class GroupByQueryQueryToolChest extends QueryToolChest mergeSequences(Sequence> seqOfSequences) { return new OrderedMergeSequence<>(Ordering.natural().nullsFirst(), seqOfSequences); - //return new ConcatSequence<>(seqOfSequences); } @Override @@ -341,12 +355,6 @@ public class GroupByQueryQueryToolChest extends QueryToolChest mergeSequences(Sequence> seqOfSequences) { diff --git a/processing/src/main/java/io/druid/query/groupby/GroupByQueryRunnerFactory.java b/processing/src/main/java/io/druid/query/groupby/GroupByQueryRunnerFactory.java index 24e85b9f1c2..1cc5600c3b6 100644 --- a/processing/src/main/java/io/druid/query/groupby/GroupByQueryRunnerFactory.java +++ b/processing/src/main/java/io/druid/query/groupby/GroupByQueryRunnerFactory.java @@ -117,11 +117,11 @@ public class GroupByQueryRunnerFactory implements QueryRunnerFactory future = queryExecutor.submit( - new AbstractPrioritizedCallable(priority) + final ListenableFuture future = queryExecutor.submit( + new AbstractPrioritizedCallable(priority) { @Override - public Boolean call() throws Exception + public Void call() throws Exception { if (bySegment) { input.run(queryParam) @@ -129,11 +129,11 @@ public class GroupByQueryRunnerFactory implements QueryRunnerFactory mergeSequences(Sequence> seqOfSequences) { 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 e3e6ad77152..e24239f8896 100644 --- a/processing/src/main/java/io/druid/query/search/SearchQueryQueryToolChest.java +++ b/processing/src/main/java/io/druid/query/search/SearchQueryQueryToolChest.java @@ -248,13 +248,6 @@ public class SearchQueryQueryToolChest extends QueryToolChest> mergeSequences(Sequence>> seqOfSequences) { diff --git a/processing/src/main/java/io/druid/query/select/SelectQueryConfig.java b/processing/src/main/java/io/druid/query/select/SelectQueryConfig.java deleted file mode 100644 index e5975df41c5..00000000000 --- a/processing/src/main/java/io/druid/query/select/SelectQueryConfig.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Druid - a distributed column store. - * Copyright (C) 2012, 2013 Metamarkets Group Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -package io.druid.query.select; - -import com.fasterxml.jackson.annotation.JsonProperty; -import io.druid.query.QueryConfig; - -/** - */ -public class SelectQueryConfig extends QueryConfig -{ - @JsonProperty - private int maxResultsToCache = 10000; - - @Override - public int getMaxResultsToCache() - { - return maxResultsToCache; - } -} diff --git a/processing/src/main/java/io/druid/query/select/SelectQueryQueryToolChest.java b/processing/src/main/java/io/druid/query/select/SelectQueryQueryToolChest.java index 1a48e66269c..95480302336 100644 --- a/processing/src/main/java/io/druid/query/select/SelectQueryQueryToolChest.java +++ b/processing/src/main/java/io/druid/query/select/SelectQueryQueryToolChest.java @@ -71,11 +71,11 @@ public class SelectQueryQueryToolChest extends QueryToolChest> mergeSequences(Sequence>> seqOfSequences) { diff --git a/processing/src/main/java/io/druid/query/timeboundary/TimeBoundaryQueryQueryToolChest.java b/processing/src/main/java/io/druid/query/timeboundary/TimeBoundaryQueryQueryToolChest.java index b77b11105e3..fdde44b8581 100644 --- a/processing/src/main/java/io/druid/query/timeboundary/TimeBoundaryQueryQueryToolChest.java +++ b/processing/src/main/java/io/druid/query/timeboundary/TimeBoundaryQueryQueryToolChest.java @@ -189,12 +189,6 @@ public class TimeBoundaryQueryQueryToolChest }; } - @Override - public int getCacheLimit() - { - return Integer.MAX_VALUE; - } - @Override public Sequence> mergeSequences(Sequence>> seqOfSequences) { diff --git a/processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryQueryToolChest.java b/processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryQueryToolChest.java index 2f1361ddfd4..e7c7e0849b5 100644 --- a/processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryQueryToolChest.java +++ b/processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryQueryToolChest.java @@ -220,12 +220,6 @@ public class TimeseriesQueryQueryToolChest extends QueryToolChest> mergeSequences(Sequence>> seqOfSequences) { diff --git a/processing/src/main/java/io/druid/query/topn/TopNQueryQueryToolChest.java b/processing/src/main/java/io/druid/query/topn/TopNQueryQueryToolChest.java index 2408e090dc0..ab1faebf67e 100644 --- a/processing/src/main/java/io/druid/query/topn/TopNQueryQueryToolChest.java +++ b/processing/src/main/java/io/druid/query/topn/TopNQueryQueryToolChest.java @@ -368,12 +368,6 @@ public class TopNQueryQueryToolChest extends QueryToolChest> mergeSequences(Sequence>> seqOfSequences) { diff --git a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndex.java b/processing/src/main/java/io/druid/segment/incremental/IncrementalIndex.java index 8d68738c22c..4f6f6a0f67f 100644 --- a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndex.java +++ b/processing/src/main/java/io/druid/segment/incremental/IncrementalIndex.java @@ -534,7 +534,7 @@ public class IncrementalIndex implements Iterable } } - return new MapBasedRow(gran.toDateTime(timeAndDims.getTimestamp()), theVals); + return new MapBasedRow(timeAndDims.getTimestamp(), theVals); } } ); diff --git a/processing/src/test/java/io/druid/query/select/SelectQueryRunnerTest.java b/processing/src/test/java/io/druid/query/select/SelectQueryRunnerTest.java index e5b6fd4760f..07f99165873 100644 --- a/processing/src/test/java/io/druid/query/select/SelectQueryRunnerTest.java +++ b/processing/src/test/java/io/druid/query/select/SelectQueryRunnerTest.java @@ -59,7 +59,7 @@ public class SelectQueryRunnerTest { return QueryRunnerTestHelper.makeQueryRunners( new SelectQueryRunnerFactory( - new SelectQueryQueryToolChest(new SelectQueryConfig(), new DefaultObjectMapper()), + new SelectQueryQueryToolChest(new QueryConfig(), new DefaultObjectMapper()), new SelectQueryEngine(), QueryRunnerTestHelper.NOOP_QUERYWATCHER ) diff --git a/server/src/main/java/io/druid/guice/QueryToolChestModule.java b/server/src/main/java/io/druid/guice/QueryToolChestModule.java index 0b06eddc015..ed5b59591a9 100644 --- a/server/src/main/java/io/druid/guice/QueryToolChestModule.java +++ b/server/src/main/java/io/druid/guice/QueryToolChestModule.java @@ -35,7 +35,6 @@ import io.druid.query.search.SearchQueryQueryToolChest; import io.druid.query.search.search.SearchQuery; import io.druid.query.search.search.SearchQueryConfig; import io.druid.query.select.SelectQuery; -import io.druid.query.select.SelectQueryConfig; import io.druid.query.select.SelectQueryQueryToolChest; import io.druid.query.timeboundary.TimeBoundaryQuery; import io.druid.query.timeboundary.TimeBoundaryQueryQueryToolChest; @@ -75,7 +74,6 @@ public class QueryToolChestModule implements Module JsonConfigProvider.bind(binder, "druid.query", QueryConfig.class); JsonConfigProvider.bind(binder, "druid.query.groupBy", GroupByQueryConfig.class); JsonConfigProvider.bind(binder, "druid.query.search", SearchQueryConfig.class); - JsonConfigProvider.bind(binder, "druid.query.select", SelectQueryConfig.class); JsonConfigProvider.bind(binder, "druid.query.topN", TopNQueryConfig.class); } } diff --git a/server/src/test/java/io/druid/client/CachingClusteredClientTest.java b/server/src/test/java/io/druid/client/CachingClusteredClientTest.java index 4acd5128af4..40036ea0e7a 100644 --- a/server/src/test/java/io/druid/client/CachingClusteredClientTest.java +++ b/server/src/test/java/io/druid/client/CachingClusteredClientTest.java @@ -32,7 +32,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Ordering; import com.metamx.common.ISE; -import com.metamx.common.guava.ConcatSequence; import com.metamx.common.guava.FunctionalIterable; import com.metamx.common.guava.MergeIterable; import com.metamx.common.guava.Sequence; @@ -84,7 +83,6 @@ import io.druid.query.search.search.SearchQueryConfig; import io.druid.query.select.EventHolder; import io.druid.query.select.PagingSpec; import io.druid.query.select.SelectQuery; -import io.druid.query.select.SelectQueryConfig; import io.druid.query.select.SelectQueryQueryToolChest; import io.druid.query.select.SelectResultValue; import io.druid.query.spec.MultipleIntervalSegmentSpec; @@ -779,7 +777,7 @@ public class CachingClusteredClientTest QueryRunner runner = new FinalizeResultsQueryRunner( client, new SelectQueryQueryToolChest( - new SelectQueryConfig(), + new QueryConfig(), jsonMapper ) ); @@ -1620,13 +1618,7 @@ public class CachingClusteredClientTest int index = 0; while (index < objects.length) { DateTime timestamp = (DateTime) objects[index++]; - - //List values = Lists.newArrayList(); - //while (index < objects.length && !(objects[index] instanceof DateTime)) { retVal.add(new MapBasedRow(timestamp, (Map) objects[index++])); - //} - - //retVal.add(new Result<>(timestamp, values)); } return retVal; } @@ -1663,7 +1655,7 @@ public class CachingClusteredClientTest .put(SearchQuery.class, new SearchQueryQueryToolChest(new SearchQueryConfig())) .put( SelectQuery.class, - new SelectQueryQueryToolChest(new SelectQueryConfig(), jsonMapper) + new SelectQueryQueryToolChest(new QueryConfig(), jsonMapper) ) .put( GroupByQuery.class,