archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8242959: Optimize ZipFile.getEntry by folding lookups for name and name+'/'

Browse source 
Reviewed-by: lancea, redestad
This commit is contained in:
Eirik Bjørsnøs 2020-04-18 20:19:45 +02:00 • committed by Claes Redestad
parent d185fe9953
commit fc728278c2
1 changed files with 37 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/java.base/share/classes/java/util/zip/ZipFile.java
View file

@ -1289,6 +1289,12 @@ public class ZipFile implements ZipConstants, Closeable {
} }
private static final int hashN(byte[] a, int off, int len) { private static final int hashN(byte[] a, int off, int len) {
// Performance optimization: getEntryPos assumes that the hash
// of a name remains unchanged when appending a trailing '/'.
if (len > 0 && a[off + len - 1] == '/') {
len--;
}
int h = 1; int h = 1;
while (len-- > 0) { while (len-- > 0) {
h = 31 * h + a[off++]; h = 31 * h + a[off++];
@ -1296,10 +1302,6 @@ public class ZipFile implements ZipConstants, Closeable {
return h; return h;
} }
private static final int hashAppend(int hash, byte b) {
return hash * 31 + b;
}
private static class End { private static class End {
int centot; // 4 bytes int centot; // 4 bytes
long cenlen; // 4 bytes long cenlen; // 4 bytes
@ -1537,29 +1539,25 @@ public class ZipFile implements ZipConstants, Closeable {
} }
int hsh = hashN(name, 0, name.length); int hsh = hashN(name, 0, name.length);
int idx = table[(hsh & 0x7fffffff) % tablelen]; int idx = table[(hsh & 0x7fffffff) % tablelen];
boolean appendSlash = false;
/* // Search down the target hash chain for a entry whose
* This while loop is an optimization where a double lookup // 32 bit hash matches the hashed name.
* for name and name+/ is being performed. The name byte
* array will be updated with an added slash only if the first
* table lookup fails and there is a matching hash value for
* name+/.
*/
while (true) {
/*
* Search down the target hash chain for a entry whose
* 32 bit hash matches the hashed name.
*/
while (idx != ZIP_ENDCHAIN) { while (idx != ZIP_ENDCHAIN) {
if (getEntryHash(idx) == hsh) { if (getEntryHash(idx) == hsh) {
if (appendSlash) {
name = Arrays.copyOf(name, name.length + 1);
name[name.length - 1] = '/';
appendSlash = false;
}
// The CEN name must match the specfied one // The CEN name must match the specfied one
int pos = getEntryPos(idx); int pos = getEntryPos(idx);
if (name.length == CENNAM(cen, pos)) { final int nlen = CENNAM(cen, pos);
final int nstart = pos + CENHDR;
// If addSlash is true, we're testing for name+/ in
// addition to name, unless name is the empty string
// or already ends with a slash
if (name.length == nlen ||
(addSlash &&
name.length > 0 &&
name.length + 1 == nlen &&
cen[nstart + nlen - 1] == '/' &&
name[name.length - 1] != '/')) {
boolean matched = true; boolean matched = true;
int nameoff = pos + CENHDR; int nameoff = pos + CENHDR;
for (int i = 0; i < name.length; i++) { for (int i = 0; i < name.length; i++) {
@ -1575,19 +1573,8 @@ public class ZipFile implements ZipConstants, Closeable {
} }
idx = getEntryNext(idx); idx = getEntryNext(idx);
} }
/* If not addSlash, or slash is already there, we are done */
if (!addSlash || name.length == 0 || name[name.length - 1] == '/') {
return -1; return -1;
} }
// Add a slash to the hash code
hsh = hashAppend(hsh, (byte)'/');
// If we find a match on the new hash code, we need to append a
// slash when comparing
appendSlash = true;
idx = table[(hsh & 0x7fffffff) % tablelen];
addSlash = false;
}
}
/** /**
* Returns true if the bytes represent a non-directory name * Returns true if the bytes represent a non-directory name