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

Merge branch 'master' into spatial

This commit is contained in:
fjy 2013-05-08 11:46:46 -07:00
parent 986bb2482d 8388d0593a
commit e1deaccd87
11 changed files with 44 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/pom.xml
View File

@ -28,7 +28,7 @@
<parent>
<groupId>com.metamx</groupId>
<artifactId>druid</artifactId>
<version>0.4.8-SNAPSHOT</version>
<version>0.4.9-SNAPSHOT</version>
</parent>
<dependencies>

41
client/src/main/java/com/metamx/druid/http/EmittingRequestLogger.java
View File

@ -19,7 +19,10 @@
package com.metamx.druid.http;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonValue;
import com.google.common.collect.ImmutableMap;
import com.metamx.druid.Query;
import com.metamx.emitter.core.Emitter;
import com.metamx.emitter.core.Event;
import org.joda.time.DateTime;
@ -64,30 +67,52 @@ public class EmittingRequestLogger implements RequestLogger
}
@Override
// override JsonValue serialization, instead use annotations
// to include type information for polymorphic Query objects
@JsonValue(value=false)
public Map<String, Object> toMap()
{
return ImmutableMap.<String, Object>builder()
.put("feed", getFeed())
.put("timestamp", request.getTimestamp())
.put("service", service)
.put("host", host)
.put("query", request.getQuery())
.put("remoteAddr", request.getRemoteAddr())
.build();
return ImmutableMap.of();
}
@Override
@JsonProperty("feed")
public String getFeed()
{
return feed;
}
@Override
@JsonProperty("timestamp")
public DateTime getCreatedTime()
{
return request.getTimestamp();
}
@JsonProperty("service")
public String getService()
{
return service;
}
@JsonProperty("host")
public String getHost()
{
return host;
}
@JsonProperty("query")
public Query getQuery()
{
return request.getQuery();
}
@JsonProperty("remoteAddr")
public String getRemoteAddr()
{
return request.getRemoteAddr();
}
@Override
public boolean isSafeToBuffer()
{

2
common/pom.xml
View File

@ -28,7 +28,7 @@
<parent>
<groupId>com.metamx</groupId>
<artifactId>druid</artifactId>
<version>0.4.8-SNAPSHOT</version>
<version>0.4.9-SNAPSHOT</version>
</parent>
<dependencies>

2
examples/pom.xml
View File

@ -9,7 +9,7 @@
<parent>
<groupId>com.metamx</groupId>
<artifactId>druid</artifactId>
<version>0.4.8-SNAPSHOT</version>
<version>0.4.9-SNAPSHOT</version>
</parent>
<dependencies>

2
index-common/pom.xml
View File

@ -29,7 +29,7 @@
<parent>
<groupId>com.metamx</groupId>
<artifactId>druid</artifactId>
<version>0.4.8-SNAPSHOT</version>
<version>0.4.9-SNAPSHOT</version>
</parent>
<dependencies>

2
indexer/pom.xml
View File

@ -28,7 +28,7 @@
<parent>
<groupId>com.metamx</groupId>
<artifactId>druid</artifactId>
<version>0.4.8-SNAPSHOT</version>
<version>0.4.9-SNAPSHOT</version>
</parent>
<dependencies>

2
merger/pom.xml
View File

@ -28,7 +28,7 @@
<parent>
<groupId>com.metamx</groupId>
<artifactId>druid</artifactId>
<version>0.4.8-SNAPSHOT</version>
<version>0.4.9-SNAPSHOT</version>
</parent>
<dependencies>

2
pom.xml
View File

@ -23,7 +23,7 @@
<groupId>com.metamx</groupId>
<artifactId>druid</artifactId>
<packaging>pom</packaging>
<version>0.4.8-SNAPSHOT</version>
<version>0.4.9-SNAPSHOT</version>
<name>druid</name>
<description>druid</description>
<scm>

2
realtime/pom.xml
View File

@ -28,7 +28,7 @@
<parent>
<groupId>com.metamx</groupId>
<artifactId>druid</artifactId>
<version>0.4.8-SNAPSHOT</version>
<version>0.4.9-SNAPSHOT</version>
</parent>
<dependencies>

2
server/pom.xml
View File

@ -28,7 +28,7 @@
<parent>
<groupId>com.metamx</groupId>
<artifactId>druid</artifactId>
<version>0.4.8-SNAPSHOT</version>
<version>0.4.9-SNAPSHOT</version>
</parent>
<dependencies>

4
services/pom.xml
View File

@ -24,11 +24,11 @@
<artifactId>druid-services</artifactId>
<name>druid-services</name>
<description>druid-services</description>
<version>0.4.8-SNAPSHOT</version>
<version>0.4.9-SNAPSHOT</version>
<parent>
<groupId>com.metamx</groupId>
<artifactId>druid</artifactId>
<version>0.4.8-SNAPSHOT</version>
<version>0.4.9-SNAPSHOT</version>
</parent>
<dependencies>