Remove getReverseIndexSize() from DfsPackDescription.

The method is used in only one location (DfsPackFile). Furthermore,
PackIndex already does an explicit computation of the size in
DfsPackFile. Simplify the DfsPackDescription by removing the method
and do the calculation similar to PackIndex.

Change-Id: I1391fdaaf7c2c3226d96ada1ae8647bcdff4794e

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsPackDescription.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsPackDescription.java
index 62fce3b73a4bb53b2c6ba9970301f7ff512b1e80..9cb29af5d29ecf3ecb98f3cb32f0acb01a5a9da6 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsPackDescription.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsPackDescription.java
@@ -168,13 +168,6 @@ public class DfsPackDescription implements Comparable<DfsPackDescription> {
                return size == null ? 0 : size.longValue();
        }
 
-       /**
-        * @return size of the reverse index, in bytes.
-        */
-       public int getReverseIndexSize() {
-               return (int) Math.min(objectCount * 8, Integer.MAX_VALUE);
-       }
-
        /** @return number of objects in the pack. */
        public long getObjectCount() {
                return objectCount;

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsPackFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsPackFile.java
index 8a4bd2e53456719898ac9c047d41adca91271470..4c41557e5dc73b7fc0cd28940ecc5d97e7174b59 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsPackFile.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsPackFile.java
@@ -283,9 +283,11 @@ public final class DfsPackFile {
                                        return revidx;
                        }
 
-                       PackReverseIndex revidx = new PackReverseIndex(idx(ctx));
-                       reverseIndex = cache.put(key, POS_REVERSE_INDEX,
-                                       packDesc.getReverseIndexSize(), revidx);
+                       PackIndex idx = idx(ctx);
+                       PackReverseIndex revidx = new PackReverseIndex(idx);
+                       int sz = (int) Math.min(
+                                       idx.getObjectCount() * 8, Integer.MAX_VALUE);
+                       reverseIndex = cache.put(key, POS_REVERSE_INDEX, sz, revidx);
                        return revidx;
                }
        }