You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2016/05/26 13:55:57 UTC
[1/2] incubator-tinkerpop git commit: Fixed some typos.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1312 ef26ba308 -> 90fe49c66
Fixed some typos.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/ac00fd5f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/ac00fd5f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/ac00fd5f
Branch: refs/heads/TINKERPOP-1312
Commit: ac00fd5fefcf725ad3385319f85b5b29d0345ca8
Parents: ef26ba3
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu May 26 15:44:23 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu May 26 15:44:23 2016 +0200
----------------------------------------------------------------------
.../strategy/optimization/RangeByIsCountStrategyTest.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ac00fd5f/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategyTest.java
index 820d4cc..8b42e7f 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategyTest.java
@@ -107,7 +107,7 @@ public class RangeByIsCountStrategyTest {
protected TraversalEngine traversalEngine;
- void applyAdjacentToIncidentStrategy(final Traversal traversal) {
+ void applyRangeByIsCountStrategy(final Traversal traversal) {
final TraversalStrategies strategies = new DefaultTraversalStrategies();
strategies.addStrategies(RangeByIsCountStrategy.instance());
@@ -117,7 +117,7 @@ public class RangeByIsCountStrategyTest {
}
public void doTest(final Traversal traversal, final Traversal optimized) {
- applyAdjacentToIncidentStrategy(traversal);
+ applyRangeByIsCountStrategy(traversal);
assertEquals(optimized, traversal);
}
@@ -140,10 +140,10 @@ public class RangeByIsCountStrategyTest {
{__.out().count().is(outside(2, 4)), __.out().limit(5).count().is(outside(2, 4))},
{__.out().count().is(within(2, 6, 4)), __.out().limit(7).count().is(within(2, 6, 4))},
{__.out().count().is(without(2, 6, 4)), __.out().limit(6).count().is(without(2, 6, 4))},
- {__.map(__.count().is(0)), __.map(__.count().limit(1).is(0))},
- {__.flatMap(__.count().is(0)), __.flatMap(__.count().limit(1).is(0))},
+ {__.map(__.count().is(0)), __.map(__.limit(1).count().is(0))},
+ {__.flatMap(__.count().is(0)), __.flatMap(__.limit(1).count().is(0))},
{__.sideEffect(__.count().is(0)), __.sideEffect(__.not(__.identity()))},
- {__.branch(__.count().is(0)), __.branch(__.count().limit(1).is(0))},
+ {__.branch(__.count().is(0)), __.branch(__.limit(1).count().is(0))},
{__.count().is(0).store("x"), __.limit(1).count().is(0).store("x")},
{__.repeat(__.out()).until(__.outE().count().is(0)), __.repeat(__.out()).until(__.not(__.outE()))},
{__.repeat(__.out()).emit(__.outE().count().is(0)), __.repeat(__.out()).emit(__.not(__.outE()))},
[2/2] incubator-tinkerpop git commit: Fixed `DefaultTraversal`'s hash
code calculation.
Posted by dk...@apache.org.
Fixed `DefaultTraversal`'s hash code calculation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/90fe49c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/90fe49c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/90fe49c6
Branch: refs/heads/TINKERPOP-1312
Commit: 90fe49c6674613a6a26713e79a1293c2fa812a34
Parents: ac00fd5
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu May 26 15:55:02 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu May 26 15:55:02 2016 +0200
----------------------------------------------------------------------
.../gremlin/process/traversal/util/DefaultTraversal.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/90fe49c6/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 43fc692..977e4ac 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
@@ -303,9 +303,10 @@ public class DefaultTraversal<S, E> implements Traversal.Admin<S, E> {
@Override
public int hashCode() {
+ int index = 0;
int result = this.getClass().hashCode();
for (final Step step : this.asAdmin().getSteps()) {
- result ^= step.hashCode();
+ result ^= Integer.rotateLeft(step.hashCode(), index++);
}
return result;
}