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

Commit147ccf5

Browse files
committed
More vacuum cleanups
1 parentf365065 commit147ccf5

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

‎src/backend/commands/vacuum.c‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.150 2000/05/29 01:46:00 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.151 2000/05/29 01:55:07 momjian Exp $
1212
*
1313
1414
*-------------------------------------------------------------------------
@@ -94,12 +94,12 @@ static void get_indices(Oid relid, int *nindices, Relation **Irel);
9494
staticvoidclose_indices(intnindices,Relation*Irel);
9595
staticvoidget_index_desc(Relationonerel,intnindices,Relation*Irel,IndDesc**Idesc);
9696
staticvoid*vac_find_eq(void*bot,intnelem,intsize,void*elm,
97-
int (*compar) (constvoid*,constvoid*));
97+
int (*compar) (constvoid*,constvoid*));
9898
staticintvac_cmp_blk(constvoid*left,constvoid*right);
9999
staticintvac_cmp_offno(constvoid*left,constvoid*right);
100100
staticintvac_cmp_vtlinks(constvoid*left,constvoid*right);
101-
staticboolvac_enough_space(VPageDescrvpd,Sizelen);
102-
staticchar*vac_show_rusage(structrusage*ru0);
101+
staticboolenough_space(VPageDescrvpd,Sizelen);
102+
staticchar*show_rusage(structrusage*ru0);
103103

104104

105105
/*
@@ -1044,7 +1044,7 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
10441044
for (i=0;i<nusf;i++)
10451045
{
10461046
vp=vacuum_pages->vpl_pagedesc[i];
1047-
if (vac_enough_space(vp,min_tlen))
1047+
if (enough_space(vp,min_tlen))
10481048
{
10491049
vpage_insert(fraged_pages,vp);
10501050
usable_free_size+=vp->vpd_free;
@@ -1074,7 +1074,7 @@ Re-using: Free/Avail. Space %u/%u; EndEmpty/Avail. Pages %u/%u. %s",
10741074
nkeep,vacrelstats->num_vtlinks,ncrash,
10751075
nunused,min_tlen,max_tlen,free_size,usable_free_size,
10761076
empty_end_pages,fraged_pages->vpl_num_pages,
1077-
vac_show_rusage(&ru0));
1077+
show_rusage(&ru0));
10781078

10791079
}
10801080

@@ -1361,15 +1361,15 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
13611361
for (;;)
13621362
{
13631363
if (to_vpd==NULL||
1364-
!vac_enough_space(to_vpd,tlen))
1364+
!enough_space(to_vpd,tlen))
13651365
{
13661366

13671367
/*
13681368
* if to_vpd no longer has enough free space to be
13691369
* useful, remove it from fraged_pages list
13701370
*/
13711371
if (to_vpd!=NULL&&
1372-
!vac_enough_space(to_vpd,vacrelstats->min_tlen))
1372+
!enough_space(to_vpd,vacrelstats->min_tlen))
13731373
{
13741374
Assert(num_fraged_pages>to_item);
13751375
memmove(fraged_pages->vpl_pagedesc+to_item,
@@ -1379,7 +1379,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
13791379
}
13801380
for (i=0;i<num_fraged_pages;i++)
13811381
{
1382-
if (vac_enough_space(fraged_pages->vpl_pagedesc[i],tlen))
1382+
if (enough_space(fraged_pages->vpl_pagedesc[i],tlen))
13831383
break;
13841384
}
13851385

@@ -1650,7 +1650,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
16501650

16511651
/* try to find new page for this tuple */
16521652
if (cur_buffer==InvalidBuffer||
1653-
!vac_enough_space(cur_page,tuple_len))
1653+
!enough_space(cur_page,tuple_len))
16541654
{
16551655
if (cur_buffer!=InvalidBuffer)
16561656
{
@@ -1661,7 +1661,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
16611661
* If previous target page is now too full to add *any*
16621662
* tuple to it, remove it from fraged_pages.
16631663
*/
1664-
if (!vac_enough_space(cur_page,vacrelstats->min_tlen))
1664+
if (!enough_space(cur_page,vacrelstats->min_tlen))
16651665
{
16661666
Assert(num_fraged_pages>cur_item);
16671667
memmove(fraged_pages->vpl_pagedesc+cur_item,
@@ -1672,7 +1672,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
16721672
}
16731673
for (i=0;i<num_fraged_pages;i++)
16741674
{
1675-
if (vac_enough_space(fraged_pages->vpl_pagedesc[i],tuple_len))
1675+
if (enough_space(fraged_pages->vpl_pagedesc[i],tuple_len))
16761676
break;
16771677
}
16781678
if (i==num_fraged_pages)
@@ -1901,7 +1901,7 @@ failed to add item with len = %u to page %u (free space %u, nusd %u, noff %u)",
19011901
elog(MESSAGE_LEVEL,"Rel %s: Pages: %u --> %u; Tuple(s) moved: %u. %s",
19021902
RelationGetRelationName(onerel),
19031903
nblocks,blkno,num_moved,
1904-
vac_show_rusage(&ru0));
1904+
show_rusage(&ru0));
19051905

19061906
if (Nvpl.vpl_num_pages>0)
19071907
{
@@ -2110,7 +2110,7 @@ scan_index(Relation indrel, int num_tuples)
21102110

21112111
elog(MESSAGE_LEVEL,"Index %s: Pages %u; Tuples %u. %s",
21122112
RelationGetRelationName(indrel),nipages,nitups,
2113-
vac_show_rusage(&ru0));
2113+
show_rusage(&ru0));
21142114

21152115
if (nitups!=num_tuples)
21162116
elog(NOTICE,"Index %s: NUMBER OF INDEX' TUPLES (%u) IS NOT THE SAME AS HEAP' (%u).\
@@ -2188,7 +2188,7 @@ vacuum_index(VPageList vpl, Relation indrel, int num_tuples, int keep_tuples)
21882188
elog(MESSAGE_LEVEL,"Index %s: Pages %u; Tuples %u: Deleted %u. %s",
21892189
RelationGetRelationName(indrel),num_pages,
21902190
num_index_tuples-keep_tuples,tups_vacuumed,
2191-
vac_show_rusage(&ru0));
2191+
show_rusage(&ru0));
21922192

21932193
if (num_index_tuples!=num_tuples+keep_tuples)
21942194
elog(NOTICE,"Index %s: NUMBER OF INDEX' TUPLES (%u) IS NOT THE SAME AS HEAP' (%u).\
@@ -3002,7 +3002,7 @@ get_index_desc(Relation onerel, int nindices, Relation *Irel, IndDesc **Idesc)
30023002

30033003

30043004
staticbool
3005-
vac_enough_space(VPageDescrvpd,Sizelen)
3005+
enough_space(VPageDescrvpd,Sizelen)
30063006
{
30073007

30083008
len=MAXALIGN(len);
@@ -3030,7 +3030,7 @@ vac_enough_space(VPageDescr vpd, Size len)
30303030
* threadable...
30313031
*/
30323032
staticchar*
3033-
vac_show_rusage(structrusage*ru0)
3033+
show_rusage(structrusage*ru0)
30343034
{
30353035
staticcharresult[64];
30363036
structrusageru1;

0 commit comments

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