tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ok...@apache.org
Subject incubator-tinkerpop git commit: a staging commit cause I'm about to do some crazy stuff.
Date Thu, 03 Dec 2015 20:33:48 GMT
Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/TINKERPOP3-1014 9af660476 -> ffd8ab0d2


a staging commit cause I'm about to do some crazy stuff.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/ffd8ab0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/ffd8ab0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/ffd8ab0d

Branch: refs/heads/TINKERPOP3-1014
Commit: ffd8ab0d27d0a0c013aa114b071ca5a7f049d8d8
Parents: 9af6604
Author: Marko A. Rodriguez <okrammarko@gmail.com>
Authored: Thu Dec 3 13:33:44 2015 -0700
Committer: Marko A. Rodriguez <okrammarko@gmail.com>
Committed: Thu Dec 3 13:33:44 2015 -0700

----------------------------------------------------------------------
 .../gremlin/process/traversal/traverser/DefaultTraverser.java  | 4 ++--
 .../process/traversal/traverser/DefaultTraverserGenerator.java | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ffd8ab0d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/DefaultTraverser.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/DefaultTraverser.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/DefaultTraverser.java
index 323b12d..80db85a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/DefaultTraverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/DefaultTraverser.java
@@ -162,7 +162,7 @@ public final class DefaultTraverser<T> implements Traverser.Admin<T>
{
 
     @Override
     public void merge(final Traverser.Admin<?> other) {
-        if (-1 != this.bulk)
+        if (Long.MIN_VALUE != this.bulk)
             this.bulk = this.bulk + other.bulk();
         if (!other.getTags().isEmpty()) {
             if (this.tags == null) this.tags = new HashSet<>();
@@ -199,7 +199,7 @@ public final class DefaultTraverser<T> implements Traverser.Admin<T>
{
 
     @Override
     public long bulk() {
-        return this.bulk == -1 ? 1 : this.bulk;
+        return this.bulk == Long.MIN_VALUE ? 1 : this.bulk;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ffd8ab0d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/DefaultTraverserGenerator.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/DefaultTraverserGenerator.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/DefaultTraverserGenerator.java
index c6733d1..a248b6c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/DefaultTraverserGenerator.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/DefaultTraverserGenerator.java
@@ -43,11 +43,11 @@ public final class DefaultTraverserGenerator implements TraverserGenerator
{
     public <S> Traverser.Admin<S> generate(final S start, final Step<S, ?>
startStep, final long initialBulk) {
         final Set<TraverserRequirement> requirements = TraversalHelper.getRootTraversal(startStep.getTraversal()).getTraverserRequirements();
         if (requirements.contains(TraverserRequirement.PATH))
-            return new DefaultTraverser<>(start, startStep, requirements.contains(TraverserRequirement.ONE_BULK)
? -1 : initialBulk, ImmutablePath.make().extend(start, startStep.getLabels()), false);
+            return new DefaultTraverser<>(start, startStep, requirements.contains(TraverserRequirement.ONE_BULK)
? Long.MIN_VALUE : initialBulk, ImmutablePath.make().extend(start, startStep.getLabels()),
false);
         else if (requirements.contains(TraverserRequirement.LABELED_PATH))
-            return new DefaultTraverser<>(start, startStep, requirements.contains(TraverserRequirement.ONE_BULK)
? -1 : initialBulk, ImmutablePath.make().extend(start, startStep.getLabels()), true);
+            return new DefaultTraverser<>(start, startStep, requirements.contains(TraverserRequirement.ONE_BULK)
? Long.MIN_VALUE : initialBulk, ImmutablePath.make().extend(start, startStep.getLabels()),
true);
         else
-            return new DefaultTraverser<>(start, startStep, requirements.contains(TraverserRequirement.ONE_BULK)
? -1 : initialBulk, EmptyPath.instance(), true);
+            return new DefaultTraverser<>(start, startStep, requirements.contains(TraverserRequirement.ONE_BULK)
? Long.MIN_VALUE : initialBulk, EmptyPath.instance(), true);
     }
 
     @Override


Mime
View raw message