diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml new file mode 100644 index 0af01d9..659faf8 *** a/doc/src/sgml/func.sgml --- b/doc/src/sgml/func.sgml *************** postgres=# SELECT * FROM pg_xlogfile_nam *** 17967,17972 **** --- 17967,17976 ---- brin_summarize_new_values + + gin_clean_pending_list + + shows the functions available for index maintenance tasks. *************** postgres=# SELECT * FROM pg_xlogfile_nam *** 17987,17992 **** --- 17991,18003 ---- integer summarize page ranges not already summarized + + + gin_clean_pending_list(index_oid regclass) + + bigint + move fast-update pending list entries into main index structure + *************** postgres=# SELECT * FROM pg_xlogfile_nam *** 18000,18005 **** --- 18011,18023 ---- into the index. + + gin_clean_pending_list accepts a GIN index OID argument + and moves the fast-update entries from the pending list into the + main index structure for that index. It returns the number of pages + removed from the pending list. + + diff --git a/doc/src/sgml/gin.sgml b/doc/src/sgml/gin.sgml new file mode 100644 index 262f1e4..5c59f2b *** a/doc/src/sgml/gin.sgml --- b/doc/src/sgml/gin.sgml *************** *** 728,734 **** from the indexed item). As of PostgreSQL 8.4, GIN is capable of postponing much of this work by inserting new tuples into a temporary, unsorted list of pending entries. ! When the table is vacuumed, or if the pending list becomes larger than , the entries are moved to the main GIN data structure using the same bulk insert techniques used during initial index creation. This greatly improves --- 728,736 ---- from the indexed item). As of PostgreSQL 8.4, GIN is capable of postponing much of this work by inserting new tuples into a temporary, unsorted list of pending entries. ! When the table is vacuumed or autoanalyzed, or when ! gin_clean_pending_list(regclass) is called, or if the ! pending list becomes larger than , the entries are moved to the main GIN data structure using the same bulk insert techniques used during initial index creation. This greatly improves diff --git a/src/backend/access/gin/ginfast.c b/src/backend/access/gin/ginfast.c new file mode 100644 index 88e3621..3d10278 *** a/src/backend/access/gin/ginfast.c --- b/src/backend/access/gin/ginfast.c *************** *** 24,29 **** --- 24,30 ---- #include "miscadmin.h" #include "utils/memutils.h" #include "utils/rel.h" + #include "utils/acl.h" #include "storage/indexfsm.h" /* GUC parameter */ *************** ginInsertCleanup(GinState *ginstate, *** 962,964 **** --- 963,999 ---- MemoryContextSwitchTo(oldCtx); MemoryContextDelete(opCtx); } + + /* + * SQL-callable function to clean the insert pending list + */ + Datum + gin_clean_pending_list(PG_FUNCTION_ARGS) + { + Oid indexoid = PG_GETARG_OID(0); + Relation indexRel = index_open(indexoid, AccessShareLock); + IndexBulkDeleteResult stats; + GinState ginstate; + + /* Must be a GIN index */ + if (indexRel->rd_rel->relkind != RELKIND_INDEX || + indexRel->rd_rel->relam != GIN_AM_OID) + ereport(ERROR, + (errcode(ERRCODE_WRONG_OBJECT_TYPE), + errmsg("\"%s\" is not a GIN index", + RelationGetRelationName(indexRel)))); + + /* User must own the index (comparable to privileges needed for VACUUM) */ + if (!pg_class_ownercheck(indexoid, GetUserId())) + aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS, + RelationGetRelationName(indexRel)); + + + memset(&stats, 0, sizeof(stats)); + initGinState(&ginstate, indexRel); + ginInsertCleanup(&ginstate, false, true, &stats); + + index_close(indexRel, AccessShareLock); + + PG_RETURN_INT64((int64) stats.pages_deleted); + } diff --git a/src/include/access/gin_private.h b/src/include/access/gin_private.h new file mode 100644 index 2ba8a21..8556b76 *** a/src/include/access/gin_private.h --- b/src/include/access/gin_private.h *************** extern void ginFreeScanKeys(GinScanOpaqu *** 878,883 **** --- 878,886 ---- /* ginget.c */ extern Datum gingetbitmap(PG_FUNCTION_ARGS); + /* ginfast.c */ + extern Datum gin_clean_pending_list(PG_FUNCTION_ARGS); + /* ginlogic.c */ extern void ginInitConsistentFunction(GinState *ginstate, GinScanKey key); diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h new file mode 100644 index f58672e..5e8f7b6 *** a/src/include/catalog/pg_proc.h --- b/src/include/catalog/pg_proc.h *************** DATA(insert OID = 3087 ( gin_extract_ts *** 4622,4627 **** --- 4622,4629 ---- DESCR("GIN tsvector support (obsolete)"); DATA(insert OID = 3088 ( gin_tsquery_consistent PGNSP PGUID 12 1 0 0 0 f f f f t f i s 6 0 16 "2281 21 3615 23 2281 2281" _null_ _null_ _null_ _null_ _null_ gin_tsquery_consistent_6args _null_ _null_ _null_ )); DESCR("GIN tsvector support (obsolete)"); + DATA(insert OID = 13952 ( gin_clean_pending_list PGNSP PGUID 12 1 0 0 0 f f f f t f v s 1 0 20 "2205" _null_ _null_ _null_ _null_ _null_ gin_clean_pending_list _null_ _null_ _null_ )); + DESCR("GIN: clean the fastupdate pending list"); DATA(insert OID = 3662 ( tsquery_lt PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 16 "3615 3615" _null_ _null_ _null_ _null_ _null_ tsquery_lt _null_ _null_ _null_ )); DATA(insert OID = 3663 ( tsquery_le PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 16 "3615 3615" _null_ _null_ _null_ _null_ _null_ tsquery_le _null_ _null_ _null_ )); diff --git a/src/test/regress/expected/gin.out b/src/test/regress/expected/gin.out new file mode 100644 index c015fe7..cc7601c *** a/src/test/regress/expected/gin.out --- b/src/test/regress/expected/gin.out *************** create table gin_test_tbl(i int4[]); *** 8,14 **** --- 8,27 ---- create index gin_test_idx on gin_test_tbl using gin (i) with (fastupdate = on); insert into gin_test_tbl select array[1, 2, g] from generate_series(1, 20000) g; insert into gin_test_tbl select array[1, 3, g] from generate_series(1, 1000) g; + select gin_clean_pending_list('gin_test_idx')>10 as many; -- flush the fastupdate buffers + many + ------ + t + (1 row) + + insert into gin_test_tbl select array[3, 1, g] from generate_series(1, 1000) g; vacuum gin_test_tbl; -- flush the fastupdate buffers + select gin_clean_pending_list('gin_test_idx'); -- nothing to flush + gin_clean_pending_list + ------------------------ + 0 + (1 row) + -- Test vacuuming delete from gin_test_tbl where i @> array[2]; vacuum gin_test_tbl; diff --git a/src/test/regress/sql/gin.sql b/src/test/regress/sql/gin.sql new file mode 100644 index 4b35560..31890b4 *** a/src/test/regress/sql/gin.sql --- b/src/test/regress/sql/gin.sql *************** create index gin_test_idx on gin_test_tb *** 10,17 **** --- 10,23 ---- insert into gin_test_tbl select array[1, 2, g] from generate_series(1, 20000) g; insert into gin_test_tbl select array[1, 3, g] from generate_series(1, 1000) g; + select gin_clean_pending_list('gin_test_idx')>10 as many; -- flush the fastupdate buffers + + insert into gin_test_tbl select array[3, 1, g] from generate_series(1, 1000) g; + vacuum gin_test_tbl; -- flush the fastupdate buffers + select gin_clean_pending_list('gin_test_idx'); -- nothing to flush + -- Test vacuuming delete from gin_test_tbl where i @> array[2]; vacuum gin_test_tbl;