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 2015/03/18 16:16:39 UTC

[3/4] incubator-tinkerpop git commit: Minor refactoring to extract method in PartitionStrategy.

Minor refactoring to extract method in PartitionStrategy.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/ae7127da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/ae7127da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/ae7127da

Branch: refs/heads/master
Commit: ae7127daeca8094ff18d9989a5e152fbb34e709e
Parents: b9bad3e
Author: Stephen Mallette <sp...@apache.org>
Authored: Wed Mar 18 11:15:37 2015 -0400
Committer: Stephen Mallette <sp...@apache.org>
Committed: Wed Mar 18 11:15:37 2015 -0400

----------------------------------------------------------------------
 .../strategy/decoration/PartitionStrategy.java          | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ae7127da/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategy.java
index d17f0d2..a699c00 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategy.java
@@ -73,27 +73,31 @@ public class PartitionStrategy extends AbstractTraversalStrategy {
 
         // all write edge steps need to have partition keys tossed into the property key/value list after mutating steps
         TraversalHelper.getStepsOfAssignableClass(AddEdgeStep.class, traversal).forEach(s -> {
-            final Object[] keyValues = Stream.concat(Stream.of(s.getKeyValues()), Stream.of(partitionKey, writePartition)).toArray();
+            final Object[] keyValues = injectPartitionInfo(s.getKeyValues());
             TraversalHelper.replaceStep(s, new AddEdgeStep(traversal, s.getDirection(), s.getEdgeLabel(), s.getVertices().iterator(), keyValues), traversal);
         });
 
         TraversalHelper.getStepsOfAssignableClass(AddEdgeByPathStep.class, traversal).forEach(s -> {
-            final Object[] keyValues = Stream.concat(Stream.of(s.getKeyValues()), Stream.of(partitionKey, writePartition)).toArray();
+            final Object[] keyValues = injectPartitionInfo(s.getKeyValues());
             TraversalHelper.replaceStep(s, new AddEdgeByPathStep(traversal, s.getDirection(), s.getEdgeLabel(), s.getStepLabel(), keyValues), traversal);
         });
 
         // all write vertex steps need to have partition keys tossed into the property key/value list after mutating steps
         TraversalHelper.getStepsOfAssignableClass(AddVertexStep.class, traversal).forEach(s -> {
-            final Object[] keyValues = Stream.concat(Stream.of(s.getKeyValues()), Stream.of(partitionKey, writePartition)).toArray();
+            final Object[] keyValues = injectPartitionInfo(s.getKeyValues());
             TraversalHelper.replaceStep(s, new AddVertexStep(traversal, keyValues), traversal);
         });
 
         TraversalHelper.getStepsOfAssignableClass(AddVertexStartStep.class, traversal).forEach(s -> {
-            final Object[] keyValues = Stream.concat(Stream.of(s.getKeyValues()), Stream.of(partitionKey, writePartition)).toArray();
+            final Object[] keyValues = injectPartitionInfo(s.getKeyValues());
             TraversalHelper.replaceStep(s, new AddVertexStartStep(traversal, keyValues), traversal);
         });
     }
 
+    private Object[] injectPartitionInfo(final Object[] propertyKeyValues) {
+        return Stream.concat(Stream.of(propertyKeyValues), Stream.of(partitionKey, writePartition)).toArray();
+    }
+
     public static class Builder {
         private String writePartition;
         private String partitionKey;