Add missing errcode() in a few ereport calls.

Amit Kapila · Amit Kapila · commit b4f140869f5d · 2020-03-18T09:27:14.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
@@ -184,7 +184,7 @@ pg_file_write_internal(text *file, text *data, bool replace)
 
 		if (stat(filename, &fst) >= 0)
 			ereport(ERROR,
-					(ERRCODE_DUPLICATE_FILE,
+					(errcode(ERRCODE_DUPLICATE_FILE),
 					 errmsg("file \"%s\" exists", filename)));
 
 		f = AllocateFile(filename, "wb");
@@ -340,7 +340,7 @@ pg_file_rename_internal(text *file1, text *file2, text *file3)
 	if (rc >= 0 || errno != ENOENT)
 	{
 		ereport(ERROR,
-				(ERRCODE_DUPLICATE_FILE,
+				(errcode(ERRCODE_DUPLICATE_FILE),
 				 errmsg("cannot rename to target file \"%s\"",
 						fn3 ? fn3 : fn2)));
 	}
@@ -371,7 +371,7 @@ pg_file_rename_internal(text *file1, text *file2, text *file3)
 			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
@@ -141,7 +141,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
`@@ -184,7 +184,7 @@ pg_file_write_internal(text file, text data, bool replace)`
`184`	`184`
`185`	`185`	`if (stat(filename, &fst) >= 0)`
`186`	`186`	`ereport(ERROR,`
`187`		`- (ERRCODE_DUPLICATE_FILE,`
	`187`	`+ (errcode(ERRCODE_DUPLICATE_FILE),`
`188`	`188`	`errmsg("file \"%s\" exists", filename)));`
`189`	`189`
`190`	`190`	`f = AllocateFile(filename, "wb");`
`@@ -340,7 +340,7 @@ pg_file_rename_internal(text file1, text file2, text *file3)`
`340`	`340`	`if (rc >= 0 \|\| errno != ENOENT)`
`341`	`341`	`{`
`342`	`342`	`ereport(ERROR,`
`343`		`- (ERRCODE_DUPLICATE_FILE,`
	`343`	`+ (errcode(ERRCODE_DUPLICATE_FILE),`
`344`	`344`	`errmsg("cannot rename to target file \"%s\"",`
`345`	`345`	`fn3 ? fn3 : fn2)));`
`346`	`346`	`}`
`@@ -371,7 +371,7 @@ pg_file_rename_internal(text file1, text file2, text *file3)`
`371`	`371`	`else`
`372`	`372`	`{`
`373`	`373`	`ereport(ERROR,`
`374`		`- (ERRCODE_UNDEFINED_FILE,`
	`374`	`+ (errcode(ERRCODE_UNDEFINED_FILE),`
`375`	`375`	`errmsg("renaming \"%s\" to \"%s\" was reverted",`
`376`	`376`	`fn2, fn3)));`
`377`	`377`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ PageIsVerified(Page page, BlockNumber blkno)`
`141`	`141`	`if (checksum_failure)`
`142`	`142`	`{`
`143`	`143`	`ereport(WARNING,`
`144`		`- (ERRCODE_DATA_CORRUPTED,`
	`144`	`+ (errcode(ERRCODE_DATA_CORRUPTED),`
`145`	`145`	`errmsg("page verification failed, calculated checksum %u but expected %u",`
`146`	`146`	`checksum, p->pd_checksum)));`
`147`	`147`