The Unified and Autonomous Development Platform
Improve performance of PatternSet.listFiles
Robin Shen1d05bb41b9f2
diff --git a/core/src/main/java/io/onedev/server/util/patternset/PatternSet.java b/core/src/main/java/io/onedev/server/util/patternset/PatternSet.javaindex 1cd9fffd8f..35ba92f347 100644--- a/core/src/main/java/io/onedev/server/util/patternset/PatternSet.java+++ b/core/src/main/java/io/onedev/server/util/patternset/PatternSet.java@@ -14,12 +14,11 @@ import org.antlr.v4.runtime.CharStreams;import org.antlr.v4.runtime.CommonTokenStream;import org.antlr.v4.runtime.RecognitionException;import org.antlr.v4.runtime.Recognizer;-import org.apache.commons.io.FileUtils;import org.apache.commons.lang3.StringUtils;+import org.apache.tools.ant.DirectoryScanner;import org.unbescape.java.JavaEscape;import io.onedev.commons.utils.stringmatch.Matcher;-import io.onedev.commons.utils.stringmatch.WildcardPathMatcher;import io.onedev.server.OneException;import io.onedev.server.util.patternset.PatternSetParser.PatternContext;import io.onedev.server.util.patternset.PatternSetParser.PatternsContext;@@ -60,15 +59,17 @@ public class PatternSet implements Serializable {}public Collection<File> listFiles(File dir) {- Collection<File> files = new ArrayList<>();- WildcardPathMatcher matcher = new WildcardPathMatcher();- int baseLen = dir.getAbsolutePath().length() + 1;- for (File file: FileUtils.listFiles(dir, null, true)) {- String relative = file.getAbsolutePath().substring(baseLen);- relative = relative.replace('\\', '/');- if (matches(matcher, relative))- files.add(file);- }+ Collection<File> files = new ArrayList<File>();++ DirectoryScanner scanner = new DirectoryScanner();+ scanner.setBasedir(dir);+ scanner.setIncludes(includes.toArray(new String[0]));+ scanner.setExcludes(excludes.toArray(new String[0]));+ scanner.scan();++ for (String path: scanner.getIncludedFiles())+ files.add(new File(dir, path));+return files;}