This is an automated email from the ASF dual-hosted git repository.
okram pushed a commit to branch tp4
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/tp4 by this push:
new 4c09b58 decided to use TP3 .equals() method for functions developed
by @dkuppitz for steps.
4c09b58 is described below
commit 4c09b58d262761269c890a4f443aece9ee2893f5
Author: Marko A. Rodriguez <okramma...@gmail.com>
AuthorDate: Thu Mar 28 06:35:44 2019 -0600
decided to use TP3 .equals() method for functions developed by @dkuppitz
for steps.
---
.../apache/tinkerpop/machine/function/AbstractFunction.java | 9 +++------
.../tinkerpop/machine/function/branch/BranchBranch.java | 5 -----
.../tinkerpop/machine/function/branch/RepeatBranch.java | 11 -----------
.../tinkerpop/machine/function/filter/FilterFilter.java | 8 --------
.../tinkerpop/machine/function/filter/HasKeyFilter.java | 8 --------
.../tinkerpop/machine/function/filter/HasKeyValueFilter.java | 8 --------
.../apache/tinkerpop/machine/function/filter/IsFilter.java | 8 --------
.../tinkerpop/machine/function/flatmap/FlatMapFlatMap.java | 7 -------
.../tinkerpop/machine/function/initial/InitialInitial.java | 7 -------
.../apache/tinkerpop/machine/function/map/ConstantMap.java | 7 -------
.../org/apache/tinkerpop/machine/function/map/MapMap.java | 7 -------
.../org/apache/tinkerpop/machine/function/map/PathMap.java | 8 --------
.../org/apache/tinkerpop/machine/function/map/ValueMap.java | 7 -------
.../tinkerpop/machine/function/reduce/GroupCountReduce.java | 7 -------
.../org/apache/tinkerpop/machine/traverser/TraverserSet.java | 10 +++++++---
15 files changed, 10 insertions(+), 107 deletions(-)
diff --git
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/AbstractFunction.java
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/AbstractFunction.java
index 97c6bd1..694cf78 100644
---
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/AbstractFunction.java
+++
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/AbstractFunction.java
@@ -51,15 +51,12 @@ public abstract class AbstractFunction<C> implements
CFunction<C> {
@Override
public int hashCode() {
- return this.coefficient.hashCode() ^ (null == this.label ? 1 :
this.label.hashCode());
+ return this.getClass().hashCode() ^ this.coefficient.hashCode() ^
(null == this.label ? 1 : this.label.hashCode());
}
@Override
- public boolean equals(final Object object) {
- return object instanceof AbstractFunction &&
- this.coefficient.equals(((AbstractFunction)
object).coefficient) &&
- ((null == this.label && null == ((AbstractFunction)
object).label) ||
- (null != this.label &&
this.label.equals(((AbstractFunction) object).label)));
+ public boolean equals(final Object other) {
+ return other != null && other.getClass().equals(this.getClass()) &&
this.hashCode() == other.hashCode();
}
@Override
diff --git
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/branch/BranchBranch.java
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/branch/BranchBranch.java
index fbf86e3..13f182c 100644
---
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/branch/BranchBranch.java
+++
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/branch/BranchBranch.java
@@ -53,11 +53,6 @@ public final class BranchBranch<C, S, E> extends
AbstractFunction<C> implements
}
@Override
- public boolean equals(final Object object) {
- return object instanceof BranchBranch &&
this.branches.equals(((BranchBranch) object).branches) && super.equals(object);
- }
-
- @Override
public BranchBranch<C, S, E> clone() {
final BranchBranch<C, S, E> clone = (BranchBranch<C, S, E>)
super.clone();
clone.branches = new HashMap<>(this.branches.size());
diff --git
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/branch/RepeatBranch.java
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/branch/RepeatBranch.java
index b496666..eddb43b 100644
---
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/branch/RepeatBranch.java
+++
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/branch/RepeatBranch.java
@@ -109,17 +109,6 @@ public final class RepeatBranch<C, S> extends
AbstractFunction<C> {
}
@Override
- public boolean equals(final Object object) {
- return object instanceof RepeatBranch &&
- this.repeatCompilation.equals(((RepeatBranch)
object).repeatCompilation) &&
- this.emitCompilation.equals(((RepeatBranch)
object).emitCompilation) &&
- this.untilCompilation.equals(((RepeatBranch)
object).untilCompilation) &&
- this.emitLocation == ((RepeatBranch) object).emitLocation &&
- this.untilLocation == ((RepeatBranch) object).untilLocation &&
- super.equals(object);
- }
-
- @Override
public RepeatBranch<C, S> clone() {
final RepeatBranch<C, S> clone = (RepeatBranch<C, S>) super.clone();
clone.repeatCompilation = this.repeatCompilation.clone();
diff --git
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/filter/FilterFilter.java
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/filter/FilterFilter.java
index fd7a68c..3730fe3 100644
---
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/filter/FilterFilter.java
+++
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/filter/FilterFilter.java
@@ -55,14 +55,6 @@ public final class FilterFilter<C, S> extends
AbstractFunction<C> implements Fil
}
@Override
- public boolean equals(final Object object) {
- return object instanceof FilterFilter &&
- this.predicate.equals(((FilterFilter) object).predicate) &&
- this.argument.equals(((FilterFilter) object).argument) &&
- super.equals(object);
- }
-
- @Override
public String toString() {
return StringFactory.makeFunctionString(this, this.argument);
}
diff --git
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/filter/HasKeyFilter.java
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/filter/HasKeyFilter.java
index 17c4e13..81b1fbe 100644
---
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/filter/HasKeyFilter.java
+++
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/filter/HasKeyFilter.java
@@ -66,14 +66,6 @@ public final class HasKeyFilter<C, K, V> extends
AbstractFunction<C> implements
}
@Override
- public boolean equals(final Object object) {
- return object instanceof HasKeyFilter &&
- this.predicate.equals(((HasKeyFilter) object).predicate) &&
- this.key.equals(((HasKeyFilter) object).key) &&
- super.equals(object);
- }
-
- @Override
public String toString() {
return StringFactory.makeFunctionString(this, this.key);
}
diff --git
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/filter/HasKeyValueFilter.java
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/filter/HasKeyValueFilter.java
index c300af3..bfbd541 100644
---
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/filter/HasKeyValueFilter.java
+++
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/filter/HasKeyValueFilter.java
@@ -53,14 +53,6 @@ public final class HasKeyValueFilter<C, K, V> extends
AbstractFunction<C> implem
}
@Override
- public boolean equals(final Object object) {
- return object instanceof HasKeyValueFilter &&
- this.key.equals(((HasKeyValueFilter) object).key) &&
- this.value.equals(((HasKeyValueFilter) object).value) &&
- super.equals(object);
- }
-
- @Override
public String toString() {
return StringFactory.makeFunctionString(this, this.key, this.value);
}
diff --git
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/filter/IsFilter.java
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/filter/IsFilter.java
index e8549b8..c55dc1b 100644
---
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/filter/IsFilter.java
+++
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/filter/IsFilter.java
@@ -52,14 +52,6 @@ public final class IsFilter<C, S> extends
AbstractFunction<C> implements FilterF
}
@Override
- public boolean equals(final Object object) {
- return object instanceof IsFilter &&
- this.predicate.equals(((IsFilter) object).predicate) &&
- this.argument.equals(((IsFilter) object).argument) &&
- super.equals(object);
- }
-
- @Override
public String toString() {
return StringFactory.makeFunctionString(this, this.predicate,
this.argument);
}
diff --git
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/flatmap/FlatMapFlatMap.java
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/flatmap/FlatMapFlatMap.java
index 47a84cd..4851bb9 100644
---
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/flatmap/FlatMapFlatMap.java
+++
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/flatmap/FlatMapFlatMap.java
@@ -76,13 +76,6 @@ public final class FlatMapFlatMap<C, S, E> extends
AbstractFunction<C> implement
}
@Override
- public boolean equals(final Object object) {
- return object instanceof FlatMapFlatMap &&
- this.argument.equals(((FlatMapFlatMap) object).argument) &&
- super.equals(object);
- }
-
- @Override
public FlatMapFlatMap<C, S, E> clone() {
final FlatMapFlatMap<C, S, E> clone = (FlatMapFlatMap<C, S, E>)
super.clone();
clone.argument = this.argument.clone();
diff --git
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/initial/InitialInitial.java
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/initial/InitialInitial.java
index 601e81f..d043892 100644
---
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/initial/InitialInitial.java
+++
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/initial/InitialInitial.java
@@ -51,13 +51,6 @@ public final class InitialInitial<C, S> extends
AbstractFunction<C> implements I
}
@Override
- public boolean equals(final Object object) {
- return object instanceof InitialInitial &&
- Arrays.equals(this.objects, ((InitialInitial) object).objects)
&&
- super.equals(object);
- }
-
- @Override
public String toString() {
return StringFactory.makeFunctionString(this, this.objects);
}
diff --git
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/map/ConstantMap.java
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/map/ConstantMap.java
index bd26b5c..2abe342 100644
---
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/map/ConstantMap.java
+++
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/map/ConstantMap.java
@@ -48,13 +48,6 @@ public final class ConstantMap<C, S, E> extends
AbstractFunction<C> implements M
}
@Override
- public boolean equals(final Object object) {
- return object instanceof ConstantMap &&
- this.constant.equals(((ConstantMap) object).constant) &&
- super.equals(object);
- }
-
- @Override
public String toString() {
return StringFactory.makeFunctionString(this, this.constant);
}
diff --git
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/map/MapMap.java
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/map/MapMap.java
index 2176295..3bf2b6c 100644
---
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/map/MapMap.java
+++
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/map/MapMap.java
@@ -54,13 +54,6 @@ public final class MapMap<C, S, E> extends
AbstractFunction<C> implements MapFun
}
@Override
- public boolean equals(final Object object) {
- return object instanceof MapMap &&
- this.argument.equals(((MapMap) object).argument) &&
- super.equals(object);
- }
-
- @Override
public MapMap<C, S, E> clone() {
final MapMap<C, S, E> clone = (MapMap<C, S, E>) super.clone();
clone.argument = this.argument.clone();
diff --git
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/map/PathMap.java
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/map/PathMap.java
index 65eec4d..0e708f8 100644
---
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/map/PathMap.java
+++
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/map/PathMap.java
@@ -76,14 +76,6 @@ public final class PathMap<C, S> extends AbstractFunction<C>
implements MapFunct
}
@Override
- public boolean equals(final Object object) {
- return object instanceof PathMap &&
- this.pathLabels.equals(((PathMap) object).pathLabels) &&
- this.byCompilations.equals(((PathMap) object).byCompilations)
&&
- super.equals(object);
- }
-
- @Override
public PathMap<C, S> clone() {
final PathMap<C, S> clone = (PathMap<C, S>) super.clone();
clone.byCompilations = this.byCompilations.clone();
diff --git
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/map/ValueMap.java
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/map/ValueMap.java
index 4461902..720f03e 100644
---
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/map/ValueMap.java
+++
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/map/ValueMap.java
@@ -57,13 +57,6 @@ public final class ValueMap<C, K, V> extends
AbstractFunction<C> implements MapF
}
@Override
- public boolean equals(final Object object) {
- return object instanceof ValueMap &&
- this.key.equals(((ValueMap) object).key) &&
- super.equals(object);
- }
-
- @Override
public String toString() {
return StringFactory.makeFunctionString(this, this.key);
}
diff --git
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/reduce/GroupCountReduce.java
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/reduce/GroupCountReduce.java
index a90d0fc..0e2dbad 100644
---
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/reduce/GroupCountReduce.java
+++
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/reduce/GroupCountReduce.java
@@ -74,13 +74,6 @@ public final class GroupCountReduce<C, S, E> extends
AbstractFunction<C> impleme
}
@Override
- public boolean equals(final Object object) {
- return object instanceof GroupCountReduce &&
- this.byCompilation.equals(((GroupCountReduce)
object).byCompilation) &&
- super.equals(object);
- }
-
- @Override
public GroupCountReduce<C, S, E> clone() {
final GroupCountReduce<C, S, E> clone = (GroupCountReduce<C, S, E>)
super.clone();
clone.byCompilation = this.byCompilation.clone();
diff --git
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/traverser/TraverserSet.java
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/traverser/TraverserSet.java
index 2f88cb5..8c40dbb 100644
---
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/traverser/TraverserSet.java
+++
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/traverser/TraverserSet.java
@@ -20,12 +20,16 @@ package org.apache.tinkerpop.machine.traverser;
import org.apache.tinkerpop.machine.util.FastNoSuchElementException;
+import org.apache.tinkerpop.machine.util.IteratorUtils;
import java.io.Serializable;
import java.util.AbstractSet;
+import java.util.ArrayList;
import java.util.Collections;
+import java.util.Comparator;
import java.util.Iterator;
import java.util.LinkedHashMap;
+import java.util.List;
import java.util.Map;
import java.util.Queue;
import java.util.Set;
@@ -132,15 +136,15 @@ public final class TraverserSet<C, S> extends
AbstractSet<Traverser<C, S>> imple
return this.map.values().toString();
}
- /*public void sort(final Comparator<Traverser<S>> comparator) {
+ public void sort(final Comparator<Traverser<C,S>> comparator) {
final List<Traverser<C, S>> list = new ArrayList<>(this.map.size());
IteratorUtils.removeOnNext(this.map.values().iterator()).forEachRemaining(list::add);
Collections.sort(list, comparator);
- this.map.reset();
+ this.map.clear();
list.forEach(traverser -> this.map.put(traverser, traverser));
}
- public void shuffle() {
+ /*public void shuffle() {
final List<Traverser<C, S>> list = new ArrayList<>(this.map.size());
IteratorUtils.removeOnNext(this.map.values().iterator()).forEachRemaining(list::add);
Collections.shuffle(list);
