Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moved cursor.ToListAsync inside transaction, as required for Neo4J 4.… #362

Merged
merged 1 commit into from
Jul 3, 2020
Merged

Moved cursor.ToListAsync inside transaction, as required for Neo4J 4.… #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Moved cursor.ToListAsync inside transaction, as required for Neo4J 4.… 
…x. Also sorted out some nulls in bookmarks.
  • Loading branch information
@tobymiller
tobymiller committed Jul 3, 2020
commit d4c9a30fd1359c473a327d4c7117ed8d5679443d
6 changes: 5 additions & 1 deletion Neo4jClient.Tests/BoltTestHarness.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,12 @@ public void Dispose()

public void SetupCypherRequestResponse(string request, IDictionary<string, object> cypherQueryQueryParameters, IResultCursor response)
{
var mockTransaction = new Mock<IAsyncTransaction>();
MockSession.Setup(s => s.RunAsync(request, It.IsAny<IDictionary<string, object>>())).Returns(Task.FromResult(response));
MockSession.Setup(s => s.WriteTransactionAsync(It.IsAny<Func<IAsyncTransaction, Task<IResultCursor>>>())).Returns(Task.FromResult(response));
mockTransaction.Setup(s => s.RunAsync(request, It.IsAny<IDictionary<string, object>>())).Returns(Task.FromResult(response));
MockSession.Setup(s => s.WriteTransactionAsync(It.IsAny<Func<IAsyncTransaction, Task<List<IRecord>>>>()))
.Returns<Func<IAsyncTransaction, Task<List<IRecord>>>>(
async param => await param(mockTransaction.Object));
}

public async Task<IRawGraphClient> CreateAndConnectBoltGraphClient()
Expand Down
28 changes: 22 additions & 6 deletions Neo4jClient/BoltGraphClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,13 +485,25 @@ async Task<IEnumerable<TResult>> IRawGraphClient.ExecuteGetCypherResultsAsync<TR
}
else
{
var session = Driver.AsyncSession(x => x.WithDefaultAccessMode(query.IsWrite ? AccessMode.Write : AccessMode.Read).WithBookmarks(query.Bookmarks.ToArray()));
var session = Driver.AsyncSession(x =>
{
x.WithDefaultAccessMode(query.IsWrite ? AccessMode.Write : AccessMode.Read);
if (query.Bookmarks != null) x.WithBookmarks(query.Bookmarks.ToArray());
});

var result = query.IsWrite
? await session.WriteTransactionAsync(s => s.RunAsync(query, this)).ConfigureAwait(false)
: await session.ReadTransactionAsync(s => s.RunAsync(query, this)).ConfigureAwait(false);

results = ParseResults<TResult>(await result.ToListAsync().ConfigureAwait(false), query);
? await session.WriteTransactionAsync(async s =>
{
var cursor = await s.RunAsync(query, this).ConfigureAwait(false);
return await cursor.ToListAsync().ConfigureAwait(false);
}).ConfigureAwait(false)
: await session.ReadTransactionAsync(async s =>
{
var cursor = await s.RunAsync(query, this).ConfigureAwait(false);
return await cursor.ToListAsync().ConfigureAwait(false);
}).ConfigureAwait(false);

results = ParseResults<TResult>(result, query);
lastBookmark = session.LastBookmark;
await session.CloseAsync();
}
Expand Down Expand Up @@ -563,7 +575,11 @@ async Task IRawGraphClient.ExecuteCypherAsync(CypherQuery query)
});
}

var session = Driver.AsyncSession(x => x.WithDefaultAccessMode(query.IsWrite ? AccessMode.Write : AccessMode.Read).WithBookmarks().WithBookmarks(query.Bookmarks.ToArray()) );
var session = Driver.AsyncSession(x =>
{
x.WithDefaultAccessMode(query.IsWrite ? AccessMode.Write : AccessMode.Read);
if (query.Bookmarks != null) x.WithBookmarks(query.Bookmarks.ToArray());
});
{
if (query.IsWrite)
await session.WriteTransactionAsync(async s => await s.RunAsync(query, this)).ConfigureAwait(false);
Expand Down
11 changes: 9 additions & 2 deletions Neo4jClient/DriverWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,19 @@ public IAsyncSession Session(AccessMode defaultMode, string bookmark)

public IAsyncSession Session(AccessMode defaultMode, IEnumerable<string> bookmarks)
{
return driver.AsyncSession(x => x.WithDefaultAccessMode(defaultMode).WithBookmarks(Bookmark.From(bookmarks.ToArray())));
return driver.AsyncSession(x =>
{
x.WithDefaultAccessMode(defaultMode);
if (bookmarks != null) x.WithBookmarks(Bookmark.From(bookmarks.ToArray()));
});
}

public IAsyncSession Session(IEnumerable<string> bookmarks)
{
return driver.AsyncSession(x => x.WithBookmarks(Bookmark.From(bookmarks.ToArray())));
return driver.AsyncSession(x =>
{
if (bookmarks != null) x.WithBookmarks(Bookmark.From(bookmarks.ToArray()));
});
}

public IAsyncSession AsyncSession()
Expand Down
6 changes: 5 additions & 1 deletion Neo4jClient/Transactions/Bolt/BoltNeo4jTransaction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ public BoltNeo4jTransaction(IDriver driver, IEnumerable<string> bookmarks, bool
{
Bookmarks = bookmarks?.ToList();
var accessMode = isWrite ? AccessMode.Write : AccessMode.Read;
Session = driver.AsyncSession(x => x.WithDefaultAccessMode(accessMode).WithBookmarks(Bookmark.From(Bookmarks.ToArray())));
Session = driver.AsyncSession(x =>
{
x.WithDefaultAccessMode(accessMode);
if (bookmarks != null) x.WithBookmarks(Bookmark.From(Bookmarks.ToArray()));
});

var tx = Session.BeginTransactionAsync();
tx.Wait();
Expand Down
5 changes: 4 additions & 1 deletion Neo4jClient/Transactions/Bolt/BoltTransactionManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,10 @@ public ITransaction BeginTransaction(TransactionScopeOption scopeOption, IEnumer

private BoltTransactionContext GenerateTransaction(IEnumerable<string> bookmarks)
{
var session = ((BoltGraphClient)client).Driver.AsyncSession(x => x.WithBookmarks(Bookmark.From(bookmarks.ToArray())));
var session = ((BoltGraphClient) client).Driver.AsyncSession(x =>
{
if (bookmarks != null) x.WithBookmarks(Bookmark.From(bookmarks.ToArray()));
});
var transactionTask = session.BeginTransactionAsync();
transactionTask.Wait();
var transaction = transactionTask.Result;
Expand Down