Fix copyfuncs/equalfuncs support for VacuumStmt.

robertmhaas · robertmhaas · commit 53680c116ce8 · 2019-03-18T23:21:36.000-04:00
Commit 6776142 failed to do this, and the buildfarm broke. Patch by me, per advice from Tom Lane and Michael Paquier. Discussion: http://postgr.es/m/13988.1552960403@sss.pgh.pa.us
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
@@ -3852,8 +3852,9 @@ _copyVacuumStmt(const VacuumStmt *from)
 {
 	VacuumStmt *newnode = makeNode(VacuumStmt);
 
-	COPY_SCALAR_FIELD(options);
+	COPY_NODE_FIELD(options);
 	COPY_NODE_FIELD(rels);
+	COPY_SCALAR_FIELD(is_vacuumcmd);
 
 	return newnode;
 }
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
@@ -1671,8 +1671,9 @@ _equalDropdbStmt(const DropdbStmt *a, const DropdbStmt *b)
 static bool
 _equalVacuumStmt(const VacuumStmt *a, const VacuumStmt *b)
 {
-	COMPARE_SCALAR_FIELD(options);
+	COMPARE_NODE_FIELD(options);
 	COMPARE_NODE_FIELD(rels);
+	COMPARE_SCALAR_FIELD(is_vacuumcmd);
 
 	return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -3852,8 +3852,9 @@ _copyVacuumStmt(const VacuumStmt *from)`
`3852`	`3852`	`{`
`3853`	`3853`	`VacuumStmt *newnode = makeNode(VacuumStmt);`
`3854`	`3854`
`3855`		`- COPY_SCALAR_FIELD(options);`
	`3855`	`+ COPY_NODE_FIELD(options);`
`3856`	`3856`	`COPY_NODE_FIELD(rels);`
	`3857`	`+ COPY_SCALAR_FIELD(is_vacuumcmd);`
`3857`	`3858`
`3858`	`3859`	`return newnode;`
`3859`	`3860`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1671,8 +1671,9 @@ _equalDropdbStmt(const DropdbStmt a, const DropdbStmt b)`
`1671`	`1671`	`static bool`
`1672`	`1672`	`_equalVacuumStmt(const VacuumStmt a, const VacuumStmt b)`
`1673`	`1673`	`{`
`1674`		`- COMPARE_SCALAR_FIELD(options);`
	`1674`	`+ COMPARE_NODE_FIELD(options);`
`1675`	`1675`	`COMPARE_NODE_FIELD(rels);`
	`1676`	`+ COMPARE_SCALAR_FIELD(is_vacuumcmd);`
`1676`	`1677`
`1677`	`1678`	`return true;`
`1678`	`1679`	`}`