NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit15d5d74

committed

pgrowlocks: change lock mode output labels for consistency

Change "Share" to "For Share" and "Key Share" to "For Key Share" forconsistency with other lock mode labels.BACKWARD COMPATIBILITY BREAKReported-by: David CookDiscussion:https://postgr.es/m/CA+dNBPNBf+FCEwohe7SH1tSks0R_G4F=tuvM=hnPs4qWiAH8vg@mail.gmail.comBackpatch-through: master

1 parent1b5a004 commit15d5d74Copy full SHA for 15d5d74

File tree

3 files changed

+23

-23

lines changed

contrib/pgrowlocks
- expected
  - pgrowlocks.out
- pgrowlocks.c
doc/src/sgml
- pgrowlocks.sgml

3 files changed

+23

-23

lines changed

`‎contrib/pgrowlocks/expected/pgrowlocks.out`

Lines changed: 20 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -136,10 +136,10 @@ a\|b`
`136`	`136`	`(2 rows)`
`137`	`137`
`138`	`138`	`step s2_rowlocks: SELECT locked_row, multi, modes FROM pgrowlocks('multixact_conflict');`
`139`		`-locked_row\|multi\|modes`
`140`		`-----------+-----+-------------------`
`141`		`-(0,1) \|t \|{"Key Share",Share}`
`142`		`-(0,2) \|t \|{"Key Share",Share}`
	`139`	`+locked_row\|multi\|modes`
	`140`	`+----------+-----+-----------------------------`
	`141`	`+(0,1) \|t \|{"ForKey Share","ForShare"}`
	`142`	`+(0,2) \|t \|{"ForKey Share","ForShare"}`
`143`	`143`	`(2 rows)`
`144`	`144`
`145`	`145`	`step s1_commit: COMMIT;`
`@@ -161,10 +161,10 @@ a\|b`
`161`	`161`	`(2 rows)`
`162`	`162`
`163`	`163`	`step s2_rowlocks: SELECT locked_row, multi, modes FROM pgrowlocks('multixact_conflict');`
`164`		`-locked_row\|multi\|modes`
`165`		`-----------+-----+---------------------------------`
`166`		`-(0,1) \|t \|{"Key Share","For No Key Update"}`
`167`		`-(0,2) \|t \|{"Key Share","For No Key Update"}`
	`164`	`+locked_row\|multi\|modes`
	`165`	`+----------+-----+-------------------------------------`
	`166`	`+(0,1) \|t \|{"ForKey Share","For No Key Update"}`
	`167`	`+(0,2) \|t \|{"ForKey Share","For No Key Update"}`
`168`	`168`	`(2 rows)`
`169`	`169`
`170`	`170`	`step s1_commit: COMMIT;`
`@@ -186,10 +186,10 @@ a\|b`
`186`	`186`	`(2 rows)`
`187`	`187`
`188`	`188`	`step s2_rowlocks: SELECT locked_row, multi, modes FROM pgrowlocks('multixact_conflict');`
`189`		`-locked_row\|multi\|modes`
`190`		`-----------+-----+--------------------------`
`191`		`-(0,1) \|t \|{"Key Share","For Update"}`
`192`		`-(0,2) \|t \|{"Key Share","For Update"}`
	`189`	`+locked_row\|multi\|modes`
	`190`	`+----------+-----+------------------------------`
	`191`	`+(0,1) \|t \|{"ForKey Share","For Update"}`
	`192`	`+(0,2) \|t \|{"ForKey Share","For Update"}`
`193`	`193`	`(2 rows)`
`194`	`194`
`195`	`195`	`step s1_commit: COMMIT;`
`@@ -205,10 +205,10 @@ a\|b`
`205`	`205`
`206`	`206`	`step s1_updatea: UPDATE multixact_conflict SET a = 10 WHERE a = 1;`
`207`	`207`	`step s2_rowlocks: SELECT locked_row, multi, modes FROM pgrowlocks('multixact_conflict');`
`208`		`-locked_row\|multi\|modes`
`209`		`-----------+-----+--------------------`
`210`		`-(0,1) \|t \|{"Key Share",Update}`
`211`		`-(0,2) \|f \|{"For Key Share"}`
	`208`	`+locked_row\|multi\|modes`
	`209`	`+----------+-----+------------------------`
	`210`	`+(0,1) \|t \|{"ForKey Share",Update}`
	`211`	`+(0,2) \|f \|{"For Key Share"}`
`212`	`212`	`(2 rows)`
`213`	`213`
`214`	`214`	`step s1_commit: COMMIT;`
`@@ -224,10 +224,10 @@ a\|b`
`224`	`224`
`225`	`225`	`step s1_updateb: UPDATE multixact_conflict SET b = 11 WHERE b = 4;`
`226`	`226`	`step s2_rowlocks: SELECT locked_row, multi, modes FROM pgrowlocks('multixact_conflict');`
`227`		`-locked_row\|multi\|modes`
`228`		`-----------+-----+-----------------------------`
`229`		`-(0,1) \|f \|{"For Key Share"}`
`230`		`-(0,2) \|t \|{"Key Share","No Key Update"}`
	`227`	`+locked_row\|multi\|modes`
	`228`	`+----------+-----+---------------------------------`
	`229`	`+(0,1) \|f \|{"For Key Share"}`
	`230`	`+(0,2) \|t \|{"ForKey Share","No Key Update"}`
`231`	`231`	`(2 rows)`
`232`	`232`
`233`	`233`	`step s1_commit: COMMIT;`

`‎contrib/pgrowlocks/pgrowlocks.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -200,10 +200,10 @@ pgrowlocks(PG_FUNCTION_ARGS)`
`200`	`200`	`snprintf(buf,NCHARS,"For No Key Update");`
`201`	`201`	`break;`
`202`	`202`	`caseMultiXactStatusForShare:`
`203`		`-snprintf(buf,NCHARS,"Share");`
	`203`	`+snprintf(buf,NCHARS,"ForShare");`
`204`	`204`	`break;`
`205`	`205`	`caseMultiXactStatusForKeyShare:`
`206`		`-snprintf(buf,NCHARS,"Key Share");`
	`206`	`+snprintf(buf,NCHARS,"ForKey Share");`
`207`	`207`	`break;`
`208`	`208`	`}`
`209`	`209`	`strcat(values[Atnum_modes],buf);`

`‎doc/src/sgml/pgrowlocks.sgml`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ pgrowlocks(text) returns setof record`
`74`	`74`	`<entry><structfield>modes</structfield></entry>`
`75`	`75`	`<entry><type>text[]</type></entry>`
`76`	`76`	`<entry>Lock mode of lockers (more than one if multitransaction),`
`77`		`- an array of <literal>Key Share</literal>, <literal>Share</literal>,`
	`77`	`+ an array of <literal>ForKey Share</literal>, <literal>ForShare</literal>,`
`78`	`78`	`<literal>For No Key Update</literal>, <literal>No Key Update</literal>,`
`79`	`79`	`<literal>For Update</literal>, <literal>Update</literal>.</entry>`
`80`	`80`	`</row>`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit15d5d74

File tree

3 files changed

3 files changed

`‎contrib/pgrowlocks/expected/pgrowlocks.out`

`‎contrib/pgrowlocks/pgrowlocks.c`

`‎doc/src/sgml/pgrowlocks.sgml`

0 commit comments