You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/08/05 23:16:49 UTC
tinkerpop git commit: smarter use of lastTraverser in
DefaultTraversal.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1278 08aa1bbdb -> e65ff9e7c
smarter use of lastTraverser in DefaultTraversal.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e65ff9e7
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e65ff9e7
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e65ff9e7
Branch: refs/heads/TINKERPOP-1278
Commit: e65ff9e7c1f0c29ac1b76342d2191ed6a590fa5d
Parents: 08aa1bb
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Aug 5 17:16:42 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Aug 5 17:16:42 2016 -0600
----------------------------------------------------------------------
.../process/traversal/util/DefaultTraversal.java | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e65ff9e7/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
index a191ada..5bd01da 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
@@ -164,7 +164,7 @@ public class DefaultTraversal<S, E> implements Traversal.Admin<S, E> {
@Override
public Traverser.Admin<E> nextTraverser() {
if (!this.locked) this.applyStrategies();
- if (this.lastTraverser.bulk() > 0) {
+ if (this.lastTraverser.bulk() > 0L) {
final Traverser.Admin<E> temp = this.lastTraverser;
this.lastTraverser = EmptyTraverser.instance();
return temp;
@@ -182,20 +182,10 @@ public class DefaultTraversal<S, E> implements Traversal.Admin<S, E> {
@Override
public E next() {
if (!this.locked) this.applyStrategies();
- if (this.lastTraverser.bulk() > 0) {
- this.lastTraverser.setBulk(this.lastTraverser.bulk() - 1L);
- return this.lastTraverser.get();
- } else {
+ if (this.lastTraverser.bulk() == 0L)
this.lastTraverser = this.finalEndStep.next();
- if (this.lastTraverser.bulk() == 1) {
- final E temp = this.lastTraverser.get();
- this.lastTraverser = EmptyTraverser.instance();
- return temp;
- } else {
- this.lastTraverser.setBulk(this.lastTraverser.bulk() - 1L);
- return this.lastTraverser.get();
- }
- }
+ this.lastTraverser.setBulk(this.lastTraverser.bulk() - 1L);
+ return this.lastTraverser.get();
}
@Override