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

Merge pull request #780 from metamx/new-druid-api 

update druid-api for json parsing improvements
This commit is contained in:
fjy 2014-10-07 14:35:39 -06:00
parent f1d37d569c 30183d3b4d
commit 5be4d6b4aa
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -41,7 +41,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<metamx.java-util.version>0.26.8</metamx.java-util.version> <metamx.java-util.version>0.26.8</metamx.java-util.version>
<apache.curator.version>2.6.0</apache.curator.version> <apache.curator.version>2.6.0</apache.curator.version>
<druid.api.version>0.2.11</druid.api.version> <druid.api.version>0.2.12</druid.api.version>
</properties> </properties>
<modules> <modules>

3
processing/src/main/java/io/druid/data/input/ProtoBufInputRowParser.java
View File

@ -69,7 +69,8 @@ public class ProtoBufInputRowParser implements ByteBufferInputRowParser
if (parseSpec == null) { if (parseSpec == null) {
this.parseSpec = new JSONParseSpec( this.parseSpec = new JSONParseSpec(
timestampSpec, timestampSpec,
new DimensionsSpec(dimensions, dimensionExclusions, spatialDimensions) new DimensionsSpec(dimensions, dimensionExclusions, spatialDimensions),
JSONParseSpec.JSON
); );
} else { } else {
this.parseSpec = parseSpec; this.parseSpec = parseSpec;

3
processing/src/test/java/io/druid/data/input/ProtoBufInputRowParserTest.java
View File

@ -59,7 +59,8 @@ public class ProtoBufInputRowParserTest
ProtoBufInputRowParser parser = new ProtoBufInputRowParser( ProtoBufInputRowParser parser = new ProtoBufInputRowParser(
new JSONParseSpec( new JSONParseSpec(
new TimestampSpec("timestamp", "iso"), new TimestampSpec("timestamp", "iso"),
new DimensionsSpec(Arrays.asList(DIMENSIONS), Arrays.<String>asList(), null) new DimensionsSpec(Arrays.asList(DIMENSIONS), Arrays.<String>asList(), null),
JSONParseSpec.JSON
), ),
"prototest.desc", "prototest.desc",
null, null, null, null null, null, null, null

3
server/src/test/java/io/druid/segment/realtime/FireDepartmentTest.java
View File

@ -61,7 +61,8 @@ public class FireDepartmentTest
Arrays.asList("dim1", "dim2"), Arrays.asList("dim1", "dim2"),
null, null,
null null
) ),
JSONParseSpec.JSON
), ),
null, null, null, null null, null, null, null
), ),

6
server/src/test/java/io/druid/segment/realtime/plumber/RealtimePlumberSchoolTest.java
View File

@ -123,7 +123,11 @@ public class RealtimePlumberSchoolTest
@Override @Override
public ParseSpec getParseSpec() public ParseSpec getParseSpec()
{ {
return new JSONParseSpec(new TimestampSpec("timestamp", "auto"), new DimensionsSpec(null, null, null)); return new JSONParseSpec(
new TimestampSpec("timestamp", "auto"),
new DimensionsSpec(null, null, null),
JSONParseSpec.JSON
);
} }
@Override @Override