Micro-optimize CanonicalTreeParser next() for ObjectWalk

ObjectWalk is invoking next() for each record we consider in a tree.
Rather than doing several method calls against the current parser,
and testing if we are at eof() at least twice per next() invocation,
do it only once and inline the logic to move the parser forward.

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

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/CanonicalTreeParser.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/CanonicalTreeParser.java
index 8a202035aaa17b61928553df8d71de9f62c965e0..0b9dc004462791088026f1c752ead41f5abc383b 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/CanonicalTreeParser.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/CanonicalTreeParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2009, Google Inc.
+ * Copyright (C) 2008-2010, Google Inc.
  * Copyright (C) 2008, Shawn O. Pearce <spearce@spearce.org>
  * and other copyright owners as documented in the project's IP log.
  *
@@ -122,7 +122,9 @@ public class CanonicalTreeParser extends AbstractTreeIterator {
                raw = treeData;
                prevPtr = -1;
                currPtr = 0;
-               if (!eof())
+               if (eof())
+                       nextPtr = 0;
+               else
                        parseEntry();
        }
 
@@ -159,15 +161,19 @@ public class CanonicalTreeParser extends AbstractTreeIterator {
        public CanonicalTreeParser next() {
                CanonicalTreeParser p = this;
                for (;;) {
-                       p.next(1);
-                       if (p.eof() && p.parent != null) {
-                               // Parent was left pointing at the entry for us; advance
-                               // the parent to the next entry, possibly unwinding many
-                               // levels up the tree.
-                               //
+                       if (p.nextPtr == p.raw.length) {
+                               // This parser has reached EOF, return to the parent.
+                               if (p.parent == null) {
+                                       p.currPtr = p.nextPtr;
+                                       return p;
+                               }
                                p = (CanonicalTreeParser) p.parent;
                                continue;
                        }
+
+                       p.prevPtr = p.currPtr;
+                       p.currPtr = p.nextPtr;
+                       p.parseEntry();
                        return p;
                }
        }