Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit0180bd6

Browse files
committed
Remove all "traces" of trace_userlocks, because userlocks were removed
in PG 8.2.
1 parent23610da commit0180bd6

File tree

5 files changed

+2
-41
lines changed

5 files changed

+2
-41
lines changed

‎doc/src/sgml/config.sgml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6192,28 +6192,6 @@ LOG: CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
61926192
</listitem>
61936193
</varlistentry>
61946194

6195-
<varlistentry>
6196-
<term><varname>trace_userlocks</varname> (<type>boolean</type>)</term>
6197-
<indexterm>
6198-
<primary><varname>trace_userlocks</> configuration parameter</primary>
6199-
</indexterm>
6200-
<listitem>
6201-
<para>
6202-
If on, emit information about user lock usage. Output is the same
6203-
as for <symbol>trace_locks</symbol>, only for user locks.
6204-
</para>
6205-
<para>
6206-
User locks were removed as of PostgreSQL version 8.2. This option
6207-
currently has no effect.
6208-
</para>
6209-
<para>
6210-
This parameter is only available if the <symbol>LOCK_DEBUG</symbol>
6211-
macro was defined when <productname>PostgreSQL</productname> was
6212-
compiled.
6213-
</para>
6214-
</listitem>
6215-
</varlistentry>
6216-
62176195
<varlistentry>
62186196
<term><varname>trace_lock_oidmin</varname> (<type>integer</type>)</term>
62196197
<indexterm>

‎src/backend/storage/lmgr/lock.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -213,12 +213,7 @@ static const LockMethodData user_lockmethod = {
213213
AccessExclusiveLock,/* highest valid lock mode number */
214214
true,
215215
LockConflicts,
216-
lock_mode_names,
217-
#ifdefLOCK_DEBUG
218-
&Trace_userlocks
219-
#else
220-
&Dummy_trace
221-
#endif
216+
lock_mode_names
222217
};
223218

224219
/*
@@ -276,7 +271,6 @@ static ResourceOwner awaitedOwner;
276271

277272
intTrace_lock_oidmin=FirstNormalObjectId;
278273
boolTrace_locks= false;
279-
boolTrace_userlocks= false;
280274
intTrace_lock_table=0;
281275
boolDebug_deadlocks= false;
282276

‎src/backend/utils/misc/check_guc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ INTENTIONALLY_NOT_INCLUDED="autocommit debug_deadlocks \
2020
is_superuser lc_collate lc_ctype lc_messages lc_monetary lc_numeric lc_time\
2121
pre_auth_delay role seed server_encoding server_version server_version_int\
2222
session_authorization trace_lock_oidmin trace_lock_table trace_locks trace_lwlocks\
23-
trace_notifytrace_userlockstransaction_isolation transaction_read_only\
23+
trace_notify transaction_isolation transaction_read_only\
2424
zero_damaged_pages"
2525

2626
### What options are listed in postgresql.conf.sample, but don't appear

‎src/backend/utils/misc/guc.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,16 +1058,6 @@ static struct config_bool ConfigureNamesBool[] =
10581058
false,
10591059
NULL,NULL,NULL
10601060
},
1061-
{
1062-
{"trace_userlocks",PGC_SUSET,DEVELOPER_OPTIONS,
1063-
gettext_noop("No description available."),
1064-
NULL,
1065-
GUC_NOT_IN_SAMPLE
1066-
},
1067-
&Trace_userlocks,
1068-
false,
1069-
NULL,NULL,NULL
1070-
},
10711061
{
10721062
{"trace_lwlocks",PGC_SUSET,DEVELOPER_OPTIONS,
10731063
gettext_noop("No description available."),

‎src/include/storage/lock.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ extern intmax_locks_per_xact;
3434
#ifdefLOCK_DEBUG
3535
externintTrace_lock_oidmin;
3636
externboolTrace_locks;
37-
externboolTrace_userlocks;
3837
externintTrace_lock_table;
3938
externboolDebug_deadlocks;
4039
#endif/* LOCK_DEBUG */

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp