Browse Source

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
stable-2.3
Colby Ranger 12 years ago
parent
commit
3f0176aea6
  1. 7
      org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsPackDescription.java
  2. 8
      org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsPackFile.java

7
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 == 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. */ /** @return number of objects in the pack. */
public long getObjectCount() { public long getObjectCount() {
return objectCount; return objectCount;

8
org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsPackFile.java

@ -283,9 +283,11 @@ public final class DfsPackFile {
return revidx; return revidx;
} }
PackReverseIndex revidx = new PackReverseIndex(idx(ctx)); PackIndex idx = idx(ctx);
reverseIndex = cache.put(key, POS_REVERSE_INDEX, PackReverseIndex revidx = new PackReverseIndex(idx);
packDesc.getReverseIndexSize(), revidx); int sz = (int) Math.min(
idx.getObjectCount() * 8, Integer.MAX_VALUE);
reverseIndex = cache.put(key, POS_REVERSE_INDEX, sz, revidx);
return revidx; return revidx;
} }
} }

Loading…
Cancel
Save