You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2018/10/03 10:13:16 UTC
[1/5] tinkerpop git commit: optmizes collection copy with Collections
addAll
Repository: tinkerpop
Updated Branches:
refs/heads/master b788201bf -> 7ac00a13b
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/master
Commit: 0e34073d8a756a52eda571bd9ddac0b94b42d54a
Parents: ca3a343
Author: Otavio Santana <ot...@gmail.com>
Authored: Wed Aug 22 16:45:19 2018 -0300
Committer: Otavio Santana <ot...@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
[3/5] tinkerpop git commit: Merge branch 'pr-920' into tp32
Posted by sp...@apache.org.
Merge branch 'pr-920' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/76c9aba9
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/76c9aba9
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/76c9aba9
Branch: refs/heads/master
Commit: 76c9aba94f0f5c464fe4be975809c7dce9c7b92b
Parents: e7af98b b34bf4d
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Oct 3 06:12:43 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Oct 3 06:12:43 2018 -0400
----------------------------------------------------------------------
.../traversal/dsl/graph/GraphTraversal.java | 48 ++++++++++++--------
.../step/sideEffect/SideEffectCapStep.java | 4 +-
2 files changed, 30 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
[5/5] tinkerpop git commit: Merge branch 'tp33'
Posted by sp...@apache.org.
Merge branch 'tp33'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7ac00a13
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7ac00a13
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7ac00a13
Branch: refs/heads/master
Commit: 7ac00a13b4bfce60bc62e5c8d952681027ffebed
Parents: b788201 650f31f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Oct 3 06:13:04 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Oct 3 06:13:04 2018 -0400
----------------------------------------------------------------------
.../traversal/dsl/graph/GraphTraversal.java | 48 ++++++++++++--------
.../step/sideEffect/SideEffectCapStep.java | 4 +-
2 files changed, 30 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7ac00a13/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
[2/5] tinkerpop git commit: fixes traversal
Posted by sp...@apache.org.
fixes traversal
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b34bf4da
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b34bf4da
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b34bf4da
Branch: refs/heads/master
Commit: b34bf4da9bf4829d6474ccdb9397a30b705bd01d
Parents: 0e34073
Author: Otavio Santana <ot...@gmail.com>
Authored: Tue Sep 25 15:57:52 2018 -0300
Committer: Otavio Santana <ot...@gmail.com>
Committed: Tue Sep 25 15:57:52 2018 -0300
----------------------------------------------------------------------
.../traversal/dsl/graph/GraphTraversal.java | 37 ++++++++++++++------
1 file changed, 27 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b34bf4da/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 5ba7823..ba09a7c 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
@@ -1480,22 +1480,39 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
* @since 3.2.2
*/
public default GraphTraversal<S, E> hasId(final Object id, final Object... otherIds) {
- if (id instanceof P)
+ if (id instanceof P) {
return this.hasId((P) id);
+ }
else {
- final List<Object> ids = new ArrayList<>();
+ Object[] ids;
if (id instanceof Object[]) {
- Collections.addAll(ids, (Object[]) id);
- } else
- ids.add(id);
+ ids = (Object[]) id;
+ } else {
+ ids = new Object[] {id};
+ }
+ int size = ids.length;
+ int capacity = size;
for (final Object i : otherIds) {
if (i.getClass().isArray()) {
- Collections.addAll(ids, (Object[]) i);
- } else
- ids.add(i);
+ final Object[] tmp = (Object[]) i;
+ int newLength = size + tmp.length;
+ if (capacity < newLength) {
+ ids = Arrays.copyOf(ids, capacity = size + tmp.length);
+ }
+ System.arraycopy(tmp, 0, ids, size, tmp.length);
+ size = newLength;
+ } else {
+ if (capacity == size) {
+ ids = Arrays.copyOf(ids, capacity = size * 2);
+ }
+ ids[size++] = i;
+ }
+ }
+ if (capacity > size) {
+ ids = Arrays.copyOf(ids, size);
}
- this.asAdmin().getBytecode().addStep(Symbols.hasId, ids.toArray());
- return TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(T.id.getAccessor(), ids.size() == 1 ? P.eq(ids.get(0)) : P.within(ids)));
+ this.asAdmin().getBytecode().addStep(Symbols.hasId, ids);
+ return TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(T.id.getAccessor(), ids.length == 1 ? P.eq(ids[0]) : P.within(ids)));
}
}
[4/5] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/650f31f1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/650f31f1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/650f31f1
Branch: refs/heads/master
Commit: 650f31f1b8bee2ddfcda56afd41612a2e3d36b6a
Parents: c10bde3 76c9aba
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Oct 3 06:12:56 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Oct 3 06:12:56 2018 -0400
----------------------------------------------------------------------
.../traversal/dsl/graph/GraphTraversal.java | 48 ++++++++++++--------
.../step/sideEffect/SideEffectCapStep.java | 4 +-
2 files changed, 30 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/650f31f1/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------