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

66.67

/Rdmp.Core/Repositories/Managers/HighPerformance/DataExportFilterManagerFromChildProvider.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 System;
using System.Collections.Generic;
using System.Linq;
using Rdmp.Core.Curation.Data;
using Rdmp.Core.DataExport.Data;
using Rdmp.Core.Providers;

namespace Rdmp.Core.Repositories.Managers.HighPerformance;

/// <summary>
/// Provides a memory based efficient (in terms of the number of database queries sent) way of finding all containers and subcontainers and filters in the entire DataExportManager
/// database at once rather than using the methods on IContainer and IFilter which send individual database queries for relevant subcontainers etc.
/// </summary>
internal class DataExportFilterManagerFromChildProvider : DataExportFilterManager
{
    private readonly Dictionary<int, List<FilterContainer>> _subContainers = new();

    private readonly Dictionary<int, List<DeployedExtractionFilter>> _containersToFilters;

    /// <summary>
    /// Fetches all containers and filters out of the <paramref name="repository"/> and sets the class up to provide
    /// fast access to them.
    /// </summary>
    /// <param name="repository"></param>
    /// <param name="childProvider"></param>
    public DataExportFilterManagerFromChildProvider(DataExportRepository repository,
        DataExportChildProvider childProvider) : base(repository)
    {
        _containersToFilters = childProvider.AllDeployedExtractionFilters
            .Where(static f => f.FilterContainer_ID.HasValue).GroupBy(static f => f.FilterContainer_ID.Value)
            .ToDictionary(static gdc => gdc.Key, static gdc => gdc.ToList());

        var server = repository.DiscoveredServer;
        using var con = repository.GetConnection();
        using var r = server.GetCommand("SELECT *  FROM FilterContainerSubcontainers", con).ExecuteReader();
        while (r.Read())
        {
            var parentId = Convert.ToInt32(r["FilterContainer_ParentID"]);
            var subcontainerId = Convert.ToInt32(r["FilterContainerChildID"]);

            if (!_subContainers.ContainsKey(parentId))
                _subContainers.Add(parentId, new List<FilterContainer>());

            _subContainers[parentId].Add(childProvider.AllContainers[subcontainerId]);
        }

        r.Close();
    }

    /// <summary>
    /// Returns all subcontainers found in the <paramref name="parent"/> (results are returned from the cache created during class construction)
    /// </summary>
    public override IContainer[] GetSubContainers(IContainer parent) =>
        _subContainers.TryGetValue(parent.ID, out var result)
            ? result.ToArray()
            : Array.Empty<IContainer>();

    public override IFilter[] GetFilters(IContainer container) =>
        _containersToFilters.TryGetValue(container.ID, out var filters)
            ? filters.ToArray()
            : Array.Empty<IFilter>();
}

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 System;
8	using System.Collections.Generic;
9	using System.Linq;
10	using Rdmp.Core.Curation.Data;
11	using Rdmp.Core.DataExport.Data;
12	using Rdmp.Core.Providers;
13
14	namespace Rdmp.Core.Repositories.Managers.HighPerformance;
15
16	/// <summary>
17	/// Provides a memory based efficient (in terms of the number of database queries sent) way of finding all containers and subcontainers and filters in the entire DataExportManager
18	/// database at once rather than using the methods on IContainer and IFilter which send individual database queries for relevant subcontainers etc.
19	/// </summary>
20	internal class DataExportFilterManagerFromChildProvider : DataExportFilterManager
21	{
22	private readonly Dictionary<int, List<FilterContainer>> _subContainers = new();	132✔
23
24	private readonly Dictionary<int, List<DeployedExtractionFilter>> _containersToFilters;
25
26	/// <summary>
27	/// Fetches all containers and filters out of the <paramref name="repository"/> and sets the class up to provide
28	/// fast access to them.
29	/// </summary>
30	/// <param name="repository"></param>
31	/// <param name="childProvider"></param>
32	public DataExportFilterManagerFromChildProvider(DataExportRepository repository,
33	DataExportChildProvider childProvider) : base(repository)	132✔
34	{
35	_containersToFilters = childProvider.AllDeployedExtractionFilters	132✔
36	.Where(static f => f.FilterContainer_ID.HasValue).GroupBy(static f => f.FilterContainer_ID.Value)	8✔
37	.ToDictionary(static gdc => gdc.Key, static gdc => gdc.ToList());	140✔
38
39	var server = repository.DiscoveredServer;	132✔
40	using var con = repository.GetConnection();	132✔
41	using var r = server.GetCommand("SELECT * FROM FilterContainerSubcontainers", con).ExecuteReader();	132✔
42	while (r.Read())	132!
43	{
44	var parentId = Convert.ToInt32(r["FilterContainer_ParentID"]);	×
45	var subcontainerId = Convert.ToInt32(r["FilterContainerChildID"]);	×
46
47	if (!_subContainers.ContainsKey(parentId))	×
48	_subContainers.Add(parentId, new List<FilterContainer>());	×
49
50	_subContainers[parentId].Add(childProvider.AllContainers[subcontainerId]);	×
51	}
52
53	r.Close();	132✔
54	}	264✔
55
56	/// <summary>
57	/// Returns all subcontainers found in the <paramref name="parent"/> (results are returned from the cache created during class construction)
58	/// </summary>
59	public override IContainer[] GetSubContainers(IContainer parent) =>
60	_subContainers.TryGetValue(parent.ID, out var result)	4!
61	? result.ToArray()	4✔
62	: Array.Empty<IContainer>();	4✔
63
64	public override IFilter[] GetFilters(IContainer container) =>
65	_containersToFilters.TryGetValue(container.ID, out var filters)	4!
66	? filters.ToArray()	4✔
67	: Array.Empty<IFilter>();	4✔
68	}

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