mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-08-22 16:03:23 +02:00
Message style improvements
This commit is contained in:
parent
e5f6493e35
commit
d954019f0a
@ -848,12 +848,14 @@ heap_vacuum_rel(Relation rel, VacuumParams *params,
|
|||||||
read_rate, write_rate);
|
read_rate, write_rate);
|
||||||
if (track_io_timing)
|
if (track_io_timing)
|
||||||
{
|
{
|
||||||
appendStringInfoString(&buf, _("I/O Timings:"));
|
appendStringInfoString(&buf, _("I/O timings:"));
|
||||||
if (pgStatBlockReadTime - startreadtime > 0)
|
if (pgStatBlockReadTime - startreadtime > 0)
|
||||||
appendStringInfo(&buf, _(" read=%.3f"),
|
appendStringInfo(&buf, _(" read: %.3f ms"),
|
||||||
(double) (pgStatBlockReadTime - startreadtime) / 1000);
|
(double) (pgStatBlockReadTime - startreadtime) / 1000);
|
||||||
|
if ((pgStatBlockReadTime - startreadtime > 0) && (pgStatBlockWriteTime - startwritetime > 0))
|
||||||
|
appendStringInfoString(&buf, _(","));
|
||||||
if (pgStatBlockWriteTime - startwritetime > 0)
|
if (pgStatBlockWriteTime - startwritetime > 0)
|
||||||
appendStringInfo(&buf, _(" write=%.3f"),
|
appendStringInfo(&buf, _(" write: %.3f ms"),
|
||||||
(double) (pgStatBlockWriteTime - startwritetime) / 1000);
|
(double) (pgStatBlockWriteTime - startwritetime) / 1000);
|
||||||
appendStringInfoChar(&buf, '\n');
|
appendStringInfoChar(&buf, '\n');
|
||||||
}
|
}
|
||||||
@ -1650,7 +1652,7 @@ lazy_scan_heap(LVRelState *vacrel, VacuumParams *params, bool aggressive)
|
|||||||
*/
|
*/
|
||||||
if (vacrel->nindexes == 0 && vacrel->lpdead_item_pages > 0)
|
if (vacrel->nindexes == 0 && vacrel->lpdead_item_pages > 0)
|
||||||
ereport(elevel,
|
ereport(elevel,
|
||||||
(errmsg("\"%s\": removed %lld dead item identifiers in %u pages",
|
(errmsg("table \"%s\": removed %lld dead item identifiers in %u pages",
|
||||||
vacrel->relname, (long long) vacrel->lpdead_items,
|
vacrel->relname, (long long) vacrel->lpdead_items,
|
||||||
vacrel->lpdead_item_pages)));
|
vacrel->lpdead_item_pages)));
|
||||||
|
|
||||||
@ -1673,7 +1675,7 @@ lazy_scan_heap(LVRelState *vacrel, VacuumParams *params, bool aggressive)
|
|||||||
appendStringInfo(&buf, _("%s."), pg_rusage_show(&ru0));
|
appendStringInfo(&buf, _("%s."), pg_rusage_show(&ru0));
|
||||||
|
|
||||||
ereport(elevel,
|
ereport(elevel,
|
||||||
(errmsg("\"%s\": found %lld removable, %lld nonremovable row versions in %u out of %u pages",
|
(errmsg("table \"%s\": found %lld removable, %lld nonremovable row versions in %u out of %u pages",
|
||||||
vacrel->relname,
|
vacrel->relname,
|
||||||
(long long) vacrel->tuples_deleted,
|
(long long) vacrel->tuples_deleted,
|
||||||
(long long) vacrel->num_tuples, vacrel->scanned_pages,
|
(long long) vacrel->num_tuples, vacrel->scanned_pages,
|
||||||
@ -2177,7 +2179,7 @@ lazy_vacuum(LVRelState *vacrel)
|
|||||||
*/
|
*/
|
||||||
vacrel->do_index_vacuuming = false;
|
vacrel->do_index_vacuuming = false;
|
||||||
ereport(elevel,
|
ereport(elevel,
|
||||||
(errmsg("\"%s\": index scan bypassed: %u pages from table (%.2f%% of total) have %lld dead item identifiers",
|
(errmsg("table \"%s\": index scan bypassed: %u pages from table (%.2f%% of total) have %lld dead item identifiers",
|
||||||
vacrel->relname, vacrel->lpdead_item_pages,
|
vacrel->relname, vacrel->lpdead_item_pages,
|
||||||
100.0 * vacrel->lpdead_item_pages / vacrel->rel_pages,
|
100.0 * vacrel->lpdead_item_pages / vacrel->rel_pages,
|
||||||
(long long) vacrel->lpdead_items)));
|
(long long) vacrel->lpdead_items)));
|
||||||
@ -2388,8 +2390,8 @@ lazy_vacuum_heap_rel(LVRelState *vacrel)
|
|||||||
vacuumed_pages == vacrel->lpdead_item_pages));
|
vacuumed_pages == vacrel->lpdead_item_pages));
|
||||||
|
|
||||||
ereport(elevel,
|
ereport(elevel,
|
||||||
(errmsg("\"%s\": removed %d dead item identifiers in %u pages",
|
(errmsg("table \"%s\": removed %lld dead item identifiers in %u pages",
|
||||||
vacrel->relname, tupindex, vacuumed_pages),
|
vacrel->relname, (long long ) tupindex, vacuumed_pages),
|
||||||
errdetail_internal("%s", pg_rusage_show(&ru0))));
|
errdetail_internal("%s", pg_rusage_show(&ru0))));
|
||||||
|
|
||||||
/* Revert to the previous phase information for error traceback */
|
/* Revert to the previous phase information for error traceback */
|
||||||
@ -2625,7 +2627,7 @@ lazy_check_wraparound_failsafe(LVRelState *vacrel)
|
|||||||
vacrel->relnamespace,
|
vacrel->relnamespace,
|
||||||
vacrel->relname,
|
vacrel->relname,
|
||||||
vacrel->num_index_scans),
|
vacrel->num_index_scans),
|
||||||
errdetail("table's relfrozenxid or relminmxid is too far in the past"),
|
errdetail("The table's relfrozenxid or relminmxid is too far in the past."),
|
||||||
errhint("Consider increasing configuration parameter \"maintenance_work_mem\" or \"autovacuum_work_mem\".\n"
|
errhint("Consider increasing configuration parameter \"maintenance_work_mem\" or \"autovacuum_work_mem\".\n"
|
||||||
"You might also need to consider other ways for VACUUM to keep up with the allocation of transaction IDs.")));
|
"You might also need to consider other ways for VACUUM to keep up with the allocation of transaction IDs.")));
|
||||||
|
|
||||||
@ -4261,7 +4263,7 @@ vacuum_error_callback(void *arg)
|
|||||||
if (BlockNumberIsValid(errinfo->blkno))
|
if (BlockNumberIsValid(errinfo->blkno))
|
||||||
{
|
{
|
||||||
if (OffsetNumberIsValid(errinfo->offnum))
|
if (OffsetNumberIsValid(errinfo->offnum))
|
||||||
errcontext("while scanning block %u and offset %u of relation \"%s.%s\"",
|
errcontext("while scanning block %u offset %u of relation \"%s.%s\"",
|
||||||
errinfo->blkno, errinfo->offnum, errinfo->relnamespace, errinfo->relname);
|
errinfo->blkno, errinfo->offnum, errinfo->relnamespace, errinfo->relname);
|
||||||
else
|
else
|
||||||
errcontext("while scanning block %u of relation \"%s.%s\"",
|
errcontext("while scanning block %u of relation \"%s.%s\"",
|
||||||
@ -4276,7 +4278,7 @@ vacuum_error_callback(void *arg)
|
|||||||
if (BlockNumberIsValid(errinfo->blkno))
|
if (BlockNumberIsValid(errinfo->blkno))
|
||||||
{
|
{
|
||||||
if (OffsetNumberIsValid(errinfo->offnum))
|
if (OffsetNumberIsValid(errinfo->offnum))
|
||||||
errcontext("while vacuuming block %u and offset %u of relation \"%s.%s\"",
|
errcontext("while vacuuming block %u offset %u of relation \"%s.%s\"",
|
||||||
errinfo->blkno, errinfo->offnum, errinfo->relnamespace, errinfo->relname);
|
errinfo->blkno, errinfo->offnum, errinfo->relnamespace, errinfo->relname);
|
||||||
else
|
else
|
||||||
errcontext("while vacuuming block %u of relation \"%s.%s\"",
|
errcontext("while vacuuming block %u of relation \"%s.%s\"",
|
||||||
|
@ -778,7 +778,7 @@ do_analyze_rel(Relation onerel, VacuumParams *params,
|
|||||||
* reads which are also picked up by track_io_timing, if enabled,
|
* reads which are also picked up by track_io_timing, if enabled,
|
||||||
* the 'average write rate' is actually talking about the rate of
|
* the 'average write rate' is actually talking about the rate of
|
||||||
* pages being dirtied, not being written out, so it's typical to
|
* pages being dirtied, not being written out, so it's typical to
|
||||||
* have a non-zero 'avg write rate' while I/O Timings only reports
|
* have a non-zero 'avg write rate' while I/O timings only reports
|
||||||
* reads.
|
* reads.
|
||||||
*
|
*
|
||||||
* It's not clear that an ANALYZE will ever result in
|
* It's not clear that an ANALYZE will ever result in
|
||||||
@ -813,12 +813,14 @@ do_analyze_rel(Relation onerel, VacuumParams *params,
|
|||||||
read_rate, write_rate);
|
read_rate, write_rate);
|
||||||
if (track_io_timing)
|
if (track_io_timing)
|
||||||
{
|
{
|
||||||
appendStringInfoString(&buf, _("I/O Timings:"));
|
appendStringInfoString(&buf, _("I/O timings:"));
|
||||||
if (pgStatBlockReadTime - startreadtime > 0)
|
if (pgStatBlockReadTime - startreadtime > 0)
|
||||||
appendStringInfo(&buf, _(" read=%.3f"),
|
appendStringInfo(&buf, _(" read: %.3f ms"),
|
||||||
(double) (pgStatBlockReadTime - startreadtime) / 1000);
|
(double) (pgStatBlockReadTime - startreadtime) / 1000);
|
||||||
|
if ((pgStatBlockReadTime - startreadtime > 0) && (pgStatBlockWriteTime - startwritetime > 0))
|
||||||
|
appendStringInfoString(&buf, _(","));
|
||||||
if (pgStatBlockWriteTime - startwritetime > 0)
|
if (pgStatBlockWriteTime - startwritetime > 0)
|
||||||
appendStringInfo(&buf, _(" write=%.3f"),
|
appendStringInfo(&buf, _(" write: %.3f ms"),
|
||||||
(double) (pgStatBlockWriteTime - startwritetime) / 1000);
|
(double) (pgStatBlockWriteTime - startwritetime) / 1000);
|
||||||
appendStringInfoChar(&buf, '\n');
|
appendStringInfoChar(&buf, '\n');
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user