Skip to content

Commit f9f773b

Browse files
author
Zhen Li
committed
Adding bookmark updates in all write queries
However this bookmark is not used for querying nodes count. It is only used to randomly generate queries waiting or not waiting for bookmark.
1 parent 438de66 commit f9f773b

File tree

5 files changed

+15
-8
lines changed

5 files changed

+15
-8
lines changed

driver/src/test/java/org/neo4j/driver/stress/AsyncWriteQuery.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public CompletionStage<Void> execute( C context )
5555
}
5656
else
5757
{
58+
context.setBookmark( session.lastBookmark() );
5859
assertEquals( 1, summary.counters().nodesCreated() );
5960
context.nodeCreated();
6061
}

driver/src/test/java/org/neo4j/driver/stress/AsyncWriteQueryInTx.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,10 @@ public CompletionStage<Void> execute( C context )
4545

4646
CompletionStage<ResultSummary> txCommitted = session.beginTransactionAsync().thenCompose( tx ->
4747
tx.runAsync( "CREATE ()" ).thenCompose( cursor ->
48-
cursor.consumeAsync().thenCompose( summary ->
49-
tx.commitAsync().thenApply( ignore -> summary ) ) ) );
48+
cursor.consumeAsync().thenCompose( summary -> tx.commitAsync().thenApply( ignore -> {
49+
context.setBookmark( session.lastBookmark() );
50+
return summary;
51+
} ) ) ) );
5052

5153
return txCommitted.handle( ( summary, error ) ->
5254
{

driver/src/test/java/org/neo4j/driver/stress/BlockingWriteQuery.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.neo4j.driver.AccessMode;
2222
import org.neo4j.driver.Driver;
2323
import org.neo4j.driver.Session;
24-
import org.neo4j.driver.Result;
24+
import org.neo4j.driver.summary.ResultSummary;
2525

2626
import static org.junit.jupiter.api.Assertions.assertEquals;
2727

@@ -38,12 +38,13 @@ public BlockingWriteQuery( AbstractStressTestBase<C> stressTest, Driver driver,
3838
@Override
3939
public void execute( C context )
4040
{
41-
Result result = null;
41+
ResultSummary summary = null;
4242
Throwable queryError = null;
4343

4444
try ( Session session = newSession( AccessMode.WRITE, context ) )
4545
{
46-
result = session.run( "CREATE ()" );
46+
summary = session.run( "CREATE ()" ).consume();
47+
context.setBookmark( session.lastBookmark() );
4748
}
4849
catch ( Throwable error )
4950
{
@@ -54,9 +55,9 @@ public void execute( C context )
5455
}
5556
}
5657

57-
if ( queryError == null && result != null )
58+
if ( queryError == null && summary != null )
5859
{
59-
assertEquals( 1, result.consume().counters().nodesCreated() );
60+
assertEquals( 1, summary.counters().nodesCreated() );
6061
context.nodeCreated();
6162
}
6263
}

driver/src/test/java/org/neo4j/driver/stress/RxWriteQuery.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ public CompletionStage<Void> execute( C context )
4747
{
4848
CompletableFuture<Void> queryFinished = new CompletableFuture<>();
4949
Flux.usingWhen( Mono.fromSupplier( () -> newSession( AccessMode.WRITE, context ) ),
50-
session -> session.run( "CREATE ()" ).consume(), RxSession::close )
50+
session -> Flux.from( session.run( "CREATE ()" ).consume() )
51+
.doOnComplete( () -> context.setBookmark( session.lastBookmark() ) ),
52+
RxSession::close )
5153
.subscribe( summary -> {
5254
assertEquals( 1, summary.counters().nodesCreated() );
5355
context.nodeCreated();

driver/src/test/java/org/neo4j/driver/stress/RxWriteQueryInTx.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public CompletionStage<Void> execute( C context )
4949
Flux.usingWhen( session.beginTransaction(), tx -> tx.run( "CREATE ()" ).consume(),
5050
RxTransaction::commit, ( tx, error ) -> tx.rollback(), null ).subscribe(
5151
summary -> {
52+
context.setBookmark( session.lastBookmark() );
5253
assertEquals( 1, summary.counters().nodesCreated() );
5354
context.nodeCreated();
5455
queryFinished.complete( null );

0 commit comments

Comments
 (0)