Commit 4d174f3

authored

Creation of backup and restore statistics can be switched off to support Firebird Server 2.0 (#1182)

1 parent 69502b3 commit 4d174f3Copy full SHA for 4d174f3

File tree

2 files changed

+10

-6

lines changed

src/FirebirdSql.Data.FirebirdClient/Services
- FbBackup.cs
- FbRestore.cs

2 files changed

+10

-6

lines changed

`‎src/FirebirdSql.Data.FirebirdClient/Services/FbBackup.cs`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public sealed class FbBackup : FbService`
`32`	`32`	`public int Factor { get; set; }`
`33`	`33`	`public string SkipData { get; set; }`
`34`	`34`	`public FbBackupFlags Options { get; set; }`
`35`		`- public FbBackupRestoreStatistics Statistics { get; set; }`
	`35`	`+ public FbBackupRestoreStatistics? Statistics { get; set; }`
`36`	`36`
`37`	`37`	`public FbBackup(string connectionString = null)`
`38`	`38`	`: base(connectionString)`
`@@ -67,7 +67,8 @@ public void Execute()`
`67`	`67`	`if (!string.IsNullOrEmpty(SkipData))`
`68`	`68`	`startSpb.Append2(IscCodes.isc_spb_bkp_skip_data, SkipData);`
`69`	`69`	`startSpb.Append(IscCodes.isc_spb_options, (int)Options);`
`70`		`- startSpb.Append2(IscCodes.isc_spb_bkp_stat, Statistics.BuildConfiguration());`
	`70`	`+ if (Statistics.HasValue)`
	`71`	`+ startSpb.Append2(IscCodes.isc_spb_bkp_stat, Statistics.Value.BuildConfiguration());`
`71`	`72`	`if (ConnectionStringOptions.ParallelWorkers > 0)`
`72`	`73`	`startSpb.Append(IscCodes.isc_spb_bkp_parallel_workers, ConnectionStringOptions.ParallelWorkers);`
`73`	`74`	`StartTask(startSpb);`
`@@ -113,7 +114,8 @@ public async Task ExecuteAsync(CancellationToken cancellationToken = default)`
`113`	`114`	`if (!string.IsNullOrEmpty(SkipData))`
`114`	`115`	`startSpb.Append2(IscCodes.isc_spb_bkp_skip_data, SkipData);`
`115`	`116`	`startSpb.Append(IscCodes.isc_spb_options, (int)Options);`
`116`		`- startSpb.Append2(IscCodes.isc_spb_bkp_stat, Statistics.BuildConfiguration());`
	`117`	`+ if (Statistics.HasValue)`
	`118`	`+ startSpb.Append2(IscCodes.isc_spb_bkp_stat, Statistics.Value.BuildConfiguration());`
`117`	`119`	`if (ConnectionStringOptions.ParallelWorkers > 0)`
`118`	`120`	`startSpb.Append(IscCodes.isc_spb_bkp_parallel_workers, ConnectionStringOptions.ParallelWorkers);`
`119`	`121`	`await StartTaskAsync(startSpb, cancellationToken).ConfigureAwait(false);`

`‎src/FirebirdSql.Data.FirebirdClient/Services/FbRestore.cs`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public int? PageSize`
`46`	`46`	`public bool ReadOnly { get; set; }`
`47`	`47`	`public string SkipData { get; set; }`
`48`	`48`	`public FbRestoreFlags Options { get; set; }`
`49`		`- public FbBackupRestoreStatistics Statistics { get; set; }`
	`49`	`+ public FbBackupRestoreStatistics? Statistics { get; set; }`
`50`	`50`
`51`	`51`	`public FbRestore(string connectionString = null)`
`52`	`52`	`: base(connectionString)`
`@@ -82,7 +82,8 @@ public void Execute()`
`82`	`82`	`if (!string.IsNullOrEmpty(SkipData))`
`83`	`83`	`startSpb.Append2(IscCodes.isc_spb_res_skip_data, SkipData);`
`84`	`84`	`startSpb.Append(IscCodes.isc_spb_options, (int)Options);`
`85`		`- startSpb.Append2(IscCodes.isc_spb_res_stat, Statistics.BuildConfiguration());`
	`85`	`+ if (Statistics.HasValue)`
	`86`	`+ startSpb.Append2(IscCodes.isc_spb_res_stat, Statistics.Value.BuildConfiguration());`
`86`	`87`	`if (ConnectionStringOptions.ParallelWorkers > 0)`
`87`	`88`	`startSpb.Append(IscCodes.isc_spb_res_parallel_workers, ConnectionStringOptions.ParallelWorkers);`
`88`	`89`	`StartTask(startSpb);`
`@@ -129,7 +130,8 @@ public async Task ExecuteAsync(CancellationToken cancellationToken = default)`
`129`	`130`	`if (!string.IsNullOrEmpty(SkipData))`
`130`	`131`	`startSpb.Append2(IscCodes.isc_spb_res_skip_data, SkipData);`
`131`	`132`	`startSpb.Append(IscCodes.isc_spb_options, (int)Options);`
`132`		`- startSpb.Append2(IscCodes.isc_spb_res_stat, Statistics.BuildConfiguration());`
	`133`	`+ if (Statistics.HasValue)`
	`134`	`+ startSpb.Append2(IscCodes.isc_spb_res_stat, Statistics.Value.BuildConfiguration());`
`133`	`135`	`if (ConnectionStringOptions.ParallelWorkers > 0)`
`134`	`136`	`startSpb.Append(IscCodes.isc_spb_res_parallel_workers, ConnectionStringOptions.ParallelWorkers);`
`135`	`137`	`await StartTaskAsync(startSpb, cancellationToken).ConfigureAwait(false);`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 4d174f3

File tree

2 files changed

2 files changed

`‎src/FirebirdSql.Data.FirebirdClient/Services/FbBackup.cs`

`‎src/FirebirdSql.Data.FirebirdClient/Services/FbRestore.cs`

0 commit comments