diff --git a/contrib/pgrowlocks/expected/pgrowlocks.out b/contrib/pgrowlocks/expected/pgrowlocks.out index 725467266a..77431bfe18 100644 --- a/contrib/pgrowlocks/expected/pgrowlocks.out +++ b/contrib/pgrowlocks/expected/pgrowlocks.out @@ -136,10 +136,10 @@ a|b (2 rows) step s2_rowlocks: SELECT locked_row, multi, modes FROM pgrowlocks('multixact_conflict'); -locked_row|multi|modes -----------+-----+------------------- -(0,1) |t |{"Key Share",Share} -(0,2) |t |{"Key Share",Share} +locked_row|multi|modes +----------+-----+----------------------------- +(0,1) |t |{"For Key Share","For Share"} +(0,2) |t |{"For Key Share","For Share"} (2 rows) step s1_commit: COMMIT; @@ -161,10 +161,10 @@ a|b (2 rows) step s2_rowlocks: SELECT locked_row, multi, modes FROM pgrowlocks('multixact_conflict'); -locked_row|multi|modes -----------+-----+--------------------------------- -(0,1) |t |{"Key Share","For No Key Update"} -(0,2) |t |{"Key Share","For No Key Update"} +locked_row|multi|modes +----------+-----+------------------------------------- +(0,1) |t |{"For Key Share","For No Key Update"} +(0,2) |t |{"For Key Share","For No Key Update"} (2 rows) step s1_commit: COMMIT; @@ -186,10 +186,10 @@ a|b (2 rows) step s2_rowlocks: SELECT locked_row, multi, modes FROM pgrowlocks('multixact_conflict'); -locked_row|multi|modes -----------+-----+-------------------------- -(0,1) |t |{"Key Share","For Update"} -(0,2) |t |{"Key Share","For Update"} +locked_row|multi|modes +----------+-----+------------------------------ +(0,1) |t |{"For Key Share","For Update"} +(0,2) |t |{"For Key Share","For Update"} (2 rows) step s1_commit: COMMIT; @@ -205,10 +205,10 @@ a|b step s1_updatea: UPDATE multixact_conflict SET a = 10 WHERE a = 1; step s2_rowlocks: SELECT locked_row, multi, modes FROM pgrowlocks('multixact_conflict'); -locked_row|multi|modes -----------+-----+-------------------- -(0,1) |t |{"Key Share",Update} -(0,2) |f |{"For Key Share"} +locked_row|multi|modes +----------+-----+------------------------ +(0,1) |t |{"For Key Share",Update} +(0,2) |f |{"For Key Share"} (2 rows) step s1_commit: COMMIT; @@ -224,10 +224,10 @@ a|b step s1_updateb: UPDATE multixact_conflict SET b = 11 WHERE b = 4; step s2_rowlocks: SELECT locked_row, multi, modes FROM pgrowlocks('multixact_conflict'); -locked_row|multi|modes -----------+-----+----------------------------- -(0,1) |f |{"For Key Share"} -(0,2) |t |{"Key Share","No Key Update"} +locked_row|multi|modes +----------+-----+--------------------------------- +(0,1) |f |{"For Key Share"} +(0,2) |t |{"For Key Share","No Key Update"} (2 rows) step s1_commit: COMMIT; diff --git a/contrib/pgrowlocks/pgrowlocks.c b/contrib/pgrowlocks/pgrowlocks.c index c543277b7c..a04e187ec4 100644 --- a/contrib/pgrowlocks/pgrowlocks.c +++ b/contrib/pgrowlocks/pgrowlocks.c @@ -200,10 +200,10 @@ pgrowlocks(PG_FUNCTION_ARGS) snprintf(buf, NCHARS, "For No Key Update"); break; case MultiXactStatusForShare: - snprintf(buf, NCHARS, "Share"); + snprintf(buf, NCHARS, "For Share"); break; case MultiXactStatusForKeyShare: - snprintf(buf, NCHARS, "Key Share"); + snprintf(buf, NCHARS, "For Key Share"); break; } strcat(values[Atnum_modes], buf); diff --git a/doc/src/sgml/pgrowlocks.sgml b/doc/src/sgml/pgrowlocks.sgml index b5e655735a..9c6e86b27e 100644 --- a/doc/src/sgml/pgrowlocks.sgml +++ b/doc/src/sgml/pgrowlocks.sgml @@ -74,7 +74,7 @@ pgrowlocks(text) returns setof record modes text[] Lock mode of lockers (more than one if multitransaction), - an array of Key Share, Share, + an array of For Key Share, For Share, For No Key Update, No Key Update, For Update, Update.