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

Commitce04221

Browse files
committed
Stylistic changes in bufmgr.c
Basically replaces (*a).b with a->b as it is everywhere else inPostgres.Manfred Koizar
1 parent5e926cb commitce04221

File tree

1 file changed

+29
-28
lines changed

1 file changed

+29
-28
lines changed

‎src/backend/storage/page/bufpage.c

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/storage/page/bufpage.c,v 1.57 2003/11/29 19:51:57 pgsql Exp $
11+
* $PostgreSQL: pgsql/src/backend/storage/page/bufpage.c,v 1.58 2004/06/08 14:00:35 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -151,8 +151,8 @@ PageAddItem(Page page,
151151
if (offsetNumber<limit)
152152
{
153153
itemId=PageGetItemId(phdr,offsetNumber);
154-
if (((*itemId).lp_flags&LP_USED)||
155-
((*itemId).lp_len!=0))
154+
if ((itemId->lp_flags&LP_USED)||
155+
(itemId->lp_len!=0))
156156
{
157157
elog(WARNING,"will not overwrite a used ItemId");
158158
returnInvalidOffsetNumber;
@@ -172,8 +172,8 @@ PageAddItem(Page page,
172172
for (offsetNumber=1;offsetNumber<limit;offsetNumber++)
173173
{
174174
itemId=PageGetItemId(phdr,offsetNumber);
175-
if ((((*itemId).lp_flags&LP_USED)==0)&&
176-
((*itemId).lp_len==0))
175+
if (((itemId->lp_flags&LP_USED)==0)&&
176+
(itemId->lp_len==0))
177177
break;
178178
}
179179
/* if no free slot, we'll put it at limit (1st open slot) */
@@ -214,9 +214,9 @@ PageAddItem(Page page,
214214
(limit-offsetNumber)*sizeof(ItemIdData));
215215

216216
/* set the item pointer */
217-
(*itemId).lp_off=upper;
218-
(*itemId).lp_len=size;
219-
(*itemId).lp_flags=flags;
217+
itemId->lp_off=upper;
218+
itemId->lp_len=size;
219+
itemId->lp_flags=flags;
220220

221221
/* copy the item's data onto the page */
222222
memcpy((char*)page+upper,item,size);
@@ -278,19 +278,20 @@ PageRestoreTempPage(Page tempPage, Page oldPage)
278278
/*
279279
* sorting support for PageRepairFragmentation
280280
*/
281-
structitemIdSortData
281+
typedefstructitemIdSortData
282282
{
283283
intoffsetindex;/* linp array index */
284284
intitemoff;/* page offset of item data */
285285
Sizealignedlen;/* MAXALIGN(item data len) */
286-
};
286+
}itemIdSortData;
287+
typedefitemIdSortData*itemIdSort;
287288

288289
staticint
289290
itemoffcompare(constvoid*itemidp1,constvoid*itemidp2)
290291
{
291292
/* Sort in decreasing itemoff order */
292-
return ((structitemIdSortData*)itemidp2)->itemoff-
293-
((structitemIdSortData*)itemidp1)->itemoff;
293+
return ((itemIdSort)itemidp2)->itemoff-
294+
((itemIdSort)itemidp1)->itemoff;
294295
}
295296

296297
/*
@@ -309,8 +310,8 @@ PageRepairFragmentation(Page page, OffsetNumber *unused)
309310
Offsetpd_lower= ((PageHeader)page)->pd_lower;
310311
Offsetpd_upper= ((PageHeader)page)->pd_upper;
311312
Offsetpd_special= ((PageHeader)page)->pd_special;
312-
structitemIdSortData*itemidbase,
313-
*itemidptr;
313+
itemIdSortitemidbase,
314+
itemidptr;
314315
ItemIdlp;
315316
intnline,
316317
nused;
@@ -340,9 +341,9 @@ PageRepairFragmentation(Page page, OffsetNumber *unused)
340341
for (i=0;i<nline;i++)
341342
{
342343
lp=PageGetItemId(page,i+1);
343-
if ((*lp).lp_flags&LP_DELETE)/* marked for deletion */
344-
(*lp).lp_flags &= ~(LP_USED |LP_DELETE);
345-
if ((*lp).lp_flags&LP_USED)
344+
if (lp->lp_flags&LP_DELETE)/* marked for deletion */
345+
lp->lp_flags &= ~(LP_USED |LP_DELETE);
346+
if (lp->lp_flags&LP_USED)
346347
nused++;
347348
elseif (unused)
348349
unused[i-nused]= (OffsetNumber)i;
@@ -354,37 +355,36 @@ PageRepairFragmentation(Page page, OffsetNumber *unused)
354355
for (i=0;i<nline;i++)
355356
{
356357
lp=PageGetItemId(page,i+1);
357-
(*lp).lp_len=0;/* indicate unused & deallocated */
358+
lp->lp_len=0;/* indicate unused & deallocated */
358359
}
359360
((PageHeader)page)->pd_upper=pd_special;
360361
}
361362
else
362363
{/* nused != 0 */
363364
/* Need to compact the page the hard way */
364-
itemidbase= (structitemIdSortData*)
365-
palloc(sizeof(structitemIdSortData)*nused);
365+
itemidbase= (itemIdSort)palloc(sizeof(itemIdSortData)*nused);
366366
itemidptr=itemidbase;
367367
totallen=0;
368368
for (i=0;i<nline;i++)
369369
{
370370
lp=PageGetItemId(page,i+1);
371-
if ((*lp).lp_flags&LP_USED)
371+
if (lp->lp_flags&LP_USED)
372372
{
373373
itemidptr->offsetindex=i;
374-
itemidptr->itemoff=(*lp).lp_off;
374+
itemidptr->itemoff=lp->lp_off;
375375
if (itemidptr->itemoff< (int)pd_upper||
376376
itemidptr->itemoff >= (int)pd_special)
377377
ereport(ERROR,
378378
(errcode(ERRCODE_DATA_CORRUPTED),
379379
errmsg("corrupted item pointer: %u",
380380
itemidptr->itemoff)));
381-
itemidptr->alignedlen=MAXALIGN((*lp).lp_len);
381+
itemidptr->alignedlen=MAXALIGN(lp->lp_len);
382382
totallen+=itemidptr->alignedlen;
383383
itemidptr++;
384384
}
385385
else
386386
{
387-
(*lp).lp_len=0;/* indicate unused & deallocated */
387+
lp->lp_len=0;/* indicate unused & deallocated */
388388
}
389389
}
390390

@@ -395,7 +395,7 @@ PageRepairFragmentation(Page page, OffsetNumber *unused)
395395
(unsignedint)totallen,pd_special-pd_lower)));
396396

397397
/* sort itemIdSortData array into decreasing itemoff order */
398-
qsort((char*)itemidbase,nused,sizeof(structitemIdSortData),
398+
qsort((char*)itemidbase,nused,sizeof(itemIdSortData),
399399
itemoffcompare);
400400

401401
/* compactify page */
@@ -408,7 +408,7 @@ PageRepairFragmentation(Page page, OffsetNumber *unused)
408408
memmove((char*)page+upper,
409409
(char*)page+itemidptr->itemoff,
410410
itemidptr->alignedlen);
411-
(*lp).lp_off=upper;
411+
lp->lp_off=upper;
412412
}
413413

414414
((PageHeader)page)->pd_upper=upper;
@@ -538,8 +538,9 @@ PageIndexTupleDelete(Page page, OffsetNumber offnum)
538538
nline--;/* there's one less than when we started */
539539
for (i=1;i <=nline;i++)
540540
{
541-
if (PageGetItemId(phdr,i)->lp_off <=offset)
542-
PageGetItemId(phdr,i)->lp_off+=size;
541+
ItemIdii=PageGetItemId(phdr,i);
542+
if (ii->lp_off <=offset)
543+
ii->lp_off+=size;
543544
}
544545
}
545546
}

0 commit comments

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