6245535001

Committed 20 Sep 2023 07:44AM UTC coverage: 57.013%. First build

Build # 6245535001

Build Type

push

github

Committed by

web-flow

Commit Message

8.1.0 Release (#1628)

* Bump Newtonsoft.Json from 13.0.1 to 13.0.2

Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 13.0.1 to 13.0.2.
- [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases)
- [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/13.0.1...13.0.2)

---
updated-dependencies:
- dependency-name: Newtonsoft.Json
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump NLog from 5.0.5 to 5.1.0

Bumps [NLog](https://github.com/NLog/NLog) from 5.0.5 to 5.1.0.
- [Release notes](https://github.com/NLog/NLog/releases)
- [Changelog](https://github.com/NLog/NLog/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/NLog/NLog/compare/v5.0.5...v5.1.0)

---
updated-dependencies:
- dependency-name: NLog
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump NLog from 5.0.5 to 5.1.0

* Fix -r flag - should have been --results-directory all along

* Bump Newtonsoft.Json from 13.0.1 to 13.0.2

* Bump YamlDotNet from 12.0.2 to 12.1.0

Bumps [YamlDotNet](https://github.com/aaubry/YamlDotNet) from 12.0.2 to 12.1.0.
- [Release notes](https://github.com/aaubry/YamlDotNet/releases)
- [Commits](https://github.com/aaubry/YamlDotNet/compare/v12.0.2...v12.1.0)

---
updated-dependencies:
- dependency-name: YamlDotNet
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump Moq from 4.18.2 to 4.18.3

Bumps [Moq](https://github.com/moq/moq4) from 4.18.2 to 4.18.3.
- [Release notes](https://github.com/moq/moq4/releases)
- [Changelog](https://github.com/moq/moq4/blob/main/CHANGELOG.md)
- [Commits](https://github.com/moq/moq4/compare/v4.18.2...v4.18.3)

---
updated-dependencies:
- dependency-name: Moq
... (continued)

Run Details

10732 of 20257 branches covered (0.0%)

Branch coverage included in aggregate %.

48141 of 48141 new or added lines in 1086 files covered. (100.0%)

30685 of 52388 relevant lines covered (58.57%)

7387.88 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

12.31

/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandClearQueryCache.cs

﻿// Copyright (c) The University of Dundee 2018-2019
// This file is part of the Research Data Management Platform (RDMP).
// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.

using Rdmp.Core.Curation.Data;
using Rdmp.Core.Curation.Data.Cohort;
using Rdmp.Core.Databases;
using Rdmp.Core.Icons.IconOverlays;
using Rdmp.Core.Icons.IconProvision;
using Rdmp.Core.QueryCaching.Aggregation;
using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats;

namespace Rdmp.Core.CommandExecution.AtomicCommands;

/// <summary>
/// Clears cached cohort set data stored in an <see cref="ExternalDatabaseServer"/> that is acting
/// as a <see cref="QueryCachingPatcher"/>
/// </summary>
public sealed class ExecuteCommandClearQueryCache : BasicCommandExecution
{
    private readonly CohortIdentificationConfiguration _cic;

    /// <summary>
    /// Clears all cache entries in the cache used by <paramref name="cic"/>
    /// </summary>
    /// <param name="activator"></param>
    /// <param name="cic"></param>
    public ExecuteCommandClearQueryCache(IBasicActivateItems activator,
        [DemandsInitialization("The Cohort Builder query for which you want to invalidate all cache entries")]
        CohortIdentificationConfiguration cic) : base(activator)
    {
        _cic = cic;

        if (cic.QueryCachingServer_ID == null)
        {
            SetImpossible($"CohortIdentificationConfiguration {cic} does not have a query cache configured");
            return;
        }

        if (cic.RootCohortAggregateContainer_ID == null)
        {
            SetImpossible($"CohortIdentificationConfiguration {cic} has no root container");
            return;
        }

        if (GetCacheCount() == 0) SetImpossible($"There are no cache entries for {cic}");
    }

    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
        IconOverlayProvider.GetOverlayNoCache(Image.Load<Rgba32>(CatalogueIcons.ExternalDatabaseServer_Cache),
            OverlayKind.Delete);

    public override void Execute()
    {
        base.Execute();

        var cacheManager = new CachedAggregateConfigurationResultsManager(_cic.QueryCachingServer);
        var deleted = 0;

        foreach (var ag in _cic.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively())
        {
            // just in case they changed the role or something weird we should nuke all its roles
            deleted += cacheManager.DeleteCacheEntryIfAny(ag, AggregateOperation.IndexedExtractionIdentifierList)
                ? 1
                : 0;
            deleted += cacheManager.DeleteCacheEntryIfAny(ag, AggregateOperation.JoinableInceptionQuery) ? 1 : 0;
        }

        foreach (var joinable in _cic.GetAllJoinables())
        {
            // just in case they changed the role or something weird we should nuke all its roles
            deleted += cacheManager.DeleteCacheEntryIfAny(joinable.AggregateConfiguration,
                AggregateOperation.IndexedExtractionIdentifierList)
                ? 1
                : 0;
            deleted += cacheManager.DeleteCacheEntryIfAny(joinable.AggregateConfiguration,
                AggregateOperation.JoinableInceptionQuery)
                ? 1
                : 0;
        }

        Show("Cache Entries Cleared", $"Deleted {deleted} cache entries");
    }


    private int GetCacheCount()
    {
        var cacheManager = new CachedAggregateConfigurationResultsManager(_cic.QueryCachingServer);
        var found = 0;

        foreach (var ag in _cic.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively())
        {
            // just incase they changed the role or something wierd we should nuke all its roles
            found += cacheManager.GetLatestResultsTableUnsafe(ag, AggregateOperation.IndexedExtractionIdentifierList) !=
                     null
                ? 1
                : 0;
            found += cacheManager.GetLatestResultsTableUnsafe(ag, AggregateOperation.JoinableInceptionQuery) != null
                ? 1
                : 0;
        }

        foreach (var joinable in _cic.GetAllJoinables())
        {
            // just incase they changed the role or something wierd we should nuke all its roles
            found += cacheManager.GetLatestResultsTableUnsafe(joinable.AggregateConfiguration,
                AggregateOperation.IndexedExtractionIdentifierList) != null
                ? 1
                : 0;
            found += cacheManager.GetLatestResultsTableUnsafe(joinable.AggregateConfiguration,
                AggregateOperation.JoinableInceptionQuery) != null
                ? 1
                : 0;
        }

        return found;
    }
}

1	// Copyright (c) The University of Dundee 2018-2019
2	// This file is part of the Research Data Management Platform (RDMP).
3	// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
4	// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
5	// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.
6
7	using Rdmp.Core.Curation.Data;
8	using Rdmp.Core.Curation.Data.Cohort;
9	using Rdmp.Core.Databases;
10	using Rdmp.Core.Icons.IconOverlays;
11	using Rdmp.Core.Icons.IconProvision;
12	using Rdmp.Core.QueryCaching.Aggregation;
13	using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision;
14	using SixLabors.ImageSharp;
15	using SixLabors.ImageSharp.PixelFormats;
16
17	namespace Rdmp.Core.CommandExecution.AtomicCommands;
18
19	/// <summary>
20	/// Clears cached cohort set data stored in an <see cref="ExternalDatabaseServer"/> that is acting
21	/// as a <see cref="QueryCachingPatcher"/>
22	/// </summary>
23	public sealed class ExecuteCommandClearQueryCache : BasicCommandExecution
24	{
25	private readonly CohortIdentificationConfiguration _cic;
26
27	/// <summary>
28	/// Clears all cache entries in the cache used by <paramref name="cic"/>
29	/// </summary>
30	/// <param name="activator"></param>
31	/// <param name="cic"></param>
32	public ExecuteCommandClearQueryCache(IBasicActivateItems activator,
33	[DemandsInitialization("The Cohort Builder query for which you want to invalidate all cache entries")]
34	CohortIdentificationConfiguration cic) : base(activator)	4✔
35	{
36	_cic = cic;	4✔
37
38	if (cic.QueryCachingServer_ID == null)	4!
39	{
40	SetImpossible($"CohortIdentificationConfiguration {cic} does not have a query cache configured");	4✔
41	return;	4✔
42	}
43
44	if (cic.RootCohortAggregateContainer_ID == null)	×
45	{
46	SetImpossible($"CohortIdentificationConfiguration {cic} has no root container");	×
47	return;	×
48	}
49
50	if (GetCacheCount() == 0) SetImpossible($"There are no cache entries for {cic}");	×
51	}	×
52
53	public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
54	IconOverlayProvider.GetOverlayNoCache(Image.Load<Rgba32>(CatalogueIcons.ExternalDatabaseServer_Cache),	4✔
55	OverlayKind.Delete);	4✔
56
57	public override void Execute()
58	{
59	base.Execute();	×
60
61	var cacheManager = new CachedAggregateConfigurationResultsManager(_cic.QueryCachingServer);	×
62	var deleted = 0;	×
63
64	foreach (var ag in _cic.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively())	×
65	{
66	// just in case they changed the role or something weird we should nuke all its roles
67	deleted += cacheManager.DeleteCacheEntryIfAny(ag, AggregateOperation.IndexedExtractionIdentifierList)	×
68	? 1	×
69	: 0;	×
70	deleted += cacheManager.DeleteCacheEntryIfAny(ag, AggregateOperation.JoinableInceptionQuery) ? 1 : 0;	×
71	}
72
73	foreach (var joinable in _cic.GetAllJoinables())	×
74	{
75	// just in case they changed the role or something weird we should nuke all its roles
76	deleted += cacheManager.DeleteCacheEntryIfAny(joinable.AggregateConfiguration,	×
77	AggregateOperation.IndexedExtractionIdentifierList)	×
78	? 1	×
79	: 0;	×
80	deleted += cacheManager.DeleteCacheEntryIfAny(joinable.AggregateConfiguration,	×
81	AggregateOperation.JoinableInceptionQuery)	×
82	? 1	×
83	: 0;	×
84	}
85
86	Show("Cache Entries Cleared", $"Deleted {deleted} cache entries");	×
87	}	×
88
89
90	private int GetCacheCount()
91	{
92	var cacheManager = new CachedAggregateConfigurationResultsManager(_cic.QueryCachingServer);	×
93	var found = 0;	×
94
95	foreach (var ag in _cic.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively())	×
96	{
97	// just incase they changed the role or something wierd we should nuke all its roles
98	found += cacheManager.GetLatestResultsTableUnsafe(ag, AggregateOperation.IndexedExtractionIdentifierList) !=	×
99	null	×
100	? 1	×
101	: 0;	×
102	found += cacheManager.GetLatestResultsTableUnsafe(ag, AggregateOperation.JoinableInceptionQuery) != null	×
103	? 1	×
104	: 0;	×
105	}
106
107	foreach (var joinable in _cic.GetAllJoinables())	×
108	{
109	// just incase they changed the role or something wierd we should nuke all its roles
110	found += cacheManager.GetLatestResultsTableUnsafe(joinable.AggregateConfiguration,	×
111	AggregateOperation.IndexedExtractionIdentifierList) != null	×
112	? 1	×
113	: 0;	×
114	found += cacheManager.GetLatestResultsTableUnsafe(joinable.AggregateConfiguration,	×
115	AggregateOperation.JoinableInceptionQuery) != null	×
116	? 1	×
117	: 0;	×
118	}
119
120	return found;	×
121	}
122	}

HicServices / RDMP / 6245535001

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous