Commit18c41cb

Amit Kapila

committed

Add missing errcode() in a few ereport calls.

This will allow to specifying SQLSTATE error code for the errors in themissing places.Reported-by: Sawada MasahikoAuthor: Sawada MasahikoBackpatch-through: 9.5Discussion:https://postgr.es/m/CA+fd4k6N8EjNvZpM8nme+y+05mz-SM8Z_BgkixzkA34R+ej0Kw@mail.gmail.com

1 parent974c8ea commit18c41cbCopy full SHA for 18c41cb

File tree

-4

lines changed

-4

lines changed

Lines changed: 3 additions & 3 deletions

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`	`}`

Lines changed: 1 addition & 1 deletion

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`

Comments

(0)