NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit1b49d56

committed

clusterdb: Allow specifying tables to process in all databases.

Presently, clusterdb's --table option cannot be used together with--all, i.e., you cannot specify tables to process in all databases.This commit removes this unnecessary restriction. In passing,change the synopsis in the documentation to use "[option...]"instead of "[--verbose | -v]". There are other general-purposeoptions (e.g., --quiet and --echo), but the synopsis currently onlylists --verbose.Reviewed-by: Kyotaro Horiguchi, Dean RasheedDiscussion:https://postgr.es/m/20230628232402.GA1954626%40nathanxps13

1 parent5fb4cea commit1b49d56Copy full SHA for 1b49d56

File tree

3 files changed

+38

-18

lines changed

doc/src/sgml/ref
- clusterdb.sgml
src/bin/scripts
- clusterdb.c
- t
  - 011_clusterdb_all.pl

3 files changed

+38

-18

lines changed

`‎doc/src/sgml/ref/clusterdb.sgml`

Lines changed: 8 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ PostgreSQL documentation`
`23`	`23`	`<cmdsynopsis>`
`24`	`24`	`<command>clusterdb</command>`
`25`	`25`	`<arg rep="repeat"><replaceable>connection-option</replaceable></arg>`
`26`		`- <group choice="opt"><argchoice="plain"><option>--verbose</option></arg><arg choice="plain"><option>-v</option></arg></group>`
	`26`	`+ <argrep="repeat"><replaceable>option</replaceable></arg>`
`27`	`27`
`28`	`28`	`<arg choice="plain" rep="repeat">`
`29`	`29`	`<arg choice="opt">`
`@@ -35,14 +35,13 @@ PostgreSQL documentation`
`35`	`35`	`</arg>`
`36`	`36`	`</arg>`
`37`	`37`
`38`		`- <arg choice="opt"><replaceable>dbname</replaceable></arg>`
`39`		`- </cmdsynopsis>`
`40`		`-`
`41`		`- <cmdsynopsis>`
`42`		`- <command>clusterdb</command>`
`43`		`- <arg rep="repeat"><replaceable>connection-option</replaceable></arg>`
`44`		`- <group choice="opt"><arg choice="plain"><option>--verbose</option></arg><arg choice="plain"><option>-v</option></arg></group>`
`45`		`- <group choice="plain"><arg choice="plain"><option>--all</option></arg><arg choice="plain"><option>-a</option></arg></group>`
	`38`	`+ <arg choice="opt">`
	`39`	`+ <group choice="plain">`
	`40`	`+ <arg choice="plain"><replaceable>dbname</replaceable></arg>`
	`41`	`+ <arg choice="plain"><option>-a</option></arg>`
	`42`	`+ <arg choice="plain"><option>--all</option></arg>`
	`43`	`+ </group>`
	`44`	`+ </arg>`
`46`	`45`	`</cmdsynopsis>`
`47`	`46`	`</refsynopsisdiv>`
`48`	`47`

`‎src/bin/scripts/clusterdb.c`

Lines changed: 19 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,9 @@`
`21`	`21`
`22`	`22`	`staticvoidcluster_one_database(constConnParamscparams,constchartable,`
`23`	`23`	`constchar*progname,boolverbose,boolecho);`
`24`		`-staticvoidcluster_all_databases(ConnParamscparams,constcharprogname,`
`25`		`-boolverbose,boolecho,boolquiet);`
	`24`	`+staticvoidcluster_all_databases(ConnParamscparams,SimpleStringListtables,`
	`25`	`+constchar*progname,boolverbose,boolecho,`
	`26`	`+boolquiet);`
`26`	`27`	`staticvoidhelp(constchar*progname);`
`27`	`28`
`28`	`29`
`@@ -147,12 +148,10 @@ main(int argc, char *argv[])`
`147`	`148`	`if (dbname)`
`148`	`149`	`pg_fatal("cannot cluster all databases and a specific one at the same time");`
`149`	`150`
`150`		`-if (tables.head!=NULL)`
`151`		`-pg_fatal("cannot cluster specific table(s) in all databases");`
`152`		`-`
`153`	`151`	`cparams.dbname=maintenance_db;`
`154`	`152`
`155`		`-cluster_all_databases(&cparams,progname,verbose,echo,quiet);`
	`153`	`+cluster_all_databases(&cparams,&tables,`
	`154`	`+progname,verbose,echo,quiet);`
`156`	`155`	`}`
`157`	`156`	`else`
`158`	`157`	`{`
`@@ -226,8 +225,9 @@ cluster_one_database(const ConnParams cparams, const char table,`
`226`	`225`
`227`	`226`
`228`	`227`	`staticvoid`
`229`		`-cluster_all_databases(ConnParamscparams,constcharprogname,`
`230`		`-boolverbose,boolecho,boolquiet)`
	`228`	`+cluster_all_databases(ConnParamscparams,SimpleStringListtables,`
	`229`	`+constchar*progname,boolverbose,boolecho,`
	`230`	`+boolquiet)`
`231`	`231`	`{`
`232`	`232`	`PGconn*conn;`
`233`	`233`	`PGresult*result;`
`@@ -251,7 +251,17 @@ cluster_all_databases(ConnParams cparams, const char progname,`
`251`	`251`
`252`	`252`	`cparams->override_dbname=dbname;`
`253`	`253`
`254`		`-cluster_one_database(cparams,NULL,progname,verbose,echo);`
	`254`	`+if (tables->head!=NULL)`
	`255`	`+{`
	`256`	`+SimpleStringListCell*cell;`
	`257`	`+`
	`258`	`+for (cell=tables->head;cell;cell=cell->next)`
	`259`	`+cluster_one_database(cparams,cell->val,`
	`260`	`+progname,verbose,echo);`
	`261`	`+}`
	`262`	`+else`
	`263`	`+cluster_one_database(cparams,NULL,`
	`264`	`+progname,verbose,echo);`
`255`	`265`	`}`
`256`	`266`
`257`	`267`	`PQclear(result);`

`‎src/bin/scripts/t/011_clusterdb_all.pl`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,4 +33,15 @@`
`33`	`33`	`qr/FATAL: cannot connect to invalid database "regression_invalid"/,`
`34`	`34`	`'clusterdb cannot target invalid database');`
`35`	`35`
	`36`	`+$node->safe_psql('postgres',`
	`37`	`+'CREATE TABLE test1 (a int); CREATE INDEX test1x ON test1 (a); CLUSTER test1 USING test1x'`
	`38`	`+);`
	`39`	`+$node->safe_psql('template1',`
	`40`	`+'CREATE TABLE test1 (a int); CREATE INDEX test1x ON test1 (a); CLUSTER test1 USING test1x'`
	`41`	`+);`
	`42`	`+$node->issues_sql_like(`
	`43`	`+['clusterdb','-a','-t','test1' ],`
	`44`	`+qr/statement: CLUSTER public\.test1/s,`
	`45`	`+'cluster specific table in all databases');`
	`46`	`+`
`36`	`47`	`done_testing();`

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!

Commit1b49d56

File tree

3 files changed

3 files changed

`‎doc/src/sgml/ref/clusterdb.sgml`

`‎src/bin/scripts/clusterdb.c`

`‎src/bin/scripts/t/011_clusterdb_all.pl`

0 commit comments