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

#2900 Prevent code generation bugs when multiple aggregates are code … #2901

Closed
wants to merge 2 commits into from
Closed

#2900 Prevent code generation bugs when multiple aggregates are code … #2901

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70fffd4
#2900 Prevent code generation bugs when multiple aggregates are code …
erdtsieck Jan 13, 2024
4691629
#2900 older c# style new object
erdtsieck Jan 14, 2024
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
35 changes: 30 additions & 5 deletions src/Marten/Events/Aggregation/GeneratedAggregateProjectionBase.CodeGen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,36 +78,61 @@ protected override bool tryAttachTypes(Assembly assembly, StoreOptions options)
return _inlineType != null && _liveType != null;
}

/// <summary>
/// Prevent code generation bugs when multiple aggregates are code generated in parallel
/// Happens more often on dynamic code generation
/// </summary>
private static readonly object LockObjAssembleTypes = new object();

protected override void assembleTypes(GeneratedAssembly assembly, StoreOptions options)
{
lock (LockObjAssembleTypes)
{
ReferenceAssembliesAndTypes(assembly);
AddUsingNamespaces(assembly);
CheckAndSetAsyncFlag();
ValidateAndSetAggregateMapping(options);
BuildAggregationTypes(assembly);
}
}

private void ReferenceAssembliesAndTypes(GeneratedAssembly assembly)
{
assembly.Rules.ReferenceTypes(GetType());
assembly.ReferenceAssembly(GetType().Assembly);
assembly.ReferenceAssembly(typeof(T).Assembly);


assembly.Rules.ReferenceTypes(_applyMethods.ReferencedTypes().ToArray());
assembly.Rules.ReferenceTypes(_createMethods.ReferencedTypes().ToArray());
assembly.Rules.ReferenceTypes(_shouldDeleteMethods.ReferencedTypes().ToArray());

// Walk the assembly dependencies for the projection and aggregate types,
// and this will catch generic type argument dependencies as well. For GH-2061
assembly.Rules.ReferenceTypes(GetType(), typeof(T));
}

private static void AddUsingNamespaces(GeneratedAssembly assembly)
{
assembly.UsingNamespaces.Add("System");
assembly.UsingNamespaces.Add("System.Linq");
}

private void CheckAndSetAsyncFlag()
{
_isAsync = _createMethods.IsAsync || _applyMethods.IsAsync;
}

private void ValidateAndSetAggregateMapping(StoreOptions options)
{
_aggregateMapping = options.Storage.FindMapping(typeof(T));


if (_aggregateMapping.IdMember == null)
{
throw new InvalidDocumentException(
$"No identity property or field can be determined for the aggregate '{typeof(T).FullNameInCode()}', but one is required to be used as an aggregate in projections");
}
}


private void BuildAggregationTypes(GeneratedAssembly assembly)
{
buildLiveAggregationType(assembly);
buildInlineAggregationType(assembly);
}
Expand Down
Loading