-
Notifications
You must be signed in to change notification settings - Fork 24
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.
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
Race conditions with DataContext #35
Open
sheastrickland
wants to merge
1
commit into
scale-tone:master
Choose a base branch
from
TicketSolutionsPtyLtd:tabledefinition-raceconditions
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
using System; | ||
using System.Collections.Concurrent; | ||
using System.Linq; | ||
using System.Threading; | ||
using System.Threading.Tasks; | ||
|
||
using Amazon; | ||
|
@@ -124,7 +125,7 @@ public DataTable<TEntity> GetTable<TEntity>(object hashKeyValue, Func<ITableCach | |
var tableWrapper = TableWrappers.GetOrAdd | ||
( | ||
new Tuple<Type, object>(entityType, hashKeyValue), | ||
t => | ||
t => new Lazy<TableDefinitionWrapper>(() => | ||
{ | ||
// if cache is not provided, then passing a fake implementation | ||
var cacheImplementation = | ||
|
@@ -144,8 +145,8 @@ public DataTable<TEntity> GetTable<TEntity>(object hashKeyValue, Func<ITableCach | |
); | ||
wrapper.OnLog += this.OnLog; | ||
return wrapper; | ||
} | ||
); | ||
}, LazyThreadSafetyMode.ExecutionAndPublication) | ||
).Value; | ||
|
||
if (tableWrapper.TableDefinition != tableDefinition) | ||
{ | ||
|
@@ -171,7 +172,7 @@ public DataTable<TEntity> GetTable<TEntity>(object hashKeyValue, Func<ITableCach | |
/// </summary> | ||
public void SubmitChanges() | ||
{ | ||
Task.WaitAll(this.TableWrappers.Values.Select(t => t.SubmitChangesAsync()).ToArray()); | ||
Task.WaitAll(this.TableWrappers.Values.Select(t => t.Value.SubmitChangesAsync()).ToArray()); | ||
} | ||
|
||
#endregion | ||
|
@@ -193,15 +194,15 @@ public void SubmitChanges() | |
/// <summary> | ||
/// TableDefinitionWrapper instances for each entity type and HashKey value (if specified) | ||
/// </summary> | ||
protected internal readonly ConcurrentDictionary<Tuple<Type, object>, TableDefinitionWrapper> TableWrappers = new ConcurrentDictionary<Tuple<Type, object>, TableDefinitionWrapper>(); | ||
protected internal readonly ConcurrentDictionary<Tuple<Type, object>, Lazy<TableDefinitionWrapper>> TableWrappers = new ConcurrentDictionary<Tuple<Type, object>, Lazy<TableDefinitionWrapper>>(); | ||
|
||
/// <summary> | ||
/// A fake cache implementation, which does no caching | ||
/// </summary> | ||
private static readonly ITableCache FakeCacheImplementation = new FakeTableCache(); | ||
|
||
|
||
private class CachedTableDefinitions : ConcurrentDictionary<string, Table> | ||
private class CachedTableDefinitions : ConcurrentDictionary<string, Lazy<Table>> | ||
{ | ||
/// <summary> | ||
/// Instead of storing a reference to DynamoDBClient we're storing it's HashCode | ||
|
@@ -219,6 +220,11 @@ public bool IsAssignedToThisClientInstance(IAmazonDynamoDB client) | |
} | ||
} | ||
|
||
/// <summary> | ||
/// Used to lock while updating the <see cref="_cachedTableDefinitions" /> field | ||
/// </summary> | ||
private static readonly object CacheTableDefinitionsLock = new object(); | ||
|
||
/// <summary> | ||
/// Table objects are cached here per DynamoDBClient instance. | ||
/// In order not to reload table metadata between DataContext instance creations. | ||
|
@@ -269,20 +275,28 @@ private Table GetTableDefinition(Type entityType) | |
throw new InvalidOperationException("An instance of AmazonDynamoDbClient was not provided. Use either a ctor, that takes AmazonDynamoDbClient instance or GetTable() method, that takes Table object"); | ||
} | ||
|
||
var cachedTableDefinitions = _cachedTableDefinitions; | ||
if | ||
( | ||
(cachedTableDefinitions == null) | ||
(_cachedTableDefinitions == null) | ||
|| | ||
(!cachedTableDefinitions.IsAssignedToThisClientInstance(this._client)) | ||
(!_cachedTableDefinitions.IsAssignedToThisClientInstance(this._client)) | ||
) | ||
{ | ||
cachedTableDefinitions = new CachedTableDefinitions(this._client); | ||
_cachedTableDefinitions = cachedTableDefinitions; | ||
lock (CacheTableDefinitionsLock) | ||
{ | ||
if ((_cachedTableDefinitions == null) | ||
|| | ||
(!_cachedTableDefinitions.IsAssignedToThisClientInstance(this._client))) | ||
{ | ||
_cachedTableDefinitions = new CachedTableDefinitions(this._client); | ||
} | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is ensuring safely swapping the shared static instance, used by all lightweight instances. |
||
} | ||
|
||
var cachedTableDefinitions = _cachedTableDefinitions; | ||
|
||
string tableName = this.GetTableNameForType(entityType); | ||
return cachedTableDefinitions.GetOrAdd(tableName, name => Table.LoadTable(this._client, name)); | ||
return cachedTableDefinitions.GetOrAdd(tableName, name => new Lazy<Table>(() => Table.LoadTable(this._client, name), LazyThreadSafetyMode.ExecutionAndPublication)).Value; | ||
} | ||
|
||
#endregion | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is where it is replacing the shared static instance, used by all lightweight instances of all data context's.