motiejus
/
jgit
1
Fork 0
Code Releases Activity

dfs: Fix default DfsStreamKey to include DfsRepositoryDescription 

Not all DFS implementations use globally unique pack names in the
DfsPackDescription.  Most require the DfsRepositoryDescription to
qualify the pack.  Include DfsRepositoryDescription in the default
DfsStreamKey implementation, to prevent cache collisions.

Change-Id: I9ebf0c76bf2b414a702ae050b32e42588067bc44
This commit is contained in:
Shawn Pearce 2017-07-19 05:53:30 -07:00
parent 90a957c947
commit 4321ccd468
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackDescription.java
View File

@ -133,7 +133,7 @@ public String getFileName(PackExt ext) {
* @return cache key for use by the block cache. * @return cache key for use by the block cache.
*/ */
public DfsStreamKey getStreamKey(PackExt ext) { public DfsStreamKey getStreamKey(PackExt ext) {
return DfsStreamKey.of(getFileName(ext)); return DfsStreamKey.of(getRepositoryDescription(), getFileName(ext));
} }
/** @return the source of the pack. */ /** @return the source of the pack. */

26
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsStreamKey.java
View File

@ -50,22 +50,14 @@
/** Key used by {@link DfsBlockCache} to disambiguate streams. */ /** Key used by {@link DfsBlockCache} to disambiguate streams. */
public abstract class DfsStreamKey { public abstract class DfsStreamKey {
/** /**
* @param repo
* description of the containing repository.
* @param name * @param name
* compute the key from a string name. * compute the key from a string name.
* @return key for {@code name} * @return key for {@code name}
*/ */
public static DfsStreamKey of(String name) { public static DfsStreamKey of(DfsRepositoryDescription repo, String name) {
return of(name.getBytes(UTF_8)); return new ByteArrayDfsStreamKey(repo, name.getBytes(UTF_8));
}
/**
* @param name
* compute the key from a byte array. The key takes ownership of
* the passed {@code byte[] name}.
* @return key for {@code name}
*/
public static DfsStreamKey of(byte[] name) {
return new ByteArrayDfsStreamKey(name);
} }
final int hash; final int hash;
@ -95,10 +87,12 @@ public String toString() {
} }
private static final class ByteArrayDfsStreamKey extends DfsStreamKey { private static final class ByteArrayDfsStreamKey extends DfsStreamKey {
private final DfsRepositoryDescription repo;
private final byte[] name; private final byte[] name;
ByteArrayDfsStreamKey(byte[] name) { ByteArrayDfsStreamKey(DfsRepositoryDescription repo, byte[] name) {
super(Arrays.hashCode(name)); super(repo.hashCode() * 31 + Arrays.hashCode(name));
this.repo = repo;
this.name = name; this.name = name;
} }
@ -106,7 +100,9 @@ private static final class ByteArrayDfsStreamKey extends DfsStreamKey {
public boolean equals(Object o) { public boolean equals(Object o) {
if (o instanceof ByteArrayDfsStreamKey) { if (o instanceof ByteArrayDfsStreamKey) {
ByteArrayDfsStreamKey k = (ByteArrayDfsStreamKey) o; ByteArrayDfsStreamKey k = (ByteArrayDfsStreamKey) o;
return hash == k.hash && Arrays.equals(name, k.name); return hash == k.hash
&& repo.equals(k.repo)
&& Arrays.equals(name, k.name);
} }
return false; return false;
} }