Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Ostrovsky2015-04-24 16:55:31 +0000
committerDavid Ostrovsky2015-04-26 15:52:24 +0000
commitd1da2780c2488151c7a5d44e08e6bf459e65338d (patch)
tree702051546c14030593d8753429503516257c7924
parenta312131d79d724df85a8fb248f902c4d8b3ea2ce (diff)
downloadjgit-d1da2780c2488151c7a5d44e08e6bf459e65338d.tar.gz
jgit-d1da2780c2488151c7a5d44e08e6bf459e65338d.tar.xz
jgit-d1da2780c2488151c7a5d44e08e6bf459e65338d.zip
Revert "Let ObjectWalk.markUninteresting also mark the root tree as"
The Iff2de881 tried to fix missing tree ..." but introduced severe performance degradation (>10x in some cases) when acting as server (git push) and as client (replication). IOW cure is worse than the disease. This reverts commit c4797fe98655b3d52d0a90ba44fce6e053db3b8b. Change-Id: I4e6056eb352d51277867f857a0cab380eca153ac Signed-off-by: David Ostrovsky <david@ostrovsky.org>
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ObjectWalkTest.java15
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java14
2 files changed, 1 insertions, 28 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ObjectWalkTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ObjectWalkTest.java
index 9cbb1c8752..dfde7fcf2c 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ObjectWalkTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ObjectWalkTest.java
@@ -215,21 +215,6 @@ public class ObjectWalkTest extends RevWalkTestCase {
}
@Test
- public void testMarkUninterestingPropagation() throws Exception {
- final RevBlob f = blob("1");
- final RevTree t = tree(file("f", f));
- final RevCommit c1 = commit(t);
- final RevCommit c2 = commit(t);
-
- markUninteresting(c1);
- markStart(c2);
-
- assertSame(c2, objw.next());
- assertNull(objw.next());
- assertNull(objw.nextObject());
- }
-
- @Test
public void testEmptyTreeCorruption() throws Exception {
ObjectId bId = ObjectId
.fromString("abbbfafe3129f85747aba7bfac992af77134c607");
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java
index b73ccb1974..a0af067dc0 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java
@@ -232,7 +232,7 @@ public class ObjectWalk extends RevWalk {
}
if (o instanceof RevCommit)
- markUninteresting((RevCommit) o);
+ super.markUninteresting((RevCommit) o);
else if (o instanceof RevTree)
markTreeUninteresting((RevTree) o);
else
@@ -242,18 +242,6 @@ public class ObjectWalk extends RevWalk {
addObject(o);
}
- @Override
- public void markUninteresting(RevCommit c) throws MissingObjectException,
- IncorrectObjectTypeException, IOException {
- super.markUninteresting(c);
- try {
- markTreeUninteresting(c.getTree());
- } catch (MissingObjectException e) {
- // we don't care if the tree of the commit does not exist locally
- }
- }
-
- @Override
public void sort(RevSort s) {
super.sort(s);
boundary = hasRevSort(RevSort.BOUNDARY);

Back to the top