NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitb69f2e3

committed

Teach vacuumlo to limit number of removals, via new -l option.

Also, handle failure better: don't just blindly keep trying to deletestuff after the transaction has already failed.Tim Lewis, reviewed by Josh Kupershmidt, with further hacking by me.

1 parentf54e373 commitb69f2e3Copy full SHA for b69f2e3

File tree

2 files changed

+47

-6

lines changed

contrib/vacuumlo
- vacuumlo.c
doc/src/sgml
- vacuumlo.sgml

2 files changed

+47

-6

lines changed

`‎contrib/vacuumlo/vacuumlo.c`

Lines changed: 37 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ struct _param`
`48`	`48`	`char*pg_host;`
`49`	`49`	`intverbose;`
`50`	`50`	`intdry_run;`
	`51`	`+longtransaction_limit;`
`51`	`52`	`};`
`52`	`53`
`53`	`54`	`intvacuumlo(char,struct_param);`
`@@ -65,11 +66,12 @@ vacuumlo(char database, struct _param param)`
`65`	`66`	`PGresult*res,`
`66`	`67`	`*res2;`
`67`	`68`	`charbuf[BUFSIZE];`
`68`		`-intmatched;`
`69`		`-intdeleted;`
	`69`	`+longmatched;`
	`70`	`+longdeleted;`
`70`	`71`	`inti;`
`71`	`72`	`staticchar*password=NULL;`
`72`	`73`	`boolnew_pass;`
	`74`	`+boolsuccess= true;`
`73`	`75`
`74`	`76`	`if (param->pg_prompt==TRI_YES&&password==NULL)`
`75`	`77`	`password=simple_prompt("Password: ",100, false);`
`@@ -280,12 +282,19 @@ vacuumlo(char database, struct _param param)`
`280`	`282`	`{`
`281`	`283`	`fprintf(stderr,"\nFailed to remove lo %u: ",lo);`
`282`	`284`	`fprintf(stderr,"%s",PQerrorMessage(conn));`
	`285`	`+if (PQtransactionStatus(conn)==PQTRANS_INERROR)`
	`286`	`+{`
	`287`	`+success= false;`
	`288`	`+break;`
	`289`	`+}`
`283`	`290`	`}`
`284`	`291`	`else`
`285`	`292`	`deleted++;`
`286`	`293`	`}`
`287`	`294`	`else`
`288`	`295`	`deleted++;`
	`296`	`+if (param->transaction_limit!=0&&deleted >=param->transaction_limit)`
	`297`	`+break;`
`289`	`298`	`}`
`290`	`299`	`PQclear(res);`
`291`	`300`
`@@ -298,10 +307,20 @@ vacuumlo(char database, struct _param param)`
`298`	`307`	`PQfinish(conn);`
`299`	`308`
`300`	`309`	`if (param->verbose)`
`301`		`-fprintf(stdout,"\r%s %d large objects from %s.\n",`
`302`		`- (param->dry_run ?"Would remove" :"Removed"),deleted,database);`
	`310`	`+{`
	`311`	`+if (param->dry_run)`
	`312`	`+fprintf(stdout,"\rWould remove %ld large objects from %s.\n",`
	`313`	`+deleted,database);`
	`314`	`+elseif (success)`
	`315`	`+fprintf(stdout,`
	`316`	`+"\rSuccessfully removed %ld large objects from %s.\n",`
	`317`	`+deleted,database);`
	`318`	`+else`
	`319`	`+fprintf(stdout,"\rRemoval from %s failed at object %ld of %ld.\n",`
	`320`	`+database,deleted,matched);`
	`321`	`+}`
`303`	`322`
`304`		`-return0;`
	`323`	`+return((param->dry_run\|\|success) ?0 :-1);`
`305`	`324`	`}`
`306`	`325`
`307`	`326`	`void`
`@@ -311,6 +330,7 @@ usage(const char *progname)`
`311`	`330`	`printf("Usage:\n %s [OPTION]... DBNAME...\n\n",progname);`
`312`	`331`	`printf("Options:\n");`
`313`	`332`	`printf(" -h HOSTNAME database server host or socket directory\n");`
	`333`	`+printf(" -l LIMIT stop after removing LIMIT large objects\n");`
`314`	`334`	`printf(" -n don't remove large objects, just show what would be done\n");`
`315`	`335`	`printf(" -p PORT database server port\n");`
`316`	`336`	`printf(" -U USERNAME user name to connect as\n");`
`@@ -342,6 +362,7 @@ main(int argc, char **argv)`
`342`	`362`	`param.pg_port=NULL;`
`343`	`363`	`param.verbose=0;`
`344`	`364`	`param.dry_run=0;`
	`365`	`+param.transaction_limit=0;`
`345`	`366`
`346`	`367`	`if (argc>1)`
`347`	`368`	`{`
`@@ -359,7 +380,7 @@ main(int argc, char **argv)`
`359`	`380`
`360`	`381`	`while (1)`
`361`	`382`	`{`
`362`		`-c=getopt(argc,argv,"h:U:p:vnwW");`
	`383`	`+c=getopt(argc,argv,"h:l:U:p:vnwW");`
`363`	`384`	`if (c==-1)`
`364`	`385`	`break;`
`365`	`386`
`@@ -395,6 +416,16 @@ main(int argc, char **argv)`
`395`	`416`	`}`
`396`	`417`	`param.pg_port=strdup(optarg);`
`397`	`418`	`break;`
	`419`	`+case'l':`
	`420`	`+param.transaction_limit=strtol(optarg,NULL,10);`
	`421`	`+if (param.transaction_limit<0)`
	`422`	`+{`
	`423`	`+fprintf(stderr,`
	`424`	`+"%s: transaction limit must not be negative (0 disables)\n",`
	`425`	`+progname);`
	`426`	`+exit(1);`
	`427`	`+}`
	`428`	`+break;`
`398`	`429`	`case'h':`
`399`	`430`	`param.pg_host=strdup(optarg);`
`400`	`431`	`break;`

`‎doc/src/sgml/vacuumlo.sgml`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,16 @@ vacuumlo [options] database [database2 ... databaseN]`
`56`	`56`	`</listitem>`
`57`	`57`	`</varlistentry>`
`58`	`58`
	`59`	`+ <varlistentry>`
	`60`	`+ <term><option>-l</option> <replaceable>limit</></term>`
	`61`	`+ <listitem>`
	`62`	`+ <para>`
	`63`	`+ Stop after removing LIMIT large objects. Useful to avoid`
	`64`	`+ exceeding <xref linkend="guc-max-locks-per-transaction">.`
	`65`	`+ </para>`
	`66`	`+ </listitem>`
	`67`	`+ </varlistentry>`
	`68`	`+`
`59`	`69`	`<varlistentry>`
`60`	`70`	`<term><option>-w</></term>`
`61`	`71`	`<term><option>--no-password</></term>`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitb69f2e3

File tree

2 files changed

2 files changed

`‎contrib/vacuumlo/vacuumlo.c`

`‎doc/src/sgml/vacuumlo.sgml`

0 commit comments