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 2017/09/05 16:56:54 UTC
[1/8] tinkerpop git commit: Improved `hashcode()` and `equals()` for
all Traverser implementations.
Repository: tinkerpop
Updated Branches:
refs/heads/tp32 397158ade -> 2e2d2cdfe
Improved `hashcode()` and `equals()` for all Traverser implementations.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d0659e37
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d0659e37
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d0659e37
Branch: refs/heads/tp32
Commit: d0659e379bf59a164b4c3d87cc83de545d433547
Parents: 107329a
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Aug 24 13:51:41 2017 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Mon Aug 28 07:06:23 2017 -0700
----------------------------------------------------------------------
.../traverser/B_LP_O_P_S_SE_SL_Traverser.java | 12 ++++--------
.../traverser/B_LP_O_S_SE_SL_Traverser.java | 12 ++++--------
.../traverser/B_O_S_SE_SL_Traverser.java | 17 +++++++++++------
.../traversal/traverser/B_O_Traverser.java | 2 +-
.../traverser/LP_O_OB_P_S_SE_SL_Traverser.java | 15 +++++++--------
.../traverser/LP_O_OB_S_SE_SL_Traverser.java | 11 ++++-------
.../traverser/O_OB_S_SE_SL_Traverser.java | 18 +++++++++++-------
.../process/traversal/traverser/O_Traverser.java | 11 +++++++++++
8 files changed, 53 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d0659e37/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_O_P_S_SE_SL_Traverser.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_O_P_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_O_P_S_SE_SL_Traverser.java
index 49f19e4..919157c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_O_P_S_SE_SL_Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_O_P_S_SE_SL_Traverser.java
@@ -80,17 +80,13 @@ public class B_LP_O_P_S_SE_SL_Traverser<T> extends B_O_S_SE_SL_Traverser<T> {
@Override
public int hashCode() {
- return super.hashCode() + this.path.hashCode();
+ return carriesUnmergeableSack() ? System.identityHashCode(this) : (super.hashCode() ^ this.path.hashCode());
}
@Override
public boolean equals(final Object object) {
- return (object instanceof B_LP_O_P_S_SE_SL_Traverser)
- && ((B_LP_O_P_S_SE_SL_Traverser) object).t.equals(this.t)
- && ((B_LP_O_P_S_SE_SL_Traverser) object).future.equals(this.future)
- && ((B_LP_O_P_S_SE_SL_Traverser) object).loops == this.loops
- && (null == this.sack || null != this.sideEffects.getSackMerger())
- && ((B_LP_O_P_S_SE_SL_Traverser) object).path.equals(this.path);
+ return object instanceof B_LP_O_P_S_SE_SL_Traverser &&
+ super.equals(object) &&
+ ((B_LP_O_P_S_SE_SL_Traverser) object).path.equals(this.path);
}
-
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d0659e37/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_O_S_SE_SL_Traverser.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_O_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_O_S_SE_SL_Traverser.java
index 74a049c..1e50f3d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_O_S_SE_SL_Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_O_S_SE_SL_Traverser.java
@@ -112,17 +112,13 @@ public class B_LP_O_S_SE_SL_Traverser<T> extends B_O_S_SE_SL_Traverser<T> {
@Override
public int hashCode() {
- return super.hashCode() + this.path.hashCode();
+ return carriesUnmergeableSack() ? System.identityHashCode(this) : (super.hashCode() ^ this.path.hashCode());
}
@Override
public boolean equals(final Object object) {
- return (object instanceof B_LP_O_S_SE_SL_Traverser)
- && ((B_LP_O_S_SE_SL_Traverser) object).t.equals(this.t)
- && ((B_LP_O_S_SE_SL_Traverser) object).future.equals(this.future)
- && ((B_LP_O_S_SE_SL_Traverser) object).loops == this.loops
- && (null == this.sack || (null != this.sideEffects && null != this.sideEffects.getSackMerger())) // hmmm... serialization in OLAP destroys the transient sideEffects
- && ((B_LP_O_S_SE_SL_Traverser) object).path.popEquals(Pop.last, this.path); // this should be Pop.all?
+ return object instanceof B_LP_O_S_SE_SL_Traverser &&
+ super.equals(object) &&
+ ((B_LP_O_S_SE_SL_Traverser) object).path.equals(this.path);
}
-
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d0659e37/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_S_SE_SL_Traverser.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_S_SE_SL_Traverser.java
index ab1a783..2612472 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_S_SE_SL_Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_S_SE_SL_Traverser.java
@@ -23,6 +23,8 @@ import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSideEffects;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import java.util.Random;
+
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
@@ -110,17 +112,20 @@ public class B_O_S_SE_SL_Traverser<T> extends B_O_Traverser<T> {
/////////////////
+ final boolean carriesUnmergeableSack() {
+ return null != this.sack && (null == this.sideEffects || null == this.sideEffects.getSackMerger());
+ }
+
@Override
public int hashCode() {
- return this.t.hashCode() + this.future.hashCode() + this.loops;
+ return carriesUnmergeableSack() ? System.identityHashCode(this) : (super.hashCode() ^ this.loops);
}
@Override
public boolean equals(final Object object) {
- return object instanceof B_O_S_SE_SL_Traverser
- && ((B_O_S_SE_SL_Traverser) object).t.equals(this.t)
- && ((B_O_S_SE_SL_Traverser) object).future.equals(this.future)
- && ((B_O_S_SE_SL_Traverser) object).loops == this.loops
- && (null == this.sack || (null != this.sideEffects && null != this.sideEffects.getSackMerger())); // hmmm... serialization in OLAP destroys the transient sideEffects
+ return object instanceof B_O_S_SE_SL_Traverser &&
+ super.equals(object) &&
+ ((B_O_S_SE_SL_Traverser) object).loops == this.loops &&
+ !carriesUnmergeableSack(); // hmmm... serialization in OLAP destroys the transient sideEffects
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d0659e37/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_Traverser.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_Traverser.java
index 4a66ab1..cef4e96 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_Traverser.java
@@ -65,7 +65,7 @@ public class B_O_Traverser<T> extends O_Traverser<T> {
@Override
public boolean equals(final Object object) {
return object instanceof B_O_Traverser &&
- ((B_O_Traverser) object).t.equals(this.t) &&
+ super.equals(object) &&
((B_O_Traverser) object).future.equals(this.future);
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d0659e37/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_P_S_SE_SL_Traverser.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_P_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_P_S_SE_SL_Traverser.java
index 5f24e8c..b1f4aa7 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_P_S_SE_SL_Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_P_S_SE_SL_Traverser.java
@@ -106,17 +106,16 @@ public class LP_O_OB_P_S_SE_SL_Traverser<T> extends O_OB_S_SE_SL_Traverser<T> {
@Override
public int hashCode() {
- return super.hashCode() + this.path.hashCode();
+ if (carriesUnmergeableSack()) {
+ return System.identityHashCode(this);
+ }
+ return super.hashCode() ^ this.path.hashCode();
}
@Override
public boolean equals(final Object object) {
- return (object instanceof LP_O_OB_P_S_SE_SL_Traverser)
- && ((LP_O_OB_P_S_SE_SL_Traverser) object).t.equals(this.t)
- && ((LP_O_OB_P_S_SE_SL_Traverser) object).future.equals(this.future)
- && ((LP_O_OB_P_S_SE_SL_Traverser) object).loops == this.loops
- && (null == this.sack || null != this.sideEffects.getSackMerger())
- && ((LP_O_OB_P_S_SE_SL_Traverser) object).path.equals(this.path);
+ return object instanceof LP_O_OB_P_S_SE_SL_Traverser &&
+ super.equals(object) &&
+ ((LP_O_OB_P_S_SE_SL_Traverser) object).path.equals(this.path);
}
-
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d0659e37/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_S_SE_SL_Traverser.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_S_SE_SL_Traverser.java
index 58f420c..b58560c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_S_SE_SL_Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_S_SE_SL_Traverser.java
@@ -89,16 +89,13 @@ public class LP_O_OB_S_SE_SL_Traverser<T> extends O_OB_S_SE_SL_Traverser<T> {
@Override
public int hashCode() {
- return super.hashCode() + this.path.hashCode();
+ return carriesUnmergeableSack() ? System.identityHashCode(this) : (super.hashCode() ^ this.path.hashCode());
}
@Override
public boolean equals(final Object object) {
- return (object instanceof LP_O_OB_S_SE_SL_Traverser)
- && ((LP_O_OB_S_SE_SL_Traverser) object).t.equals(this.t)
- && ((LP_O_OB_S_SE_SL_Traverser) object).future.equals(this.future)
- && ((LP_O_OB_S_SE_SL_Traverser) object).loops == this.loops
- && (null == this.sack || null != this.sideEffects.getSackMerger())
- && ((LP_O_OB_S_SE_SL_Traverser) object).path.popEquals(Pop.last, this.path); // this should be Pop.all?
+ return object instanceof LP_O_OB_S_SE_SL_Traverser &&
+ super.equals(object) &&
+ ((LP_O_OB_S_SE_SL_Traverser) object).path.equals(this.path);
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d0659e37/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/O_OB_S_SE_SL_Traverser.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/O_OB_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/O_OB_S_SE_SL_Traverser.java
index 2fb68ad..d1532bf 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/O_OB_S_SE_SL_Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/O_OB_S_SE_SL_Traverser.java
@@ -133,17 +133,21 @@ public class O_OB_S_SE_SL_Traverser<T> extends O_Traverser<T> {
/////////////////
+ final boolean carriesUnmergeableSack() {
+ return null != this.sack && (null == this.sideEffects || null == this.sideEffects.getSackMerger());
+ }
+
@Override
public int hashCode() {
- return this.t.hashCode() + this.future.hashCode() + this.loops;
+ return carriesUnmergeableSack() ? System.identityHashCode(this) : (super.hashCode() ^ this.loops);
}
@Override
public boolean equals(final Object object) {
- return object instanceof O_OB_S_SE_SL_Traverser
- && ((O_OB_S_SE_SL_Traverser) object).t.equals(this.t)
- && ((O_OB_S_SE_SL_Traverser) object).future.equals(this.future)
- && ((O_OB_S_SE_SL_Traverser) object).loops == this.loops
- && (null == this.sack || (null != this.sideEffects && null != this.sideEffects.getSackMerger())); // hmmm... serialization in OLAP destroys the transient sideEffects
+ return object instanceof O_OB_S_SE_SL_Traverser &&
+ super.equals(object) &&
+ ((O_OB_S_SE_SL_Traverser) object).loops == this.loops &&
+ ((O_OB_S_SE_SL_Traverser) object).future.equals(this.future) &&
+ !carriesUnmergeableSack(); // hmmm... serialization in OLAP destroys the transient sideEffects
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d0659e37/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/O_Traverser.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/O_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/O_Traverser.java
index e9735b0..b4e1e0d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/O_Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/O_Traverser.java
@@ -68,4 +68,15 @@ public abstract class O_Traverser<T> extends AbstractTraverser<T> {
this.tags.addAll(other.getTags());
}
}
+
+ @Override
+ public boolean equals(final Object object) {
+ return object instanceof O_Traverser &&
+ super.equals(object) &&
+ (this.tags == null
+ ? ((O_Traverser) object).tags == null
+ : (((O_Traverser) object).tags != null &&
+ ((O_Traverser) object).tags.containsAll(this.tags) &&
+ this.tags.containsAll(((O_Traverser) object).tags)));
+ }
}
[7/8] tinkerpop git commit: Added `hashCode()` in `O_Traverser` and
`B_O_Traverser` as suggested by @okram and @robertdale.
Posted by dk...@apache.org.
Added `hashCode()` in `O_Traverser` and `B_O_Traverser` as suggested by @okram and @robertdale.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1b8afd0b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1b8afd0b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1b8afd0b
Branch: refs/heads/tp32
Commit: 1b8afd0b0dcfe3e2ca23bb75b8f9d9ecff744267
Parents: 73e2b9c
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Sep 5 06:49:48 2017 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Sep 5 06:53:56 2017 -0700
----------------------------------------------------------------------
.../gremlin/process/traversal/traverser/B_O_Traverser.java | 5 +++++
.../gremlin/process/traversal/traverser/O_Traverser.java | 5 +++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1b8afd0b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_Traverser.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_Traverser.java
index f4b32f3..5ac3699 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_Traverser.java
@@ -62,6 +62,11 @@ public class B_O_Traverser<T> extends O_Traverser<T> {
this.future = stepId;
}
+ @Override
+ public int hashCode() {
+ return super.hashCode();
+ }
+
protected final boolean equals(final B_O_Traverser other) {
return super.equals(other) && other.future.equals(this.future);
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1b8afd0b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/O_Traverser.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/O_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/O_Traverser.java
index 0c8152e..f4678c1 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/O_Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/O_Traverser.java
@@ -70,6 +70,11 @@ public abstract class O_Traverser<T> extends AbstractTraverser<T> {
}
}
+ @Override
+ public int hashCode() {
+ return super.hashCode();
+ }
+
protected final boolean equals(final O_Traverser other) {
return super.equals(other) && Objects.equals(this.tags, other.tags);
}
[8/8] tinkerpop git commit: Merge branch 'TINKERPOP-1759' into tp32
Posted by dk...@apache.org.
Merge branch 'TINKERPOP-1759' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2e2d2cdf
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2e2d2cdf
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2e2d2cdf
Branch: refs/heads/tp32
Commit: 2e2d2cdfe36515cab8da4f2b6e43c5b6ecd412cf
Parents: 397158a 1b8afd0
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Sep 5 09:53:53 2017 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Sep 5 09:53:53 2017 -0700
----------------------------------------------------------------------
.../traverser/B_LP_O_P_S_SE_SL_Traverser.java | 14 ++---
.../traverser/B_LP_O_S_SE_SL_Traverser.java | 14 ++---
.../traverser/B_O_S_SE_SL_Traverser.java | 19 +++++--
.../traversal/traverser/B_O_Traverser.java | 13 ++++-
.../traverser/LP_O_OB_P_S_SE_SL_Traverser.java | 14 ++---
.../traverser/LP_O_OB_S_SE_SL_Traverser.java | 13 ++---
.../traverser/O_OB_S_SE_SL_Traverser.java | 19 ++++---
.../traversal/traverser/O_Traverser.java | 15 +++++
.../strategy/decoration/SackStrategyTest.java | 60 ++++++++++++++++++++
9 files changed, 134 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
[4/8] tinkerpop git commit: Moved performance test from
`TinkerGraphPerformanceTest` to `SackStrategyTest`.
Posted by dk...@apache.org.
Moved performance test from `TinkerGraphPerformanceTest` to `SackStrategyTest`.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/469f9cf6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/469f9cf6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/469f9cf6
Branch: refs/heads/tp32
Commit: 469f9cf64768ec50bbcbe3d1c0ea9e8bd90f9713
Parents: ea4fcdf
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Mon Aug 28 11:18:36 2017 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Mon Aug 28 11:18:36 2017 -0700
----------------------------------------------------------------------
.../strategy/decoration/SackStrategyTest.java | 66 ++++++++++++++++++++
.../traversal/TinkerGraphPerformanceTest.java | 53 ----------------
2 files changed, 66 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/469f9cf6/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SackStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SackStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SackStrategyTest.java
new file mode 100644
index 0000000..92f25e8
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SackStrategyTest.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Operator;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
+import org.apache.tinkerpop.gremlin.util.TimeUtil;
+import org.junit.Test;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.runner.RunWith;
+
+import java.util.stream.IntStream;
+
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.lessThan;
+import static org.junit.Assert.assertThat;
+
+/**
+ * @author Daniel Kuppitz (http://gremlin.guru)
+ */
+@RunWith(Enclosed.class)
+public class SackStrategyTest {
+
+ public static class PerformanceTest {
+
+ /**
+ * Check the traverser's hashcode() implementation if this test fails. hashcode() should
+ * not generate too many hash collisions.
+ */
+ @Test
+ public void sacksWithoutMergerShouldBeFast() {
+
+ final TraversalStrategies strategies = new DefaultTraversalStrategies();
+ strategies.addStrategies(SackStrategy.build().initialValue(() -> 0).create());
+
+ final Integer[] starts = IntStream.range(0, 8192).boxed().toArray(Integer[]::new);
+ final GraphTraversal traversal = __.inject(starts).sack(Operator.mult).sack().barrier();
+ traversal.asAdmin().setStrategies(strategies);
+ traversal.asAdmin().applyStrategies();
+
+ final double runtime = TimeUtil.clock(10,
+ () -> traversal.asAdmin().clone().iterate());
+
+ assertThat(runtime, is(lessThan(50.0)));
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/469f9cf6/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/TinkerGraphPerformanceTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/TinkerGraphPerformanceTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/TinkerGraphPerformanceTest.java
deleted file mode 100644
index 1e2c905..0000000
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/TinkerGraphPerformanceTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.tinkergraph.process.traversal;
-
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.apache.tinkerpop.gremlin.util.TimeUtil;
-import org.junit.Test;
-
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.lessThan;
-import static org.junit.Assert.assertThat;
-
-/**
- * @author Daniel Kuppitz (http://gremlin.guru)
- */
-public class TinkerGraphPerformanceTest {
-
- /**
- * Check the traverser's hashcode() implementation if this test fails. hashcode() should
- * not generate too many hash collisions.
- */
- @Test
- public void sacksWithoutMergerShouldBeFast() {
-
- final TinkerGraph graph = TinkerGraph.open();
- for (int i = 0; i < 8192; i++) {
- graph.addVertex().property("x", 0);
- }
-
- final GraphTraversalSource g = graph.traversal();
- final double runtime = TimeUtil.clock(10,
- () -> g.withSack(0).V().values("x").barrier().iterate());
-
- assertThat(runtime, is(lessThan(50.0)));
- }
-}
[6/8] tinkerpop git commit: Replaced SackStrategy performance test
with a sanity check, that only verifies,
that we get a diversified set of hashcodes for traversers that carry
unmergeable sacks.
Posted by dk...@apache.org.
Replaced SackStrategy performance test with a sanity check, that only verifies, that we get
a diversified set of hashcodes for traversers that carry unmergeable sacks.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/73e2b9cb
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/73e2b9cb
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/73e2b9cb
Branch: refs/heads/tp32
Commit: 73e2b9cbcfb565919983a7a9f7d7765990a7416f
Parents: e16e52b
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Aug 29 08:43:49 2017 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Aug 29 08:43:49 2017 -0700
----------------------------------------------------------------------
.../strategy/decoration/SackStrategyTest.java | 22 +++++++-------------
1 file changed, 8 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/73e2b9cb/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SackStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SackStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SackStrategyTest.java
index 92f25e8..7576e9a 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SackStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SackStrategyTest.java
@@ -20,10 +20,10 @@ package org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration;
import org.apache.tinkerpop.gremlin.process.traversal.Operator;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
-import org.apache.tinkerpop.gremlin.util.TimeUtil;
import org.junit.Test;
import org.junit.experimental.runners.Enclosed;
import org.junit.runner.RunWith;
@@ -31,7 +31,7 @@ import org.junit.runner.RunWith;
import java.util.stream.IntStream;
import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.lessThan;
+import static org.hamcrest.Matchers.greaterThan;
import static org.junit.Assert.assertThat;
/**
@@ -40,27 +40,21 @@ import static org.junit.Assert.assertThat;
@RunWith(Enclosed.class)
public class SackStrategyTest {
- public static class PerformanceTest {
+ public static class SanityCheck {
- /**
- * Check the traverser's hashcode() implementation if this test fails. hashcode() should
- * not generate too many hash collisions.
- */
@Test
- public void sacksWithoutMergerShouldBeFast() {
+ public void traversersWithUnmergeableSacksShouldGenerateDiversifiedHashCodes() {
final TraversalStrategies strategies = new DefaultTraversalStrategies();
strategies.addStrategies(SackStrategy.build().initialValue(() -> 0).create());
final Integer[] starts = IntStream.range(0, 8192).boxed().toArray(Integer[]::new);
- final GraphTraversal traversal = __.inject(starts).sack(Operator.mult).sack().barrier();
+ final GraphTraversal<Integer, Long> traversal = __.inject(starts).sack(Operator.mult).sack().
+ map(Traverser::hashCode).dedup().count();
+
traversal.asAdmin().setStrategies(strategies);
traversal.asAdmin().applyStrategies();
-
- final double runtime = TimeUtil.clock(10,
- () -> traversal.asAdmin().clone().iterate());
-
- assertThat(runtime, is(lessThan(50.0)));
+ assertThat(traversal.next(), is(greaterThan(8100L))); // allow a few hash collisions
}
}
}
[5/8] tinkerpop git commit: Inlined return statement.
Posted by dk...@apache.org.
Inlined return statement.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e16e52b3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e16e52b3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e16e52b3
Branch: refs/heads/tp32
Commit: e16e52b3d166068ab7118b4c255b86b45a4ef46c
Parents: 469f9cf
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Aug 29 06:02:45 2017 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Aug 29 06:02:45 2017 -0700
----------------------------------------------------------------------
.../traversal/traverser/LP_O_OB_P_S_SE_SL_Traverser.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e16e52b3/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_P_S_SE_SL_Traverser.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_P_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_P_S_SE_SL_Traverser.java
index aa17e57..afecc37 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_P_S_SE_SL_Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_P_S_SE_SL_Traverser.java
@@ -106,10 +106,7 @@ public class LP_O_OB_P_S_SE_SL_Traverser<T> extends O_OB_S_SE_SL_Traverser<T> {
@Override
public int hashCode() {
- if (carriesUnmergeableSack()) {
- return System.identityHashCode(this);
- }
- return super.hashCode() ^ this.path.hashCode();
+ return carriesUnmergeableSack() ? System.identityHashCode(this) : (super.hashCode() ^ this.path.hashCode());
}
protected final boolean equals(final LP_O_OB_P_S_SE_SL_Traverser other) {
[2/8] tinkerpop git commit: Improved equals() inheritance chain in
Traverser implementations. We now have fewer checks and fewer casts. Cool!
Posted by dk...@apache.org.
Improved equals() inheritance chain in Traverser implementations.
We now have fewer checks and fewer casts. Cool!
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f8626ce6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f8626ce6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f8626ce6
Branch: refs/heads/tp32
Commit: f8626ce6d3f6be4dddba09b74c38b49e8d379eb7
Parents: d0659e3
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Fri Aug 25 08:43:33 2017 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Mon Aug 28 07:06:33 2017 -0700
----------------------------------------------------------------------
.../traverser/B_LP_O_P_S_SE_SL_Traverser.java | 8 +++++---
.../traversal/traverser/B_LP_O_S_SE_SL_Traverser.java | 8 +++++---
.../traversal/traverser/B_O_S_SE_SL_Traverser.java | 10 ++++++----
.../process/traversal/traverser/B_O_Traverser.java | 8 +++++---
.../traverser/LP_O_OB_P_S_SE_SL_Traverser.java | 8 +++++---
.../traversal/traverser/LP_O_OB_S_SE_SL_Traverser.java | 8 +++++---
.../traversal/traverser/O_OB_S_SE_SL_Traverser.java | 11 ++++++-----
.../process/traversal/traverser/O_Traverser.java | 13 ++++++-------
8 files changed, 43 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f8626ce6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_O_P_S_SE_SL_Traverser.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_O_P_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_O_P_S_SE_SL_Traverser.java
index 919157c..5507862 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_O_P_S_SE_SL_Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_O_P_S_SE_SL_Traverser.java
@@ -83,10 +83,12 @@ public class B_LP_O_P_S_SE_SL_Traverser<T> extends B_O_S_SE_SL_Traverser<T> {
return carriesUnmergeableSack() ? System.identityHashCode(this) : (super.hashCode() ^ this.path.hashCode());
}
+ protected final boolean equals(final B_LP_O_P_S_SE_SL_Traverser other) {
+ return super.equals(other) && other.path.equals(this.path);
+ }
+
@Override
public boolean equals(final Object object) {
- return object instanceof B_LP_O_P_S_SE_SL_Traverser &&
- super.equals(object) &&
- ((B_LP_O_P_S_SE_SL_Traverser) object).path.equals(this.path);
+ return object instanceof B_LP_O_P_S_SE_SL_Traverser && this.equals((B_LP_O_P_S_SE_SL_Traverser) object);
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f8626ce6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_O_S_SE_SL_Traverser.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_O_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_O_S_SE_SL_Traverser.java
index 1e50f3d..35f967a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_O_S_SE_SL_Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_O_S_SE_SL_Traverser.java
@@ -115,10 +115,12 @@ public class B_LP_O_S_SE_SL_Traverser<T> extends B_O_S_SE_SL_Traverser<T> {
return carriesUnmergeableSack() ? System.identityHashCode(this) : (super.hashCode() ^ this.path.hashCode());
}
+ protected final boolean equals(final B_LP_O_S_SE_SL_Traverser other) {
+ return super.equals(other) && other.path.equals(this.path);
+ }
+
@Override
public boolean equals(final Object object) {
- return object instanceof B_LP_O_S_SE_SL_Traverser &&
- super.equals(object) &&
- ((B_LP_O_S_SE_SL_Traverser) object).path.equals(this.path);
+ return object instanceof B_LP_O_S_SE_SL_Traverser && this.equals((B_LP_O_S_SE_SL_Traverser) object);
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f8626ce6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_S_SE_SL_Traverser.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_S_SE_SL_Traverser.java
index 2612472..0409cd7 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_S_SE_SL_Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_S_SE_SL_Traverser.java
@@ -113,6 +113,7 @@ public class B_O_S_SE_SL_Traverser<T> extends B_O_Traverser<T> {
/////////////////
final boolean carriesUnmergeableSack() {
+ // hmmm... serialization in OLAP destroys the transient sideEffects
return null != this.sack && (null == this.sideEffects || null == this.sideEffects.getSackMerger());
}
@@ -121,11 +122,12 @@ public class B_O_S_SE_SL_Traverser<T> extends B_O_Traverser<T> {
return carriesUnmergeableSack() ? System.identityHashCode(this) : (super.hashCode() ^ this.loops);
}
+ protected final boolean equals(final B_O_S_SE_SL_Traverser other) {
+ return super.equals(other) && other.loops == this.loops && !carriesUnmergeableSack();
+ }
+
@Override
public boolean equals(final Object object) {
- return object instanceof B_O_S_SE_SL_Traverser &&
- super.equals(object) &&
- ((B_O_S_SE_SL_Traverser) object).loops == this.loops &&
- !carriesUnmergeableSack(); // hmmm... serialization in OLAP destroys the transient sideEffects
+ return object instanceof B_O_S_SE_SL_Traverser && this.equals((B_O_S_SE_SL_Traverser) object);
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f8626ce6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_Traverser.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_Traverser.java
index cef4e96..f4b32f3 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_Traverser.java
@@ -62,10 +62,12 @@ public class B_O_Traverser<T> extends O_Traverser<T> {
this.future = stepId;
}
+ protected final boolean equals(final B_O_Traverser other) {
+ return super.equals(other) && other.future.equals(this.future);
+ }
+
@Override
public boolean equals(final Object object) {
- return object instanceof B_O_Traverser &&
- super.equals(object) &&
- ((B_O_Traverser) object).future.equals(this.future);
+ return object instanceof B_O_Traverser && this.equals((B_O_Traverser) object);
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f8626ce6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_P_S_SE_SL_Traverser.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_P_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_P_S_SE_SL_Traverser.java
index b1f4aa7..aa17e57 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_P_S_SE_SL_Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_P_S_SE_SL_Traverser.java
@@ -112,10 +112,12 @@ public class LP_O_OB_P_S_SE_SL_Traverser<T> extends O_OB_S_SE_SL_Traverser<T> {
return super.hashCode() ^ this.path.hashCode();
}
+ protected final boolean equals(final LP_O_OB_P_S_SE_SL_Traverser other) {
+ return super.equals(other) && other.path.equals(this.path);
+ }
+
@Override
public boolean equals(final Object object) {
- return object instanceof LP_O_OB_P_S_SE_SL_Traverser &&
- super.equals(object) &&
- ((LP_O_OB_P_S_SE_SL_Traverser) object).path.equals(this.path);
+ return object instanceof LP_O_OB_P_S_SE_SL_Traverser && this.equals((LP_O_OB_P_S_SE_SL_Traverser) object);
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f8626ce6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_S_SE_SL_Traverser.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_S_SE_SL_Traverser.java
index b58560c..1ce6b4d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_S_SE_SL_Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_S_SE_SL_Traverser.java
@@ -92,10 +92,12 @@ public class LP_O_OB_S_SE_SL_Traverser<T> extends O_OB_S_SE_SL_Traverser<T> {
return carriesUnmergeableSack() ? System.identityHashCode(this) : (super.hashCode() ^ this.path.hashCode());
}
+ protected final boolean equals(final LP_O_OB_S_SE_SL_Traverser other) {
+ return super.equals(other) && other.path.equals(this.path);
+ }
+
@Override
public boolean equals(final Object object) {
- return object instanceof LP_O_OB_S_SE_SL_Traverser &&
- super.equals(object) &&
- ((LP_O_OB_S_SE_SL_Traverser) object).path.equals(this.path);
+ return object instanceof LP_O_OB_S_SE_SL_Traverser && this.equals((LP_O_OB_S_SE_SL_Traverser) object);
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f8626ce6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/O_OB_S_SE_SL_Traverser.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/O_OB_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/O_OB_S_SE_SL_Traverser.java
index d1532bf..d81a564 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/O_OB_S_SE_SL_Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/O_OB_S_SE_SL_Traverser.java
@@ -134,6 +134,7 @@ public class O_OB_S_SE_SL_Traverser<T> extends O_Traverser<T> {
/////////////////
final boolean carriesUnmergeableSack() {
+ // hmmm... serialization in OLAP destroys the transient sideEffects
return null != this.sack && (null == this.sideEffects || null == this.sideEffects.getSackMerger());
}
@@ -142,12 +143,12 @@ public class O_OB_S_SE_SL_Traverser<T> extends O_Traverser<T> {
return carriesUnmergeableSack() ? System.identityHashCode(this) : (super.hashCode() ^ this.loops);
}
+ protected final boolean equals(final O_OB_S_SE_SL_Traverser other) {
+ return super.equals(other) && other.loops == this.loops && other.future.equals(this.future) &&
+ !carriesUnmergeableSack();
+ }
@Override
public boolean equals(final Object object) {
- return object instanceof O_OB_S_SE_SL_Traverser &&
- super.equals(object) &&
- ((O_OB_S_SE_SL_Traverser) object).loops == this.loops &&
- ((O_OB_S_SE_SL_Traverser) object).future.equals(this.future) &&
- !carriesUnmergeableSack(); // hmmm... serialization in OLAP destroys the transient sideEffects
+ return object instanceof O_OB_S_SE_SL_Traverser && this.equals((O_OB_S_SE_SL_Traverser) object);
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f8626ce6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/O_Traverser.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/O_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/O_Traverser.java
index b4e1e0d..0c8152e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/O_Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/O_Traverser.java
@@ -23,6 +23,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.AbstractTraverser;
import java.util.HashSet;
+import java.util.Objects;
import java.util.Set;
/**
@@ -69,14 +70,12 @@ public abstract class O_Traverser<T> extends AbstractTraverser<T> {
}
}
+ protected final boolean equals(final O_Traverser other) {
+ return super.equals(other) && Objects.equals(this.tags, other.tags);
+ }
+
@Override
public boolean equals(final Object object) {
- return object instanceof O_Traverser &&
- super.equals(object) &&
- (this.tags == null
- ? ((O_Traverser) object).tags == null
- : (((O_Traverser) object).tags != null &&
- ((O_Traverser) object).tags.containsAll(this.tags) &&
- this.tags.containsAll(((O_Traverser) object).tags)));
+ return object instanceof O_Traverser && this.equals((O_Traverser) object);
}
}
[3/8] tinkerpop git commit: Added TinkerGraphPerformanceTest to
ensure that the latest changes in hashcode() implementations don't get
reverted some day.
Posted by dk...@apache.org.
Added TinkerGraphPerformanceTest to ensure that the latest changes in hashcode() implementations don't get reverted some day.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ea4fcdff
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ea4fcdff
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ea4fcdff
Branch: refs/heads/tp32
Commit: ea4fcdfffabdf8dc8c8a5ce11f983161f6287aef
Parents: f8626ce
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Fri Aug 25 07:13:01 2017 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Mon Aug 28 07:06:33 2017 -0700
----------------------------------------------------------------------
.../traversal/TinkerGraphPerformanceTest.java | 53 ++++++++++++++++++++
1 file changed, 53 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ea4fcdff/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/TinkerGraphPerformanceTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/TinkerGraphPerformanceTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/TinkerGraphPerformanceTest.java
new file mode 100644
index 0000000..1e2c905
--- /dev/null
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/TinkerGraphPerformanceTest.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph.process.traversal;
+
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.apache.tinkerpop.gremlin.util.TimeUtil;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.lessThan;
+import static org.junit.Assert.assertThat;
+
+/**
+ * @author Daniel Kuppitz (http://gremlin.guru)
+ */
+public class TinkerGraphPerformanceTest {
+
+ /**
+ * Check the traverser's hashcode() implementation if this test fails. hashcode() should
+ * not generate too many hash collisions.
+ */
+ @Test
+ public void sacksWithoutMergerShouldBeFast() {
+
+ final TinkerGraph graph = TinkerGraph.open();
+ for (int i = 0; i < 8192; i++) {
+ graph.addVertex().property("x", 0);
+ }
+
+ final GraphTraversalSource g = graph.traversal();
+ final double runtime = TimeUtil.clock(10,
+ () -> g.withSack(0).V().values("x").barrier().iterate());
+
+ assertThat(runtime, is(lessThan(50.0)));
+ }
+}