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

Merge tag 'druid-0.4.12.5' 

[maven-release-plugin]  copy for tag druid-0.4.12.5

Conflicts:
	client/pom.xml
	common/pom.xml
	examples/pom.xml
	index-common/pom.xml
	indexer/pom.xml
	merger/pom.xml
	pom.xml
	realtime/pom.xml
	server/pom.xml
	services/pom.xml
This commit is contained in:
fjy 2013-05-20 12:14:23 -07:00
parent e28a896463 ee51a5d1ae
commit a792525063
3 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/src/main/java/com/metamx/druid/coordination/ServerManager.java
View File

@ -255,7 +255,8 @@ public class ServerManager implements QuerySegmentWalker
);
}
}
);
)
.filter(Predicates.<QueryRunner<T>>notNull());
}
}
)

20
server/src/main/java/com/metamx/druid/index/v1/QueryableIndexStorageAdapter.java
View File

@ -145,6 +145,10 @@ public class QueryableIndexStorageAdapter extends BaseStorageAdapter
final Interval dataInterval = new Interval(getMinTime().getMillis(), gran.next(getMaxTime().getMillis()));
if (!actualInterval.overlaps(dataInterval)) {
return ImmutableList.of();
}
if (actualInterval.getStart().isBefore(dataInterval.getStart())) {
actualInterval = actualInterval.withStart(dataInterval.getStart());
}
@ -519,11 +523,9 @@ public class QueryableIndexStorageAdapter extends BaseStorageAdapter
if (capabilities.isDictionaryEncoded()) {
cachedColumnVals = holder.getDictionaryEncoding();
}
else if(capabilities.getType() == ValueType.COMPLEX) {
} else if (capabilities.getType() == ValueType.COMPLEX) {
cachedColumnVals = holder.getComplexColumn();
}
else {
} else {
cachedColumnVals = holder.getGenericColumn();
}
}
@ -956,11 +958,9 @@ public class QueryableIndexStorageAdapter extends BaseStorageAdapter
if (holder.getCapabilities().isDictionaryEncoded()) {
cachedColumnVals = holder.getDictionaryEncoding();
}
else if(type == ValueType.COMPLEX) {
} else if (type == ValueType.COMPLEX) {
cachedColumnVals = holder.getComplexColumn();
}
else {
} else {
cachedColumnVals = holder.getGenericColumn();
}
}
@ -1082,7 +1082,9 @@ public class QueryableIndexStorageAdapter extends BaseStorageAdapter
Closeables.closeQuietly(complexColumn);
}
for (Object column : objectColumnCache.values()) {
if(column instanceof Closeable) Closeables.closeQuietly((Closeable)column);
if (column instanceof Closeable) {
Closeables.closeQuietly((Closeable) column);
}
}
}
}

2
server/src/main/java/com/metamx/druid/utils/DruidSetup.java
View File

@ -103,11 +103,13 @@ public class DruidSetup
if ("dump".equals(cmd) && args.length == 3) {
final String zkConnect = args[1];
curator = connectToZK(zkConnect);
curator.start();
String zpathBase = args[2];
dumpFromZk(curator, zkConnect, zpathBase, System.out);
} else if ("put".equals(cmd) && args.length == 3) {
final String zkConnect = args[1];
curator = connectToZK(zkConnect);
curator.start();
final String pfile = args[2];
putToZk(curator, pfile);
} else {