mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-27 08:39:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Actually there's a better way to do this, which is to count tuples

Browse Source 
during the vacuumcleanup scan that we're going to do anyway.  Should
save a few cycles (one calculation per page, not per tuple) as well
as not having to depend on assumptions about heap and index being
in step.
I think this could probably be made to work for GIST too, but that
code looks messy enough that I'm disinclined to try right now.
This commit is contained in:
Tom Lane 2006-02-12 00:18:17 +00:00
parent fd267c1ebc
commit d52a57fc30
1 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/backend/access/nbtree/nbtree.c
View File

@ -12,7 +12,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/access/nbtree/nbtree.c,v 1.139 2006/02/11 23:31:33 tgl Exp $ * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtree.c,v 1.140 2006/02/12 00:18:17 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -539,16 +539,12 @@ btbulkdelete(PG_FUNCTION_ARGS)
IndexBulkDeleteCallback callback = (IndexBulkDeleteCallback) PG_GETARG_POINTER(1); IndexBulkDeleteCallback callback = (IndexBulkDeleteCallback) PG_GETARG_POINTER(1);
void *callback_state = (void *) PG_GETARG_POINTER(2); void *callback_state = (void *) PG_GETARG_POINTER(2);
IndexBulkDeleteResult *result; IndexBulkDeleteResult *result;
double tuples_removed; double tuples_removed = 0;
double num_index_tuples;
OffsetNumber deletable[MaxOffsetNumber]; OffsetNumber deletable[MaxOffsetNumber];
int ndeletable; int ndeletable;
Buffer buf; Buffer buf;
BlockNumber num_pages; BlockNumber num_pages;
tuples_removed = 0;
num_index_tuples = 0;
/* /*
* The outer loop iterates over index leaf pages, the inner over items on * The outer loop iterates over index leaf pages, the inner over items on
* a leaf page. We issue just one _bt_delitems() call per page, so as to * a leaf page. We issue just one _bt_delitems() call per page, so as to
@ -566,19 +562,12 @@ btbulkdelete(PG_FUNCTION_ARGS)
* could be stopped on those. * could be stopped on those.
* *
* We can skip the scan entirely if there's nothing to delete (indicated * We can skip the scan entirely if there's nothing to delete (indicated
* by callback_state == NULL) and the index isn't partial. For a partial * by callback_state == NULL).
* index we must scan in order to derive a trustworthy tuple count.
*/ */
if (callback_state || vac_is_partial_index(rel)) if (callback_state)
{
buf = _bt_get_endpoint(rel, 0, false); buf = _bt_get_endpoint(rel, 0, false);
}
else else
{
/* skip scan and set flag for btvacuumcleanup */
buf = InvalidBuffer; buf = InvalidBuffer;
num_index_tuples = -1;
}
if (BufferIsValid(buf)) /* check for empty index */ if (BufferIsValid(buf)) /* check for empty index */
{ {
@ -634,8 +623,6 @@ btbulkdelete(PG_FUNCTION_ARGS)
deletable[ndeletable++] = offnum; deletable[ndeletable++] = offnum;
tuples_removed += 1; tuples_removed += 1;
} }
else
num_index_tuples += 1;
} }
} }
@ -663,7 +650,7 @@ btbulkdelete(PG_FUNCTION_ARGS)
result = (IndexBulkDeleteResult *) palloc0(sizeof(IndexBulkDeleteResult)); result = (IndexBulkDeleteResult *) palloc0(sizeof(IndexBulkDeleteResult));
result->num_pages = num_pages; result->num_pages = num_pages;
result->num_index_tuples = num_index_tuples; /* btvacuumcleanup will fill in num_index_tuples */
result->tuples_removed = tuples_removed; result->tuples_removed = tuples_removed;
PG_RETURN_POINTER(result); PG_RETURN_POINTER(result);
@ -687,6 +674,7 @@ btvacuumcleanup(PG_FUNCTION_ARGS)
BlockNumber *freePages; BlockNumber *freePages;
int nFreePages, int nFreePages,
maxFreePages; maxFreePages;
double num_index_tuples = 0;
BlockNumber pages_deleted = 0; BlockNumber pages_deleted = 0;
MemoryContext mycontext; MemoryContext mycontext;
MemoryContext oldcontext; MemoryContext oldcontext;
@ -801,6 +789,12 @@ btvacuumcleanup(PG_FUNCTION_ARGS)
MemoryContextSwitchTo(oldcontext); MemoryContextSwitchTo(oldcontext);
continue; /* pagedel released buffer */ continue; /* pagedel released buffer */
} }
else if (P_ISLEAF(opaque))
{
/* Count the index entries of live leaf pages */
num_index_tuples += PageGetMaxOffsetNumber(page) + 1 -
P_FIRSTDATAKEY(opaque);
}
_bt_relbuf(rel, buf); _bt_relbuf(rel, buf);
} }
@ -847,16 +841,10 @@ btvacuumcleanup(PG_FUNCTION_ARGS)
/* update statistics */ /* update statistics */
stats->num_pages = num_pages; stats->num_pages = num_pages;
stats->num_index_tuples = num_index_tuples;
stats->pages_deleted = pages_deleted; stats->pages_deleted = pages_deleted;
stats->pages_free = nFreePages; stats->pages_free = nFreePages;
/* if btbulkdelete skipped the scan, use heap's tuple count */
if (stats->num_index_tuples < 0)
{
Assert(info->num_heap_tuples >= 0);
stats->num_index_tuples = info->num_heap_tuples;
}
PG_RETURN_POINTER(stats); PG_RETURN_POINTER(stats);
} }