opendev/gerrit
Code Issues Proposed changes

OutputStreamQuery: Optimize formatter allocation

Browse Source 
Use Joda's DateTimeFormatter rather than the slow, unsafe JDK
SimpleDateFormat. This is immutable so we can parse the format string
only once.

Don't construct a Gson if we don't need it. Continue constructing one
per request, which is cheap and we already do it for the REST API.

Change-Id: Ibd60893c008f5b0da9d25a0190d16390d138c5ba
This commit is contained in:
Dave Borowitz
2014-12-22 15:40:01 -08:00
parent 6c69f8435a
commit ac8a7c4193
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gerrit-server/src/main/java/com/google/gerrit/server/query/change/OutputStreamQuery.java
View File

@@ -32,6 +32,8 @@ import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import org.eclipse.jgit.util.io.DisabledOutputStream;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,11 +43,9 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.lang.reflect.Field;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Date;
import java.util.List;
/**
@@ -56,14 +56,13 @@ public class OutputStreamQuery {
private static final Logger log =
LoggerFactory.getLogger(OutputStreamQuery.class);
private static final DateTimeFormatter dtf =
DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss zzz");
public static enum OutputFormat {
TEXT, JSON
}
private final Gson gson = new Gson();
private final SimpleDateFormat sdf =
new SimpleDateFormat("yyyy-MM-dd HH:mm:ss zzz");
private final QueryProcessor queryProcessor;
private final EventFactory eventFactory;
private final TrackingFooters trackingFooters;
@@ -295,7 +294,7 @@ public class OutputStreamQuery {
break;
case JSON:
out.print(gson.toJson(data));
out.print(new Gson().toJson(data));
out.print('\n');
break;
}
@@ -342,7 +341,7 @@ public class OutputStreamQuery {
out.print('\n');
} else if (value instanceof Long && isDateField(field)) {
out.print(' ');
out.print(sdf.format(new Date(((Long) value) * 1000L)));
out.print(dtf.print(((Long) value) * 1000L));
out.print('\n');
} else if (isPrimitive(value)) {
out.print(' ');