Merge pull request #2084 from HicServices/bugfix/RDMP-271-slow-catalogue

Bugfix/rdmp 271 Improve Catalogue Overview Speed
HicServices · Dec 9, 2024 · dbb900e · dbb900e
2 parents 5fdeaf4 + 6d1e78e
commit dbb900e
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [8.4.1] - Unreleased
 
+- Improve Overview Model Generation Speed
 - Add Remote Table Without DB Creation Attacher
 
 ## [8.4.0] - 2024-12-02

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -11,6 +11,7 @@
     <PackageVersion Include="HIC.SynthEHR" Version="2.0.1" />
     <PackageVersion Include="HIC.FAnsiSql" Version="3.2.7" />
     <PackageVersion Include="LibArchive.Net" Version="0.1.5" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Documentation/CodeTutorials/Packages.md b/Documentation/CodeTutorials/Packages.md
@@ -42,4 +42,5 @@
 | AWSSDK.SecurityToken | [GitHub](https://github.com/aws/aws-sdk-net) | [Apache 2.0](https://opensource.org/licenses/Apache-2.0)  | |
 | AWSSDK.SSO | [GitHub](https://github.com/aws/aws-sdk-net) | [Apache 2.0](https://opensource.org/licenses/Apache-2.0)  | |
 | AWSSDK.SSOOIDC | [GitHub](https://github.com/aws/aws-sdk-net) | [Apache 2.0](https://opensource.org/licenses/Apache-2.0)  | |
+| Microsoft.Bcl.AsyncInterfaces | [Nuget](https://www.nuget.org/packages/microsoft.bcl.asyncinterfaces/) | [MIT](https://opensource.org/licenses/MIT)  | |
 [DBMS]: ./Glossary.md#DBMS
diff --git a/Rdmp.Core/Curation/Data/Overview/OverviewModel.cs b/Rdmp.Core/Curation/Data/Overview/OverviewModel.cs
@@ -69,7 +69,7 @@ public void Regen(string whereClause)
         dt.EndLoadData();
         con.Dispose();
         _numberOfRecords = dt.Rows.Count;
-        _numberOfPeople = hasExtractionIdentifier ? dt.DefaultView.ToTable(true, column.ColumnInfo.GetRuntimeName()).Rows.Count : 0;
+        _numberOfPeople = hasExtractionIdentifier?dt.AsEnumerable().Select(r => r[column.ColumnInfo.GetRuntimeName()]).ToList().Distinct().Count():0;
         GetDataLoads();
         dt.Dispose();
     }

diff --git a/Rdmp.Core/Rdmp.Core.csproj b/Rdmp.Core/Rdmp.Core.csproj
@@ -327,6 +327,7 @@
 		<PackageReference Include="HIC.SynthEHR" />
 		<PackageReference Include="HIC.FAnsiSql" />
 		<PackageReference Include="LibArchive.Net" />
+		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
 		<PackageReference Include="Microsoft.SourceLink.GitHub">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCatalogue.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCatalogue.cs
@@ -10,6 +10,7 @@
 using Rdmp.Core.CommandExecution.Combining;
 using Rdmp.Core.Curation.Data;
 using Rdmp.UI.ItemActivation;
+using Rdmp.UI.MainFormUITabs;
 using Rdmp.UI.Overview;
 
 namespace Rdmp.UI.CommandExecution.Proposals;
@@ -24,7 +25,7 @@ public ProposeExecutionWhenTargetIsCatalogue(IActivateItems itemActivator) : bas
 
     public override void Activate(Catalogue c)
     {
-        ItemActivator.Activate<ViewCatalogueOverviewUI, Catalogue>(c);
+        ItemActivator.Activate<CatalogueUI, Catalogue>(c);
     }
 
     public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, Catalogue targetCatalogue,

diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs
@@ -10,6 +10,6 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("8.4.0")]
-[assembly: AssemblyFileVersion("8.4.0")]
-[assembly: AssemblyInformationalVersion("8.4.0")]
+[assembly: AssemblyVersion("8.4.1")]
+[assembly: AssemblyFileVersion("8.4.1")]
+[assembly: AssemblyInformationalVersion("8.4.1")]