Skip to content

Commit ae6a658

Browse files
bmomjianbmomjian
committed
Rename LockTab to LockTable in function name.
1 parent eef15f5 commit ae6a658

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.27 1998/06/15 19:29:20 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.28 1998/06/26 01:58:45 momjian Exp $
1111
*
1212
* NOTES
1313
* Outside modules can create a lock table and acquire/release
@@ -18,7 +18,7 @@
1818
*
1919
* Interface:
2020
*
21-
* LockAcquire(), LockRelease(), LockTabInit().
21+
* LockAcquire(), LockRelease(), LockTableInit().
2222
*
2323
* LockReplace() is called only within this module and by the
2424
* lkchain module. It releases a lock without looking
@@ -213,7 +213,7 @@ LockTypeInit(LOCKTAB *ltable,
213213
}
214214

215215
/*
216-
* LockTabInit -- initialize a lock table structure
216+
* LockTableInit -- initialize a lock table structure
217217
*
218218
* Notes:
219219
* (a) a lock table has four separate entries in the binding
@@ -223,7 +223,7 @@ LockTypeInit(LOCKTAB *ltable,
223223
*
224224
*/
225225
LockTableId
226-
LockTabInit(char *tabName,
226+
LockTableInit(char *tabName,
227227
MASK *conflictsP,
228228
int *prioP,
229229
int ntypes)
@@ -237,15 +237,15 @@ LockTabInit(char *tabName,
237237

238238
if (ntypes > MAX_LOCKTYPES)
239239
{
240-
elog(NOTICE, "LockTabInit: too many lock types %d greater than %d",
240+
elog(NOTICE, "LockTableInit: too many lock types %d greater than %d",
241241
ntypes, MAX_LOCKTYPES);
242242
return (INVALID_TABLEID);
243243
}
244244

245245
if (NumTables > MAX_TABLES)
246246
{
247247
elog(NOTICE,
248-
"LockTabInit: system limit of MAX_TABLES (%d) lock tables",
248+
"LockTableInit: system limit of MAX_TABLES (%d) lock tables",
249249
MAX_TABLES);
250250
return (INVALID_TABLEID);
251251
}
@@ -254,15 +254,15 @@ LockTabInit(char *tabName,
254254
shmemName = (char *) palloc((unsigned) (strlen(tabName) + 32));
255255
if (!shmemName)
256256
{
257-
elog(NOTICE, "LockTabInit: couldn't malloc string %s \n", tabName);
257+
elog(NOTICE, "LockTableInit: couldn't malloc string %s \n", tabName);
258258
return (INVALID_TABLEID);
259259
}
260260

261261
/* each lock table has a non-shared header */
262262
ltable = (LOCKTAB *) palloc((unsigned) sizeof(LOCKTAB));
263263
if (!ltable)
264264
{
265-
elog(NOTICE, "LockTabInit: couldn't malloc lock table %s\n", tabName);
265+
elog(NOTICE, "LockTableInit: couldn't malloc lock table %s\n", tabName);
266266
pfree(shmemName);
267267
return (INVALID_TABLEID);
268268
}
@@ -285,7 +285,7 @@ LockTabInit(char *tabName,
285285

286286
if (!ltable->ctl)
287287
{
288-
elog(FATAL, "LockTabInit: couldn't initialize %s", tabName);
288+
elog(FATAL, "LockTableInit: couldn't initialize %s", tabName);
289289
status = FALSE;
290290
}
291291

@@ -326,7 +326,7 @@ LockTabInit(char *tabName,
326326
Assert(ltable->lockHash->hash == tag_hash);
327327
if (!ltable->lockHash)
328328
{
329-
elog(FATAL, "LockTabInit: couldn't initialize %s", tabName);
329+
elog(FATAL, "LockTableInit: couldn't initialize %s", tabName);
330330
status = FALSE;
331331
}
332332

@@ -347,7 +347,7 @@ LockTabInit(char *tabName,
347347

348348
if (!ltable->xidHash)
349349
{
350-
elog(FATAL, "LockTabInit: couldn't initialize %s", tabName);
350+
elog(FATAL, "LockTableInit: couldn't initialize %s", tabName);
351351
status = FALSE;
352352
}
353353

@@ -365,7 +365,7 @@ LockTabInit(char *tabName,
365365
}
366366

367367
/*
368-
* LockTabRename -- allocate another tableId to the same
368+
* LockTableRename -- allocate another tableId to the same
369369
* lock table.
370370
*
371371
* NOTES: Both the lock module and the lock chain (lchain.c)
@@ -378,7 +378,7 @@ LockTabInit(char *tabName,
378378
*/
379379
#ifdef NOT_USED
380380
LockTableId
381-
LockTabRename(LockTableId tableId)
381+
LockTableRename(LockTableId tableId)
382382
{
383383
LockTableId newTableId;
384384

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
*
1414
* IDENTIFICATION
15-
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.14 1998/06/23 17:59:54 momjian Exp $
15+
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.15 1998/06/26 01:58:45 momjian Exp $
1616
*
1717
* NOTES:
1818
* (1) The lock.c module assumes that the caller here is doing
@@ -96,14 +96,14 @@ InitMultiLevelLockm()
9696
if (MultiTableId)
9797
return MultiTableId;
9898

99-
tableId = LockTabInit("LockTable", MultiConflicts, MultiPrios, 5);
99+
tableId = LockTableInit("LockTable", MultiConflicts, MultiPrios, 5);
100100
MultiTableId = tableId;
101101
if (!(MultiTableId))
102102
elog(ERROR, "InitMultiLockm: couldnt initialize lock table");
103103
/* -----------------------
104104
* No short term lock table for now. -Jeff 15 July 1991
105105
*
106-
* ShortTermTableId = LockTabRename(tableId);
106+
* ShortTermTableId = LockTableRename(tableId);
107107
* if (! (ShortTermTableId)) {
108108
* elog(ERROR,"InitMultiLockm: couldnt rename lock table");
109109
* }

‎src/include/storage/lock.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: lock.h,v 1.12 1998/06/15 18:40:03 momjian Exp $
9+
* $Id: lock.h,v 1.13 1998/06/26 01:58:46 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -207,7 +207,7 @@ extern SPINLOCK LockMgrLock;
207207
extern void InitLocks(void);
208208
extern void LockDisable(int status);
209209
extern LockTableId
210-
LockTabInit(char *tabName, MASK *conflictsP, int *prioP,
210+
LockTableInit(char *tabName, MASK *conflictsP, int *prioP,
211211
int ntypes);
212212
extern bool LockAcquire(LockTableId tableId, LOCKTAG *lockName, LOCKT lockt);
213213
extern int

0 commit comments

Comments
 (0)