Merge pull request #1294 from druid-io/update-api

Update druid-api version
This commit is contained in:
Xavier Léauté 2015-04-17 14:58:56 -07:00
commit b438ca32d5
8 changed files with 16 additions and 12 deletions

View File

@ -81,7 +81,8 @@ public class IndexTaskTest
new CSVParseSpec( new CSVParseSpec(
new TimestampSpec( new TimestampSpec(
"ts", "ts",
"auto" "auto",
null
), ),
new DimensionsSpec( new DimensionsSpec(
Arrays.asList("ts"), Arrays.asList("ts"),
@ -147,7 +148,8 @@ public class IndexTaskTest
new CSVParseSpec( new CSVParseSpec(
new TimestampSpec( new TimestampSpec(
"ts", "ts",
"auto" "auto",
null
), ),
new DimensionsSpec( new DimensionsSpec(
Arrays.asList("ts"), Arrays.asList("ts"),
@ -254,7 +256,8 @@ public class IndexTaskTest
new CSVParseSpec( new CSVParseSpec(
new TimestampSpec( new TimestampSpec(
"ts", "ts",
"auto" "auto",
null
), ),
new DimensionsSpec( new DimensionsSpec(
Arrays.asList("dim"), Arrays.asList("dim"),

View File

@ -283,7 +283,7 @@ public class IngestSegmentFirehoseFactoryTest
ROW_PARSER, ROW_PARSER,
new MapInputRowParser( new MapInputRowParser(
new JSONParseSpec( new JSONParseSpec(
new TimestampSpec(TIME_COLUMN, "auto"), new TimestampSpec(TIME_COLUMN, "auto", null),
new DimensionsSpec( new DimensionsSpec(
ImmutableList.<String>of(), ImmutableList.<String>of(),
ImmutableList.of(DIM_FLOAT_NAME, DIM_LONG_NAME), ImmutableList.of(DIM_FLOAT_NAME, DIM_LONG_NAME),
@ -366,7 +366,7 @@ public class IngestSegmentFirehoseFactoryTest
private static final InputRowParser<Map<String, Object>> ROW_PARSER = new MapInputRowParser( private static final InputRowParser<Map<String, Object>> ROW_PARSER = new MapInputRowParser(
new JSONParseSpec( new JSONParseSpec(
new TimestampSpec(TIME_COLUMN, "auto"), new TimestampSpec(TIME_COLUMN, "auto", null),
new DimensionsSpec( new DimensionsSpec(
ImmutableList.of(DIM_NAME), ImmutableList.of(DIM_NAME),
ImmutableList.of(DIM_FLOAT_NAME, DIM_LONG_NAME), ImmutableList.of(DIM_FLOAT_NAME, DIM_LONG_NAME),

View File

@ -68,7 +68,7 @@
<metamx.java-util.version>0.27.0</metamx.java-util.version> <metamx.java-util.version>0.27.0</metamx.java-util.version>
<apache.curator.version>2.7.0</apache.curator.version> <apache.curator.version>2.7.0</apache.curator.version>
<jetty.version>9.2.5.v20141112</jetty.version> <jetty.version>9.2.5.v20141112</jetty.version>
<druid.api.version>0.3.6</druid.api.version> <druid.api.version>0.3.7</druid.api.version>
<jackson.version>2.4.4</jackson.version> <jackson.version>2.4.4</jackson.version>
<log4j.version>2.2</log4j.version> <log4j.version>2.2</log4j.version>
<slf4j.version>1.7.10</slf4j.version> <slf4j.version>1.7.10</slf4j.version>

View File

@ -56,7 +56,7 @@ public class ProtoBufInputRowParserTest
//configure parser with desc file //configure parser with desc file
ProtoBufInputRowParser parser = new ProtoBufInputRowParser( ProtoBufInputRowParser parser = new ProtoBufInputRowParser(
new JSONParseSpec( new JSONParseSpec(
new TimestampSpec("timestamp", "iso"), new TimestampSpec("timestamp", "iso", null),
new DimensionsSpec(Arrays.asList(DIMENSIONS), Arrays.<String>asList(), null) new DimensionsSpec(Arrays.asList(DIMENSIONS), Arrays.<String>asList(), null)
), ),
"prototest.desc" "prototest.desc"

View File

@ -195,7 +195,7 @@ public class TestIndex
{ {
StringInputRowParser parser = new StringInputRowParser( StringInputRowParser parser = new StringInputRowParser(
new DelimitedParseSpec( new DelimitedParseSpec(
new TimestampSpec("ts", "iso"), new TimestampSpec("ts", "iso", null),
new DimensionsSpec(Arrays.asList(DIMENSIONS), null, null), new DimensionsSpec(Arrays.asList(DIMENSIONS), null, null),
"\t", "\t",
"\u0001", "\u0001",

View File

@ -40,7 +40,7 @@ public class DataSchemaTest
"test", "test",
new StringInputRowParser( new StringInputRowParser(
new JSONParseSpec( new JSONParseSpec(
new TimestampSpec("time", "auto"), new TimestampSpec("time", "auto", null),
new DimensionsSpec(ImmutableList.of("dimB", "dimA"), null, null) new DimensionsSpec(ImmutableList.of("dimB", "dimA"), null, null)
) )
), ),
@ -64,7 +64,7 @@ public class DataSchemaTest
"test", "test",
new StringInputRowParser( new StringInputRowParser(
new JSONParseSpec( new JSONParseSpec(
new TimestampSpec("time", "auto"), new TimestampSpec("time", "auto", null),
new DimensionsSpec(ImmutableList.of("time", "dimA", "dimB", "col2"), ImmutableList.of("dimC"), null) new DimensionsSpec(ImmutableList.of("time", "dimA", "dimB", "col2"), ImmutableList.of("dimC"), null)
) )
), ),

View File

@ -53,7 +53,8 @@ public class FireDepartmentTest
new JSONParseSpec( new JSONParseSpec(
new TimestampSpec( new TimestampSpec(
"timestamp", "timestamp",
"auto" "auto",
null
), ),
new DimensionsSpec( new DimensionsSpec(
Arrays.asList("dim1", "dim2"), Arrays.asList("dim1", "dim2"),

View File

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