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

Commit5aea406

Browse files
committed
Inline function, rename libpq variablees, change lrel to lockrel.
1 parent8bac4ca commit5aea406

File tree

14 files changed

+164
-190
lines changed

14 files changed

+164
-190
lines changed

‎src/backend/libpq/be-dumpdata.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-dumpdata.c,v 1.15 1998/03/30 16:46:29 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-dumpdata.c,v 1.16 1998/07/13 16:34:48 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -194,8 +194,8 @@ be_typeinit(PortalEntry *entry,
194194
for (i=0;i<natts;++i)
195195
{
196196
strncpy(group->types[i].name,attrs[i]->attname.data,NAMEDATALEN);
197-
group->types[i].adtid=attrs[i]->atttypid;
198-
group->types[i].adtsize=attrs[i]->attlen;
197+
group->types[i].typid=attrs[i]->atttypid;
198+
group->types[i].typlen=attrs[i]->attlen;
199199
}
200200
}
201201
}

‎src/backend/libpq/portal.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.14 1998/06/15 19:28:27 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.15 1998/07/13 16:34:48 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -327,7 +327,7 @@ PQftypeGroup(PortalBuffer *portal, int group_index, int field_number)
327327

328328
if ((gbp=pbuf_findGroup(portal,group_index))&&
329329
in_range("PQftypeGroup: field number",field_number,0,gbp->no_fields))
330-
return (gbp->types[field_number].adtid);
330+
return (gbp->types[field_number].typid);
331331
return (-1);
332332
}
333333

@@ -348,7 +348,7 @@ PQfsizeGroup(PortalBuffer *portal, int group_index, int field_number)
348348

349349
if ((gbp=pbuf_findGroup(portal,group_index))&&
350350
in_range("PQfsizeGroup: field number",field_number,0,gbp->no_fields))
351-
return (gbp->types[field_number].adtsize);
351+
return (gbp->types[field_number].typlen);
352352
return (-1);
353353
}
354354

@@ -481,8 +481,8 @@ PQftype(PortalBuffer *portal, int tuple_index, int field_number)
481481
return (-1);
482482

483483
if ((gbp=PQgroup(portal,tuple_index))&&
484-
in_range("PQftype: field number",field_number,0,gbp->no_fields))
485-
return (gbp->types[field_number].adtid);
484+
in_range("PQftype: field number",field_number,0,gbp->no_fields))
485+
return (gbp->types[field_number].typid);
486486
return (-1);
487487
}
488488

@@ -502,7 +502,7 @@ PQfsize(PortalBuffer *portal, int tuple_index, int field_number)
502502

503503
if ((gbp=PQgroup(portal,tuple_index))&&
504504
in_range("PQfsize: field number",field_number,0,gbp->no_fields))
505-
return (gbp->types[field_number].adtsize);
505+
return (gbp->types[field_number].typlen);
506506
return (-1);
507507
}
508508

‎src/backend/storage/buffer/bufmgr.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.38 1998/06/15 19:29:09 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.39 1998/07/13 16:34:49 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -114,14 +114,14 @@ RelationGetBufferWithBuffer(Relation relation,
114114
Bufferbuffer)
115115
{
116116
BufferDesc*bufHdr;
117-
LRelIdlrelId;
117+
LockRelIdlrelId;
118118

119119
if (BufferIsValid(buffer))
120120
{
121121
if (!BufferIsLocal(buffer))
122122
{
123123
bufHdr=&BufferDescriptors[buffer-1];
124-
lrelId=RelationGetLRelId(relation);
124+
lrelId=RelationGetLockRelId(relation);
125125
SpinAcquire(BufMgrLock);
126126
if (bufHdr->tag.blockNum==blockNumber&&
127127
bufHdr->tag.relId.relId==lrelId.relId&&
@@ -1282,7 +1282,7 @@ BufferGetRelation(Buffer buffer)
12821282
Assert(!BufferIsLocal(buffer));/* not supported for local buffers */
12831283

12841284
/* XXX should be a critical section */
1285-
relid=LRelIdGetRelationId(BufferDescriptors[buffer-1].tag.relId);
1285+
relid=LockRelIdGetRelationId(BufferDescriptors[buffer-1].tag.relId);
12861286
relation=RelationIdGetRelation(relid);
12871287

12881288
RelationDecrementReferenceCount(relation);

‎src/backend/storage/ipc/sinvaladt.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.11 1998/06/27 04:53:36 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.12 1998/07/13 16:34:49 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -85,7 +85,7 @@ SISetActiveProcess(SISeg *segInOutP, BackendId backendId)
8585
int
8686
SIBackendInit(SISeg*segInOutP)
8787
{
88-
LRelIdLtCreateRelId();
88+
LockRelIdLtCreateRelId();
8989
TransactionIdLMITransactionIdCopy();
9090

9191
Assert(MyBackendTag>0);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp