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

Fix DataSourceMetadataResultValue serde.

This commit is contained in:
Gian Merlino 2015-02-03 17:39:42 -08:00
parent 1298b4abd3
commit 085ad8d345
3 changed files with 52 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
processing/src/main/java/io/druid/query/datasourcemetadata/DataSourceMetadataQuery.java
View File

@ -22,7 +22,6 @@ package io.druid.query.datasourcemetadata;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import io.druid.common.utils.JodaUtils;
import io.druid.query.BaseQuery;
import io.druid.query.DataSource;
@ -45,9 +44,6 @@ public class DataSourceMetadataQuery extends BaseQuery<Result<DataSourceMetadata
JodaUtils.MIN_INSTANT, JodaUtils.MAX_INSTANT
);
public static String MAX_INGESTED_EVENT_TIME = "maxIngestedEventTime";
@JsonCreator
public DataSourceMetadataQuery(
@JsonProperty("dataSource") DataSource dataSource,

6
processing/src/main/java/io/druid/query/datasourcemetadata/DataSourceMetadataResultValue.java
View File

@ -20,7 +20,7 @@
package io.druid.query.datasourcemetadata;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.joda.time.DateTime;
/**
@ -31,13 +31,13 @@ public class DataSourceMetadataResultValue
@JsonCreator
public DataSourceMetadataResultValue(
DateTime maxIngestedEventTime
@JsonProperty("maxIngestedEventTime") DateTime maxIngestedEventTime
)
{
this.maxIngestedEventTime = maxIngestedEventTime;
}
@JsonValue
@JsonProperty
public DateTime getMaxIngestedEventTime()
{
return maxIngestedEventTime;

35
processing/src/test/java/io/druid/query/datasourcemetadata/DataSourceMetadataQueryTest.java
View File

@ -21,6 +21,7 @@
package io.druid.query.datasourcemetadata;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@ -40,7 +41,6 @@ import io.druid.query.aggregation.AggregatorFactory;
import io.druid.query.aggregation.CountAggregatorFactory;
import io.druid.query.timeboundary.TimeBoundaryQueryQueryToolChest;
import io.druid.segment.IncrementalIndexSegment;
import io.druid.segment.TestIndex;
import io.druid.segment.incremental.IncrementalIndex;
import io.druid.segment.incremental.OnheapIncrementalIndex;
import io.druid.timeline.LogicalSegment;
@ -113,7 +113,8 @@ public class DataSourceMetadataQueryTest
{
final IncrementalIndex rtIndex = new OnheapIncrementalIndex(
0L, QueryGranularity.NONE, new AggregatorFactory[]{new CountAggregatorFactory("count")}, 1000
);;
);
;
final QueryRunner runner = QueryRunnerTestHelper.makeQueryRunner(
(QueryRunnerFactory) new DataSourceMetadataQueryRunnerFactory(
QueryRunnerTestHelper.NOOP_QUERYWATCHER
@ -209,4 +210,34 @@ public class DataSourceMetadataQueryTest
}
}
@Test
public void testResultSerialization()
{
final DataSourceMetadataResultValue resultValue = new DataSourceMetadataResultValue(new DateTime("2000-01-01T00Z"));
final Map<String, Object> resultValueMap = new DefaultObjectMapper().convertValue(
resultValue,
new TypeReference<Map<String, Object>>()
{
}
);
Assert.assertEquals(
ImmutableMap.<String, Object>of("maxIngestedEventTime", "2000-01-01T00:00:00.000Z"),
resultValueMap
);
}
@Test
public void testResultDeserialization()
{
final Map<String, Object> resultValueMap = ImmutableMap.<String, Object>of(
"maxIngestedEventTime",
"2000-01-01T00:00:00.000Z"
);
final DataSourceMetadataResultValue resultValue = new DefaultObjectMapper().convertValue(
resultValueMap,
DataSourceMetadataResultValue.class
);
Assert.assertEquals(new DateTime("2000"), resultValue.getMaxIngestedEventTime());
}
}