Fix transaction handling for PERIODIC COMMIT in Bolt server

neo4j · Apr 20, 2016 · 7cf7891 · 7cf7891
1 parent 4ed2502
commit 7cf7891
Show file tree

Hide file tree

Showing 5 changed files with 223 additions and 187 deletions.
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/internal/CypherStatementRunner.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/internal/CypherStatementRunner.java
@@ -23,6 +23,7 @@
 
 import org.neo4j.bolt.v1.runtime.spi.RecordStream;
 import org.neo4j.bolt.v1.runtime.spi.StatementRunner;
+import org.neo4j.graphdb.Result;
 import org.neo4j.kernel.api.exceptions.KernelException;
 import org.neo4j.kernel.impl.coreapi.PropertyContainerLocker;
 import org.neo4j.kernel.impl.query.QueryExecutionEngine;
@@ -60,13 +61,23 @@ else if ( statement.equalsIgnoreCase( "rollback" ) )
         }
         else
         {
-            if ( !ctx.hasTransaction() )
+            boolean hasTx = ctx.hasTransaction();
+            boolean isPeriodicCommit = queryExecutionEngine.isPeriodicCommit( statement );
+
+            if ( !hasTx && !isPeriodicCommit )
             {
                 ctx.beginImplicitTransaction();
             }
 
             QuerySession session = ctx.createSession( queryExecutionEngine.queryService(), locker );
-            return new CypherAdapterStream( queryExecutionEngine.executeQuery( statement, params, session ) );
+            Result result = queryExecutionEngine.executeQuery( statement, params, session );
+
+            if ( isPeriodicCommit )
+            {
+                ctx.beginImplicitTransaction();
+            }
+
+            return new CypherAdapterStream( result );
         }
     }
 }
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/internal/SessionStateMachine.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/internal/SessionStateMachine.java
@@ -764,8 +764,7 @@ public boolean hasTransaction()
     @Override
     public QuerySession createSession( GraphDatabaseQueryService service, PropertyContainerLocker locker )
     {
-        InternalTransaction transaction =
-                service.beginTransaction( currentTransaction.transactionType(), currentTransaction.mode() );
+        InternalTransaction transaction = service.beginTransaction( implicit, accessMode );
         Neo4jTransactionalContext transactionalContext =
                 new Neo4jTransactionalContext( service, transaction, spi.currentStatement(), locker );
         return new BoltQuerySession( transactionalContext, querySource() );