Skip to content

Memoize file match patterns #1412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bsideup merged 2 commits into from
Jun 25, 2020
Merged

Memoize file match patterns #1412

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cea9aff
Compile each file match pattern only once
swiedenfeld Jun 12, 2020
f54ffdd
Update GoLangFileMatch.java
bsideup Jun 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion docker-java-core/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,14 @@
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;

import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import com.google.common.util.concurrent.UncheckedExecutionException;
import org.apache.commons.lang.StringUtils;

import com.github.dockerjava.core.exception.GoLangFileMatchException;
Expand Down Expand Up @@ -52,6 +58,11 @@ private GoLangFileMatch() {

private static final String PATTERN_CHARS_TO_ESCAPE = "\\.[]{}()*+-?^$|";

private static final LoadingCache<String, Pattern> PATTERN_CACHE = CacheBuilder.newBuilder()
.expireAfterAccess(1, TimeUnit.HOURS)
.maximumSize(10_000)
.build(CacheLoader.from(GoLangFileMatch::buildPattern));

public static boolean match(List<String> patterns, File file) {
return !match(patterns, file.getPath()).isEmpty();
}
Expand All @@ -74,7 +85,11 @@ public static List<String> match(List<String> patterns, String name) {
}

public static boolean match(String pattern, String name) {
return buildPattern(pattern).matcher(name).matches();
try {
return PATTERN_CACHE.get(pattern).matcher(name).matches();
} catch (ExecutionException | UncheckedExecutionException e) {
throw new GoLangFileMatchException(e.getCause().getMessage());
}
}

private static Pattern buildPattern(String pattern) {
Expand Down