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

fix npe queryID

This commit is contained in:
nishantmonu51 2014-03-01 04:32:27 +05:30
parent e54949ca98
commit 40aa6ecaef
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/src/main/java/io/druid/server/QueryResource.java
View File

@ -92,7 +92,7 @@ public class QueryResource
final long start = System.currentTimeMillis();
Query query = null;
byte[] requestQuery = null;
String queryID;
String queryId;
final boolean isSmile = "application/smile".equals(req.getContentType());
@ -105,9 +105,10 @@ public class QueryResource
try {
requestQuery = ByteStreams.toByteArray(req.getInputStream());
query = objectMapper.readValue(requestQuery, Query.class);
queryID = query.getId();
if (queryID == null) {
query = query.withId(idProvider.next(query));
queryId = query.getId();
if (queryId == null) {
queryId = idProvider.next(query);
query = query.withId(queryId);
}
requestLogger.log(
@ -136,7 +137,7 @@ public class QueryResource
.setUser6(String.valueOf(query.hasFilters()))
.setUser7(req.getRemoteAddr())
.setUser9(query.getDuration().toPeriod().toStandardMinutes().toString())
.setUser10(queryID)
.setUser10(queryId)
.build("request/time", requestTime)
);
}