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

Merge branch 'master' of github.com:metamx/druid

This commit is contained in:
fjy 2014-04-14 16:21:17 -07:00
parent 9bfc738032 807fff7697
commit 291dac8de8
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
processing/src/main/java/io/druid/query/select/SelectQueryQueryToolChest.java
View File

@ -170,10 +170,9 @@ public class SelectQueryQueryToolChest extends QueryToolChest<Result<SelectResul
++index;
}
final Set<String> metrics = Sets.newTreeSet();
if (query.getMetrics() != null) {
dimensions.addAll(query.getMetrics());
metrics.addAll(query.getMetrics());
}
final byte[][] metricBytes = new byte[metrics.size()][];

5
server/src/main/java/io/druid/curator/announcement/Announcer.java
View File

@ -212,11 +212,6 @@ public class Announcer
pathsToReinstate.add(path);
}
for (ChildData data : cache.getCurrentData()) {
log.info("Node[%s] in cache is removed to reinstate.", data.getPath());
pathsToReinstate.remove(data.getPath());
}
if (!pathsToReinstate.isEmpty() && !pathsLost.compareAndSet(null, pathsToReinstate)) {
log.info("Already had a pathsLost set!?[%s]", parentPath);
}