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

70.15

/Rdmp.Core/DataLoad/Modules/Mutilators/MatchingTablesMutilator.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.Diagnostics;
using System.Linq;
using System.Text.RegularExpressions;
using FAnsi.Discovery;
using Rdmp.Core.Curation.Data;
using Rdmp.Core.Curation.Data.DataLoad;
using Rdmp.Core.DataLoad.Engine.Job;
using Rdmp.Core.DataLoad.Engine.Mutilators;
using Rdmp.Core.ReusableLibraryCode.Checks;
using Rdmp.Core.ReusableLibraryCode.Progress;

namespace Rdmp.Core.DataLoad.Modules.Mutilators;

public abstract class MatchingTablesMutilator : IPluginMutilateDataTables
{
    private readonly LoadStage[] _allowedStages;

    [DemandsInitialization(
        "All tables matching this pattern which have a TableInfo defined in the load will be affected by this mutilation",
        DefaultValue = ".*")]
    public Regex TableRegexPattern { get; set; }

    [DemandsInitialization(
        "Overrides TableRegexPattern.  If this is set then the tables chosen will be mutilated instead")]
    public TableInfo[] OnlyTables { get; set; }

    [DemandsInitialization("How long to allow for each command to execute in seconds", DefaultValue = 600)]
    public int Timeout { get; set; }

    protected DiscoveredDatabase DbInfo;
    private LoadStage _loadStage;

    protected MatchingTablesMutilator(params LoadStage[] allowedStages)
    {
        _allowedStages = allowedStages;
    }

    public virtual void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventsListener)
    {
    }

    public void Initialize(DiscoveredDatabase dbInfo, LoadStage loadStage)
    {
        if (_allowedStages != null && !_allowedStages.Contains(loadStage))
            throw new NotSupportedException($"Mutilation {GetType()} is not allowed at stage {loadStage}");

        _loadStage = loadStage;
        DbInfo = dbInfo;
    }

    public ExitCodeType Mutilate(IDataLoadJob job)
    {
        if (TableRegexPattern != null)
            TableRegexPattern = new Regex(TableRegexPattern.ToString(), RegexOptions.IgnoreCase);

        foreach (var tableInfo in job.RegularTablesToLoad)
            if (OnlyTables != null && OnlyTables.Any())
            {
                if (OnlyTables.Contains(tableInfo))
                    FireMutilate(tableInfo, job);
            }
            else if (TableRegexPattern == null)
            {
                throw new Exception("You must specify either TableRegexPattern or OnlyTables");
            }
            else if (TableRegexPattern.IsMatch(tableInfo.GetRuntimeName()))
            {
                FireMutilate(tableInfo, job);
            }

        return ExitCodeType.Success;
    }

    private void FireMutilate(ITableInfo tableInfo, IDataLoadJob job)
    {
        var tbl = DbInfo.ExpectTable(tableInfo.GetRuntimeName(_loadStage, job.Configuration.DatabaseNamer));

        if (!tbl.Exists())
        {
            job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error,
                $"Expected table {tbl} did not exist in RAW"));
        }
        else
        {
            job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                $"About to run {GetType()} mutilation on table {tbl}"));
            var sw = new Stopwatch();
            sw.Start();
            MutilateTable(job, tableInfo, tbl);
            sw.Stop();
            job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                $"{GetType()} mutilation on table {tbl} completed after {sw.ElapsedMilliseconds} ms"));
        }
    }

    protected abstract void MutilateTable(IDataLoadEventListener job, ITableInfo tableInfo, DiscoveredTable table);

    public virtual void Check(ICheckNotifier notifier)
    {
        if (TableRegexPattern == null && (OnlyTables == null || OnlyTables.Length == 0))
            notifier.OnCheckPerformed(new CheckEventArgs(
                "You must specify either a regex pattern (TableRegexPattern) or set OnlyTables for identifying tables which need to be processed",
                CheckResult.Fail));
    }
}

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.Diagnostics;
9	using System.Linq;
10	using System.Text.RegularExpressions;
11	using FAnsi.Discovery;
12	using Rdmp.Core.Curation.Data;
13	using Rdmp.Core.Curation.Data.DataLoad;
14	using Rdmp.Core.DataLoad.Engine.Job;
15	using Rdmp.Core.DataLoad.Engine.Mutilators;
16	using Rdmp.Core.ReusableLibraryCode.Checks;
17	using Rdmp.Core.ReusableLibraryCode.Progress;
18
19	namespace Rdmp.Core.DataLoad.Modules.Mutilators;
20
21	public abstract class MatchingTablesMutilator : IPluginMutilateDataTables
22	{
23	private readonly LoadStage[] _allowedStages;
24
25	[DemandsInitialization(
26	"All tables matching this pattern which have a TableInfo defined in the load will be affected by this mutilation",
27	DefaultValue = ".*")]
28	public Regex TableRegexPattern { get; set; }	180✔
29
30	[DemandsInitialization(
31	"Overrides TableRegexPattern. If this is set then the tables chosen will be mutilated instead")]
32	public TableInfo[] OnlyTables { get; set; }	28✔
33
34	[DemandsInitialization("How long to allow for each command to execute in seconds", DefaultValue = 600)]
35	public int Timeout { get; set; }	48✔
36
37	protected DiscoveredDatabase DbInfo;
38	private LoadStage _loadStage;
39
40	protected MatchingTablesMutilator(params LoadStage[] allowedStages)	28✔
41	{
42	_allowedStages = allowedStages;	28✔
43	}	28✔
44
45	public virtual void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventsListener)
46	{
47	}	×
48
49	public void Initialize(DiscoveredDatabase dbInfo, LoadStage loadStage)
50	{
51	if (_allowedStages != null && !_allowedStages.Contains(loadStage))	28!
52	throw new NotSupportedException($"Mutilation {GetType()} is not allowed at stage {loadStage}");	×
53
54	_loadStage = loadStage;	28✔
55	DbInfo = dbInfo;	28✔
56	}	28✔
57
58	public ExitCodeType Mutilate(IDataLoadJob job)
59	{
60	if (TableRegexPattern != null)	28✔
61	TableRegexPattern = new Regex(TableRegexPattern.ToString(), RegexOptions.IgnoreCase);	28✔
62
63	foreach (var tableInfo in job.RegularTablesToLoad)	112✔
64	if (OnlyTables != null && OnlyTables.Any())	28!
65	{
66	if (OnlyTables.Contains(tableInfo))	×
67	FireMutilate(tableInfo, job);	×
68	}
69	else if (TableRegexPattern == null)	28!
70	{
71	throw new Exception("You must specify either TableRegexPattern or OnlyTables");	×
72	}
73	else if (TableRegexPattern.IsMatch(tableInfo.GetRuntimeName()))	28✔
74	{
75	FireMutilate(tableInfo, job);	28✔
76	}
77
78	return ExitCodeType.Success;	28✔
79	}
80
81	private void FireMutilate(ITableInfo tableInfo, IDataLoadJob job)
82	{
83	var tbl = DbInfo.ExpectTable(tableInfo.GetRuntimeName(_loadStage, job.Configuration.DatabaseNamer));	28✔
84
85	if (!tbl.Exists())	28!
86	{
87	job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error,	×
88	$"Expected table {tbl} did not exist in RAW"));	×
89	}
90	else
91	{
92	job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,	28✔
93	$"About to run {GetType()} mutilation on table {tbl}"));	28✔
94	var sw = new Stopwatch();	28✔
95	sw.Start();	28✔
96	MutilateTable(job, tableInfo, tbl);	28✔
97	sw.Stop();	28✔
98	job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,	28✔
99	$"{GetType()} mutilation on table {tbl} completed after {sw.ElapsedMilliseconds} ms"));	28✔
100	}
101	}	28✔
102
103	protected abstract void MutilateTable(IDataLoadEventListener job, ITableInfo tableInfo, DiscoveredTable table);
104
105	public virtual void Check(ICheckNotifier notifier)
106	{
107	if (TableRegexPattern == null && (OnlyTables == null \|\| OnlyTables.Length == 0))	12!
108	notifier.OnCheckPerformed(new CheckEventArgs(	×
109	"You must specify either a regex pattern (TableRegexPattern) or set OnlyTables for identifying tables which need to be processed",	×
110	CheckResult.Fail));	×
111	}	12✔
112	}

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