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/17 21:49:13 UTC
[1/2] incubator-tinkerpop git commit: Add back an before/after commit
assert for checking against ConcurrentModificationExceptions.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 67f112f6e -> b61be9f84
Add back an before/after commit assert for checking against ConcurrentModificationExceptions.
Opted out Neo4j from that test as it does not seem to support it.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/071c01e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/071c01e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/071c01e2
Branch: refs/heads/master
Commit: 071c01e24826f2fc075a264ff5cd7196ab8bc7ff
Parents: 86d953b
Author: Stephen Mallette <sp...@apache.org>
Authored: Tue Mar 17 16:40:49 2015 -0400
Committer: Stephen Mallette <sp...@apache.org>
Committed: Tue Mar 17 16:40:49 2015 -0400
----------------------------------------------------------------------
.../apache/tinkerpop/gremlin/structure/GraphTest.java | 5 +----
.../tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java | 11 ++++++++---
2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/071c01e2/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphTest.java
index e061323..15c799c 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphTest.java
@@ -337,10 +337,7 @@ public class GraphTest extends AbstractGremlinTest {
edgeIterator.next().remove();
}
assertFalse(edgeIterator.hasNext());
-
- // TODO: Neo4j fails on this: tryCommit(g, g -> assertFalse(g.iterators().edgeIterator().hasNext()));
- tryCommit(graph);
- assertFalse(graph.edges().hasNext());
+ tryCommit(graph, g -> assertFalse(g.edges().hasNext()));
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/071c01e2/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java
index a10318e..e4adf0b 100644
--- a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java
+++ b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java
@@ -68,16 +68,21 @@ import java.util.stream.Stream;
test = "org.apache.tinkerpop.gremlin.structure.VertexTest$ExceptionConsistencyWhenVertexRemovedTest",
method = "shouldThrowExceptionIfVertexWasRemovedWhenCallingProperty",
specific = "property(single,k,v)",
- reason = "Neo4j throws a NodeNotFoundException instead of the desired IllegalStateException")
+ reason = "Neo4j throws a NodeNotFoundException instead of the desired IllegalStateException.")
@Graph.OptOut(
test = "org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.AddVertexTest$Traversals",
method = "g_V_addVXlabel_animal_age_0X",
- reason = "Neo4j global graph operators stream created vertices created after the access to the global iterator"
+ reason = "Neo4j global graph operators stream created vertices created after the access to the global iterator."
)
@Graph.OptOut(
test = "org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.GroovyAddVertexTest$StandardTraversals",
method = "g_V_addVXlabel_animal_age_0X",
- reason = "Neo4j global graph operators stream created vertices created after the access to the global iterator"
+ reason = "Neo4j global graph operators stream created vertices created after the access to the global iterator."
+)
+@Graph.OptOut(
+ test = "org.apache.tinkerpop.gremlin.structure.GraphTest",
+ method = "shouldRemoveEdgesWithoutConcurrentModificationException",
+ reason = "Neo4j global graph operators stream removes edges after access to the global iterator."
)
public class Neo4jGraph implements Graph, WrappedGraph<GraphDatabaseService> {
[2/2] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/master'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/b61be9f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/b61be9f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/b61be9f8
Branch: refs/heads/master
Commit: b61be9f849f06e30c53c6a77156c4f74fa13b56a
Parents: 071c01e 67f112f
Author: Stephen Mallette <sp...@apache.org>
Authored: Tue Mar 17 16:41:34 2015 -0400
Committer: Stephen Mallette <sp...@apache.org>
Committed: Tue Mar 17 16:41:34 2015 -0400
----------------------------------------------------------------------
.../computer/giraph/GiraphComputeVertex.java | 9 +--
.../process/computer/TinkerGraphView.java | 77 ++++++++------------
.../tinkergraph/structure/TinkerEdge.java | 39 +++++++---
.../tinkergraph/structure/TinkerElement.java | 51 -------------
.../tinkergraph/structure/TinkerHelper.java | 69 ++++++++++--------
.../tinkergraph/structure/TinkerProperty.java | 7 +-
.../tinkergraph/structure/TinkerVertex.java | 44 ++++++++---
.../structure/TinkerVertexProperty.java | 29 +++++++-
8 files changed, 165 insertions(+), 160 deletions(-)
----------------------------------------------------------------------