diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/access/gin/ginfast.c | 9 | ||||
| -rw-r--r-- | src/backend/access/gin/gininsert.c | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/backend/access/gin/ginfast.c b/src/backend/access/gin/ginfast.c index d8624237ec1..f474ad6598e 100644 --- a/src/backend/access/gin/ginfast.c +++ b/src/backend/access/gin/ginfast.c @@ -11,7 +11,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gin/ginfast.c,v 1.1 2009/03/24 20:17:10 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/access/gin/ginfast.c,v 1.2 2009/03/24 22:06:03 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -749,9 +749,10 @@ ginInsertCleanup(Relation index, GinState *ginstate, * XXX using up maintenance_work_mem here is probably unreasonably * much, since vacuum might already be using that much. */ - if ( GinPageGetOpaque(page)->rightlink == InvalidBlockNumber || - ( GinPageHasFullRow(page) && - accum.allocatedMemory > maintenance_work_mem * 1024L ) ) + if (GinPageGetOpaque(page)->rightlink == InvalidBlockNumber || + (GinPageHasFullRow(page) && + (accum.allocatedMemory >= maintenance_work_mem * 1024L || + accum.maxdepth > GIN_MAX_TREE_DEPTH))) { ItemPointerData *list; uint32 nlist; diff --git a/src/backend/access/gin/gininsert.c b/src/backend/access/gin/gininsert.c index d05882cdb94..f6a348eb85d 100644 --- a/src/backend/access/gin/gininsert.c +++ b/src/backend/access/gin/gininsert.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gin/gininsert.c,v 1.19 2009/03/24 20:17:11 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/access/gin/gininsert.c,v 1.20 2009/03/24 22:06:03 tgl Exp $ *------------------------------------------------------------------------- */ @@ -245,7 +245,9 @@ ginBuildCallback(Relation index, HeapTuple htup, Datum *values, &htup->t_self); /* If we've maxed out our available memory, dump everything to the index */ - if (buildstate->accum.allocatedMemory >= maintenance_work_mem * 1024L) + /* Also dump if the tree seems to be getting too unbalanced */ + if (buildstate->accum.allocatedMemory >= maintenance_work_mem * 1024L || + buildstate->accum.maxdepth > GIN_MAX_TREE_DEPTH) { ItemPointerData *list; Datum entry; |