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

Fix BucketExtractionFn on objects that are strings. (#4072)

This commit is contained in:
Gian Merlino 2017-03-16 22:59:11 -07:00 committed by Jonathan Wei
parent 403fbae7b1
commit 3ec1877887
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,7 @@ public class BucketExtractionFn implements ExtractionFn
if (value instanceof Number) { if (value instanceof Number) {
return bucket(((Number) value).doubleValue()); return bucket(((Number) value).doubleValue());
} else if (value instanceof String) { } else if (value instanceof String) {
return apply(value); return apply((String) value);
} }
return null; return null;
} }

5
processing/src/test/java/io/druid/query/extraction/BucketExtractionFnTest.java
View File

@ -32,6 +32,7 @@ public class BucketExtractionFnTest
public void testApply() public void testApply()
{ {
BucketExtractionFn extractionFn1 = new BucketExtractionFn(100.0, 0.5); BucketExtractionFn extractionFn1 = new BucketExtractionFn(100.0, 0.5);
Assert.assertEquals("1200.5", extractionFn1.apply((Object) "1234.99"));
Assert.assertEquals("1200.5", extractionFn1.apply("1234.99")); Assert.assertEquals("1200.5", extractionFn1.apply("1234.99"));
Assert.assertEquals("0.5", extractionFn1.apply("1")); Assert.assertEquals("0.5", extractionFn1.apply("1"));
Assert.assertEquals("0.5", extractionFn1.apply("100")); Assert.assertEquals("0.5", extractionFn1.apply("100"));
@ -69,7 +70,7 @@ public class BucketExtractionFnTest
final ObjectMapper objectMapper = new DefaultObjectMapper(); final ObjectMapper objectMapper = new DefaultObjectMapper();
final String json1 = "{ \"type\" : \"bucket\", \"size\" : \"2\", \"offset\" : \"0.5\" }"; final String json1 = "{ \"type\" : \"bucket\", \"size\" : \"2\", \"offset\" : \"0.5\" }";
BucketExtractionFn extractionFn1 = (BucketExtractionFn)objectMapper.readValue(json1, ExtractionFn.class); BucketExtractionFn extractionFn1 = (BucketExtractionFn) objectMapper.readValue(json1, ExtractionFn.class);
Assert.assertEquals(2, extractionFn1.getSize(), DELTA); Assert.assertEquals(2, extractionFn1.getSize(), DELTA);
Assert.assertEquals(0.5, extractionFn1.getOffset(), DELTA); Assert.assertEquals(0.5, extractionFn1.getOffset(), DELTA);
@ -82,7 +83,7 @@ public class BucketExtractionFnTest
); );
final String json2 = "{ \"type\" : \"bucket\"}"; final String json2 = "{ \"type\" : \"bucket\"}";
BucketExtractionFn extractionFn2 = (BucketExtractionFn)objectMapper.readValue(json2, ExtractionFn.class); BucketExtractionFn extractionFn2 = (BucketExtractionFn) objectMapper.readValue(json2, ExtractionFn.class);
Assert.assertEquals(1, extractionFn2.getSize(), DELTA); Assert.assertEquals(1, extractionFn2.getSize(), DELTA);
Assert.assertEquals(0, extractionFn2.getOffset(), DELTA); Assert.assertEquals(0, extractionFn2.getOffset(), DELTA);