NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit534b6f3

committed

Use an enum instead of two bools to indicate wal inclusion in base backups

This makes the code easier to read as it becomes more explicit what thedifferent allowed combinations really are.Suggested by Michael Paquier

1 parent7c3abe3 commit534b6f3Copy full SHA for 534b6f3

File tree

1 file changed

+22

-16

lines changed

src/bin/pg_basebackup
- pg_basebackup.c

1 file changed

+22

-16

lines changed

`‎src/bin/pg_basebackup/pg_basebackup.c`

Lines changed: 22 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,16 @@ typedef struct TablespaceList`
`61`	`61`	`*/`
`62`	`62`	`#defineMINIMUM_VERSION_FOR_PG_WAL100000`
`63`	`63`
	`64`	`+/*`
	`65`	`+ * Different ways to include WAL`
	`66`	`+ */`
	`67`	`+typedefenum`
	`68`	`+{`
	`69`	`+NO_WAL,`
	`70`	`+FETCH_WAL,`
	`71`	`+STREAM_WAL`
	`72`	`+}IncludeWal;`
	`73`	`+`
`64`	`74`	`/* Global options */`
`65`	`75`	`staticchar*basedir=NULL;`
`66`	`76`	`staticTablespaceListtablespace_dirs= {NULL,NULL};`
`@@ -71,8 +81,7 @@ static bool noclean = false;`
`71`	`81`	`staticboolshowprogress= false;`
`72`	`82`	`staticintverbose=0;`
`73`	`83`	`staticintcompresslevel=0;`
`74`		`-staticboolincludewal= true;`
`75`		`-staticboolstreamwal= true;`
	`84`	`+staticIncludeWalincludewal=STREAM_WAL;`
`76`	`85`	`staticboolfastcheckpoint= false;`
`77`	`86`	`staticboolwriterecoveryconf= false;`
`78`	`87`	`staticbooldo_sync= true;`
`@@ -1697,7 +1706,7 @@ BaseBackup(void)`
`1697`	`1706`	`* If WAL streaming was requested, also check that the server is new`
`1698`	`1707`	`* enough for that.`
`1699`	`1708`	`*/`
`1700`		`-if (streamwal&& !CheckServerVersionForStreaming(conn))`
	`1709`	`+if (includewal==STREAM_WAL&& !CheckServerVersionForStreaming(conn))`
`1701`	`1710`	`{`
`1702`	`1711`	`/*`
`1703`	`1712`	`* Error message already written in CheckServerVersionForStreaming(),`
`@@ -1731,9 +1740,9 @@ BaseBackup(void)`
`1731`	`1740`	`psprintf("BASE_BACKUP LABEL '%s' %s %s %s %s %s %s",`
`1732`	`1741`	`escaped_label,`
`1733`	`1742`	`showprogress ?"PROGRESS" :"",`
`1734`		`-includewal&& !streamwal ?"WAL" :"",`
	`1743`	`+includewal==FETCH_WAL ?"WAL" :"",`
`1735`	`1744`	`fastcheckpoint ?"FAST" :"",`
`1736`		`-includewal ?"NOWAIT" :"",`
	`1745`	`+includewal==NO_WAL?"" :"NOWAIT",`
`1737`	`1746`	`maxrate_clause ?maxrate_clause :"",`
`1738`	`1747`	`format=='t' ?"TABLESPACE_MAP" :"");`
`1739`	`1748`
`@@ -1776,7 +1785,7 @@ BaseBackup(void)`
`1776`	`1785`	`PQclear(res);`
`1777`	`1786`	`MemSet(xlogend,0,sizeof(xlogend));`
`1778`	`1787`
`1779`		`-if (verbose&&includewal)`
	`1788`	`+if (verbose&&includewal!=NO_WAL)`
`1780`	`1789`	`fprintf(stderr,_("transaction log start point: %s on timeline %u\n"),`
`1781`	`1790`	`xlogstart,starttli);`
`1782`	`1791`
`@@ -1833,7 +1842,7 @@ BaseBackup(void)`
`1833`	`1842`	`* If we're streaming WAL, start the streaming session before we start`
`1834`	`1843`	`* receiving the actual data chunks.`
`1835`	`1844`	`*/`
`1836`		`-if (streamwal)`
	`1845`	`+if (includewal==STREAM_WAL)`
`1837`	`1846`	`{`
`1838`	`1847`	`if (verbose)`
`1839`	`1848`	`fprintf(stderr,_("%s: starting background WAL receiver\n"),`
`@@ -1879,7 +1888,7 @@ BaseBackup(void)`
`1879`	`1888`	`disconnect_and_exit(1);`
`1880`	`1889`	`}`
`1881`	`1890`	`strlcpy(xlogend,PQgetvalue(res,0,0),sizeof(xlogend));`
`1882`		`-if (verbose&&includewal)`
	`1891`	`+if (verbose&&includewal!=NO_WAL)`
`1883`	`1892`	`fprintf(stderr,"transaction log end point: %s\n",xlogend);`
`1884`	`1893`	`PQclear(res);`
`1885`	`1894`
`@@ -2117,20 +2126,17 @@ main(int argc, char **argv)`
`2117`	`2126`	`if (strcmp(optarg,"n")==0\|\|`
`2118`	`2127`	`strcmp(optarg,"none")==0)`
`2119`	`2128`	`{`
`2120`		`-includewal= false;`
`2121`		`-streamwal= false;`
	`2129`	`+includewal=NO_WAL;`
`2122`	`2130`	`}`
`2123`	`2131`	`elseif (strcmp(optarg,"f")==0\|\|`
`2124`	`2132`	`strcmp(optarg,"fetch")==0)`
`2125`	`2133`	`{`
`2126`		`-includewal= true;`
`2127`		`-streamwal= false;`
	`2134`	`+includewal=FETCH_WAL;`
`2128`	`2135`	`}`
`2129`	`2136`	`elseif (strcmp(optarg,"s")==0\|\|`
`2130`	`2137`	`strcmp(optarg,"stream")==0)`
`2131`	`2138`	`{`
`2132`		`-includewal= true;`
`2133`		`-streamwal= true;`
	`2139`	`+includewal=STREAM_WAL;`
`2134`	`2140`	`}`
`2135`	`2141`	`else`
`2136`	`2142`	`{`
`@@ -2261,7 +2267,7 @@ main(int argc, char **argv)`
`2261`	`2267`	`exit(1);`
`2262`	`2268`	`}`
`2263`	`2269`
`2264`		`-if (format=='t'&&streamwal&&strcmp(basedir,"-")==0)`
	`2270`	`+if (format=='t'&&includewal==STREAM_WAL&&strcmp(basedir,"-")==0)`
`2265`	`2271`	`{`
`2266`	`2272`	`fprintf(stderr,`
`2267`	`2273`	`_("%s: cannot stream transaction logs in tar mode to stdout\n"),`
`@@ -2271,7 +2277,7 @@ main(int argc, char **argv)`
`2271`	`2277`	`exit(1);`
`2272`	`2278`	`}`
`2273`	`2279`
`2274`		`-if (replication_slot&&!streamwal)`
	`2280`	`+if (replication_slot&&includewal!=STREAM_WAL)`
`2275`	`2281`	`{`
`2276`	`2282`	`fprintf(stderr,`
`2277`	`2283`	`_("%s: replication slots can only be used with WAL streaming\n"),`

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!

Commit534b6f3

File tree

1 file changed

1 file changed

`‎src/bin/pg_basebackup/pg_basebackup.c`

0 commit comments