Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2616 from gianm/getContextBoolean 

Make specifying query context booleans more consistent.
This commit is contained in:
Xavier Léauté 2016-03-09 14:23:10 -08:00
parent 4c3a3f8da6 708bc674fa
commit 0f3a7c94c6
8 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
processing/src/main/java/io/druid/query/BaseQuery.java
View File

@ -193,6 +193,12 @@ public abstract class BaseQuery<T extends Comparable<T>> implements Query<T>
return retVal == null ? defaultValue : retVal;
}
@Override
public boolean getContextBoolean(String key, boolean defaultValue)
{
return parseBoolean(this, key, defaultValue);
}
protected Map<String, Object> computeOverridenContext(Map<String, Object> overrides)
{
Map<String, Object> overridden = Maps.newTreeMap();

2
processing/src/main/java/io/druid/query/Query.java
View File

@ -81,6 +81,8 @@ public interface Query<T>
<ContextType> ContextType getContextValue(String key, ContextType defaultValue);
boolean getContextBoolean(String key, boolean defaultValue);
boolean isDescending();
Ordering<T> getResultOrdering();

2
processing/src/main/java/io/druid/query/groupby/GroupByQueryHelper.java
View File

@ -81,7 +81,7 @@ public class GroupByQueryHelper
);
final IncrementalIndex index;
if (query.getContextValue("useOffheap", false)) {
if (query.getContextBoolean("useOffheap", false)) {
index = new OffheapIncrementalIndex(
// use granularity truncated min timestamp
// since incoming truncated timestamps may precede timeStart

2
processing/src/main/java/io/druid/query/groupby/GroupByQueryQueryToolChest.java
View File

@ -130,7 +130,7 @@ public class GroupByQueryQueryToolChest extends QueryToolChest<Row, GroupByQuery
return runner.run(query, responseContext);
}
if (Boolean.valueOf(query.getContextValue(GROUP_BY_MERGE_KEY, "true"))) {
if (query.getContextBoolean(GROUP_BY_MERGE_KEY, true)) {
return mergeGroupByResults(
(GroupByQuery) query,
runner,

2
processing/src/main/java/io/druid/query/timeseries/TimeseriesQuery.java
View File

@ -106,7 +106,7 @@ public class TimeseriesQuery extends BaseQuery<Result<TimeseriesResultValue>>
public boolean isSkipEmptyBuckets()
{
return Boolean.parseBoolean(getContextValue("skipEmptyBuckets", "false"));
return getContextBoolean("skipEmptyBuckets", false);
}
public TimeseriesQuery withQuerySegmentSpec(QuerySegmentSpec querySegmentSpec)

2
processing/src/main/java/io/druid/query/topn/TopNQueryEngine.java
View File

@ -119,7 +119,7 @@ public class TopNQueryEngine
topNAlgorithm = new DimExtractionTopNAlgorithm(capabilities, query);
} else if (selector.isAggregateAllMetrics()) {
topNAlgorithm = new PooledTopNAlgorithm(capabilities, query, bufferPool);
} else if (selector.isAggregateTopNMetricFirst() || query.getContextValue("doAggregateTopNMetricFirst", false)) {
} else if (selector.isAggregateTopNMetricFirst() || query.getContextBoolean("doAggregateTopNMetricFirst", false)) {
topNAlgorithm = new AggregateTopNMetricFirstAlgorithm(capabilities, query, bufferPool);
} else {
topNAlgorithm = new PooledTopNAlgorithm(capabilities, query, bufferPool);

7
processing/src/test/java/io/druid/query/datasourcemetadata/DataSourceMetadataQueryTest.java
View File

@ -81,7 +81,7 @@ public class DataSourceMetadataQueryTest
"useCache",
true,
"populateCache",
true,
"true",
"finalize",
true
)
@ -101,8 +101,11 @@ public class DataSourceMetadataQueryTest
Assert.assertEquals(1, serdeQuery.getContextValue("priority"));
Assert.assertEquals(true, serdeQuery.getContextValue("useCache"));
Assert.assertEquals(true, serdeQuery.getContextValue("populateCache"));
Assert.assertEquals("true", serdeQuery.getContextValue("populateCache"));
Assert.assertEquals(true, serdeQuery.getContextValue("finalize"));
Assert.assertEquals(true, serdeQuery.getContextBoolean("useCache", false));
Assert.assertEquals(true, serdeQuery.getContextBoolean("populateCache", false));
Assert.assertEquals(true, serdeQuery.getContextBoolean("finalize", false));
}
@Test

2
server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumber.java
View File

@ -266,7 +266,7 @@ public class RealtimePlumber implements Plumber
@Override
public <T> QueryRunner<T> getQueryRunner(final Query<T> query)
{
final boolean skipIncrementalSegment = query.getContextValue(SKIP_INCREMENTAL_SEGMENT, false);
final boolean skipIncrementalSegment = query.getContextBoolean(SKIP_INCREMENTAL_SEGMENT, false);
final QueryRunnerFactory<T, Query<T>> factory = conglomerate.findFactory(query);
final QueryToolChest<T, Query<T>> toolchest = factory.getToolchest();