PackWriter: Try for accurate delta reuse on cached pack

If a cached pack is used, it might know how many deltas are contained
within it.  Record that count as part of our reusedDeltas field
for the stats line we show clients.

Change-Id: I1c61fb817305a95eeac654cccf132cba20b2339c
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/CachedPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/CachedPack.java
index c369e653ef3d57fda045c04a44fe41ab7052444c..580fa78416f0fa1c1384fee8c4ef2a8a7c6ad332 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/CachedPack.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/CachedPack.java
@@ -71,6 +71,27 @@ public abstract class CachedPack {
         */
        public abstract long getObjectCount() throws IOException;
 
+       /**
+        * Get the number of delta objects stored in this pack.
+        * <p>
+        * This is an optional method, not every cached pack storage system knows
+        * the precise number of deltas stored within the pack. This number must be
+        * smaller than {@link #getObjectCount()} as deltas are not supposed to span
+        * across pack files.
+        * <p>
+        * This method must be fast, if the only way to determine delta counts is to
+        * scan the pack file's contents one object at a time, implementors should
+        * return 0 and avoid the high cost of the scan.
+        *
+        * @return the number of deltas; 0 if the number is not known or there are
+        *         no deltas.
+        * @throws IOException
+        *             if the delta count cannot be read.
+        */
+       public long getDeltaCount() throws IOException {
+               return 0;
+       }
+
        /**
         * Determine if the pack contains the requested objects.
         *

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackWriter.java
index 3b1016926fcb6330671854ef12c1c660fd517dca..b8b27676770ca5514396f396d4e12e91e4e1449d 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackWriter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackWriter.java
@@ -588,6 +588,7 @@ public class PackWriter {
 
                for (CachedPack pack : cachedPacks) {
                        stats.reusedObjects += pack.getObjectCount();
+                       stats.reusedDeltas += pack.getDeltaCount();
                        reuseSupport.copyPackAsIs(out, pack);
                }
                writeChecksum(out);