motiejus
/
jgit
1
Fork 0
Code Releases Activity

Revert "Speed up PathFilterGroup.include for large set of paths" 

This reverts commit 576e5acdd0

The comparator is broken.

Change-Id: Ic59110b154613f3ff4a215a6c1293a4c15cd3885
This commit is contained in:
Robin Rosenberg 2013-01-09 18:47:16 -05:00 committed by Gerrit Code Review @ Eclipse.org
parent 576e5acdd0
commit bc07097ebe
1 changed files with 15 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathFilterGroup.java
View File

@ -177,73 +177,33 @@ public String toString() {
} }
static class Group extends TreeFilter { static class Group extends TreeFilter {
private static int pathPrefixSortCompare(byte[] p1, byte[] p2, private static final Comparator<PathFilter> PATH_SORT = new Comparator<PathFilter>() {
boolean justMatch) {
int ci = 0;
while (ci < p1.length && ci < p2.length) {
int c1 = p1[ci];
int c2 = p2[ci];
if (c1 == '/')
c1 = 0;
if (c2 == '/')
c2 = 0;
int cmp = c1 - c2;
if (cmp != 0)
return cmp;
++ci;
}
if (ci < p1.length) {
int c1 = p1[ci];
if (c1 == '/')
if (justMatch)
return 0;
return 1;
}
if (ci < p2.length) {
int c2 = p2[ci];
if (c2 == '/')
return 0;
return -1;
}
return 0;
}
private static final Comparator<PathFilter> PATH_PREFIX_SORT = new Comparator<PathFilter>() {
public int compare(final PathFilter o1, final PathFilter o2) { public int compare(final PathFilter o1, final PathFilter o2) {
return pathPrefixSortCompare(o1.pathRaw, o2.pathRaw, false); return o1.pathStr.compareTo(o2.pathStr);
} }
}; };
private final PathFilter[] paths; private final PathFilter[] paths;
private Group(final PathFilter[] p) { private Group(final PathFilter[] p) {
paths = p; paths = p;
Arrays.sort(paths, PATH_PREFIX_SORT); Arrays.sort(paths, PATH_SORT);
} }
@Override @Override
public boolean include(final TreeWalk walker) { public boolean include(final TreeWalk walker) {
final byte[] rawPath = walker.getRawPath(); final int n = paths.length;
Comparator comparator = new Comparator<Object>() { for (int i = 0;;) {
public int compare(Object pf, Object raw) { final byte[] r = paths[i].pathRaw;
PathFilter pathFilter = (PathFilter) pf; final int cmp = walker.isPathPrefix(r, r.length);
int ret = -pathPrefixSortCompare(walker.getRawPath(), if (cmp == 0)
pathFilter.pathRaw, true); return true;
return ret; if (++i < n)
} continue;
}; if (cmp > 0)
throw StopWalkException.INSTANCE;
Object[] pathsObject = paths; return false;
Object rawObject = rawPath; }
@SuppressWarnings("unchecked")
int position = Arrays.binarySearch(pathsObject, rawObject,
comparator);
if (position >= 0)
return true;
if (position == -paths.length - 1)
throw StopWalkException.INSTANCE;
return false;
} }
@Override @Override