Bump to OrientDB 1.2.

Fixes problem with vertex duplicates #312.
tinkerpop · Oct 11, 2012 · 0ab461f · 0ab461f
1 parent fcda13a
commit 0ab461f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/blueprints-orient-graph/pom.xml b/blueprints-orient-graph/pom.xml
@@ -27,12 +27,12 @@
         <dependency>
             <groupId>com.orientechnologies</groupId>
             <artifactId>orientdb-core</artifactId>
-            <version>1.1.0</version>
+            <version>1.2.0</version>
         </dependency>
         <dependency>
             <groupId>com.orientechnologies</groupId>
             <artifactId>orient-commons</artifactId>
-            <version>1.1.0</version>
+            <version>1.2.0</version>
         </dependency>
         <dependency>
             <groupId>com.tinkerpop.blueprints</groupId>

diff --git a/...ts-orient-graph/src/main/java/com/tinkerpop/blueprints/impls/orient/OrientBatchGraph.java b/...ts-orient-graph/src/main/java/com/tinkerpop/blueprints/impls/orient/OrientBatchGraph.java
@@ -55,17 +55,14 @@ public class OrientBatchGraph extends OrientBaseGraph {
      */
     public OrientBatchGraph(final OGraphDatabase iDatabase) {
         super(iDatabase);
-        getRawGraph().declareIntent( new OIntentMassiveInsert() );
     }
 
     public OrientBatchGraph(final String url) {
         super(url, ADMIN, ADMIN);
-        getRawGraph().declareIntent( new OIntentMassiveInsert() );
     }
 
     public OrientBatchGraph(final String url, final String username, final String password) {
         super(url, username, password);
-        getRawGraph().declareIntent( new OIntentMassiveInsert() );
     }
 
     public Features getFeatures() {

diff --git a/blueprints-test/src/main/java/com/tinkerpop/blueprints/TransactionalGraphTestSuite.java b/blueprints-test/src/main/java/com/tinkerpop/blueprints/TransactionalGraphTestSuite.java
@@ -367,6 +367,23 @@ public void testAutomaticSuccessfulTransactionOnShutdown() {
         graph.shutdown();
     }
 
+    public void testVertexCountOnPreTransactionCommit() {
+        TransactionalGraph graph = (TransactionalGraph) graphTest.generateGraph();
+        Vertex v1 = graph.addVertex(null);
+        graph.stopTransaction(Conclusion.SUCCESS);
+
+        vertexCount(graph, 1);
+
+        Vertex v2 = graph.addVertex(null);
+        graph.addEdge(null, v1, v2, convertId(graph, "friend"));
+
+        vertexCount(graph, 2);
+
+        graph.stopTransaction(Conclusion.SUCCESS);
+
+        vertexCount(graph, 2);
+
+    }
 
     public void testBulkTransactionsOnEdges() {
         TransactionalGraph graph = (TransactionalGraph) graphTest.generateGraph();