This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch merge-rename
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/merge-rename by this push:
new dafc54e4d9 Renamed steps around "merge" for better consistency.
dafc54e4d9 is described below
commit dafc54e4d98bd4585574490c1358adcab33aa934
Author: Stephen Mallette <[email protected]>
AuthorDate: Mon Aug 19 07:52:04 2024 -0400
Renamed steps around "merge" for better consistency.
TraveralMergeStep should have been MergeStep but that name was in use
already as a base class for mergeV/E. Renamed that base class to
MergeElementStep allowing merge() to use MergeStep.
---
CHANGELOG.asciidoc | 2 +
.../traversal/dsl/graph/GraphTraversal.java | 6 +-
.../process/traversal/step/map/MergeEdgeStep.java | 4 +-
.../map/{MergeStep.java => MergeElementStep.java} | 15 +-
.../process/traversal/step/map/MergeStep.java | 388 ++++-----------------
.../traversal/step/map/MergeVertexStep.java | 4 +-
.../traversal/step/map/TraversalMergeStep.java | 126 -------
.../process/traversal/util/BytecodeHelper.java | 4 +-
...versalMergeStepTest.java => MergeStepTest.java} | 2 +-
9 files changed, 85 insertions(+), 466 deletions(-)
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index ee232e9fc1..50ecb2d21c 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -35,6 +35,8 @@
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* Added new list filtering step `none()`.
* Added support for `Set` in GraphSON and GraphBinary serialization for
`gremlin-javascript`, where it previously just converted to array.
* Added `Set` syntax in `gremlin-language`.
+* Renamed `MergeStep` to `MergeElementStep` as it is a base class to
`mergeV()` and `mergeE()`.
+* Renamed `TraversalMergeStep` of `merge()` to `MergeStep` for consistency.
* Removed the deprecated `withGraph()` option from `AnonymousTraversalSource`.
* Removed the `gremlin-archetype` module in favor of newer sample applications
in each GLV's `examples` folder.
* Bumped to `commons-collection4`.
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index aa364e4fc4..09e5f5eeb8 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -163,7 +163,7 @@ import
org.apache.tinkerpop.gremlin.process.traversal.step.map.ToUpperGlobalStep
import
org.apache.tinkerpop.gremlin.process.traversal.step.map.ToUpperLocalStep;
import
org.apache.tinkerpop.gremlin.process.traversal.step.map.TraversalFlatMapStep;
import
org.apache.tinkerpop.gremlin.process.traversal.step.map.TraversalMapStep;
-import
org.apache.tinkerpop.gremlin.process.traversal.step.map.TraversalMergeStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.MergeStep;
import
org.apache.tinkerpop.gremlin.process.traversal.step.map.TraversalSelectStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.TreeStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.TrimGlobalStep;
@@ -1939,13 +1939,13 @@ public interface GraphTraversal<S, E> extends
Traversal<S, E> {
/**
* Merges the list traverser and list argument. Also known as union.
*
- * @return the traversal with an appended {@link TraversalMergeStep}.
+ * @return the traversal with an appended {@link MergeStep}.
* @see <a
href="http://tinkerpop.apache.org/docs/${project.version}/reference/#merge-step";
target="_blank">Reference Documentation - Merge Step</a>
* @since 3.7.1
*/
public default <E2> GraphTraversal<S, E2> merge(final Object values) {
this.asAdmin().getBytecode().addStep(Symbols.merge, values);
- return this.asAdmin().addStep(new TraversalMergeStep<>(this.asAdmin(),
values));
+ return this.asAdmin().addStep(new MergeStep<>(this.asAdmin(), values));
}
/**
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeEdgeStep.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeEdgeStep.java
index a5747fdfa0..bb22d218e5 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeEdgeStep.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeEdgeStep.java
@@ -52,12 +52,12 @@ import static
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.outV;
/**
* Implementation for the {@code mergeE()} step covering both the start step
version and the one used mid-traversal.
*/
-public class MergeEdgeStep<S> extends MergeStep<S, Edge, Object> {
+public class MergeEdgeStep<S> extends MergeElementStep<S, Edge, Object> {
private static final Set allowedTokens = new
LinkedHashSet(Arrays.asList(T.id, T.label, Direction.IN, Direction.OUT));
public static void validateMapInput(final Map map, final boolean
ignoreTokens) {
- MergeStep.validate(map, ignoreTokens, allowedTokens, "mergeE");
+ MergeElementStep.validate(map, ignoreTokens, allowedTokens, "mergeE");
}
private Traversal.Admin<S, Object> outVTraversal = null;
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeStep.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeElementStep.java
similarity index 96%
copy from
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeStep.java
copy to
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeElementStep.java
index a692c2435e..44e954fb31 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeStep.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeElementStep.java
@@ -46,7 +46,6 @@ import
org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequire
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil;
import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Element;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.Vertex;
@@ -57,7 +56,7 @@ import
org.apache.tinkerpop.gremlin.structure.util.StringFactory;
/**
* Abstract base class for the {@code mergeV/E()} implementations.
*/
-public abstract class MergeStep<S, E, C> extends FlatMapStep<S, E>
+public abstract class MergeElementStep<S, E, C> extends FlatMapStep<S, E>
implements Writing<Event>, Deleting<Event>,
TraversalOptionParent<Merge, S, C> {
protected final boolean isStart;
@@ -72,17 +71,17 @@ public abstract class MergeStep<S, E, C> extends
FlatMapStep<S, E>
protected boolean usesPartitionStrategy;
- public MergeStep(final Traversal.Admin traversal, final boolean isStart) {
+ public MergeElementStep(final Traversal.Admin traversal, final boolean
isStart) {
this(traversal, isStart, new IdentityTraversal<>());
}
- public MergeStep(final Traversal.Admin traversal, final boolean isStart,
final Map mergeMap) {
+ public MergeElementStep(final Traversal.Admin traversal, final boolean
isStart, final Map mergeMap) {
this(traversal, isStart, new ConstantTraversal<>(mergeMap));
validate(mergeMap, false);
}
- public MergeStep(final Traversal.Admin traversal, final boolean isStart,
- final Traversal.Admin mergeTraversal) {
+ public MergeElementStep(final Traversal.Admin traversal, final boolean
isStart,
+ final Traversal.Admin mergeTraversal) {
super(traversal);
this.isStart = isStart;
this.mergeTraversal = integrateChild(mergeTraversal);
@@ -243,8 +242,8 @@ public abstract class MergeStep<S, E, C> extends
FlatMapStep<S, E>
}
@Override
- public MergeStep<S, E, C> clone() {
- final MergeStep<S, E, C> clone = (MergeStep<S, E, C>) super.clone();
+ public MergeElementStep<S, E, C> clone() {
+ final MergeElementStep<S, E, C> clone = (MergeElementStep<S, E, C>)
super.clone();
clone.mergeTraversal = mergeTraversal.clone();
clone.onCreateTraversal = onCreateTraversal != null ?
onCreateTraversal.clone() : null;
clone.onMatchTraversal = onMatchTraversal != null ?
onMatchTraversal.clone() : null;
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeStep.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeStep.java
index a692c2435e..d11fdf0894 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeStep.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeStep.java
@@ -18,365 +18,109 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.map;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-
-import org.apache.tinkerpop.gremlin.process.traversal.Merge;
-import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
-import org.apache.tinkerpop.gremlin.process.traversal.TraverserGenerator;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.lambda.ConstantTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.lambda.IdentityTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.step.Deleting;
-import
org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent;
-import org.apache.tinkerpop.gremlin.process.traversal.step.Writing;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.Parameters;
-import
org.apache.tinkerpop.gremlin.process.traversal.step.util.event.CallbackRegistry;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.event.Event;
-import
org.apache.tinkerpop.gremlin.process.traversal.step.util.event.ListCallbackRegistry;
-import
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
import
org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
+import org.apache.tinkerpop.gremlin.process.traversal.util.ListFunction;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil;
-import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.T;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator;
-import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
-import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
/**
- * Abstract base class for the {@code mergeV/E()} implementations.
+ * A map step that returns the merger of the traverser and the provided
arguments without duplicates. This is commonly
+ * known as a union.
*/
-public abstract class MergeStep<S, E, C> extends FlatMapStep<S, E>
- implements Writing<Event>, Deleting<Event>,
TraversalOptionParent<Merge, S, C> {
-
- protected final boolean isStart;
- protected boolean first = true;
- protected Traversal.Admin<S, Map> mergeTraversal;
- protected Traversal.Admin<S, Map> onCreateTraversal = null;
- protected Traversal.Admin<S, Map<String, ?>> onMatchTraversal = null;
-
- protected CallbackRegistry<Event> callbackRegistry;
+public final class MergeStep<S, E> extends ScalarMapStep<S, E> implements
TraversalParent, ListFunction {
+ private Traversal.Admin<S, E> valueTraversal;
+ private Object parameterItems;
- private Parameters parameters = new Parameters();
-
- protected boolean usesPartitionStrategy;
-
- public MergeStep(final Traversal.Admin traversal, final boolean isStart) {
- this(traversal, isStart, new IdentityTraversal<>());
- }
-
- public MergeStep(final Traversal.Admin traversal, final boolean isStart,
final Map mergeMap) {
- this(traversal, isStart, new ConstantTraversal<>(mergeMap));
- validate(mergeMap, false);
- }
-
- public MergeStep(final Traversal.Admin traversal, final boolean isStart,
- final Traversal.Admin mergeTraversal) {
+ public MergeStep(final Traversal.Admin traversal, final Object values) {
super(traversal);
- this.isStart = isStart;
- this.mergeTraversal = integrateChild(mergeTraversal);
-
- // determines if this step uses PartitionStrategy. it's not great that
merge needs to know about a particular
- // strategy but if it doesn't then it can't determine if Parameters
are being used properly or not. to not have
- // this check seems to invite problems. in some sense, this is not the
first time steps have had to know more
- // about strategies than is probably preferred - EventStrategy comes
to mind
- this.usesPartitionStrategy =
TraversalHelper.getRootTraversal(traversal).
-
getStrategies().getStrategy(PartitionStrategy.class).isPresent();
- }
-
- /**
- * Gets the traversal that will be used to provide the {@code Map} that
will be used to search for elements.
- * This {@code Map} also will be used as the default data set to be used
to create the element if the search is not
- * successful.
- */
- public Traversal.Admin<S, Map> getMergeTraversal() {
- return mergeTraversal;
- }
-
- /**
- * Gets the traversal that will be used to provide the {@code Map} that
will be used to create elements that
- * do not match the search criteria of {@link #getMergeTraversal()}.
- */
- public Traversal.Admin<S, Map> getOnCreateTraversal() {
- return onCreateTraversal;
- }
- /**
- * Gets the traversal that will be used to provide the {@code Map} that
will be used to modify elements that
- * match the search criteria of {@link #getMergeTraversal()}.
- */
- public Traversal.Admin<S, Map<String, ?>> getOnMatchTraversal() {
- return onMatchTraversal;
- }
-
- /**
- * Determines if this is a start step.
- */
- public boolean isStart() {
- return isStart;
- }
-
- /**
- * Determine if this is the first pass through {@link #processNextStart()}.
- */
- public boolean isFirst() {
- return first;
- }
-
- public CallbackRegistry<Event> getCallbackRegistry() {
- return callbackRegistry;
- }
-
- @Override
- public void addChildOption(final Merge token, final Traversal.Admin<S, C>
traversalOption) {
- if (token == Merge.onCreate) {
- this.onCreateTraversal = this.integrateChild(traversalOption);
- } else if (token == Merge.onMatch) {
- this.onMatchTraversal = this.integrateChild(traversalOption);
+ if (values instanceof Traversal) {
+ valueTraversal = integrateChild(((Traversal<S, E>)
values).asAdmin());
} else {
- throw new UnsupportedOperationException(String.format("Option %s
for Merge is not supported", token.name()));
+ parameterItems = values;
}
}
@Override
- public <S, C> List<Traversal.Admin<S, C>> getLocalChildren() {
- final List<Traversal.Admin<S, C>> children = new ArrayList<>();
- if (mergeTraversal != null) children.add((Traversal.Admin<S, C>)
mergeTraversal);
- if (onMatchTraversal != null) children.add((Traversal.Admin<S, C>)
onMatchTraversal);
- if (onCreateTraversal != null) children.add((Traversal.Admin<S, C>)
onCreateTraversal);
- return children;
- }
-
- /**
- * This implementation should only be used as a mechanism for supporting
{@link PartitionStrategy}. Using this
- * with {@link GraphTraversal#with(String,Object)} will have an ill effect
of simply acting like a call to
- * {@link GraphTraversal#property(Object, Object, Object...)}. No mutating
steps currently support use of
- * {@link GraphTraversal#with(String,Object)} so perhaps it's best to not
start with that now.
- */
- @Override
- public void configure(final Object... keyValues) {
- this.parameters.set(this, keyValues);
- }
-
- @Override
- public Parameters getParameters() {
- return this.parameters;
- }
-
- public boolean isUsingPartitionStrategy() {
- return usesPartitionStrategy;
- }
+ public String getStepName() { return "merge"; }
@Override
- protected Traverser.Admin<E> processNextStart() {
- // when it's a start step a traverser needs to be created to kick off
the traversal.
- if (isStart && first) {
- first = false;
- generateTraverser(false);
- }
- return super.processNextStart();
- }
+ protected E map(final Traverser.Admin<S> traverser) {
+ final S incoming = traverser.get();
+
+ final Map mapA = (incoming instanceof Map) ? (Map) incoming : null;
+ if (mapA != null) {
+ final Object mapB = (valueTraversal != null) ?
TraversalUtil.apply(traverser, valueTraversal) : parameterItems;
+ if (!(mapB instanceof Map)) {
+ throw new IllegalArgumentException(
+ String.format(
+ "%s step expected provided argument to
evaluate to a Map, encountered %s",
+ getStepName(),
+ mapB.getClass()));
+ }
- private void generateTraverser(final Object o) {
- final TraverserGenerator generator =
this.getTraversal().getTraverserGenerator();
- this.addStart(generator.generate(o, (Step) this, 1L));
- }
+ final Map mergedMap = new HashMap(mapA);
+ mergedMap.putAll((Map) mapB);
+ return (E) mergedMap;
+ } else {
+ final Collection listA = convertTraverserToCollection(traverser);
- protected Graph getGraph() {
- return this.getTraversal().getGraph().get();
- }
+ if (parameterItems instanceof Map) {
+ throw new IllegalArgumentException(getStepName() + " step type
mismatch: expected argument to be Iterable but got Map");
+ }
+ final Collection listB =
+ (null != valueTraversal)
+ ? convertTraversalToCollection(traverser,
valueTraversal)
+ : convertArgumentToCollection(parameterItems);
- @Override
- public CallbackRegistry<Event> getMutatingCallbackRegistry() {
- if (null == callbackRegistry) callbackRegistry = new
ListCallbackRegistry<>();
- return callbackRegistry;
- }
+ final Set elements = new HashSet();
- @Override
- public int hashCode() {
- int result = super.hashCode();
- if (mergeTraversal != null)
- result ^= mergeTraversal.hashCode();
- if (onCreateTraversal != null)
- result ^= onCreateTraversal.hashCode();
- if (onMatchTraversal != null)
- result ^= onMatchTraversal.hashCode();
- return result;
- }
+ elements.addAll(listA);
+ elements.addAll(listB);
- @Override
- public void reset() {
- super.reset();
- first = true;
- mergeTraversal.reset();
- if (onCreateTraversal != null) onCreateTraversal.reset();
- if (onMatchTraversal != null) onMatchTraversal.reset();
+ return (E) elements;
+ }
}
@Override
- public Set<TraverserRequirement> getRequirements() {
- return this.getSelfAndChildRequirements();
+ public List<Traversal.Admin<S, E>> getLocalChildren() {
+ return (null == valueTraversal) ? Collections.emptyList() :
Collections.singletonList(valueTraversal);
}
@Override
- public String toString() {
- return StringFactory.stepString(this, mergeTraversal,
onCreateTraversal, onMatchTraversal);
- }
+ public Set<TraverserRequirement> getRequirements() { return
this.getSelfAndChildRequirements(); }
@Override
public void setTraversal(final Traversal.Admin<?, ?> parentTraversal) {
super.setTraversal(parentTraversal);
- this.integrateChild(mergeTraversal);
- this.integrateChild(onCreateTraversal);
- this.integrateChild(onMatchTraversal);
+ if (valueTraversal != null) {
this.integrateChild(this.valueTraversal); }
}
@Override
- public MergeStep<S, E, C> clone() {
- final MergeStep<S, E, C> clone = (MergeStep<S, E, C>) super.clone();
- clone.mergeTraversal = mergeTraversal.clone();
- clone.onCreateTraversal = onCreateTraversal != null ?
onCreateTraversal.clone() : null;
- clone.onMatchTraversal = onMatchTraversal != null ?
onMatchTraversal.clone() : null;
- return clone;
- }
-
- protected void validate(final Map map, final boolean ignoreTokens) {
- final Set allowedTokens = getAllowedTokens();
- validate(map, ignoreTokens, allowedTokens, this instanceof
MergeVertexStep ? "mergeV" : "mergeE");
- }
-
- protected static void validate(final Map map, final boolean ignoreTokens,
final Set allowedTokens, final String op) {
- if (null == map) return;
-
- ((Map<?,?>) map).entrySet().forEach(e -> {
- final Object k = e.getKey();
- final Object v = e.getValue();
-
- if (v == null) {
- throw new IllegalArgumentException(String.format("%s() does
not allow null Map values - check: %s", op, k));
- }
-
- if (ignoreTokens) {
- if (!(k instanceof String)) {
- throw new
IllegalArgumentException(String.format("option(onMatch) expects keys in Map to
be of String - check: %s", k));
- } else {
- ElementHelper.validateProperty((String) k, v);
- }
- } else {
- if (!(k instanceof String) && !allowedTokens.contains(k)) {
- throw new IllegalArgumentException(String.format(
- "%s() and option(onCreate) args expect keys in Map
to be either String or %s - check: %s",
- op, allowedTokens, k));
- }
- if (k == T.label) {
- if (!(v instanceof String)) {
- throw new IllegalArgumentException(String.format(
- "%s() and option(onCreate) args expect T.label
value to be of String - found: %s", op,
- v.getClass().getSimpleName()));
- } else {
- ElementHelper.validateLabel((String) v);
- }
- }
- if (k == Direction.OUT && v instanceof Merge && v !=
Merge.outV) {
- throw new IllegalArgumentException(String.format("Only
Merge.outV token may be used for Direction.OUT, found: %s", v));
- }
- if (k == Direction.IN && v instanceof Merge && v != Merge.inV)
{
- throw new IllegalArgumentException(String.format("Only
Merge.inV token may be used for Direction.IN, found: %s", v));
- }
- if (k instanceof String) {
- ElementHelper.validateProperty((String) k, v);
- }
- }
- });
- }
-
- /**
- * Prohibit overrides to the existence criteria (id/label/from/to) in
onCreate.
- */
- protected void validateNoOverrides(final Map<?,?> mergeMap, final Map<?,?>
onCreateMap) {
- for (final Map.Entry e : onCreateMap.entrySet()) {
- final Object k = e.getKey();
- final Object v = e.getValue();
- if (mergeMap.containsKey(k) && !Objects.equals(v,
mergeMap.get(k))) {
- throw new IllegalArgumentException(String.format(
- "option(onCreate) cannot override values from merge()
argument: (%s, %s)", k, v));
- }
- }
- }
-
- /**
- * null Map == empty Map
- */
- protected Map materializeMap(final Traverser.Admin<S> traverser,
Traversal.Admin<S, ?> mapTraversal) {
- Map map = (Map) TraversalUtil.apply(traverser, mapTraversal);
-
- // PartitionStrategy uses parameters as a mechanism for setting the
partition key. trying to be as specific
- // as possible here wrt parameters usage to avoid misuse
- if (usesPartitionStrategy) {
- map = null == map ? new LinkedHashMap() : map;
- for (Map.Entry<Object, List<Object>> entry :
parameters.getRaw().entrySet()) {
- final Object k = entry.getKey();
- final List<Object> v = entry.getValue();
- map.put(k, v.get(0));
- }
- }
-
- return map == null ? new LinkedHashMap() : map;
- }
-
- /**
- * Translate the Map into a g.V() traversal against the supplied graph.
Graph providers will presumably optimize
- * this traversal to use whatever indices are present and appropriate for
efficiency.
- *
- * Callers are responsible for closing this iterator when finished.
- */
- protected CloseableIterator<Vertex> searchVertices(final Map search) {
- if (search == null)
- return CloseableIterator.empty();
-
- final Graph graph = getGraph();
- final Object id = search.get(T.id);
- final String label = (String) search.get(T.label);
-
- GraphTraversal t = searchVerticesTraversal(graph, id);
- t = searchVerticesLabelConstraint(t, label);
- t = searchVerticesPropertyConstraints(t, search);
-
- // this should auto-close the underlying traversal
- return CloseableIterator.of(t);
- }
-
- protected GraphTraversal searchVerticesTraversal(final Graph graph, final
Object id) {
- return id != null ? graph.traversal().V(id) : graph.traversal().V();
- }
-
- protected GraphTraversal searchVerticesLabelConstraint(GraphTraversal t,
final String label) {
- return label != null ? t.hasLabel(label) : t;
- }
-
- protected GraphTraversal searchVerticesPropertyConstraints(GraphTraversal
t, final Map search) {
- for (final Map.Entry e : ((Map<?,?>) search).entrySet()) {
- final Object k = e.getKey();
- if (!(k instanceof String)) continue;
- t = t.has((String) k, e.getValue());
+ public MergeStep<S, E> clone() {
+ final MergeStep<S, E> clone = (MergeStep<S, E>) super.clone();
+ if (null != this.valueTraversal) {
+ clone.valueTraversal = this.valueTraversal.clone();
+ } else {
+ clone.parameterItems = this.parameterItems;
}
- return t;
+ return clone;
}
@Override
- protected abstract Iterator<E> flatMap(final Traverser.Admin<S> traverser);
-
- protected abstract Set getAllowedTokens();
-
+ public int hashCode() {
+ int result = super.hashCode();
+ return Objects.hash(result, valueTraversal, parameterItems);
+ }
}
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexStep.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexStep.java
index 905ed27fe4..9aab3790ac 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexStep.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexStep.java
@@ -43,12 +43,12 @@ import static java.util.stream.Collectors.toList;
/**
* Implementation for the {@code mergeV()} step covering both the start step
version and the one used mid-traversal.
*/
-public class MergeVertexStep<S> extends MergeStep<S, Vertex, Map> {
+public class MergeVertexStep<S> extends MergeElementStep<S, Vertex, Map> {
private static final Set allowedTokens = new
LinkedHashSet(Arrays.asList(T.id, T.label));
public static void validateMapInput(final Map map, final boolean
ignoreTokens) {
- MergeStep.validate(map, ignoreTokens, allowedTokens, "mergeV");
+ MergeElementStep.validate(map, ignoreTokens, allowedTokens, "mergeV");
}
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TraversalMergeStep.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TraversalMergeStep.java
deleted file mode 100644
index 3e339482b7..0000000000
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TraversalMergeStep.java
+++ /dev/null
@@ -1,126 +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.process.traversal.step.map;
-
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
-import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
-import
org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
-import org.apache.tinkerpop.gremlin.process.traversal.util.ListFunction;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-
-/**
- * A map step that returns the merger of the traverser and the provided
arguments without duplicates. This is commonly
- * known as a union.
- */
-public final class TraversalMergeStep<S, E> extends ScalarMapStep<S, E>
implements TraversalParent, ListFunction {
- private Traversal.Admin<S, E> valueTraversal;
- private Object parameterItems;
-
- public TraversalMergeStep(final Traversal.Admin traversal, final Object
values) {
- super(traversal);
-
- if (values instanceof Traversal) {
- valueTraversal = integrateChild(((Traversal<S, E>)
values).asAdmin());
- } else {
- parameterItems = values;
- }
- }
-
- @Override
- public String getStepName() { return "merge"; }
-
- @Override
- protected E map(final Traverser.Admin<S> traverser) {
- final S incoming = traverser.get();
-
- final Map mapA = (incoming instanceof Map) ? (Map) incoming : null;
- if (mapA != null) {
- final Object mapB = (valueTraversal != null) ?
TraversalUtil.apply(traverser, valueTraversal) : parameterItems;
- if (!(mapB instanceof Map)) {
- throw new IllegalArgumentException(
- String.format(
- "%s step expected provided argument to
evaluate to a Map, encountered %s",
- getStepName(),
- mapB.getClass()));
- }
-
- final Map mergedMap = new HashMap(mapA);
- mergedMap.putAll((Map) mapB);
- return (E) mergedMap;
- } else {
- final Collection listA = convertTraverserToCollection(traverser);
-
- if (parameterItems instanceof Map) {
- throw new IllegalArgumentException(getStepName() + " step type
mismatch: expected argument to be Iterable but got Map");
- }
- final Collection listB =
- (null != valueTraversal)
- ? convertTraversalToCollection(traverser,
valueTraversal)
- : convertArgumentToCollection(parameterItems);
-
- final Set elements = new HashSet();
-
- elements.addAll(listA);
- elements.addAll(listB);
-
- return (E) elements;
- }
- }
-
- @Override
- public List<Traversal.Admin<S, E>> getLocalChildren() {
- return (null == valueTraversal) ? Collections.emptyList() :
Collections.singletonList(valueTraversal);
- }
-
- @Override
- public Set<TraverserRequirement> getRequirements() { return
this.getSelfAndChildRequirements(); }
-
- @Override
- public void setTraversal(final Traversal.Admin<?, ?> parentTraversal) {
- super.setTraversal(parentTraversal);
- if (valueTraversal != null) {
this.integrateChild(this.valueTraversal); }
- }
-
- @Override
- public TraversalMergeStep<S, E> clone() {
- final TraversalMergeStep<S, E> clone = (TraversalMergeStep<S, E>)
super.clone();
- if (null != this.valueTraversal) {
- clone.valueTraversal = this.valueTraversal.clone();
- } else {
- clone.parameterItems = this.parameterItems;
- }
- return clone;
- }
-
- @Override
- public int hashCode() {
- int result = super.hashCode();
- return Objects.hash(result, valueTraversal, parameterItems);
- }
-}
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/BytecodeHelper.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/BytecodeHelper.java
index b9515e69f5..b650f2d122 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/BytecodeHelper.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/BytecodeHelper.java
@@ -138,7 +138,7 @@ import
org.apache.tinkerpop.gremlin.process.traversal.step.map.ToUpperGlobalStep
import
org.apache.tinkerpop.gremlin.process.traversal.step.map.ToUpperLocalStep;
import
org.apache.tinkerpop.gremlin.process.traversal.step.map.TraversalFlatMapStep;
import
org.apache.tinkerpop.gremlin.process.traversal.step.map.TraversalMapStep;
-import
org.apache.tinkerpop.gremlin.process.traversal.step.map.TraversalMergeStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.MergeStep;
import
org.apache.tinkerpop.gremlin.process.traversal.step.map.TraversalSelectStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.TreeStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.TrimGlobalStep;
@@ -253,7 +253,7 @@ public final class BytecodeHelper {
put(GraphTraversal.Symbols.combine,
Collections.singletonList(CombineStep.class));
put(GraphTraversal.Symbols.difference,
Collections.singletonList(DifferenceStep.class));
put(GraphTraversal.Symbols.disjunct,
Collections.singletonList(DisjunctStep.class));
- put(GraphTraversal.Symbols.merge,
Collections.singletonList(TraversalMergeStep.class));
+ put(GraphTraversal.Symbols.merge,
Collections.singletonList(MergeStep.class));
put(GraphTraversal.Symbols.conjoin,
Collections.singletonList(ConjoinStep.class));
put(GraphTraversal.Symbols.product,
Collections.singletonList(ProductStep.class));
put(GraphTraversal.Symbols.intersect,
Collections.singletonList(IntersectStep.class));
diff --git
a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TraversalMergeStepTest.java
b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeStepTest.java
similarity index 98%
rename from
gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TraversalMergeStepTest.java
rename to
gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeStepTest.java
index 7756d01e90..d60180a261 100644
---
a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TraversalMergeStepTest.java
+++
b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeStepTest.java
@@ -31,7 +31,7 @@ import java.util.Set;
import static org.junit.Assert.assertEquals;
-public class TraversalMergeStepTest extends StepTest {
+public class MergeStepTest extends StepTest {
@Override
protected List<Traversal> getTraversals() {
return Arrays.asList(
