opendev/gerrit
Code Issues Proposed changes

Merge changes from topic 'binary-files-size'

Browse Source 
* changes:
  Show for binary files the file size increase/decrease as percentage
  FileInfo: Include file size
This commit is contained in:
David Pursehouse 2015-11-11 00:56:21 +00:00 committed by Gerrit Code Review
commit dd3b71d4ee
13 changed files with 107 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Documentation/rest-api-changes.txt
View File

@ -414,35 +414,42 @@ default. Optional fields are:
"files": {
"gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeCache.java": {
"lines_deleted": 8,
"size_delta": -412
"size_delta": -412,
"size": 7782
},
"gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeDetailCache.java": {
"lines_inserted": 1,
"size_delta": 23
"size_delta": 23,
"size": 6762
},
"gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java": {
"lines_inserted": 11,
"lines_deleted": 19,
"size_delta": -298
"size_delta": -298,
"size": 47023
},
"gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java": {
"lines_inserted": 23,
"lines_deleted": 20,
"size_delta": 132
"size_delta": 132,
"size": 17727
},
"gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/StarCache.java": {
"status": "D",
"lines_deleted": 139,
"size_delta": -5512
"size_delta": -5512,
"size": 13098
},
"gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/StarredChanges.java": {
"status": "A",
"lines_inserted": 204,
"size_delta": 8345
"size_delta": 8345,
"size": 8345
},
"gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Screen.java": {
"lines_deleted": 9,
"size_delta": -343
"size_delta": -343,
"size": 5385
}
}
}
@ -3270,12 +3277,14 @@ sorted by file path.
"/COMMIT_MSG": {
"status": "A",
"lines_inserted": 7,
"size_delta": 551
"size_delta": 551,
"size": 551
},
"gerrit-server/src/main/java/com/google/gerrit/server/project/RefControl.java": {
"lines_inserted": 5,
"lines_deleted": 3,
"size_delta": 98
"size_delta": 98,
"size": 23348
}
}
----
@ -4218,6 +4227,8 @@ Number of deleted lines. +
Not set for binary files or if no lines were deleted.
|`size_delta` ||
Number of bytes by which the file size increased/decreased.
|`size` ||
File size in bytes.
|=============================
[[fix-input]]

1
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/FileInfo.java
View File

@ -21,4 +21,5 @@ public class FileInfo {
public Integer linesInserted;
public Integer linesDeleted;
public long sizeDelta;
public long size;
}

5
gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/FileInfo.java
View File

@ -34,6 +34,11 @@ public class FileInfo extends JavaScriptObject {
// JSNI methods cannot have 'long' as a parameter type or a return type and
// it's suggested to use double in this case:
// http://www.gwtproject.org/doc/latest/DevGuideCodingBasicsJSNI.html#important
public final long size() {
return (long)_size();
}
private final native double _size() /*-{ return this.size || 0; }-*/;
public final long sizeDelta() {
return (long)_sizeDelta();
}

16
gerrit-gwtui/src/main/java/com/google/gerrit/client/FormatUtil.java
View File

@ -14,6 +14,7 @@
package com.google.gerrit.client;
import com.google.gerrit.client.change.Resources;
import com.google.gerrit.client.info.AccountInfo;
import com.google.gerrit.client.info.AccountPreferencesInfo;
import com.google.gerrit.reviewdb.client.Account;
@ -134,4 +135,19 @@ public class FormatUtil {
+ NumberFormat.getFormat("#.0").format(bytes / Math.pow(1024, exp))
+ " " + "KMGTPE".charAt(exp - 1) + "iB";
}
public static String formatPercentage(long size, long delta) {
if (size == 0) {
return Resources.C.notAvailable();
}
return (delta > 0 ? "+" : "-") + formatAbsPercentage(size, delta);
}
public static String formatAbsPercentage(long size, long delta) {
if (size == 0) {
return Resources.C.notAvailable();
}
int p = Math.abs(Math.round(delta * 100 / size));
return p + "%";
}
}

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeConstants.java
View File

@ -16,7 +16,7 @@ package com.google.gerrit.client.change;
import com.google.gwt.i18n.client.Constants;
interface ChangeConstants extends Constants {
public interface ChangeConstants extends Constants {
String previousChange();
String nextChange();
String openChange();

24
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/FileTable.java
View File

@ -16,6 +16,8 @@ package com.google.gerrit.client.change;
import static com.google.gerrit.client.FormatUtil.formatAbsBytes;
import static com.google.gerrit.client.FormatUtil.formatBytes;
import static com.google.gerrit.client.FormatUtil.formatPercentage;
import static com.google.gerrit.client.FormatUtil.formatAbsPercentage;
import com.google.gerrit.client.Dispatcher;
import com.google.gerrit.client.Gerrit;
@ -464,6 +466,7 @@ public class FileTable extends FlowPanel {
private boolean hasNonBinaryFile;
private int inserted;
private int deleted;
private long binOldSize;
private long bytesInserted;
private long bytesDeleted;
@ -520,6 +523,7 @@ public class FileTable extends FlowPanel {
private void computeInsertedDeleted() {
inserted = 0;
deleted = 0;
binOldSize = 0;
bytesInserted = 0;
bytesDeleted = 0;
for (int i = 0; i < list.length(); i++) {
@ -531,6 +535,7 @@ public class FileTable extends FlowPanel {
deleted += info.linesDeleted();
} else {
hasBinaryFile = true;
binOldSize += info.size() - info.sizeDelta();
if (info.sizeDelta() >= 0) {
bytesInserted += info.sizeDelta();
} else {
@ -771,6 +776,12 @@ public class FileTable extends FlowPanel {
}
} else if (info.binary()) {
sb.append(formatBytes(info.sizeDelta()));
long oldSize = info.size() - info.sizeDelta();
if (oldSize != 0) {
sb.append(" (")
.append(formatPercentage(oldSize, info.sizeDelta()))
.append(")");
}
}
sb.closeTd();
}
@ -827,8 +838,17 @@ public class FileTable extends FlowPanel {
if (hasNonBinaryFile) {
sb.br();
}
sb.append(Util.M.patchTableSize_ModifyBinaryFiles(
formatAbsBytes(bytesInserted), formatAbsBytes(bytesDeleted)));
if (binOldSize != 0) {
sb.append(Util.M.patchTableSize_ModifyBinaryFilesWithPercentages(
formatAbsBytes(bytesInserted),
formatAbsPercentage(binOldSize, bytesInserted),
formatAbsBytes(bytesDeleted),
formatAbsPercentage(binOldSize, bytesDeleted)));
} else {
sb.append(Util.M.patchTableSize_ModifyBinaryFiles(
formatAbsBytes(bytesInserted),
formatAbsBytes(bytesDeleted)));
}
}
sb.closeTh();

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.java
View File

@ -36,6 +36,8 @@ public interface ChangeMessages extends Messages {
String patchTableSize_Modify(int insertions, int deletions);
String patchTableSize_ModifyBinaryFiles(String bytesInserted,
String bytesDeleted);
String patchTableSize_ModifyBinaryFilesWithPercentages(String bytesInserted,
String percentageInserted, String bytesDeleted, String percentageDeleted);
String patchTableSize_LongModify(int insertions, int deletions);
String patchTableSize_Lines(@PluralCount int insertions);

1
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties
View File

@ -18,6 +18,7 @@ patchTableComments = {0} comments
patchTableDrafts = {0} drafts
patchTableSize_Modify = +{0}, -{1}
patchTableSize_ModifyBinaryFiles = +{0}, -{1}
patchTableSize_ModifyBinaryFilesWithPercentages = +{0} (+{1}), -{2} (-{3})
patchTableSize_LongModify = {0} inserted, {1} deleted
patchTableSize_Lines = {0} lines

14
gerrit-gwtui/src/test/java/com/google/gerrit/client/FormatUtilTest.java
View File

@ -15,6 +15,7 @@
package com.google.gerrit.client;
import static com.google.gerrit.client.FormatUtil.formatBytes;
import static com.google.gerrit.client.FormatUtil.formatPercentage;
import static org.junit.Assert.assertEquals;
import com.googlecode.gwt.test.GwtModule;
@ -45,4 +46,17 @@ public class FormatUtilTest extends GwtTest {
assertEquals("-27 B", formatBytes(-27));
assertEquals("-1.7 MiB", formatBytes(-1728));
}
@Test
public void testFormatPercentage() {
assertEquals("N/A", formatPercentage(0, 10));
assertEquals("0%", formatPercentage(100, 0));
assertEquals("+25%", formatPercentage(100, 25));
assertEquals("-25%", formatPercentage(100, -25));
assertEquals("+50%", formatPercentage(100, 50));
assertEquals("-50%", formatPercentage(100, -50));
assertEquals("+100%", formatPercentage(100, 100));
assertEquals("-100%", formatPercentage(100, -100));
assertEquals("+500%", formatPercentage(100, 500));
}
}

2
gerrit-server/src/main/java/com/google/gerrit/server/change/FileInfoJson.java
View File

@ -64,6 +64,7 @@ public class FileInfoJson {
? e.getChangeType().getCode() : null;
d.oldPath = e.getOldName();
d.sizeDelta = e.getSizeDelta();
d.size = e.getSize();
if (e.getPatchType() == Patch.PatchType.BINARY) {
d.binary = true;
} else {
@ -78,6 +79,7 @@ public class FileInfoJson {
// a single record with data from both sides.
d.status = Patch.ChangeType.REWRITE.getCode();
d.sizeDelta = o.sizeDelta;
d.size = o.size;
if (o.binary != null && o.binary) {
d.binary = true;
}

18
gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListEntry.java
View File

@ -51,7 +51,7 @@ public class PatchListEntry {
static PatchListEntry empty(final String fileName) {
return new PatchListEntry(ChangeType.MODIFIED, PatchType.UNIFIED, null,
fileName, EMPTY_HEADER, Collections.<Edit> emptyList(), 0, 0, 0);
fileName, EMPTY_HEADER, Collections.<Edit> emptyList(), 0, 0, 0, 0);
}
private final ChangeType changeType;
@ -62,11 +62,13 @@ public class PatchListEntry {
private final List<Edit> edits;
private final int insertions;
private final int deletions;
private final long size;
private final long sizeDelta;
// Note: When adding new fields, the serialVersionUID in PatchListKey must be
// incremented so that entries from the cache are automatically invalidated.
PatchListEntry(FileHeader hdr, List<Edit> editList, long sizeDelta) {
PatchListEntry(FileHeader hdr, List<Edit> editList, long size,
long sizeDelta) {
changeType = toChangeType(hdr);
patchType = toPatchType(hdr);
@ -111,12 +113,13 @@ public class PatchListEntry {
}
insertions = ins;
deletions = del;
this.size = size;
this.sizeDelta = sizeDelta;
}
private PatchListEntry(ChangeType changeType, PatchType patchType,
String oldName, String newName, byte[] header, List<Edit> edits,
int insertions, int deletions, long sizeDelta) {
int insertions, int deletions, long size, long sizeDelta) {
this.changeType = changeType;
this.patchType = patchType;
this.oldName = oldName;
@ -125,6 +128,7 @@ public class PatchListEntry {
this.edits = edits;
this.insertions = insertions;
this.deletions = deletions;
this.size = size;
this.sizeDelta = sizeDelta;
}
@ -172,6 +176,10 @@ public class PatchListEntry {
return deletions;
}
public long getSize() {
return size;
}
public long getSizeDelta() {
return sizeDelta;
}
@ -208,6 +216,7 @@ public class PatchListEntry {
writeBytes(out, header);
writeVarInt32(out, insertions);
writeVarInt32(out, deletions);
writeFixInt64(out, size);
writeFixInt64(out, sizeDelta);
writeVarInt32(out, edits.size());
@ -227,6 +236,7 @@ public class PatchListEntry {
byte[] hdr = readBytes(in);
int ins = readVarInt32(in);
int del = readVarInt32(in);
long size = readFixInt64(in);
long sizeDelta = readFixInt64(in);
int editCount = readVarInt32(in);
@ -240,7 +250,7 @@ public class PatchListEntry {
}
return new PatchListEntry(changeType, patchType, oldName, newName, hdr,
toList(editArray), ins, del, sizeDelta);
toList(editArray), ins, del, size, sizeDelta);
}
private static List<Edit> toList(Edit[] l) {

2
gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListKey.java
View File

@ -34,7 +34,7 @@ import java.io.ObjectOutputStream;
import java.io.Serializable;
public class PatchListKey implements Serializable {
static final long serialVersionUID = 18L;
static final long serialVersionUID = 19L;
public static final BiMap<Whitespace, Character> WHITESPACE_TYPES = ImmutableBiMap.of(
Whitespace.IGNORE_NONE, 'N',

15
gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java
View File

@ -206,7 +206,7 @@ public class PatchListLoader implements Callable<PatchList> {
getFileSize(repo, reader, e.getOldMode(), e.getOldPath(), aTree);
long newSize =
getFileSize(repo, reader, e.getNewMode(), e.getNewPath(), bTree);
entries.add(newEntry(aTree, fh, newSize - oldSize));
entries.add(newEntry(aTree, fh, newSize, newSize - oldSize));
}
}
return new PatchList(a, b, againstParent,
@ -301,37 +301,38 @@ public class PatchListLoader implements Callable<PatchList> {
byte[] rawHdr = hdr.toString().getBytes(UTF_8);
byte[] aContent = aText.getContent();
byte[] bContent = bText.getContent();
long size = bContent.length;
long sizeDelta = bContent.length - aContent.length;
RawText aRawText = new RawText(aContent);
RawText bRawText = new RawText(bContent);
EditList edits = new HistogramDiff().diff(cmp, aRawText, bRawText);
FileHeader fh = new FileHeader(rawHdr, edits, PatchType.UNIFIED);
return new PatchListEntry(fh, edits, sizeDelta);
return new PatchListEntry(fh, edits, size, sizeDelta);
}
private PatchListEntry newEntry(RevTree aTree, FileHeader fileHeader,
long sizeDelta) {
long size, long sizeDelta) {
final FileMode oldMode = fileHeader.getOldMode();
final FileMode newMode = fileHeader.getNewMode();
if (oldMode == FileMode.GITLINK || newMode == FileMode.GITLINK) {
return new PatchListEntry(fileHeader, Collections.<Edit> emptyList(),
sizeDelta);
size, sizeDelta);
}
if (aTree == null // want combined diff
|| fileHeader.getPatchType() != PatchType.UNIFIED
|| fileHeader.getHunks().isEmpty()) {
return new PatchListEntry(fileHeader, Collections.<Edit> emptyList(),
sizeDelta);
size, sizeDelta);
}
List<Edit> edits = fileHeader.toEditList();
if (edits.isEmpty()) {
return new PatchListEntry(fileHeader, Collections.<Edit> emptyList(),
sizeDelta);
size, sizeDelta);
} else {
return new PatchListEntry(fileHeader, edits, sizeDelta);
return new PatchListEntry(fileHeader, edits, size, sizeDelta);
}
}