From: Kevin Grittner Date: Fri, 3 Dec 2010 15:01:07 +0000 (-0600) Subject: Merge branch 'master' into serializable X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=58889a667c4bbbe9d529dbdd8516d71bb7a7d31d;p=users%2Fkgrittn%2Fpostgres.git Merge branch 'master' into serializable --- 58889a667c4bbbe9d529dbdd8516d71bb7a7d31d diff --cc src/include/catalog/pg_am.h index 400fce28d7,a729690aff..3cefc42e5f --- a/src/include/catalog/pg_am.h +++ b/src/include/catalog/pg_am.h @@@ -50,14 -50,13 +50,14 @@@ CATALOG(pg_am,2601 bool amsearchnulls; /* can AM search for NULL/NOT NULL entries? */ bool amstorage; /* can storage type differ from column type? */ bool amclusterable; /* does AM support cluster command? */ + bool ampredlocks; /* does AM handle predicate locks? */ Oid amkeytype; /* type of data in index, or InvalidOid */ regproc aminsert; /* "insert this tuple" function */ - regproc ambeginscan; /* "start new scan" function */ + regproc ambeginscan; /* "prepare for index scan" function */ regproc amgettuple; /* "next valid tuple" function, or 0 */ regproc amgetbitmap; /* "fetch all valid tuples" function, or 0 */ - regproc amrescan; /* "restart this scan" function */ - regproc amendscan; /* "end this scan" function */ + regproc amrescan; /* "(re)start index scan" function */ + regproc amendscan; /* "end index scan" function */ regproc ammarkpos; /* "mark current scan position" function */ regproc amrestrpos; /* "restore marked scan position" function */ regproc ambuild; /* "build new index" function */