diff options
| author | Terry Parker | 2015-11-03 23:08:32 +0000 |
|---|---|---|
| committer | Terry Parker | 2015-11-03 23:10:02 +0000 |
| commit | 36c6aecbe830d0bf6fa1bbf69176d56fd2e7318a (patch) | |
| tree | 282718de7ca806d127e12e495d7bded870010fa2 | |
| parent | 6a3127b257ae275e43b91d3b733ac2129c0792c3 (diff) | |
| download | jgit-36c6aecbe830d0bf6fa1bbf69176d56fd2e7318a.tar.gz jgit-36c6aecbe830d0bf6fa1bbf69176d56fd2e7318a.tar.xz jgit-36c6aecbe830d0bf6fa1bbf69176d56fd2e7318a.zip | |
Delta compression: reuse DeltaTask.getAdjustedWeight()
Change-Id: I07ed5207b175735b4e2c46edf652cc35908dad02
Signed-off-by: Terry Parker <tparker@google.com>
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/DeltaTask.java | 2 | ||||
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/DeltaTask.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/DeltaTask.java index 076df18800..42927426b9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/DeltaTask.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/DeltaTask.java @@ -226,7 +226,7 @@ final class DeltaTask implements Callable<Object> { } } - private static int getAdjustedWeight(ObjectToPack o) { + static int getAdjustedWeight(ObjectToPack o) { // Edge objects and those with reused deltas do not need to be // compressed. For compression calculations, ignore their weights. if (o.isEdge() || o.doNotAttemptDelta()) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java index f087aca05b..19b6b080da 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java @@ -1306,8 +1306,7 @@ public class PackWriter implements AutoCloseable { long totalWeight = 0; for (int i = 0; i < cnt; i++) { ObjectToPack o = list[i]; - if (!o.isEdge() && !o.doNotAttemptDelta()) - totalWeight += o.getWeight(); + totalWeight += DeltaTask.getAdjustedWeight(o); } long bytesPerUnit = 1; |