Add missing errcode() in a few ereport calls.

Amit Kapila · Amit Kapila · commit 569f9354bb43 · 2020-03-18T09:46:52.000+05:30
This will allow to specifying SQLSTATE error code for the errors in the missing places. Reported-by: Sawada Masahiko Author: Sawada Masahiko Backpatch-through: 9.5 Discussion: https://postgr.es/m/CA+fd4k6N8EjNvZpM8nme+y+05mz-SM8Z_BgkixzkA34R+ej0Kw@mail.gmail.com
diff --git a/contrib/adminpack/adminpack.c b/contrib/adminpack/adminpack.c
@@ -128,7 +128,7 @@ pg_file_write(PG_FUNCTION_ARGS)
 
 		if (stat(filename, &fst) >= 0)
 			ereport(ERROR,
-					(ERRCODE_DUPLICATE_FILE,
+					(errcode(ERRCODE_DUPLICATE_FILE),
 					 errmsg("file \"%s\" exists", filename)));
 
 		f = AllocateFile(filename, "wb");
@@ -194,7 +194,7 @@ pg_file_rename(PG_FUNCTION_ARGS)
 	if (rc >= 0 || errno != ENOENT)
 	{
 		ereport(ERROR,
-				(ERRCODE_DUPLICATE_FILE,
+				(errcode(ERRCODE_DUPLICATE_FILE),
 				 errmsg("cannot rename to target file \"%s\"",
 						fn3 ? fn3 : fn2)));
 	}
@@ -225,7 +225,7 @@ pg_file_rename(PG_FUNCTION_ARGS)
 			else
 			{
 				ereport(ERROR,
-						(ERRCODE_UNDEFINED_FILE,
+						(errcode(ERRCODE_UNDEFINED_FILE),
 						 errmsg("renaming \"%s\" to \"%s\" was reverted",
 								fn2, fn3)));
 			}
diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c
@@ -147,7 +147,7 @@ PageIsVerified(Page page, BlockNumber blkno)
 	if (checksum_failure)
 	{
 		ereport(WARNING,
-				(ERRCODE_DATA_CORRUPTED,
+				(errcode(ERRCODE_DATA_CORRUPTED),
 				 errmsg("page verification failed, calculated checksum %u but expected %u",
 						checksum, p->pd_checksum)));
 

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ pg_file_write(PG_FUNCTION_ARGS)`
`128`	`128`
`129`	`129`	`if (stat(filename, &fst) >= 0)`
`130`	`130`	`ereport(ERROR,`
`131`		`- (ERRCODE_DUPLICATE_FILE,`
	`131`	`+ (errcode(ERRCODE_DUPLICATE_FILE),`
`132`	`132`	`errmsg("file \"%s\" exists", filename)));`
`133`	`133`
`134`	`134`	`f = AllocateFile(filename, "wb");`
`@@ -194,7 +194,7 @@ pg_file_rename(PG_FUNCTION_ARGS)`
`194`	`194`	`if (rc >= 0 \|\| errno != ENOENT)`
`195`	`195`	`{`
`196`	`196`	`ereport(ERROR,`
`197`		`- (ERRCODE_DUPLICATE_FILE,`
	`197`	`+ (errcode(ERRCODE_DUPLICATE_FILE),`
`198`	`198`	`errmsg("cannot rename to target file \"%s\"",`
`199`	`199`	`fn3 ? fn3 : fn2)));`
`200`	`200`	`}`
`@@ -225,7 +225,7 @@ pg_file_rename(PG_FUNCTION_ARGS)`
`225`	`225`	`else`
`226`	`226`	`{`
`227`	`227`	`ereport(ERROR,`
`228`		`- (ERRCODE_UNDEFINED_FILE,`
	`228`	`+ (errcode(ERRCODE_UNDEFINED_FILE),`
`229`	`229`	`errmsg("renaming \"%s\" to \"%s\" was reverted",`
`230`	`230`	`fn2, fn3)));`
`231`	`231`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ PageIsVerified(Page page, BlockNumber blkno)`
`147`	`147`	`if (checksum_failure)`
`148`	`148`	`{`
`149`	`149`	`ereport(WARNING,`
`150`		`- (ERRCODE_DATA_CORRUPTED,`
	`150`	`+ (errcode(ERRCODE_DATA_CORRUPTED),`
`151`	`151`	`errmsg("page verification failed, calculated checksum %u but expected %u",`
`152`	`152`	`checksum, p->pd_checksum)));`
`153`	`153`