Skip to content

Commit a5cddf7

Browse files
philwebbphilwebb
committed
Reduce JarURLConnection allocations
Update JarURLConnection & Handler so that a shared static final connection is returned for entries that cannot be found. See spring-projectsgh-6215
1 parent 44b7f29 commit a5cddf7

File tree

8 files changed

+179
-103
lines changed

8 files changed

+179
-103
lines changed

‎spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryFileHeader.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ final class CentralDirectoryFileHeader implements FileHeader {
6565
}
6666

6767
void load(byte[] data, int dataOffset, RandomAccessData variableData,
68-
int variableOffset) throws IOException {
68+
int variableOffset, JarEntryFilter filter) throws IOException {
6969
// Load fixed part
7070
this.header = data;
7171
this.headerOffset = dataOffset;
@@ -81,6 +81,9 @@ void load(byte[] data, int dataOffset, RandomAccessData variableData,
8181
dataOffset = 0;
8282
}
8383
this.name = new AsciiBytes(data, dataOffset, (int) nameLength);
84+
if (filter != null) {
85+
this.name = filter.apply(this.name);
86+
}
8487
this.extra = NO_EXTRA;
8588
this.comment = NO_COMMENT;
8689
if (extraLength > 0) {
@@ -172,10 +175,10 @@ public CentralDirectoryFileHeader clone() {
172175
}
173176

174177
public static CentralDirectoryFileHeader fromRandomAccessData(RandomAccessData data,
175-
int offset) throws IOException {
178+
int offset, JarEntryFilter filter) throws IOException {
176179
CentralDirectoryFileHeader fileHeader = new CentralDirectoryFileHeader();
177180
byte[] bytes = Bytes.get(data.getSubsection(offset, 46));
178-
fileHeader.load(bytes, 0, data, offset);
181+
fileHeader.load(bytes, 0, data, offset, filter);
179182
return fileHeader;
180183
}
181184

‎spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryParser.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ private void parseEntries(CentralDirectoryEndRecord endRecord,
6565
CentralDirectoryFileHeader fileHeader = new CentralDirectoryFileHeader();
6666
int dataOffset = 0;
6767
for (int i = 0; i < endRecord.getNumberOfRecords(); i++) {
68-
fileHeader.load(bytes, dataOffset, null, 0);
68+
fileHeader.load(bytes, dataOffset, null, 0, null);
6969
visitFileHeader(dataOffset, fileHeader);
7070
dataOffset += this.CENTRAL_DIRECTORY_HEADER_BASE_SIZE
7171
+ fileHeader.getName().length() + fileHeader.getComment().length()

‎spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/Handler.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2015 the original author or authors.
2+
* Copyright 2012-2016 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -85,10 +85,10 @@ public Handler(JarFile jarFile) {
8585
@Override
8686
protected URLConnection openConnection(URL url) throws IOException {
8787
if (this.jarFile != null) {
88-
return new JarURLConnection(url, this.jarFile);
88+
return JarURLConnection.get(url, this.jarFile);
8989
}
9090
try {
91-
return new JarURLConnection(url, getRootJarFileFromUrl(url));
91+
return JarURLConnection.get(url, getRootJarFileFromUrl(url));
9292
}
9393
catch (Exception ex) {
9494
return openFallbackConnection(url, ex);

‎spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntry.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ class JarEntry extends java.util.jar.JarEntry implements FileHeader {
3939

4040
private long localHeaderOffset;
4141

42-
JarEntry(JarFile jarFile, String name, CentralDirectoryFileHeader header) {
43-
super(name);
42+
JarEntry(JarFile jarFile, CentralDirectoryFileHeader header) {
43+
super(header.getName().toString());
4444
this.jarFile = jarFile;
4545
this.localHeaderOffset = header.getLocalHeaderOffset();
4646
setCompressedSize(header.getCompressedSize());

‎spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,10 @@ public JarEntry getJarEntry(String name) {
200200
return (JarEntry) getEntry(name);
201201
}
202202

203+
public boolean containsEntry(String name) {
204+
return this.entries.containsEntry(name);
205+
}
206+
203207
@Override
204208
public ZipEntry getEntry(String name) {
205209
return this.entries.getEntry(name);
@@ -320,8 +324,7 @@ public String toString() {
320324

321325
@Override
322326
public String getName() {
323-
String path = this.pathFromRoot;
324-
return this.rootFile.getFile() + path;
327+
return this.rootFile.getFile() + this.pathFromRoot;
325328
}
326329

327330
boolean isSigned() {

‎spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFileEntries.java

+17-16
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,12 @@ class JarFileEntries implements CentralDirectoryVisitor, Iterable<JarEntry> {
6666

6767
private int[] positions;
6868

69-
private final Map<Integer, JarEntry> entriesCache = Collections
70-
.synchronizedMap(new LinkedHashMap<Integer, JarEntry>(16, 0.75f, true) {
69+
private final Map<Integer, FileHeader> entriesCache = Collections
70+
.synchronizedMap(new LinkedHashMap<Integer, FileHeader>(16, 0.75f, true) {
7171

7272
@Override
73-
protected boolean removeEldestEntry(Map.Entry<Integer, JarEntry> eldest) {
73+
protected boolean removeEldestEntry(
74+
Map.Entry<Integer, FileHeader> eldest) {
7475
if (JarFileEntries.this.jarFile.isSigned()) {
7576
return false;
7677
}
@@ -165,6 +166,10 @@ public Iterator<JarEntry> iterator() {
165166
return new EntryIterator();
166167
}
167168

169+
public boolean containsEntry(String name) {
170+
return getEntry(name, FileHeader.class, true) != null;
171+
}
172+
168173
public JarEntry getEntry(String name) {
169174
return getEntry(name, JarEntry.class, true);
170175
}
@@ -235,21 +240,17 @@ private <T extends FileHeader> T getEntry(int hashCode, String name, String suff
235240
@SuppressWarnings("unchecked")
236241
private <T extends FileHeader> T getEntry(int index, Class<T> type,
237242
boolean cacheEntry) {
238-
JarEntry entry = this.entriesCache.get(index);
239-
if (entry != null) {
240-
return (T) entry;
241-
}
242243
try {
243-
CentralDirectoryFileHeader header = CentralDirectoryFileHeader
244-
.fromRandomAccessData(this.centralDirectoryData,
245-
this.centralDirectoryOffsets[index]);
246-
if (FileHeader.class.equals(type)) {
247-
// No need to convert
248-
return (T) header;
244+
FileHeader cached = this.entriesCache.get(index);
245+
FileHeader entry = (cached != null ? cached
246+
: CentralDirectoryFileHeader.fromRandomAccessData(
247+
this.centralDirectoryData,
248+
this.centralDirectoryOffsets[index], this.filter));
249+
if (CentralDirectoryFileHeader.class.equals(entry.getClass())
250+
&& type.equals(JarEntry.class)) {
251+
entry = new JarEntry(this.jarFile, (CentralDirectoryFileHeader) entry);
249252
}
250-
entry = new JarEntry(this.jarFile, applyFilter(header.getName()).toString(),
251-
header);
252-
if (cacheEntry) {
253+
if (cacheEntry && cached != entry) {
253254
this.entriesCache.put(index, entry);
254255
}
255256
return (T) entry;

‎spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarURLConnection.java

+103-48
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,15 @@
3535
* @author Phillip Webb
3636
* @author Andy Wilkinson
3737
*/
38-
class JarURLConnection extends java.net.JarURLConnection {
38+
final class JarURLConnection extends java.net.JarURLConnection {
3939

40-
private static final FileNotFoundException FILE_NOT_FOUND_EXCEPTION = new FileNotFoundException();
40+
private static ThreadLocal<Boolean> useFastExceptions = new ThreadLocal<Boolean>();
41+
42+
private static final FileNotFoundException FILE_NOT_FOUND_EXCEPTION = new FileNotFoundException(
43+
"Jar file or entry not found");
44+
45+
private static final IllegalStateException NOT_FOUND_CONNECTION_EXCEPTION = new IllegalStateException(
46+
FILE_NOT_FOUND_EXCEPTION);
4147

4248
private static final String SEPARATOR = "!/";
4349

@@ -63,7 +69,8 @@ protected URLConnection openConnection(URL u) throws IOException {
6369

6470
private static final String READ_ACTION = "read";
6571

66-
private static ThreadLocal<Boolean> useFastExceptions = new ThreadLocal<Boolean>();
72+
private static final JarURLConnection NOT_FOUND_CONNECTION = JarURLConnection
73+
.notFound();
6774

6875
private final JarFile jarFile;
6976

@@ -75,48 +82,20 @@ protected URLConnection openConnection(URL u) throws IOException {
7582

7683
private JarEntry jarEntry;
7784

78-
protected JarURLConnection(URL url, JarFile jarFile) throws IOException {
85+
private JarURLConnection(URL url, JarFile jarFile, JarEntryName jarEntryName)
86+
throws IOException {
7987
// What we pass to super is ultimately ignored
8088
super(EMPTY_JAR_URL);
8189
this.url = url;
82-
String spec = extractFullSpec(url, jarFile.getPathFromRoot());
83-
int separator;
84-
int index = 0;
85-
while ((separator = spec.indexOf(SEPARATOR, index)) > 0) {
86-
jarFile = getNestedJarFile(jarFile, spec.substring(index, separator));
87-
index += separator + SEPARATOR.length();
88-
}
8990
this.jarFile = jarFile;
90-
this.jarEntryName = getJarEntryName(spec.substring(index));
91-
}
92-
93-
private String extractFullSpec(URL url, String pathFromRoot) {
94-
String file = url.getFile();
95-
int separatorIndex = file.indexOf(SEPARATOR);
96-
if (separatorIndex < 0) {
97-
return "";
98-
}
99-
int specIndex = separatorIndex + SEPARATOR.length() + pathFromRoot.length();
100-
return file.substring(specIndex);
101-
}
102-
103-
private JarFile getNestedJarFile(JarFile jarFile, String name) throws IOException {
104-
JarEntry jarEntry = jarFile.getJarEntry(name);
105-
if (jarEntry == null) {
106-
throwFileNotFound(jarEntry, jarFile);
107-
}
108-
return jarFile.getNestedJarFile(jarEntry);
109-
}
110-
111-
private JarEntryName getJarEntryName(String spec) {
112-
if (spec.length() == 0) {
113-
return EMPTY_JAR_ENTRY_NAME;
114-
}
115-
return new JarEntryName(spec);
91+
this.jarEntryName = jarEntryName;
11692
}
11793

11894
@Override
11995
public void connect() throws IOException {
96+
if (this.jarFile == null) {
97+
throw FILE_NOT_FOUND_EXCEPTION;
98+
}
12099
if (!this.jarEntryName.isEmpty() && this.jarEntry == null) {
121100
this.jarEntry = this.jarFile.getJarEntry(getEntryName());
122101
if (this.jarEntry == null) {
@@ -126,15 +105,6 @@ public void connect() throws IOException {
126105
this.connected = true;
127106
}
128107

129-
private void throwFileNotFound(Object entry, JarFile jarFile)
130-
throws FileNotFoundException {
131-
if (Boolean.TRUE.equals(useFastExceptions.get())) {
132-
throw FILE_NOT_FOUND_EXCEPTION;
133-
}
134-
throw new FileNotFoundException(
135-
"JAR entry " + entry + " not found in " + jarFile.getName());
136-
}
137-
138108
@Override
139109
public JarFile getJarFile() throws IOException {
140110
connect();
@@ -143,6 +113,9 @@ public JarFile getJarFile() throws IOException {
143113

144114
@Override
145115
public URL getJarFileURL() {
116+
if (this.jarFile == null) {
117+
throw NOT_FOUND_CONNECTION_EXCEPTION;
118+
}
146119
if (this.jarFileUrl == null) {
147120
this.jarFileUrl = buildJarFileUrl();
148121
}
@@ -167,7 +140,7 @@ private URL buildJarFileUrl() {
167140

168141
@Override
169142
public JarEntry getJarEntry() throws IOException {
170-
if (this.jarEntryName.isEmpty()) {
143+
if (this.jarEntryName == null || this.jarEntryName.isEmpty()) {
171144
return null;
172145
}
173146
connect();
@@ -176,11 +149,17 @@ public JarEntry getJarEntry() throws IOException {
176149

177150
@Override
178151
public String getEntryName() {
152+
if (this.jarFile == null) {
153+
throw NOT_FOUND_CONNECTION_EXCEPTION;
154+
}
179155
return this.jarEntryName.toString();
180156
}
181157

182158
@Override
183159
public InputStream getInputStream() throws IOException {
160+
if (this.jarFile == null) {
161+
throw FILE_NOT_FOUND_EXCEPTION;
162+
}
184163
if (this.jarEntryName.isEmpty()) {
185164
throw new IOException("no entry name specified");
186165
}
@@ -192,8 +171,20 @@ public InputStream getInputStream() throws IOException {
192171
return inputStream;
193172
}
194173

174+
private void throwFileNotFound(Object entry, JarFile jarFile)
175+
throws FileNotFoundException {
176+
if (Boolean.TRUE.equals(useFastExceptions.get())) {
177+
throw FILE_NOT_FOUND_EXCEPTION;
178+
}
179+
throw new FileNotFoundException(
180+
"JAR entry " + entry + " not found in " + jarFile.getName());
181+
}
182+
195183
@Override
196184
public int getContentLength() {
185+
if (this.jarFile == null) {
186+
return -1;
187+
}
197188
try {
198189
if (this.jarEntryName.isEmpty()) {
199190
return this.jarFile.size();
@@ -214,11 +205,14 @@ public Object getContent() throws IOException {
214205

215206
@Override
216207
public String getContentType() {
217-
return this.jarEntryName.getContentType();
208+
return (this.jarEntryName == null ? null : this.jarEntryName.getContentType());
218209
}
219210

220211
@Override
221212
public Permission getPermission() throws IOException {
213+
if (this.jarFile == null) {
214+
throw FILE_NOT_FOUND_EXCEPTION;
215+
}
222216
if (this.permission == null) {
223217
this.permission = new FilePermission(
224218
this.jarFile.getRootJarFile().getFile().getPath(), READ_ACTION);
@@ -230,6 +224,56 @@ static void setUseFastExceptions(boolean useFastExceptions) {
230224
JarURLConnection.useFastExceptions.set(useFastExceptions);
231225
}
232226

227+
static JarURLConnection get(URL url, JarFile jarFile) throws IOException {
228+
String spec = extractFullSpec(url, jarFile.getPathFromRoot());
229+
int separator;
230+
int index = 0;
231+
while ((separator = spec.indexOf(SEPARATOR, index)) > 0) {
232+
String entryName = spec.substring(index, separator);
233+
JarEntry jarEntry = jarFile.getJarEntry(entryName);
234+
if (jarEntry == null) {
235+
return JarURLConnection.notFound(jarFile, JarEntryName.get(entryName));
236+
}
237+
jarFile = jarFile.getNestedJarFile(jarEntry);
238+
index += separator + SEPARATOR.length();
239+
}
240+
JarEntryName jarEntryName = JarEntryName.get(spec, index);
241+
if (Boolean.TRUE.equals(useFastExceptions.get())) {
242+
if (!jarEntryName.isEmpty()
243+
&& !jarFile.containsEntry(jarEntryName.toString())) {
244+
return NOT_FOUND_CONNECTION;
245+
}
246+
}
247+
return new JarURLConnection(url, jarFile, jarEntryName);
248+
}
249+
250+
private static String extractFullSpec(URL url, String pathFromRoot) {
251+
String file = url.getFile();
252+
int separatorIndex = file.indexOf(SEPARATOR);
253+
if (separatorIndex < 0) {
254+
return "";
255+
}
256+
int specIndex = separatorIndex + SEPARATOR.length() + pathFromRoot.length();
257+
return file.substring(specIndex);
258+
}
259+
260+
private static JarURLConnection notFound() {
261+
try {
262+
return notFound(null, null);
263+
}
264+
catch (IOException ex) {
265+
throw new IllegalStateException(ex);
266+
}
267+
}
268+
269+
private static JarURLConnection notFound(JarFile jarFile, JarEntryName jarEntryName)
270+
throws IOException {
271+
if (Boolean.TRUE.equals(useFastExceptions.get())) {
272+
return NOT_FOUND_CONNECTION;
273+
}
274+
return new JarURLConnection(null, jarFile, jarEntryName);
275+
}
276+
233277
/**
234278
* A JarEntryName parsed from a URL String.
235279
*/
@@ -316,6 +360,17 @@ private String deduceContentType() {
316360
return type;
317361
}
318362

363+
public static JarEntryName get(String spec) {
364+
return get(spec, 0);
365+
}
366+
367+
public static JarEntryName get(String spec, int beginIndex) {
368+
if (spec.length() <= beginIndex) {
369+
return EMPTY_JAR_ENTRY_NAME;
370+
}
371+
return new JarEntryName(spec.substring(beginIndex));
372+
}
373+
319374
}
320375

321376
}

0 commit comments

Comments
 (0)