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

Commit09e1250

Browse files
committed
Fix for vacuum introduced today.
1 parenta4d3695 commit09e1250

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

‎src/backend/commands/vacuum.c

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.73 1998/08/1922:01:18 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.74 1998/08/1923:48:21 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -187,8 +187,11 @@ vc_init()
187187
intfd;
188188

189189
if ((fd=open("pg_vlock",O_CREAT |O_EXCL,0600))<0)
190-
elog(ERROR,"can't create lock file -- another vacuum cleaner running?");
191-
190+
{
191+
elog(ERROR,"Can't create lock file -- another vacuum cleaner running?\n\
192+
\tIf not, you may remove the pg_vlock file in the pgsql/data/base/your_db\n\
193+
\tdirectory");
194+
}
192195
close(fd);
193196

194197
/*
@@ -1443,13 +1446,13 @@ vc_scanoneind(Relation indrel, int num_tuples)
14431446

14441447
getrusage(RUSAGE_SELF,&ru1);
14451448

1446-
elog(MESSAGE_LEVEL,"Ind %s: Pages %u; Tuples %u. Elapsed %u/%u sec.",
1449+
elog(MESSAGE_LEVEL,"Index %s: Pages %u; Tuples %u. Elapsed %u/%u sec.",
14471450
indrel->rd_rel->relname.data,nipages,nitups,
14481451
ru1.ru_stime.tv_sec-ru0.ru_stime.tv_sec,
14491452
ru1.ru_utime.tv_sec-ru0.ru_utime.tv_sec);
14501453

14511454
if (nitups!=num_tuples)
1452-
elog(NOTICE,"Ind %s: NUMBER OF INDEX' TUPLES (%u) IS NOT THE SAME AS HEAP' (%u)",
1455+
elog(NOTICE,"Index %s: NUMBER OF INDEX' TUPLES (%u) IS NOT THE SAME AS HEAP' (%u)",
14531456
indrel->rd_rel->relname.data,nitups,num_tuples);
14541457

14551458
}/* vc_scanoneind */
@@ -1502,7 +1505,7 @@ vc_vaconeind(VPageList vpl, Relation indrel, int num_tuples)
15021505
#endif
15031506
if (vp->vpd_offsets_free==0)
15041507
{/* this is EmptyPage !!! */
1505-
elog(NOTICE,"Ind %s: pointer to EmptyPage (blk %u off %u) - fixing",
1508+
elog(NOTICE,"Index %s: pointer to EmptyPage (blk %u off %u) - fixing",
15061509
indrel->rd_rel->relname.data,
15071510
vp->vpd_blkno,ItemPointerGetOffsetNumber(heapptr));
15081511
}
@@ -1523,13 +1526,13 @@ vc_vaconeind(VPageList vpl, Relation indrel, int num_tuples)
15231526

15241527
getrusage(RUSAGE_SELF,&ru1);
15251528

1526-
elog(MESSAGE_LEVEL,"Ind %s: Pages %u; Tuples %u: Deleted %u. Elapsed %u/%u sec.",
1529+
elog(MESSAGE_LEVEL,"Index %s: Pages %u; Tuples %u: Deleted %u. Elapsed %u/%u sec.",
15271530
indrel->rd_rel->relname.data,num_pages,num_index_tuples,tups_vacuumed,
15281531
ru1.ru_stime.tv_sec-ru0.ru_stime.tv_sec,
15291532
ru1.ru_utime.tv_sec-ru0.ru_utime.tv_sec);
15301533

15311534
if (num_index_tuples!=num_tuples)
1532-
elog(NOTICE,"Ind %s: NUMBER OF INDEX' TUPLES (%u) IS NOT THE SAME AS HEAP' (%u)",
1535+
elog(NOTICE,"Index %s: NUMBER OF INDEX' TUPLES (%u) IS NOT THE SAME AS HEAP' (%u)",
15331536
indrel->rd_rel->relname.data,num_index_tuples,num_tuples);
15341537

15351538
}/* vc_vaconeind */

‎src/bin/initdb/initdb.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#
2727
#
2828
# IDENTIFICATION
29-
# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.47 1998/08/1919:59:45 momjian Exp $
29+
# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.48 1998/08/1923:48:23 momjian Exp $
3030
#
3131
#-------------------------------------------------------------------------
3232

@@ -219,10 +219,10 @@ for PREREQ_FILE in $TEMPLATE $GLOBAL $PG_HBA_SAMPLE; do
219219
fi
220220
done
221221

222-
echo"$CMDNAME: using$TEMPLATE as input to create the template database."
222+
["$debug"-ne 0 ]&&echo"$CMDNAME: using$TEMPLATE as input to create the template database."
223223
if [$template_only-eq 0 ];then
224-
echo"$CMDNAME: using$GLOBAL as input to create the global classes."
225-
echo"$CMDNAME: using$PG_HBA_SAMPLE as the host-based authentication" \
224+
["$debug"-ne 0 ]&&echo"$CMDNAME: using$GLOBAL as input to create the global classes."
225+
["$debug"-ne 0 ]&&echo"$CMDNAME: using$PG_HBA_SAMPLE as the host-based authentication" \
226226
"control file."
227227
echo
228228
fi

0 commit comments

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