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

Merge branch 'druid-0.7.x' into fix-test 

Conflicts:
	processing/pom.xml
	processing/src/main/java/io/druid/segment/IndexMerger.java
	processing/src/main/java/io/druid/segment/MetricHolder.java
	processing/src/main/java/io/druid/segment/data/CompressedObjectStrategy.java
	processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerTest.java
	processing/src/test/java/io/druid/segment/SchemalessTestFull.java
	server/src/test/java/io/druid/client/CachingClusteredClientTest.java
	services/src/main/java/io/druid/cli/CliHistorical.java
This commit is contained in:
fjy 2014-10-24 11:07:52 -07:00
parent bef74104d9 1b3921faad
commit 41ebdd2bae
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
processing/src/main/java/io/druid/segment/incremental/SpatialDimensionRowTransformer.java
View File

@ -144,7 +144,12 @@ public class SpatialDimensionRowTransformer implements Function<InputRow, InputR
@Override
public long getLongMetric(String metric)
{
return row.getLongMetric(metric);
try {
return row.getLongMetric(metric);
}
catch (ParseException e) {
throw Throwables.propagate(e);
}
}
@Override
@ -229,4 +234,4 @@ public class SpatialDimensionRowTransformer implements Function<InputRow, InputR
}
return true;
}
}
}

4
services/src/main/java/io/druid/cli/CliHistorical.java
View File

@ -84,8 +84,8 @@ public class CliHistorical extends ServerRunnable
Jerseys.addResource(binder, QueryResource.class);
Jerseys.addResource(binder, HistoricalResource.class);
LifecycleModule.register(binder, QueryResource.class);
LifecycleModule.register(binder, HistoricalResource.class);
LifecycleModule.register(binder, ZkCoordinator.class);
LifecycleModule.register(binder, ZkCoordinator.class);
binder.bind(Cache.class).toProvider(CacheProvider.class).in(ManageLifecycle.class);
JsonConfigProvider.bind(binder, "druid.historical.cache", CacheProvider.class);