Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-2044 ebfda524a -> b510613b1 (forced update)
optmizes collection copy with Collections addAll Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0e34073d Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0e34073d Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0e34073d Branch: refs/heads/TINKERPOP-2044 Commit: 0e34073d8a756a52eda571bd9ddac0b94b42d54a Parents: ca3a343 Author: Otavio Santana <otaviopolianasant...@gmail.com> Authored: Wed Aug 22 16:45:19 2018 -0300 Committer: Otavio Santana <otaviopolianasant...@gmail.com> Committed: Wed Aug 22 16:54:16 2018 -0300 ---------------------------------------------------------------------- .../traversal/dsl/graph/GraphTraversal.java | 17 +++++------------ .../step/sideEffect/SideEffectCapStep.java | 4 +--- 2 files changed, 6 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0e34073d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java ---------------------------------------------------------------------- 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 1dccead..5ba7823 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 @@ -149,6 +149,7 @@ import org.apache.tinkerpop.gremlin.util.function.ConstantSupplier; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.Comparator; import java.util.Iterator; import java.util.List; @@ -1484,16 +1485,12 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { else { final List<Object> ids = new ArrayList<>(); if (id instanceof Object[]) { - for (final Object i : (Object[]) id) { - ids.add(i); - } + Collections.addAll(ids, (Object[]) id); } else ids.add(id); for (final Object i : otherIds) { if (i.getClass().isArray()) { - for (final Object ii : (Object[]) i) { - ids.add(ii); - } + Collections.addAll(ids, (Object[]) i); } else ids.add(i); } @@ -1559,16 +1556,12 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { else { final List<Object> values = new ArrayList<>(); if (value instanceof Object[]) { - for (final Object v : (Object[]) value) { - values.add(v); - } + Collections.addAll(values, (Object[]) value); } else values.add(value); for (final Object v : otherValues) { if (v instanceof Object[]) { - for (final Object vv : (Object[]) v) { - values.add(vv); - } + Collections.addAll(values, (Object[]) v); } else values.add(v); } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0e34073d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java index 5ac5b27..337dbe4 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java @@ -46,9 +46,7 @@ public final class SideEffectCapStep<S, E> extends SupplyingBarrierStep<S, E> { super(traversal); this.sideEffectKeys = new ArrayList<>(1 + sideEffectKeys.length); this.sideEffectKeys.add(sideEffectKey); - for (final String key : sideEffectKeys) { - this.sideEffectKeys.add(key); - } + Collections.addAll(this.sideEffectKeys, sideEffectKeys); } @Override
