Skip to content

Commit a3e5f72

Browse files
committed
[Doc]: apply mvcc patch
1 parent 82ad0e6 commit a3e5f72

File tree

1 file changed

+82
-4
lines changed

1 file changed

+82
-4
lines changed

doc/src/sgml/mvcc.sgml

Lines changed: 82 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,12 +1001,12 @@ ERROR: could not serialize access due to read/write dependencies among transact
10011001
</term>
10021002
<listitem>
10031003
<para>
1004-
Conflicts with locks of all modes (<literal>ACCESS
1004+
Conflicts with locks of <literal>ACCESS
10051005
SHARE</literal>, <literal>ROW SHARE</literal>, <literal>ROW
10061006
EXCLUSIVE</literal>, <literal>SHARE UPDATE
10071007
EXCLUSIVE</literal>, <literal>SHARE</literal>, <literal>SHARE
10081008
ROW EXCLUSIVE</literal>, <literal>EXCLUSIVE</literal>, and
1009-
<literal>ACCESS EXCLUSIVE</literal>).
1009+
<literal>ACCESS EXCLUSIVE</literal> mode.
10101010
This mode guarantees that the
10111011
holder is the only transaction accessing the table in any way.
10121012
</para>
@@ -1034,6 +1034,40 @@ ERROR: could not serialize access due to read/write dependencies among transact
10341034
</para>
10351035
</tip>
10361036

1037+
<para>
1038+
Besides, there are two additional lock modes designed to support
1039+
<application>1C Enterprise</application>. These modes do not conflict
1040+
with any other lock modes described above. They use is possible, but not
1041+
encouraged, as <link linkend="advisory-locks">advisory locks</link> provide
1042+
the same functionality.
1043+
</para>
1044+
1045+
<variablelist>
1046+
<varlistentry>
1047+
<term>
1048+
<literal>APPLICATION SHARE</literal>
1049+
</term>
1050+
<listitem>
1051+
<para>
1052+
Conflicts with the <literal>APPLICATION EXCLUSIVE</literal> lock
1053+
mode only.
1054+
</para>
1055+
</listitem>
1056+
</varlistentry>
1057+
1058+
<varlistentry>
1059+
<term>
1060+
<literal>APPLICATION EXCLUSIVE</literal>
1061+
</term>
1062+
<listitem>
1063+
<para>
1064+
Conflicts with the <literal>APPLICATION SHARE</literal> and
1065+
<literal>APPLICATION EXCLUSIVE</literal> lock modes.
1066+
</para>
1067+
</listitem>
1068+
</varlistentry>
1069+
</variablelist>
1070+
10371071
<para>
10381072
Once acquired, a lock is normally held till end of transaction. But if a
10391073
lock is acquired after establishing a savepoint, the lock is released
@@ -1048,9 +1082,9 @@ ERROR: could not serialize access due to read/write dependencies among transact
10481082

10491083
<table tocentry="1" id="table-lock-compatibility">
10501084
<title> Conflicting Lock Modes</title>
1051-
<tgroup cols="9">
1085+
<tgroup cols="11">
10521086
<colspec colnum="2" colname="lockst">
1053-
<colspec colnum="9" colname="lockend">
1087+
<colspec colnum="11" colname="lockend">
10541088
<spanspec namest="lockst" nameend="lockend" spanname="lockreq">
10551089
<thead>
10561090
<row>
@@ -1066,6 +1100,8 @@ ERROR: could not serialize access due to read/write dependencies among transact
10661100
<entry>SHARE ROW EXCLUSIVE</entry>
10671101
<entry>EXCLUSIVE</entry>
10681102
<entry>ACCESS EXCLUSIVE</entry>
1103+
<entry>APPLICATION SHARE</entry>
1104+
<entry>APPLICATION EXCLUSIVE</entry>
10691105
</row>
10701106
</thead>
10711107
<tbody>
@@ -1079,6 +1115,8 @@ ERROR: could not serialize access due to read/write dependencies among transact
10791115
<entry align="center"></entry>
10801116
<entry align="center"></entry>
10811117
<entry align="center">X</entry>
1118+
<entry align="center"></entry>
1119+
<entry align="center"></entry>
10821120
</row>
10831121
<row>
10841122
<entry>ROW SHARE</entry>
@@ -1090,6 +1128,8 @@ ERROR: could not serialize access due to read/write dependencies among transact
10901128
<entry align="center"></entry>
10911129
<entry align="center">X</entry>
10921130
<entry align="center">X</entry>
1131+
<entry align="center"></entry>
1132+
<entry align="center"></entry>
10931133
</row>
10941134
<row>
10951135
<entry>ROW EXCLUSIVE</entry>
@@ -1101,6 +1141,8 @@ ERROR: could not serialize access due to read/write dependencies among transact
11011141
<entry align="center">X</entry>
11021142
<entry align="center">X</entry>
11031143
<entry align="center">X</entry>
1144+
<entry align="center"></entry>
1145+
<entry align="center"></entry>
11041146
</row>
11051147
<row>
11061148
<entry>SHARE UPDATE EXCLUSIVE</entry>
@@ -1112,6 +1154,8 @@ ERROR: could not serialize access due to read/write dependencies among transact
11121154
<entry align="center">X</entry>
11131155
<entry align="center">X</entry>
11141156
<entry align="center">X</entry>
1157+
<entry align="center"></entry>
1158+
<entry align="center"></entry>
11151159
</row>
11161160
<row>
11171161
<entry>SHARE</entry>
@@ -1123,6 +1167,8 @@ ERROR: could not serialize access due to read/write dependencies among transact
11231167
<entry align="center">X</entry>
11241168
<entry align="center">X</entry>
11251169
<entry align="center">X</entry>
1170+
<entry align="center"></entry>
1171+
<entry align="center"></entry>
11261172
</row>
11271173
<row>
11281174
<entry>SHARE ROW EXCLUSIVE</entry>
@@ -1134,6 +1180,8 @@ ERROR: could not serialize access due to read/write dependencies among transact
11341180
<entry align="center">X</entry>
11351181
<entry align="center">X</entry>
11361182
<entry align="center">X</entry>
1183+
<entry align="center"></entry>
1184+
<entry align="center"></entry>
11371185
</row>
11381186
<row>
11391187
<entry>EXCLUSIVE</entry>
@@ -1145,6 +1193,8 @@ ERROR: could not serialize access due to read/write dependencies among transact
11451193
<entry align="center">X</entry>
11461194
<entry align="center">X</entry>
11471195
<entry align="center">X</entry>
1196+
<entry align="center"></entry>
1197+
<entry align="center"></entry>
11481198
</row>
11491199
<row>
11501200
<entry>ACCESS EXCLUSIVE</entry>
@@ -1156,6 +1206,34 @@ ERROR: could not serialize access due to read/write dependencies among transact
11561206
<entry align="center">X</entry>
11571207
<entry align="center">X</entry>
11581208
<entry align="center">X</entry>
1209+
<entry align="center"></entry>
1210+
<entry align="center"></entry>
1211+
</row>
1212+
<row>
1213+
<entry>APPLICATION SHARE</entry>
1214+
<entry align="center"></entry>
1215+
<entry align="center"></entry>
1216+
<entry align="center"></entry>
1217+
<entry align="center"></entry>
1218+
<entry align="center"></entry>
1219+
<entry align="center"></entry>
1220+
<entry align="center"></entry>
1221+
<entry align="center"></entry>
1222+
<entry align="center"></entry>
1223+
<entry align="center">X</entry>
1224+
</row>
1225+
<row>
1226+
<entry>APPLICATION EXCLUSIVE</entry>
1227+
<entry align="center"></entry>
1228+
<entry align="center"></entry>
1229+
<entry align="center"></entry>
1230+
<entry align="center"></entry>
1231+
<entry align="center"></entry>
1232+
<entry align="center"></entry>
1233+
<entry align="center"></entry>
1234+
<entry align="center"></entry>
1235+
<entry align="center">X</entry>
1236+
<entry align="center">X</entry>
11591237
</row>
11601238
</tbody>
11611239
</tgroup>

0 commit comments

Comments
 (0)