Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove QueryRunner.run(Query, responseContext) and related legacy methods #4482

Merged
merged 8 commits into from
Aug 11, 2017
Merged

Remove QueryRunner.run(Query, responseContext) and related legacy methods #4482

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5b97ec6
Remove QueryRunner.run(Query, responseContext) and related legacy met…
leventov Jun 28, 2017
d181407
Merge remote-tracking branch 'upstream/master' into clean-queryRunner…
leventov Jun 30, 2017
736ea2e
Merge remote-tracking branch 'upstream/master' into clean-queryRunner…
leventov Jul 21, 2017
224bdfc
Merge remote-tracking branch 'upstream/master' into clean-queryRunner…
leventov Jul 21, 2017
fe478e8
Remove local var
leventov Jul 27, 2017
9349f05
Merge remote-tracking branch 'upstream/master' into clean-queryRunner…
leventov Jul 27, 2017
562936b
Merge remote-tracking branch 'upstream/master' into clean-queryRunner…
leventov Aug 4, 2017
b28c258
Merge remote-tracking branch 'upstream/master' into clean-queryRunner…
leventov Aug 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion benchmarks/src/main/java/io/druid/benchmark/FilteredAggregatorBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import io.druid.query.Druids;
import io.druid.query.FinalizeResultsQueryRunner;
import io.druid.query.Query;
import io.druid.query.QueryPlus;
import io.druid.query.QueryRunner;
import io.druid.query.QueryRunnerFactory;
import io.druid.query.QueryToolChest;
Expand Down Expand Up @@ -251,7 +252,7 @@ private static <T> List<T> runQuery(QueryRunnerFactory factory, QueryRunner runn
toolChest
);

Sequence<T> queryResult = theRunner.run(query, Maps.<String, Object>newHashMap());
Sequence<T> queryResult = theRunner.run(QueryPlus.wrap(query), Maps.newHashMap());
return Sequences.toList(queryResult, Lists.<T>newArrayList());
}

Expand Down
3 changes: 2 additions & 1 deletion benchmarks/src/main/java/io/druid/benchmark/GroupByTypeInterfaceBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import io.druid.query.DruidProcessingConfig;
import io.druid.query.FinalizeResultsQueryRunner;
import io.druid.query.Query;
import io.druid.query.QueryPlus;
import io.druid.query.QueryRunner;
import io.druid.query.QueryRunnerFactory;
import io.druid.query.QueryToolChest;
Expand Down Expand Up @@ -472,7 +473,7 @@ private static <T> List<T> runQuery(QueryRunnerFactory factory, QueryRunner runn
toolChest
);

Sequence<T> queryResult = theRunner.run(query, Maps.<String, Object>newHashMap());
Sequence<T> queryResult = theRunner.run(QueryPlus.wrap(query), Maps.newHashMap());
return Sequences.toList(queryResult, Lists.<T>newArrayList());
}

Expand Down
3 changes: 2 additions & 1 deletion benchmarks/src/main/java/io/druid/benchmark/TopNTypeInterfaceBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import io.druid.offheap.OffheapBufferGenerator;
import io.druid.query.FinalizeResultsQueryRunner;
import io.druid.query.Query;
import io.druid.query.QueryPlus;
import io.druid.query.QueryRunner;
import io.druid.query.QueryRunnerFactory;
import io.druid.query.QueryToolChest;
Expand Down Expand Up @@ -327,7 +328,7 @@ private static <T> List<T> runQuery(QueryRunnerFactory factory, QueryRunner runn
toolChest
);

Sequence<T> queryResult = theRunner.run(query, Maps.<String, Object>newHashMap());
Sequence<T> queryResult = theRunner.run(QueryPlus.wrap(query), Maps.newHashMap());
return Sequences.toList(queryResult, Lists.<T>newArrayList());
}

Expand Down
9 changes: 5 additions & 4 deletions benchmarks/src/main/java/io/druid/benchmark/query/GroupByBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import io.druid.query.DruidProcessingConfig;
import io.druid.query.FinalizeResultsQueryRunner;
import io.druid.query.Query;
import io.druid.query.QueryPlus;
import io.druid.query.QueryRunner;
import io.druid.query.QueryRunnerFactory;
import io.druid.query.QueryToolChest;
Expand Down Expand Up @@ -521,7 +522,7 @@ private static <T> List<T> runQuery(QueryRunnerFactory factory, QueryRunner runn
toolChest
);

Sequence<T> queryResult = theRunner.run(query, Maps.<String, Object>newHashMap());
Sequence<T> queryResult = theRunner.run(QueryPlus.wrap(query), Maps.<String, Object>newHashMap());
return Sequences.toList(queryResult, Lists.<T>newArrayList());
}

Expand Down Expand Up @@ -574,7 +575,7 @@ public void queryMultiQueryableIndex(Blackhole blackhole) throws Exception
(QueryToolChest) toolChest
);

Sequence<Row> queryResult = theRunner.run(query, Maps.<String, Object>newHashMap());
Sequence<Row> queryResult = theRunner.run(QueryPlus.wrap(query), Maps.newHashMap());
List<Row> results = Sequences.toList(queryResult, Lists.<Row>newArrayList());

for (Row result : results) {
Expand All @@ -598,7 +599,7 @@ public void queryMultiQueryableIndexWithSpilling(Blackhole blackhole) throws Exc
final GroupByQuery spillingQuery = query.withOverriddenContext(
ImmutableMap.<String, Object>of("bufferGrouperMaxSize", 4000)
);
Sequence<Row> queryResult = theRunner.run(spillingQuery, Maps.<String, Object>newHashMap());
Sequence<Row> queryResult = theRunner.run(QueryPlus.wrap(spillingQuery), Maps.newHashMap());
List<Row> results = Sequences.toList(queryResult, Lists.<Row>newArrayList());

for (Row result : results) {
Expand All @@ -625,7 +626,7 @@ public void queryMultiQueryableIndexWithSerde(Blackhole blackhole) throws Except
(QueryToolChest) toolChest
);

Sequence<Row> queryResult = theRunner.run(query, Maps.<String, Object>newHashMap());
Sequence<Row> queryResult = theRunner.run(QueryPlus.wrap(query), Maps.<String, Object>newHashMap());
List<Row> results = Sequences.toList(queryResult, Lists.<Row>newArrayList());

for (Row result : results) {
Expand Down
8 changes: 6 additions & 2 deletions benchmarks/src/main/java/io/druid/benchmark/query/SearchBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import io.druid.query.Druids.SearchQueryBuilder;
import io.druid.query.FinalizeResultsQueryRunner;
import io.druid.query.Query;
import io.druid.query.QueryPlus;
import io.druid.query.QueryRunner;
import io.druid.query.QueryRunnerFactory;
import io.druid.query.QueryToolChest;
Expand Down Expand Up @@ -400,7 +401,7 @@ private static <T> List<T> runQuery(QueryRunnerFactory factory, QueryRunner runn
toolChest
);

Sequence<T> queryResult = theRunner.run(query, Maps.<String, Object>newHashMap());
Sequence<T> queryResult = theRunner.run(QueryPlus.wrap(query), Maps.<String, Object>newHashMap());
return Sequences.toList(queryResult, Lists.<T>newArrayList());
}

Expand Down Expand Up @@ -465,7 +466,10 @@ public void queryMultiQueryableIndex(Blackhole blackhole) throws Exception
)
);

Sequence<Result<SearchResultValue>> queryResult = theRunner.run(query, Maps.<String, Object>newHashMap());
Sequence<Result<SearchResultValue>> queryResult = theRunner.run(
QueryPlus.wrap(query),
Maps.<String, Object>newHashMap()
);
List<Result<SearchResultValue>> results = Sequences.toList(
queryResult,
Lists.<Result<SearchResultValue>>newArrayList()
Expand Down
5 changes: 3 additions & 2 deletions benchmarks/src/main/java/io/druid/benchmark/query/SelectBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import io.druid.query.Druids;
import io.druid.query.FinalizeResultsQueryRunner;
import io.druid.query.Query;
import io.druid.query.QueryPlus;
import io.druid.query.QueryRunner;
import io.druid.query.QueryRunnerFactory;
import io.druid.query.QueryToolChest;
Expand Down Expand Up @@ -265,7 +266,7 @@ private static <T> List<T> runQuery(QueryRunnerFactory factory, QueryRunner runn
toolChest
);

Sequence<T> queryResult = theRunner.run(query, Maps.<String, Object>newHashMap());
Sequence<T> queryResult = theRunner.run(QueryPlus.wrap(query), Maps.<String, Object>newHashMap());
return Sequences.toList(queryResult, Lists.<T>newArrayList());
}

Expand Down Expand Up @@ -374,7 +375,7 @@ public void queryMultiQueryableIndex(Blackhole blackhole) throws Exception

boolean done = false;
while (!done) {
Sequence<Result<SelectResultValue>> queryResult = theRunner.run(queryCopy, Maps.<String, Object>newHashMap());
Sequence<Result<SelectResultValue>> queryResult = theRunner.run(QueryPlus.wrap(queryCopy), Maps.newHashMap());
List<Result<SelectResultValue>> results = Sequences.toList(queryResult, Lists.<Result<SelectResultValue>>newArrayList());

SelectResultValue result = results.get(0).getValue();
Expand Down
5 changes: 4 additions & 1 deletion benchmarks/src/main/java/io/druid/benchmark/query/SqlBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import io.druid.java.util.common.guava.Sequence;
import io.druid.java.util.common.guava.Sequences;
import io.druid.java.util.common.logger.Logger;
import io.druid.query.QueryPlus;
import io.druid.query.QueryRunnerFactoryConglomerate;
import io.druid.query.TableDataSource;
import io.druid.query.aggregation.AggregatorFactory;
Expand Down Expand Up @@ -76,6 +77,7 @@
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;

Expand Down Expand Up @@ -197,7 +199,8 @@ public void tearDown() throws Exception
@OutputTimeUnit(TimeUnit.MILLISECONDS)
public void queryNative(Blackhole blackhole) throws Exception
{
final Sequence<Row> resultSequence = groupByQuery.run(walker, Maps.<String, Object>newHashMap());
HashMap<String, Object> context = Maps.newHashMap();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we remove this local var?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed

final Sequence<Row> resultSequence = QueryPlus.wrap(groupByQuery).run(walker, context);
final ArrayList<Row> resultList = Sequences.toList(resultSequence, Lists.<Row>newArrayList());

for (Row row : resultList) {
Expand Down
8 changes: 6 additions & 2 deletions benchmarks/src/main/java/io/druid/benchmark/query/TimeseriesBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import io.druid.query.Druids;
import io.druid.query.FinalizeResultsQueryRunner;
import io.druid.query.Query;
import io.druid.query.QueryPlus;
import io.druid.query.QueryRunner;
import io.druid.query.QueryRunnerFactory;
import io.druid.query.QueryToolChest;
Expand Down Expand Up @@ -324,7 +325,7 @@ private static <T> List<T> runQuery(QueryRunnerFactory factory, QueryRunner runn
toolChest
);

Sequence<T> queryResult = theRunner.run(query, Maps.<String, Object>newHashMap());
Sequence<T> queryResult = theRunner.run(QueryPlus.wrap(query), Maps.<String, Object>newHashMap());
return Sequences.toList(queryResult, Lists.<T>newArrayList());
}

Expand Down Expand Up @@ -406,7 +407,10 @@ public void queryMultiQueryableIndex(Blackhole blackhole) throws Exception
)
);

Sequence<Result<TimeseriesResultValue>> queryResult = theRunner.run(query, Maps.<String, Object>newHashMap());
Sequence<Result<TimeseriesResultValue>> queryResult = theRunner.run(
QueryPlus.wrap(query),
Maps.<String, Object>newHashMap()
);
List<Result<TimeseriesResultValue>> results = Sequences.toList(queryResult, Lists.<Result<TimeseriesResultValue>>newArrayList());

for (Result<TimeseriesResultValue> result : results) {
Expand Down
8 changes: 6 additions & 2 deletions benchmarks/src/main/java/io/druid/benchmark/query/TopNBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import io.druid.offheap.OffheapBufferGenerator;
import io.druid.query.FinalizeResultsQueryRunner;
import io.druid.query.Query;
import io.druid.query.QueryPlus;
import io.druid.query.QueryRunner;
import io.druid.query.QueryRunnerFactory;
import io.druid.query.QueryToolChest;
Expand Down Expand Up @@ -305,7 +306,7 @@ private static <T> List<T> runQuery(QueryRunnerFactory factory, QueryRunner runn
toolChest
);

Sequence<T> queryResult = theRunner.run(query, Maps.<String, Object>newHashMap());
Sequence<T> queryResult = theRunner.run(QueryPlus.wrap(query), Maps.<String, Object>newHashMap());
return Sequences.toList(queryResult, Lists.<T>newArrayList());
}

Expand Down Expand Up @@ -367,7 +368,10 @@ public void queryMultiQueryableIndex(Blackhole blackhole) throws Exception
)
);

Sequence<Result<TopNResultValue>> queryResult = theRunner.run(query, Maps.<String, Object>newHashMap());
Sequence<Result<TopNResultValue>> queryResult = theRunner.run(
QueryPlus.wrap(query),
Maps.<String, Object>newHashMap()
);
List<Result<TopNResultValue>> results = Sequences.toList(queryResult, Lists.<Result<TopNResultValue>>newArrayList());

for (Result<TopNResultValue> result : results) {
Expand Down
4 changes: 2 additions & 2 deletions ...sions-contrib/scan-query/src/test/java/io/druid/query/scan/MultiSegmentScanQueryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ public void testMergeRunnersWithLimit()
factory.mergeRunners(MoreExecutors.sameThreadExecutor(), ImmutableList.of(
factory.createRunner(segment0),
factory.createRunner(segment1)
)).run(query, new HashMap<String, Object>()),
)).run(QueryPlus.wrap(query), new HashMap<String, Object>()),
Lists.<ScanResultValue>newArrayList()
);
int totalCount = 0;
Expand Down Expand Up @@ -232,7 +232,7 @@ public Sequence<ScanResultValue> run(
);
ScanQuery query = newBuilder().build();
List<ScanResultValue> results = Sequences.toList(
runner.run(query, new HashMap<String, Object>()),
runner.run(QueryPlus.wrap(query), new HashMap<String, Object>()),
Lists.<ScanResultValue>newArrayList()
);
int totalCount = 0;
Expand Down
21 changes: 11 additions & 10 deletions extensions-contrib/scan-query/src/test/java/io/druid/query/scan/ScanQueryRunnerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import io.druid.java.util.common.ISE;
import io.druid.java.util.common.guava.Sequences;
import io.druid.query.DefaultGenericQueryMetricsFactory;
import io.druid.query.QueryPlus;
import io.druid.query.QueryRunner;
import io.druid.query.QueryRunnerTestHelper;
import io.druid.query.TableDataSource;
Expand Down Expand Up @@ -155,7 +156,7 @@ public void testFullOnSelect()

HashMap<String, Object> context = new HashMap<String, Object>();
Iterable<ScanResultValue> results = Sequences.toList(
runner.run(query, context),
runner.run(QueryPlus.wrap(query), context),
Lists.<ScanResultValue>newArrayList()
);

Expand Down Expand Up @@ -194,7 +195,7 @@ public void testFullOnSelectAsCompactedList()

HashMap<String, Object> context = new HashMap<String, Object>();
Iterable<ScanResultValue> results = Sequences.toList(
runner.run(query, context),
runner.run(QueryPlus.wrap(query), context),
Lists.<ScanResultValue>newArrayList()
);

Expand All @@ -217,7 +218,7 @@ public void testSelectWithDimsAndMets()

HashMap<String, Object> context = new HashMap<String, Object>();
Iterable<ScanResultValue> results = Sequences.toList(
runner.run(query, context),
runner.run(QueryPlus.wrap(query), context),
Lists.<ScanResultValue>newArrayList()
);

Expand Down Expand Up @@ -254,7 +255,7 @@ public void testSelectWithDimsAndMetsAsCompactedList()

HashMap<String, Object> context = new HashMap<String, Object>();
Iterable<ScanResultValue> results = Sequences.toList(
runner.run(query, context),
runner.run(QueryPlus.wrap(query), context),
Lists.<ScanResultValue>newArrayList()
);

Expand Down Expand Up @@ -294,7 +295,7 @@ public void testFullOnSelectWithFilterAndLimit()

HashMap<String, Object> context = new HashMap<String, Object>();
Iterable<ScanResultValue> results = Sequences.toList(
runner.run(query, context),
runner.run(QueryPlus.wrap(query), context),
Lists.<ScanResultValue>newArrayList()
);

Expand Down Expand Up @@ -356,12 +357,12 @@ public void testSelectWithFilterLookupExtractionFn()
.build();

Iterable<ScanResultValue> results = Sequences.toList(
runner.run(query, Maps.newHashMap()),
runner.run(QueryPlus.wrap(query), Maps.newHashMap()),
Lists.<ScanResultValue>newArrayList()
);
Iterable<ScanResultValue> resultsOptimize = Sequences.toList(
toolChest.postMergeQueryDecoration(toolChest.mergeResults(toolChest.preMergeQueryDecoration(runner))).
run(query, Maps.<String, Object>newHashMap()), Lists.<ScanResultValue>newArrayList()
toolChest.postMergeQueryDecoration(toolChest.mergeResults(toolChest.preMergeQueryDecoration(runner)))
.run(QueryPlus.wrap(query), Maps.<String, Object>newHashMap()), Lists.<ScanResultValue>newArrayList()
);

final List<List<Map<String, Object>>> events = toEvents(
Expand Down Expand Up @@ -411,7 +412,7 @@ public void testFullSelectNoResults()
.build();

Iterable<ScanResultValue> results = Sequences.toList(
runner.run(query, Maps.newHashMap()),
runner.run(QueryPlus.wrap(query), Maps.newHashMap()),
Lists.<ScanResultValue>newArrayList()
);

Expand All @@ -429,7 +430,7 @@ public void testFullSelectNoDimensionAndMetric()
.build();

Iterable<ScanResultValue> results = Sequences.toList(
runner.run(query, Maps.newHashMap()),
runner.run(QueryPlus.wrap(query), Maps.newHashMap()),
Lists.<ScanResultValue>newArrayList()
);

Expand Down
3 changes: 2 additions & 1 deletion extensions-contrib/virtual-columns/src/test/java/io/druid/segment/MapVirtualColumnTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import io.druid.jackson.DefaultObjectMapper;
import io.druid.java.util.common.guava.Sequences;
import io.druid.query.Druids;
import io.druid.query.QueryPlus;
import io.druid.query.QueryRunner;
import io.druid.query.QueryRunnerTestHelper;
import io.druid.query.Result;
Expand Down Expand Up @@ -185,7 +186,7 @@ private Map mapOf(Object... elements)
private void checkSelectQuery(SelectQuery searchQuery, List<Map> expected) throws Exception
{
List<Result<SelectResultValue>> results = Sequences.toList(
runner.run(searchQuery, ImmutableMap.of()),
runner.run(QueryPlus.wrap(searchQuery), ImmutableMap.of()),
Lists.<Result<SelectResultValue>>newArrayList()
);
Assert.assertEquals(1, results.size());
Expand Down
3 changes: 2 additions & 1 deletion ...src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramTopNQueryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import io.druid.collections.StupidPool;
import io.druid.query.QueryPlus;
import io.druid.query.QueryRunner;
import io.druid.query.QueryRunnerTestHelper;
import io.druid.query.Result;
Expand Down Expand Up @@ -247,6 +248,6 @@ public void testTopNWithApproximateHistogramAgg()
);
HashMap<String, Object> context = new HashMap<String, Object>();

TestHelper.assertExpectedResults(expectedResults, runner.run(query, context));
TestHelper.assertExpectedResults(expectedResults, runner.run(QueryPlus.wrap(query), context));
}
}
3 changes: 2 additions & 1 deletion ...core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/KafkaIndexTaskTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
import io.druid.query.Druids;
import io.druid.query.IntervalChunkingQueryRunnerDecorator;
import io.druid.query.Query;
import io.druid.query.QueryPlus;
import io.druid.query.QueryRunner;
import io.druid.query.QueryRunnerFactory;
import io.druid.query.QueryRunnerFactoryConglomerate;
Expand Down Expand Up @@ -1646,7 +1647,7 @@ public long countEvents(final Task task) throws Exception
.build();

ArrayList<Result<TimeseriesResultValue>> results = Sequences.toList(
task.getQueryRunner(query).run(query, ImmutableMap.<String, Object>of()),
task.getQueryRunner(query).run(QueryPlus.wrap(query), ImmutableMap.<String, Object>of()),
Lists.<Result<TimeseriesResultValue>>newArrayList()
);

Expand Down
Loading