Add missing errcode() in a few ereport calls.

Amit Kapila · Amit Kapila · commit e37824136f06 · 2020-03-18T09:33:01.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
@@ -187,7 +187,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");
@@ -319,7 +319,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)));
 	}
@@ -350,7 +350,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
@@ -148,7 +148,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
`@@ -187,7 +187,7 @@ pg_file_write_internal(text file, text data, bool replace)`
`187`	`187`
`188`	`188`	`if (stat(filename, &fst) >= 0)`
`189`	`189`	`ereport(ERROR,`
`190`		`- (ERRCODE_DUPLICATE_FILE,`
	`190`	`+ (errcode(ERRCODE_DUPLICATE_FILE),`
`191`	`191`	`errmsg("file \"%s\" exists", filename)));`
`192`	`192`
`193`	`193`	`f = AllocateFile(filename, "wb");`
`@@ -319,7 +319,7 @@ pg_file_rename_internal(text file1, text file2, text *file3)`
`319`	`319`	`if (rc >= 0 \|\| errno != ENOENT)`
`320`	`320`	`{`
`321`	`321`	`ereport(ERROR,`
`322`		`- (ERRCODE_DUPLICATE_FILE,`
	`322`	`+ (errcode(ERRCODE_DUPLICATE_FILE),`
`323`	`323`	`errmsg("cannot rename to target file \"%s\"",`
`324`	`324`	`fn3 ? fn3 : fn2)));`
`325`	`325`	`}`
`@@ -350,7 +350,7 @@ pg_file_rename_internal(text file1, text file2, text *file3)`
`350`	`350`	`else`
`351`	`351`	`{`
`352`	`352`	`ereport(ERROR,`
`353`		`- (ERRCODE_UNDEFINED_FILE,`
	`353`	`+ (errcode(ERRCODE_UNDEFINED_FILE),`
`354`	`354`	`errmsg("renaming \"%s\" to \"%s\" was reverted",`
`355`	`355`	`fn2, fn3)));`
`356`	`356`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ PageIsVerified(Page page, BlockNumber blkno)`
`148`	`148`	`if (checksum_failure)`
`149`	`149`	`{`
`150`	`150`	`ereport(WARNING,`
`151`		`- (ERRCODE_DATA_CORRUPTED,`
	`151`	`+ (errcode(ERRCODE_DATA_CORRUPTED),`
`152`	`152`	`errmsg("page verification failed, calculated checksum %u but expected %u",`
`153`	`153`	`checksum, p->pd_checksum)));`
`154`	`154`