Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9cd8e33

Browse files
author
Michael Paquier
committed
Remove undocumented option "force" for delete command
This was in code, not in the docs...
1 parente044263 commit9cd8e33

File tree

3 files changed

+5
-30
lines changed

3 files changed

+5
-30
lines changed

‎delete.c‎

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,14 @@
1010
#include"pg_rman.h"
1111

1212
staticintpgBackupDeleteFiles(pgBackup*backup);
13-
staticboolcheckIfDeletable(pgBackup*backup);
1413

1514
int
16-
do_delete(pgBackupRange*range,boolforce)
15+
do_delete(pgBackupRange*range)
1716
{
1817
inti;
1918
intret;
2019
parray*backup_list;
21-
booldo_delete;
22-
boolforce_delete;
20+
booldo_delete= false;
2321

2422
/* DATE are always required */
2523
if (!pgBackupRangeIsValid(range))
@@ -39,17 +37,12 @@ do_delete(pgBackupRange *range, bool force)
3937
elog(ERROR_SYSTEM,_("No backup list found, can't process any more."));
4038

4139
/* Find backups to be deleted */
42-
do_delete= false;
43-
force_delete= false;
4440
for (i=0;i<parray_num(backup_list);i++)
4541
{
4642
pgBackup*backup= (pgBackup*)parray_get(backup_list,i);
4743

48-
if(force)
49-
force_delete=checkIfDeletable(backup);
50-
5144
/* delete backup and update status to DELETED */
52-
if (do_delete||force_delete)
45+
if (do_delete)
5346
{
5447
/* check for interrupt */
5548
if (interrupted)
@@ -72,7 +65,6 @@ do_delete(pgBackupRange *range, bool force)
7265
/* cleanup */
7366
parray_walk(backup_list,pgBackupFree);
7467
parray_free(backup_list);
75-
7668
return0;
7769
}
7870

@@ -247,15 +239,3 @@ pgBackupDeleteFiles(pgBackup *backup)
247239

248240
return0;
249241
}
250-
251-
bool
252-
checkIfDeletable(pgBackup*backup)
253-
{
254-
/* find latest full backup. */
255-
if (backup->status!=BACKUP_STATUS_OK&&
256-
backup->status!=BACKUP_STATUS_DELETED&&
257-
backup->status!=BACKUP_STATUS_DONE)
258-
return true;
259-
260-
return false;
261-
}

‎pg_rman.c‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ static char *target_inclusive;
4747
staticTimeLineIDtarget_tli;
4848
staticboolis_hard_copy= false;
4949

50-
/* delete configuration */
51-
staticboolforce;
52-
5350
/* show configuration */
5451
staticboolshow_all= false;
5552

@@ -71,8 +68,6 @@ static pgut_option options[] =
7168
{'b','s',"with-serverlog",&current.with_serverlog,SOURCE_ENV },
7269
{'b','Z',"compress-data",&current.compress_data,SOURCE_ENV },
7370
{'b','C',"smooth-checkpoint",&smooth_checkpoint,SOURCE_ENV },
74-
/* delete options */
75-
{'b','f',"force",&force,SOURCE_ENV },
7671
/* options with only long name (keep-xxx) */
7772
{'i',1,"keep-data-generations",&keep_data_generations,SOURCE_ENV },
7873
{'i',2,"keep-data-days",&keep_data_days,SOURCE_ENV },
@@ -201,7 +196,7 @@ main(int argc, char *argv[])
201196
elseif (pg_strcasecmp(cmd,"validate")==0)
202197
returndo_validate(&range);
203198
elseif (pg_strcasecmp(cmd,"delete")==0)
204-
returndo_delete(&range,force);
199+
returndo_delete(&range);
205200
else
206201
elog(ERROR_ARGS,"invalid command \"%s\"",cmd);
207202

‎pg_rman.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ extern int do_init(void);
244244
externintdo_show(pgBackupRange*range,boolshow_all);
245245

246246
/* in delete.c */
247-
externintdo_delete(pgBackupRange*range,boolforce);
247+
externintdo_delete(pgBackupRange*range);
248248
externvoidpgBackupDelete(intkeep_generations,intkeep_days);
249249

250250
/* in fetch.c */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp