You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2017/01/17 01:45:40 UTC
[1/2] tinkerpop git commit: fixed assertion
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1601 0edf2e929 -> ff844904d
fixed assertion
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3179f6da
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3179f6da
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3179f6da
Branch: refs/heads/TINKERPOP-1601
Commit: 3179f6dab9065206a811e124c7827d4d9c5211ad
Parents: 0edf2e9
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Jan 17 02:43:41 2017 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Jan 17 02:43:41 2017 +0100
----------------------------------------------------------------------
.../org/apache/tinkerpop/gremlin/structure/SerializationTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3179f6da/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
index 4dacf48..8e4a527 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
@@ -363,7 +363,7 @@ public class SerializationTest {
assertTrue(m.containsKey(GraphSONTokens.METRICS));
final List<Map<String, Object>> metrics = (List<Map<String, Object>>) m.get(GraphSONTokens.METRICS);
- assertEquals(2, metrics.size());
+ assertEquals(3, metrics.size());
final Map<String, Object> metrics0 = metrics.get(0);
assertTrue(metrics0.containsKey(GraphSONTokens.ID));
[2/2] tinkerpop git commit: Changed btecode representation of
excluded strategies to prevent serialization issues.
Posted by dk...@apache.org.
Changed btecode representation of excluded strategies to prevent serialization issues.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ff844904
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ff844904
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ff844904
Branch: refs/heads/TINKERPOP-1601
Commit: ff844904df2b9e5d48c4725e8679f139c0e463e0
Parents: 3179f6d
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Jan 17 02:44:13 2017 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Jan 17 02:44:13 2017 +0100
----------------------------------------------------------------------
.../tinkerpop/gremlin/process/traversal/Bytecode.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ff844904/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bytecode.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bytecode.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bytecode.java
index 7ea5f6f..13ea291 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bytecode.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bytecode.java
@@ -61,13 +61,10 @@ public final class Bytecode implements Cloneable, Serializable {
*/
public void addSource(final String sourceName, final Object... arguments) {
if (sourceName.equals(TraversalSource.Symbols.withoutStrategies)) {
- final Class<TraversalStrategy>[] classes = new Class[arguments.length];
- for (int i = 0; i < arguments.length; i++) {
- classes[i] = arguments[i] instanceof TraversalStrategyProxy ?
- ((TraversalStrategyProxy) arguments[i]).getStrategyClass() :
- (Class) arguments[i];
+ for (final Object argument : arguments) {
+ this.sourceInstructions.add(new Instruction(sourceName, argument instanceof TraversalStrategyProxy
+ ? ((TraversalStrategyProxy) argument).getStrategyClass() : (Class) argument));
}
- this.sourceInstructions.add(new Instruction(sourceName, classes));
} else
this.sourceInstructions.add(new Instruction(sourceName, flattenArguments(arguments)));
Bindings.clear();