RevWalk: Don't reset ObjectReader when stopping

Applications like UploadPack reset() and reuse the same RevWalk
multiple times in very rapid succession.  Releasing the ObjectReader's
internal state on each use, only to allocate it again on the next
cycle kills performance if the ObjectReader has internal caches, or
even if the Inflater gets returned and pulled from the InflaterCache
too frequently.

Making releasing the ObjectReader the application's responsibility
when it is done with the RevWalk, which most already do by wrapping
their loop in a try/finally block.

Change-Id: I3ad188a719e8d7f6bf27d1a7ca16d465534713f4
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/PendingGenerator.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/PendingGenerator.java
index d0a1a832fe2dd17c0294a8a19ce3c57ab2889ac0..f1624070dfc322e256789d1b1e16f383b771231a 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/PendingGenerator.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/PendingGenerator.java
@@ -129,8 +129,6 @@ class PendingGenerator extends Generator {
                                final RevCommit c = pending.next();
                                if (c == null) {
                                        walker.reader.walkAdviceEnd();
-                                       if (!(walker instanceof ObjectWalk))
-                                               walker.reader.release();
                                        return null;
                                }
 
@@ -179,7 +177,6 @@ class PendingGenerator extends Generator {
                        }
                } catch (StopWalkException swe) {
                        walker.reader.walkAdviceEnd();
-                       walker.reader.release();
                        pending.clear();
                        return null;
                }

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java
index 17cdb443c85d5bbd67e6b4875171c88cc19f5007..cdedacb730378eed4babf658c6667e333a208324 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java
@@ -1181,7 +1181,6 @@ public class RevWalk implements Iterable<RevCommit> {
                        }
                }
 
-               reader.release();
                roots.clear();
                queue = new DateRevQueue();
                pending = new StartGenerator(this);