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

Merge branch 'bug-fix' into worker-resource

This commit is contained in:
fjy 2013-07-02 16:25:07 -07:00
parent d3eb491155 fde874ea56
commit be2f153985
10 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/main/java/com/metamx/druid/query/ChainedExecutionQueryRunner.java
View File

@ -20,6 +20,7 @@
package com.metamx.druid.query;
import com.google.common.base.Function;
import com.google.common.base.Predicates;
import com.google.common.base.Throwables;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
@ -76,7 +77,7 @@ public class ChainedExecutionQueryRunner<T> implements QueryRunner<T>
{
this.exec = exec;
this.ordering = ordering;
this.queryables = Iterables.unmodifiableIterable(queryables);
this.queryables = Iterables.unmodifiableIterable(Iterables.filter(queryables, Predicates.notNull()));
}
@Override

2
common/src/main/java/com/metamx/druid/aggregation/CountAggregatorFactory.java
View File

@ -41,7 +41,7 @@ public class CountAggregatorFactory implements AggregatorFactory
@JsonProperty("name") String name
)
{
Preconditions.checkNotNull(name, "Must have a valid, non null aggregator name");
Preconditions.checkNotNull(name, "Must have a valid, non-null aggregator name");
this.name = name;
}

4
common/src/main/java/com/metamx/druid/aggregation/DoubleSumAggregatorFactory.java
View File

@ -45,8 +45,8 @@ public class DoubleSumAggregatorFactory implements AggregatorFactory
@JsonProperty("fieldName") final String fieldName
)
{
Preconditions.checkNotNull(name, "Must have a valid, nonl null aggregator name");
Preconditions.checkNotNull(fieldName, "Must have a valid, non null fieldName");
Preconditions.checkNotNull(name, "Must have a valid, non-null aggregator name");
Preconditions.checkNotNull(fieldName, "Must have a valid, non-null fieldName");
this.name = name;
this.fieldName = fieldName;

4
common/src/main/java/com/metamx/druid/aggregation/HistogramAggregatorFactory.java
View File

@ -51,8 +51,8 @@ public class HistogramAggregatorFactory implements AggregatorFactory
@JsonProperty("breaks") final List<Float> breaksList
)
{
Preconditions.checkNotNull(name, "Must have a valid, nonl null aggregator name");
Preconditions.checkNotNull(fieldName, "Must have a valid, non null fieldName");
Preconditions.checkNotNull(name, "Must have a valid, non-null aggregator name");
Preconditions.checkNotNull(fieldName, "Must have a valid, non-null fieldName");
this.name = name;
this.fieldName = fieldName;

10
common/src/main/java/com/metamx/druid/aggregation/JavaScriptAggregatorFactory.java
View File

@ -63,11 +63,11 @@ public class JavaScriptAggregatorFactory implements AggregatorFactory
@JsonProperty("fnCombine") final String fnCombine
)
{
Preconditions.checkNotNull(name, "Must have a valid, non null aggregator name");
Preconditions.checkNotNull(fieldNames, "Must have a valid, non null fieldNames");
Preconditions.checkNotNull(fnAggregate, "Must have a valid, non null fnAggregate");
Preconditions.checkNotNull(fnReset, "Must have a valid, non null fnReset");
Preconditions.checkNotNull(fnCombine, "Must have a valid, non null fnCombine");
Preconditions.checkNotNull(name, "Must have a valid, non-null aggregator name");
Preconditions.checkNotNull(fieldNames, "Must have a valid, non-null fieldNames");
Preconditions.checkNotNull(fnAggregate, "Must have a valid, non-null fnAggregate");
Preconditions.checkNotNull(fnReset, "Must have a valid, non-null fnReset");
Preconditions.checkNotNull(fnCombine, "Must have a valid, non-null fnCombine");
this.name = name;
this.fieldNames = fieldNames;

4
common/src/main/java/com/metamx/druid/aggregation/LongSumAggregatorFactory.java
View File

@ -45,8 +45,8 @@ public class LongSumAggregatorFactory implements AggregatorFactory
@JsonProperty("fieldName") final String fieldName
)
{
Preconditions.checkNotNull(name, "Must have a valid, nonl null aggregator name");
Preconditions.checkNotNull(fieldName, "Must have a valid, non null fieldName");
Preconditions.checkNotNull(name, "Must have a valid, non-null aggregator name");
Preconditions.checkNotNull(fieldName, "Must have a valid, non-null fieldName");
this.name = name;
this.fieldName = fieldName;

4
common/src/main/java/com/metamx/druid/aggregation/MaxAggregatorFactory.java
View File

@ -45,8 +45,8 @@ public class MaxAggregatorFactory implements AggregatorFactory
@JsonProperty("fieldName") final String fieldName
)
{
Preconditions.checkNotNull(name, "Must have a valid, non null aggregator name");
Preconditions.checkNotNull(fieldName, "Must have a valid, non null fieldName");
Preconditions.checkNotNull(name, "Must have a valid, non-null aggregator name");
Preconditions.checkNotNull(fieldName, "Must have a valid, non-null fieldName");
this.name = name;
this.fieldName = fieldName;

4
common/src/main/java/com/metamx/druid/aggregation/MinAggregatorFactory.java
View File

@ -45,8 +45,8 @@ public class MinAggregatorFactory implements AggregatorFactory
@JsonProperty("fieldName") final String fieldName
)
{
Preconditions.checkNotNull(name, "Must have a valid, non null aggregator name");
Preconditions.checkNotNull(fieldName, "Must have a valid, non null fieldName");
Preconditions.checkNotNull(name, "Must have a valid, non-null aggregator name");
Preconditions.checkNotNull(fieldName, "Must have a valid, non-null fieldName");
this.name = name;
this.fieldName = fieldName;

4
server/src/main/java/com/metamx/druid/loading/HdfsDataSegmentPusherConfig.java
View File

@ -21,12 +21,10 @@ package com.metamx.druid.loading;
import org.skife.config.Config;
import java.io.File;
/**
*/
public abstract class HdfsDataSegmentPusherConfig
{
@Config("druid.pusher.hdfs.storageDirectory")
public abstract File getStorageDirectory();
public abstract String getStorageDirectory();
}

2
server/src/main/java/com/metamx/druid/master/DruidMaster.java
View File

@ -668,7 +668,7 @@ public class DruidMaster
synchronized (lock) {
final LeaderLatch latch = leaderLatch.get();
if (latch == null || !latch.hasLeadership()) {
log.info("[%s] is master, not me. Phooey.", latch == null ? null : latch.getLeader().getId());
log.info("LEGGO MY EGGO. [%s] is master.", latch == null ? null : latch.getLeader().getId());
stopBeingMaster();
return;
}