]> granicus.if.org Git - postgresql/blobdiff - src/backend/utils/cache/lsyscache.c
Create the planner mechanism for optimizing simple MIN and MAX queries
[postgresql] / src / backend / utils / cache / lsyscache.c
index 3247c0aa8f6416d2b39b2b6312442e563eaaa49a..2c4d20576a5552da22c9e6912c261d646a711798 100644 (file)
@@ -3,29 +3,36 @@
  * lsyscache.c
  *       Convenience routines for common queries in the system catalog cache.
  *
- * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.61 2002/03/06 20:34:54 momjian Exp $
+ *       $PostgreSQL: pgsql/src/backend/utils/cache/lsyscache.c,v 1.123 2005/04/11 23:06:56 tgl Exp $
  *
  * NOTES
  *       Eventually, the index information should go through here, too.
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
+#include "miscadmin.h"
 
+#include "access/hash.h"
 #include "access/tupmacs.h"
 #include "catalog/pg_amop.h"
+#include "catalog/pg_amproc.h"
+#include "catalog/pg_namespace.h"
 #include "catalog/pg_opclass.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_shadow.h"
+#include "catalog/pg_group.h"
 #include "catalog/pg_statistic.h"
 #include "catalog/pg_type.h"
-#include "parser/parse_coerce.h"
+#include "nodes/makefuncs.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
+#include "utils/catcache.h"
+#include "utils/datum.h"
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
 
@@ -41,51 +48,182 @@ bool
 op_in_opclass(Oid opno, Oid opclass)
 {
        return SearchSysCacheExists(AMOPOPID,
-                                                               ObjectIdGetDatum(opclass),
                                                                ObjectIdGetDatum(opno),
+                                                               ObjectIdGetDatum(opclass),
                                                                0, 0);
 }
 
 /*
- * op_requires_recheck
+ * get_op_opclass_strategy
+ *
+ *             Get the operator's strategy number within the specified opclass,
+ *             or 0 if it's not a member of the opclass.
+ */
+int
+get_op_opclass_strategy(Oid opno, Oid opclass)
+{
+       HeapTuple       tp;
+       Form_pg_amop amop_tup;
+       int                     result;
+
+       tp = SearchSysCache(AMOPOPID,
+                                               ObjectIdGetDatum(opno),
+                                               ObjectIdGetDatum(opclass),
+                                               0, 0);
+       if (!HeapTupleIsValid(tp))
+               return 0;
+       amop_tup = (Form_pg_amop) GETSTRUCT(tp);
+       result = amop_tup->amopstrategy;
+       ReleaseSysCache(tp);
+       return result;
+}
+
+/*
+ * get_op_opclass_properties
  *
- *             Return t if operator 'opno' requires a recheck when used as a
- *             member of opclass 'opclass' (ie, this opclass is lossy for this
- *             operator).
+ *             Get the operator's strategy number, subtype, and recheck (lossy) flag
+ *             within the specified opclass.
  *
  * Caller should already have verified that opno is a member of opclass,
  * therefore we raise an error if the tuple is not found.
  */
-bool
-op_requires_recheck(Oid opno, Oid opclass)
+void
+get_op_opclass_properties(Oid opno, Oid opclass,
+                                                 int *strategy, Oid *subtype, bool *recheck)
 {
        HeapTuple       tp;
        Form_pg_amop amop_tup;
-       bool            result;
 
        tp = SearchSysCache(AMOPOPID,
-                                               ObjectIdGetDatum(opclass),
                                                ObjectIdGetDatum(opno),
+                                               ObjectIdGetDatum(opclass),
                                                0, 0);
        if (!HeapTupleIsValid(tp))
-               elog(ERROR, "op_requires_recheck: op %u is not a member of opclass %u",
+               elog(ERROR, "operator %u is not a member of opclass %u",
                         opno, opclass);
        amop_tup = (Form_pg_amop) GETSTRUCT(tp);
+       *strategy = amop_tup->amopstrategy;
+       *subtype = amop_tup->amopsubtype;
+       *recheck = amop_tup->amopreqcheck;
+       ReleaseSysCache(tp);
+}
+
+/*
+ * get_opclass_member
+ *             Get the OID of the operator that implements the specified strategy
+ *             with the specified subtype for the specified opclass.
+ *
+ * Returns InvalidOid if there is no pg_amop entry for the given keys.
+ */
+Oid
+get_opclass_member(Oid opclass, Oid subtype, int16 strategy)
+{
+       HeapTuple       tp;
+       Form_pg_amop amop_tup;
+       Oid                     result;
+
+       tp = SearchSysCache(AMOPSTRATEGY,
+                                               ObjectIdGetDatum(opclass),
+                                               ObjectIdGetDatum(subtype),
+                                               Int16GetDatum(strategy),
+                                               0);
+       if (!HeapTupleIsValid(tp))
+               return InvalidOid;
+       amop_tup = (Form_pg_amop) GETSTRUCT(tp);
+       result = amop_tup->amopopr;
+       ReleaseSysCache(tp);
+       return result;
+}
+
+/*
+ * get_op_hash_function
+ *             Get the OID of the datatype-specific hash function associated with
+ *             a hashable equality operator.
+ *
+ * Returns InvalidOid if no hash function can be found.  (This indicates
+ * that the operator should not have been marked oprcanhash.)
+ */
+Oid
+get_op_hash_function(Oid opno)
+{
+       CatCList   *catlist;
+       int                     i;
+       Oid                     opclass = InvalidOid;
+
+       /*
+        * Search pg_amop to see if the target operator is registered as the
+        * "=" operator of any hash opclass.  If the operator is registered in
+        * multiple opclasses, assume we can use the associated hash function
+        * from any one.
+        */
+       catlist = SearchSysCacheList(AMOPOPID, 1,
+                                                                ObjectIdGetDatum(opno),
+                                                                0, 0, 0);
+
+       for (i = 0; i < catlist->n_members; i++)
+       {
+               HeapTuple       tuple = &catlist->members[i]->tuple;
+               Form_pg_amop aform = (Form_pg_amop) GETSTRUCT(tuple);
+
+               if (aform->amopstrategy == HTEqualStrategyNumber &&
+                       opclass_is_hash(aform->amopclaid))
+               {
+                       opclass = aform->amopclaid;
+                       break;
+               }
+       }
+
+       ReleaseSysCacheList(catlist);
+
+       if (OidIsValid(opclass))
+       {
+               /* Found a suitable opclass, get its default hash support function */
+               return get_opclass_proc(opclass, InvalidOid, HASHPROC);
+       }
+
+       /* Didn't find a match... */
+       return InvalidOid;
+}
+
+
+/*                             ---------- AMPROC CACHES ----------                                              */
+
+/*
+ * get_opclass_proc
+ *             Get the OID of the specified support function
+ *             for the specified opclass and subtype.
+ *
+ * Returns InvalidOid if there is no pg_amproc entry for the given keys.
+ */
+Oid
+get_opclass_proc(Oid opclass, Oid subtype, int16 procnum)
+{
+       HeapTuple       tp;
+       Form_pg_amproc amproc_tup;
+       RegProcedure result;
 
-       result = amop_tup->amopreqcheck;
+       tp = SearchSysCache(AMPROCNUM,
+                                               ObjectIdGetDatum(opclass),
+                                               ObjectIdGetDatum(subtype),
+                                               Int16GetDatum(procnum),
+                                               0);
+       if (!HeapTupleIsValid(tp))
+               return InvalidOid;
+       amproc_tup = (Form_pg_amproc) GETSTRUCT(tp);
+       result = amproc_tup->amproc;
        ReleaseSysCache(tp);
        return result;
 }
 
+
 /*                             ---------- ATTRIBUTE CACHES ----------                                   */
 
 /*
  * get_attname
- *
  *             Given the relation id and the attribute number,
  *             return the "attname" field from the attribute relation.
  *
- * Note: returns a palloc'd copy of the string, or NULL if no such operator.
+ * Note: returns a palloc'd copy of the string, or NULL if no such attribute.
  */
 char *
 get_attname(Oid relid, AttrNumber attnum)
@@ -109,21 +247,38 @@ get_attname(Oid relid, AttrNumber attnum)
                return NULL;
 }
 
+/*
+ * get_relid_attribute_name
+ *
+ * Same as above routine get_attname(), except that error
+ * is handled by elog() instead of returning NULL.
+ */
+char *
+get_relid_attribute_name(Oid relid, AttrNumber attnum)
+{
+       char       *attname;
+
+       attname = get_attname(relid, attnum);
+       if (attname == NULL)
+               elog(ERROR, "cache lookup failed for attribute %d of relation %u",
+                        attnum, relid);
+       return attname;
+}
+
 /*
  * get_attnum
  *
  *             Given the relation id and the attribute name,
  *             return the "attnum" field from the attribute relation.
+ *
+ *             Returns InvalidAttrNumber if the attr doesn't exist (or is dropped).
  */
 AttrNumber
-get_attnum(Oid relid, char *attname)
+get_attnum(Oid relid, const char *attname)
 {
        HeapTuple       tp;
 
-       tp = SearchSysCache(ATTNAME,
-                                               ObjectIdGetDatum(relid),
-                                               PointerGetDatum(attname),
-                                               0, 0);
+       tp = SearchSysCacheAttName(relid, attname);
        if (HeapTupleIsValid(tp))
        {
                Form_pg_attribute att_tup = (Form_pg_attribute) GETSTRUCT(tp);
@@ -165,32 +320,6 @@ get_atttype(Oid relid, AttrNumber attnum)
                return InvalidOid;
 }
 
-/* This routine uses the attname instead of the attnum because it
- * replaces the routine find_atttype, which is called sometimes when
- * only the attname, not the attno, is available.
- */
-bool
-get_attisset(Oid relid, char *attname)
-{
-       HeapTuple       tp;
-
-       tp = SearchSysCache(ATTNAME,
-                                               ObjectIdGetDatum(relid),
-                                               PointerGetDatum(attname),
-                                               0, 0);
-       if (HeapTupleIsValid(tp))
-       {
-               Form_pg_attribute att_tup = (Form_pg_attribute) GETSTRUCT(tp);
-               bool            result;
-
-               result = att_tup->attisset;
-               ReleaseSysCache(tp);
-               return result;
-       }
-       else
-               return false;
-}
-
 /*
  * get_atttypmod
  *
@@ -240,8 +369,8 @@ get_atttypetypmod(Oid relid, AttrNumber attnum,
                                                Int16GetDatum(attnum),
                                                0, 0);
        if (!HeapTupleIsValid(tp))
-               elog(ERROR, "cache lookup failed for relation %u attribute %d",
-                        relid, attnum);
+               elog(ERROR, "cache lookup failed for attribute %d of relation %u",
+                        attnum, relid);
        att_tup = (Form_pg_attribute) GETSTRUCT(tp);
 
        *typid = att_tup->atttypid;
@@ -281,6 +410,31 @@ opclass_is_btree(Oid opclass)
        return result;
 }
 
+/*
+ * opclass_is_hash
+ *
+ *             Returns TRUE iff the specified opclass is associated with the
+ *             hash index access method.
+ */
+bool
+opclass_is_hash(Oid opclass)
+{
+       HeapTuple       tp;
+       Form_pg_opclass cla_tup;
+       bool            result;
+
+       tp = SearchSysCache(CLAOID,
+                                               ObjectIdGetDatum(opclass),
+                                               0, 0, 0);
+       if (!HeapTupleIsValid(tp))
+               elog(ERROR, "cache lookup failed for opclass %u", opclass);
+       cla_tup = (Form_pg_opclass) GETSTRUCT(tp);
+
+       result = (cla_tup->opcamid == HASH_AM_OID);
+       ReleaseSysCache(tp);
+       return result;
+}
+
 /*                             ---------- OPERATOR CACHE ----------                                     */
 
 /*
@@ -337,14 +491,37 @@ get_opname(Oid opno)
                return NULL;
 }
 
+/*
+ * op_input_types
+ *
+ *             Returns the left and right input datatypes for an operator
+ *             (InvalidOid if not relevant).
+ */
+void
+op_input_types(Oid opno, Oid *lefttype, Oid *righttype)
+{
+       HeapTuple       tp;
+       Form_pg_operator optup;
+
+       tp = SearchSysCache(OPEROID,
+                                               ObjectIdGetDatum(opno),
+                                               0, 0, 0);
+       if (!HeapTupleIsValid(tp))      /* shouldn't happen */
+               elog(ERROR, "cache lookup failed for operator %u", opno);
+       optup = (Form_pg_operator) GETSTRUCT(tp);
+       *lefttype = optup->oprleft;
+       *righttype = optup->oprright;
+       ReleaseSysCache(tp);
+}
+
 /*
  * op_mergejoinable
  *
- *             Returns the left and right sort operators and types corresponding to a
- *             mergejoinable operator, or nil if the operator is not mergejoinable.
+ *             Returns the left and right sort operators corresponding to a
+ *             mergejoinable operator, or false if the operator is not mergejoinable.
  */
 bool
-op_mergejoinable(Oid opno, Oid ltype, Oid rtype, Oid *leftOp, Oid *rightOp)
+op_mergejoinable(Oid opno, Oid *leftOp, Oid *rightOp)
 {
        HeapTuple       tp;
        bool            result = false;
@@ -357,9 +534,7 @@ op_mergejoinable(Oid opno, Oid ltype, Oid rtype, Oid *leftOp, Oid *rightOp)
                Form_pg_operator optup = (Form_pg_operator) GETSTRUCT(tp);
 
                if (optup->oprlsortop &&
-                       optup->oprrsortop &&
-                       optup->oprleft == ltype &&
-                       optup->oprright == rtype)
+                       optup->oprrsortop)
                {
                        *leftOp = optup->oprlsortop;
                        *rightOp = optup->oprrsortop;
@@ -375,12 +550,8 @@ op_mergejoinable(Oid opno, Oid ltype, Oid rtype, Oid *leftOp, Oid *rightOp)
  *
  *             Returns the cross-type comparison operators (ltype "<" rtype and
  *             ltype ">" rtype) for an operator previously determined to be
- *             mergejoinable.  Optionally, fetches the regproc ids of these
+ *             mergejoinable.  Optionally, fetches the regproc ids of these
  *             operators, as well as their operator OIDs.
- *
- * Raises error if operators cannot be found.  Assuming that the operator
- * had indeed been marked mergejoinable, this indicates that whoever marked
- * it so was mistaken.
  */
 void
 op_mergejoin_crossops(Oid opno, Oid *ltop, Oid *gtop,
@@ -388,69 +559,45 @@ op_mergejoin_crossops(Oid opno, Oid *ltop, Oid *gtop,
 {
        HeapTuple       tp;
        Form_pg_operator optup;
-       Oid                     oprleft,
-                               oprright;
 
        /*
-        * Get the declared left and right operand types of the operator.
+        * Get the declared comparison operators of the operator.
         */
        tp = SearchSysCache(OPEROID,
                                                ObjectIdGetDatum(opno),
                                                0, 0, 0);
        if (!HeapTupleIsValid(tp))      /* shouldn't happen */
-               elog(ERROR, "op_mergejoin_crossops: operator %u not found", opno);
+               elog(ERROR, "cache lookup failed for operator %u", opno);
        optup = (Form_pg_operator) GETSTRUCT(tp);
-       oprleft = optup->oprleft;
-       oprright = optup->oprright;
+       *ltop = optup->oprltcmpop;
+       *gtop = optup->oprgtcmpop;
        ReleaseSysCache(tp);
 
-       /*
-        * Look up the "<" operator with the same input types.  If there isn't
-        * one, whoever marked the "=" operator mergejoinable was a loser.
-        */
-       tp = SearchSysCache(OPERNAME,
-                                               PointerGetDatum("<"),
-                                               ObjectIdGetDatum(oprleft),
-                                               ObjectIdGetDatum(oprright),
-                                               CharGetDatum('b'));
-       if (!HeapTupleIsValid(tp))
-               elog(ERROR, "op_mergejoin_crossops: mergejoin operator %u has no matching < operator",
+       /* Check < op provided */
+       if (!OidIsValid(*ltop))
+               elog(ERROR, "mergejoin operator %u has no matching < operator",
                         opno);
-       optup = (Form_pg_operator) GETSTRUCT(tp);
-       *ltop = tp->t_data->t_oid;
        if (ltproc)
-               *ltproc = optup->oprcode;
-       ReleaseSysCache(tp);
+               *ltproc = get_opcode(*ltop);
 
-       /*
-        * And the same for the ">" operator.
-        */
-       tp = SearchSysCache(OPERNAME,
-                                               PointerGetDatum(">"),
-                                               ObjectIdGetDatum(oprleft),
-                                               ObjectIdGetDatum(oprright),
-                                               CharGetDatum('b'));
-       if (!HeapTupleIsValid(tp))
-               elog(ERROR, "op_mergejoin_crossops: mergejoin operator %u has no matching > operator",
+       /* Check > op provided */
+       if (!OidIsValid(*gtop))
+               elog(ERROR, "mergejoin operator %u has no matching > operator",
                         opno);
-       optup = (Form_pg_operator) GETSTRUCT(tp);
-       *gtop = tp->t_data->t_oid;
        if (gtproc)
-               *gtproc = optup->oprcode;
-       ReleaseSysCache(tp);
+               *gtproc = get_opcode(*gtop);
 }
 
 /*
  * op_hashjoinable
  *
- * Returns the hash operator corresponding to a hashjoinable operator,
- * or InvalidOid if the operator is not hashjoinable.
+ * Returns true if the operator is hashjoinable.
  */
-Oid
-op_hashjoinable(Oid opno, Oid ltype, Oid rtype)
+bool
+op_hashjoinable(Oid opno)
 {
        HeapTuple       tp;
-       Oid                     result = InvalidOid;
+       bool            result = false;
 
        tp = SearchSysCache(OPEROID,
                                                ObjectIdGetDatum(opno),
@@ -459,29 +606,42 @@ op_hashjoinable(Oid opno, Oid ltype, Oid rtype)
        {
                Form_pg_operator optup = (Form_pg_operator) GETSTRUCT(tp);
 
-               if (optup->oprcanhash &&
-                       optup->oprleft == ltype &&
-                       optup->oprright == rtype)
-                       result = opno;
+               result = optup->oprcanhash;
                ReleaseSysCache(tp);
        }
        return result;
 }
 
 /*
- * op_iscachable
+ * op_strict
  *
- * Get the proiscachable flag for the operator's underlying function.
+ * Get the proisstrict flag for the operator's underlying function.
  */
 bool
-op_iscachable(Oid opno)
+op_strict(Oid opno)
+{
+       RegProcedure funcid = get_opcode(opno);
+
+       if (funcid == (RegProcedure) InvalidOid)
+               elog(ERROR, "operator %u does not exist", opno);
+
+       return func_strict((Oid) funcid);
+}
+
+/*
+ * op_volatile
+ *
+ * Get the provolatile flag for the operator's underlying function.
+ */
+char
+op_volatile(Oid opno)
 {
        RegProcedure funcid = get_opcode(opno);
 
        if (funcid == (RegProcedure) InvalidOid)
-               elog(ERROR, "Operator OID %u does not exist", opno);
+               elog(ERROR, "operator %u does not exist", opno);
 
-       return func_iscachable((Oid) funcid);
+       return func_volatile((Oid) funcid);
 }
 
 /*
@@ -590,6 +750,33 @@ get_oprjoin(Oid opno)
 
 /*                             ---------- FUNCTION CACHE ----------                                     */
 
+/*
+ * get_func_name
+ *       returns the name of the function with the given funcid
+ *
+ * Note: returns a palloc'd copy of the string, or NULL if no such function.
+ */
+char *
+get_func_name(Oid funcid)
+{
+       HeapTuple       tp;
+
+       tp = SearchSysCache(PROCOID,
+                                               ObjectIdGetDatum(funcid),
+                                               0, 0, 0);
+       if (HeapTupleIsValid(tp))
+       {
+               Form_pg_proc functup = (Form_pg_proc) GETSTRUCT(tp);
+               char       *result;
+
+               result = pstrdup(NameStr(functup->proname));
+               ReleaseSysCache(tp);
+               return result;
+       }
+       else
+               return NULL;
+}
+
 /*
  * get_func_rettype
  *             Given procedure id, return the function's result type.
@@ -604,7 +791,7 @@ get_func_rettype(Oid funcid)
                                                ObjectIdGetDatum(funcid),
                                                0, 0, 0);
        if (!HeapTupleIsValid(tp))
-               elog(ERROR, "Function OID %u does not exist", funcid);
+               elog(ERROR, "cache lookup failed for function %u", funcid);
 
        result = ((Form_pg_proc) GETSTRUCT(tp))->prorettype;
        ReleaseSysCache(tp);
@@ -612,89 +799,329 @@ get_func_rettype(Oid funcid)
 }
 
 /*
- * func_iscachable
- *             Given procedure id, return the function's proiscachable flag.
+ * get_func_nargs
+ *             Given procedure id, return the number of arguments.
  */
-bool
-func_iscachable(Oid funcid)
+int
+get_func_nargs(Oid funcid)
 {
        HeapTuple       tp;
-       bool            result;
+       int                     result;
 
        tp = SearchSysCache(PROCOID,
                                                ObjectIdGetDatum(funcid),
                                                0, 0, 0);
        if (!HeapTupleIsValid(tp))
-               elog(ERROR, "Function OID %u does not exist", funcid);
+               elog(ERROR, "cache lookup failed for function %u", funcid);
 
-       result = ((Form_pg_proc) GETSTRUCT(tp))->proiscachable;
+       result = ((Form_pg_proc) GETSTRUCT(tp))->pronargs;
        ReleaseSysCache(tp);
        return result;
 }
 
-/*                             ---------- RELATION CACHE ----------                                     */
-
-#ifdef NOT_USED
 /*
- * get_relnatts
+ * get_func_signature
+ *             Given procedure id, return the function's argument and result types.
+ *             (The return value is the result type.)
  *
- *             Returns the number of attributes for a given relation.
+ * The arguments are returned as a palloc'd array.
  */
-int
-get_relnatts(Oid relid)
+Oid
+get_func_signature(Oid funcid, Oid **argtypes, int *nargs)
 {
        HeapTuple       tp;
+       Form_pg_proc procstruct;
+       Oid                     result;
 
-       tp = SearchSysCache(RELOID,
-                                               ObjectIdGetDatum(relid),
+       tp = SearchSysCache(PROCOID,
+                                               ObjectIdGetDatum(funcid),
                                                0, 0, 0);
-       if (HeapTupleIsValid(tp))
-       {
-               Form_pg_class reltup = (Form_pg_class) GETSTRUCT(tp);
-               int                     result;
+       if (!HeapTupleIsValid(tp))
+               elog(ERROR, "cache lookup failed for function %u", funcid);
 
-               result = reltup->relnatts;
-               ReleaseSysCache(tp);
-               return result;
-       }
-       else
-               return InvalidAttrNumber;
+       procstruct = (Form_pg_proc) GETSTRUCT(tp);
+
+       result = procstruct->prorettype;
+       *nargs = (int) procstruct->pronargs;
+       Assert(*nargs == procstruct->proargtypes.dim1);
+       *argtypes = (Oid *) palloc(*nargs * sizeof(Oid));
+       memcpy(*argtypes, procstruct->proargtypes.values, *nargs * sizeof(Oid));
+
+       ReleaseSysCache(tp);
+       return result;
 }
-#endif
 
 /*
- * get_rel_name
- *
- *             Returns the name of a given relation.
- *
- * Note: returns a palloc'd copy of the string, or NULL if no such relation.
+ * get_func_retset
+ *             Given procedure id, return the function's proretset flag.
  */
-char *
-get_rel_name(Oid relid)
+bool
+get_func_retset(Oid funcid)
 {
        HeapTuple       tp;
+       bool            result;
 
-       tp = SearchSysCache(RELOID,
-                                               ObjectIdGetDatum(relid),
+       tp = SearchSysCache(PROCOID,
+                                               ObjectIdGetDatum(funcid),
                                                0, 0, 0);
-       if (HeapTupleIsValid(tp))
-       {
-               Form_pg_class reltup = (Form_pg_class) GETSTRUCT(tp);
-               char       *result;
+       if (!HeapTupleIsValid(tp))
+               elog(ERROR, "cache lookup failed for function %u", funcid);
 
-               result = pstrdup(NameStr(reltup->relname));
-               ReleaseSysCache(tp);
-               return result;
-       }
-       else
-               return NULL;
+       result = ((Form_pg_proc) GETSTRUCT(tp))->proretset;
+       ReleaseSysCache(tp);
+       return result;
 }
 
-/*                             ---------- TYPE CACHE ----------                                                 */
-
 /*
- * get_typlen
- *
+ * func_strict
+ *             Given procedure id, return the function's proisstrict flag.
+ */
+bool
+func_strict(Oid funcid)
+{
+       HeapTuple       tp;
+       bool            result;
+
+       tp = SearchSysCache(PROCOID,
+                                               ObjectIdGetDatum(funcid),
+                                               0, 0, 0);
+       if (!HeapTupleIsValid(tp))
+               elog(ERROR, "cache lookup failed for function %u", funcid);
+
+       result = ((Form_pg_proc) GETSTRUCT(tp))->proisstrict;
+       ReleaseSysCache(tp);
+       return result;
+}
+
+/*
+ * func_volatile
+ *             Given procedure id, return the function's provolatile flag.
+ */
+char
+func_volatile(Oid funcid)
+{
+       HeapTuple       tp;
+       char            result;
+
+       tp = SearchSysCache(PROCOID,
+                                               ObjectIdGetDatum(funcid),
+                                               0, 0, 0);
+       if (!HeapTupleIsValid(tp))
+               elog(ERROR, "cache lookup failed for function %u", funcid);
+
+       result = ((Form_pg_proc) GETSTRUCT(tp))->provolatile;
+       ReleaseSysCache(tp);
+       return result;
+}
+
+/*                             ---------- RELATION CACHE ----------                                     */
+
+/*
+ * get_relname_relid
+ *             Given name and namespace of a relation, look up the OID.
+ *
+ * Returns InvalidOid if there is no such relation.
+ */
+Oid
+get_relname_relid(const char *relname, Oid relnamespace)
+{
+       return GetSysCacheOid(RELNAMENSP,
+                                                 PointerGetDatum(relname),
+                                                 ObjectIdGetDatum(relnamespace),
+                                                 0, 0);
+}
+
+/*
+ * get_system_catalog_relid
+ *             Get the OID of a system catalog identified by name.
+ */
+Oid
+get_system_catalog_relid(const char *catname)
+{
+       Oid                     relid;
+
+       relid = GetSysCacheOid(RELNAMENSP,
+                                                  PointerGetDatum(catname),
+                                                  ObjectIdGetDatum(PG_CATALOG_NAMESPACE),
+                                                  0, 0);
+       if (!OidIsValid(relid))
+               elog(ERROR, "cache lookup failed for system relation %s", catname);
+
+       return relid;
+}
+
+#ifdef NOT_USED
+/*
+ * get_relnatts
+ *
+ *             Returns the number of attributes for a given relation.
+ */
+int
+get_relnatts(Oid relid)
+{
+       HeapTuple       tp;
+
+       tp = SearchSysCache(RELOID,
+                                               ObjectIdGetDatum(relid),
+                                               0, 0, 0);
+       if (HeapTupleIsValid(tp))
+       {
+               Form_pg_class reltup = (Form_pg_class) GETSTRUCT(tp);
+               int                     result;
+
+               result = reltup->relnatts;
+               ReleaseSysCache(tp);
+               return result;
+       }
+       else
+               return InvalidAttrNumber;
+}
+#endif
+
+/*
+ * get_rel_name
+ *             Returns the name of a given relation.
+ *
+ * Returns a palloc'd copy of the string, or NULL if no such relation.
+ *
+ * NOTE: since relation name is not unique, be wary of code that uses this
+ * for anything except preparing error messages.
+ */
+char *
+get_rel_name(Oid relid)
+{
+       HeapTuple       tp;
+
+       tp = SearchSysCache(RELOID,
+                                               ObjectIdGetDatum(relid),
+                                               0, 0, 0);
+       if (HeapTupleIsValid(tp))
+       {
+               Form_pg_class reltup = (Form_pg_class) GETSTRUCT(tp);
+               char       *result;
+
+               result = pstrdup(NameStr(reltup->relname));
+               ReleaseSysCache(tp);
+               return result;
+       }
+       else
+               return NULL;
+}
+
+/*
+ * get_rel_namespace
+ *
+ *             Returns the pg_namespace OID associated with a given relation.
+ */
+Oid
+get_rel_namespace(Oid relid)
+{
+       HeapTuple       tp;
+
+       tp = SearchSysCache(RELOID,
+                                               ObjectIdGetDatum(relid),
+                                               0, 0, 0);
+       if (HeapTupleIsValid(tp))
+       {
+               Form_pg_class reltup = (Form_pg_class) GETSTRUCT(tp);
+               Oid                     result;
+
+               result = reltup->relnamespace;
+               ReleaseSysCache(tp);
+               return result;
+       }
+       else
+               return InvalidOid;
+}
+
+/*
+ * get_rel_type_id
+ *
+ *             Returns the pg_type OID associated with a given relation.
+ *
+ * Note: not all pg_class entries have associated pg_type OIDs; so be
+ * careful to check for InvalidOid result.
+ */
+Oid
+get_rel_type_id(Oid relid)
+{
+       HeapTuple       tp;
+
+       tp = SearchSysCache(RELOID,
+                                               ObjectIdGetDatum(relid),
+                                               0, 0, 0);
+       if (HeapTupleIsValid(tp))
+       {
+               Form_pg_class reltup = (Form_pg_class) GETSTRUCT(tp);
+               Oid                     result;
+
+               result = reltup->reltype;
+               ReleaseSysCache(tp);
+               return result;
+       }
+       else
+               return InvalidOid;
+}
+
+/*
+ * get_rel_relkind
+ *
+ *             Returns the relkind associated with a given relation.
+ */
+char
+get_rel_relkind(Oid relid)
+{
+       HeapTuple       tp;
+
+       tp = SearchSysCache(RELOID,
+                                               ObjectIdGetDatum(relid),
+                                               0, 0, 0);
+       if (HeapTupleIsValid(tp))
+       {
+               Form_pg_class reltup = (Form_pg_class) GETSTRUCT(tp);
+               char            result;
+
+               result = reltup->relkind;
+               ReleaseSysCache(tp);
+               return result;
+       }
+       else
+               return '\0';
+}
+
+
+/*                             ---------- TYPE CACHE ----------                                                 */
+
+/*
+ * get_typisdefined
+ *
+ *             Given the type OID, determine whether the type is defined
+ *             (if not, it's only a shell).
+ */
+bool
+get_typisdefined(Oid typid)
+{
+       HeapTuple       tp;
+
+       tp = SearchSysCache(TYPEOID,
+                                               ObjectIdGetDatum(typid),
+                                               0, 0, 0);
+       if (HeapTupleIsValid(tp))
+       {
+               Form_pg_type typtup = (Form_pg_type) GETSTRUCT(tp);
+               bool            result;
+
+               result = typtup->typisdefined;
+               ReleaseSysCache(tp);
+               return result;
+       }
+       else
+               return false;
+}
+
+/*
+ * get_typlen
+ *
  *             Given the type OID, return the length of the type.
  */
 int16
@@ -772,6 +1199,106 @@ get_typlenbyval(Oid typid, int16 *typlen, bool *typbyval)
        ReleaseSysCache(tp);
 }
 
+/*
+ * get_typlenbyvalalign
+ *
+ *             A three-fer: given the type OID, return typlen, typbyval, typalign.
+ */
+void
+get_typlenbyvalalign(Oid typid, int16 *typlen, bool *typbyval,
+                                        char *typalign)
+{
+       HeapTuple       tp;
+       Form_pg_type typtup;
+
+       tp = SearchSysCache(TYPEOID,
+                                               ObjectIdGetDatum(typid),
+                                               0, 0, 0);
+       if (!HeapTupleIsValid(tp))
+               elog(ERROR, "cache lookup failed for type %u", typid);
+       typtup = (Form_pg_type) GETSTRUCT(tp);
+       *typlen = typtup->typlen;
+       *typbyval = typtup->typbyval;
+       *typalign = typtup->typalign;
+       ReleaseSysCache(tp);
+}
+
+/*
+ * getTypeIOParam
+ *             Given a pg_type row, select the type OID to pass to I/O functions
+ *
+ * Formerly, all I/O functions were passed pg_type.typelem as their second
+ * parameter, but we now have a more complex rule about what to pass.
+ * This knowledge is intended to be centralized here --- direct references
+ * to typelem elsewhere in the code are wrong, if they are associated with
+ * I/O calls and not with actual subscripting operations!  (But see
+ * bootstrap.c, which can't conveniently use this routine.)
+ */
+Oid
+getTypeIOParam(HeapTuple typeTuple)
+{
+       Form_pg_type typeStruct = (Form_pg_type) GETSTRUCT(typeTuple);
+
+       /*
+        * Composite types get their own OID as parameter; array types get
+        * their typelem as parameter; everybody else gets zero.
+        */
+       if (typeStruct->typtype == 'c')
+               return HeapTupleGetOid(typeTuple);
+       else
+               return typeStruct->typelem;
+}
+
+/*
+ * get_type_io_data
+ *
+ *             A six-fer:      given the type OID, return typlen, typbyval, typalign,
+ *                                     typdelim, typioparam, and IO function OID. The IO function
+ *                                     returned is controlled by IOFuncSelector
+ */
+void
+get_type_io_data(Oid typid,
+                                IOFuncSelector which_func,
+                                int16 *typlen,
+                                bool *typbyval,
+                                char *typalign,
+                                char *typdelim,
+                                Oid *typioparam,
+                                Oid *func)
+{
+       HeapTuple       typeTuple;
+       Form_pg_type typeStruct;
+
+       typeTuple = SearchSysCache(TYPEOID,
+                                                          ObjectIdGetDatum(typid),
+                                                          0, 0, 0);
+       if (!HeapTupleIsValid(typeTuple))
+               elog(ERROR, "cache lookup failed for type %u", typid);
+       typeStruct = (Form_pg_type) GETSTRUCT(typeTuple);
+
+       *typlen = typeStruct->typlen;
+       *typbyval = typeStruct->typbyval;
+       *typalign = typeStruct->typalign;
+       *typdelim = typeStruct->typdelim;
+       *typioparam = getTypeIOParam(typeTuple);
+       switch (which_func)
+       {
+               case IOFunc_input:
+                       *func = typeStruct->typinput;
+                       break;
+               case IOFunc_output:
+                       *func = typeStruct->typoutput;
+                       break;
+               case IOFunc_receive:
+                       *func = typeStruct->typreceive;
+                       break;
+               case IOFunc_send:
+                       *func = typeStruct->typsend;
+                       break;
+       }
+       ReleaseSysCache(typeTuple);
+}
+
 #ifdef NOT_USED
 char
 get_typalign(Oid typid)
@@ -817,20 +1344,47 @@ get_typstorage(Oid typid)
 }
 
 /*
- * get_typdefault
+ * get_typtypmod
  *
+ *             Given the type OID, return the typtypmod field (domain's typmod
+ *             for base type)
+ */
+int32
+get_typtypmod(Oid typid)
+{
+       HeapTuple       tp;
+
+       tp = SearchSysCache(TYPEOID,
+                                               ObjectIdGetDatum(typid),
+                                               0, 0, 0);
+       if (HeapTupleIsValid(tp))
+       {
+               Form_pg_type typtup = (Form_pg_type) GETSTRUCT(tp);
+               int32           result;
+
+               result = typtup->typtypmod;
+               ReleaseSysCache(tp);
+               return result;
+       }
+       else
+               return -1;
+}
+
+/*
+ * get_typdefault
  *       Given a type OID, return the type's default value, if any.
- *       Returns FALSE if there is no default (effectively, default is NULL).
- *       The result points to palloc'd storage for pass-by-reference types.
+ *
+ *       The result is a palloc'd expression node tree, or NULL if there
+ *       is no defined default for the datatype.
+ *
+ * NB: caller should be prepared to coerce result to correct datatype;
+ * the returned expression tree might produce something of the wrong type.
  */
 Node *
-get_typdefault(Oid typid, int32 atttypmod)
+get_typdefault(Oid typid)
 {
        HeapTuple       typeTuple;
        Form_pg_type type;
-       Oid                     typinput;
-       Oid                     typbasetype;
-       char            typtype;
        Datum           datum;
        bool            isNull;
        Node       *expr;
@@ -838,48 +1392,100 @@ get_typdefault(Oid typid, int32 atttypmod)
        typeTuple = SearchSysCache(TYPEOID,
                                                           ObjectIdGetDatum(typid),
                                                           0, 0, 0);
-
        if (!HeapTupleIsValid(typeTuple))
-               elog(ERROR, "get_typdefault: failed to lookup type %u", typid);
-
+               elog(ERROR, "cache lookup failed for type %u", typid);
        type = (Form_pg_type) GETSTRUCT(typeTuple);
 
-       typinput = type->typinput;
-       typbasetype = type->typbasetype;
-       typtype = type->typtype;
-
        /*
-        * typdefaultbin is potentially null, so don't try to access it as a
-        * struct field. Must do it the hard way with SysCacheGetAttr.
+        * typdefault and typdefaultbin are potentially null, so don't try to
+        * access 'em as struct fields. Must do it the hard way with
+        * SysCacheGetAttr.
         */
        datum = SysCacheGetAttr(TYPEOID,
                                                        typeTuple,
                                                        Anum_pg_type_typdefaultbin,
                                                        &isNull);
 
-       ReleaseSysCache(typeTuple);
-       if (isNull)
-               return (Node *) NULL;
+       if (!isNull)
+       {
+               /* We have an expression default */
+               expr = stringToNode(DatumGetCString(DirectFunctionCall1(textout,
+                                                                                                                               datum)));
+       }
+       else
+       {
+               /* Perhaps we have a plain literal default */
+               datum = SysCacheGetAttr(TYPEOID,
+                                                               typeTuple,
+                                                               Anum_pg_type_typdefault,
+                                                               &isNull);
+
+               if (!isNull)
+               {
+                       char       *strDefaultVal;
+
+                       /* Convert text datum to C string */
+                       strDefaultVal = DatumGetCString(DirectFunctionCall1(textout,
+                                                                                                                               datum));
+                       /* Convert C string to a value of the given type */
+                       datum = OidFunctionCall3(type->typinput,
+                                                                        CStringGetDatum(strDefaultVal),
+                                                        ObjectIdGetDatum(getTypeIOParam(typeTuple)),
+                                                                        Int32GetDatum(-1));
+                       /* Build a Const node containing the value */
+                       expr = (Node *) makeConst(typid,
+                                                                         type->typlen,
+                                                                         datum,
+                                                                         false,
+                                                                         type->typbyval);
+                       pfree(strDefaultVal);
+               }
+               else
+               {
+                       /* No default */
+                       expr = NULL;
+               }
+       }
 
-       /* Convert Datum to a Node */
-       expr = stringToNode(DatumGetCString(
-                                               DirectFunctionCall1(textout, datum)));
+       ReleaseSysCache(typeTuple);
 
+       return expr;
+}
 
+/*
+ * getBaseType
+ *             If the given type is a domain, return its base type;
+ *             otherwise return the type's own OID.
+ */
+Oid
+getBaseType(Oid typid)
+{
        /*
-        * Ensure we goto the basetype before the domain type.
-        *
-        * Prevents scenarios like the below from failing:
-        * CREATE DOMAIN dom text DEFAULT random();
-        *
+        * We loop to find the bottom base type in a stack of domains.
         */
-       if (typbasetype != InvalidOid) {
-               expr = coerce_type(NULL, expr, typid,
-                                                 typbasetype, atttypmod);
-       }
+       for (;;)
+       {
+               HeapTuple       tup;
+               Form_pg_type typTup;
 
+               tup = SearchSysCache(TYPEOID,
+                                                        ObjectIdGetDatum(typid),
+                                                        0, 0, 0);
+               if (!HeapTupleIsValid(tup))
+                       elog(ERROR, "cache lookup failed for type %u", typid);
+               typTup = (Form_pg_type) GETSTRUCT(tup);
+               if (typTup->typtype != 'd')
+               {
+                       /* Not a domain, so done */
+                       ReleaseSysCache(tup);
+                       break;
+               }
 
-       return expr;
+               typid = typTup->typbasetype;
+               ReleaseSysCache(tup);
+       }
+
+       return typid;
 }
 
 /*
@@ -938,11 +1544,9 @@ get_typavgwidth(Oid typid, int32 typmod)
 /*
  * get_typtype
  *
- *             Given the type OID, find if it is a basic type, a named relation
- *             or the generic type 'relation'.
+ *             Given the type OID, find if it is a basic type, a complex type, etc.
  *             It returns the null char if the cache lookup fails...
  */
-#ifdef NOT_USED
 char
 get_typtype(Oid typid)
 {
@@ -963,7 +1567,259 @@ get_typtype(Oid typid)
        else
                return '\0';
 }
-#endif
+
+/*
+ * get_typ_typrelid
+ *
+ *             Given the type OID, get the typrelid (InvalidOid if not a complex
+ *             type).
+ */
+Oid
+get_typ_typrelid(Oid typid)
+{
+       HeapTuple       tp;
+
+       tp = SearchSysCache(TYPEOID,
+                                               ObjectIdGetDatum(typid),
+                                               0, 0, 0);
+       if (HeapTupleIsValid(tp))
+       {
+               Form_pg_type typtup = (Form_pg_type) GETSTRUCT(tp);
+               Oid                     result;
+
+               result = typtup->typrelid;
+               ReleaseSysCache(tp);
+               return result;
+       }
+       else
+               return InvalidOid;
+}
+
+/*
+ * get_element_type
+ *
+ *             Given the type OID, get the typelem (InvalidOid if not an array type).
+ *
+ * NB: this only considers varlena arrays to be true arrays; InvalidOid is
+ * returned if the input is a fixed-length array type.
+ */
+Oid
+get_element_type(Oid typid)
+{
+       HeapTuple       tp;
+
+       tp = SearchSysCache(TYPEOID,
+                                               ObjectIdGetDatum(typid),
+                                               0, 0, 0);
+       if (HeapTupleIsValid(tp))
+       {
+               Form_pg_type typtup = (Form_pg_type) GETSTRUCT(tp);
+               Oid                     result;
+
+               if (typtup->typlen == -1)
+                       result = typtup->typelem;
+               else
+                       result = InvalidOid;
+               ReleaseSysCache(tp);
+               return result;
+       }
+       else
+               return InvalidOid;
+}
+
+/*
+ * get_array_type
+ *
+ *             Given the type OID, get the corresponding array type.
+ *             Returns InvalidOid if no array type can be found.
+ *
+ * NB: this only considers varlena arrays to be true arrays.
+ */
+Oid
+get_array_type(Oid typid)
+{
+       HeapTuple       tp;
+
+       tp = SearchSysCache(TYPEOID,
+                                               ObjectIdGetDatum(typid),
+                                               0, 0, 0);
+       if (HeapTupleIsValid(tp))
+       {
+               Form_pg_type typtup = (Form_pg_type) GETSTRUCT(tp);
+               char       *array_typename;
+               Oid                     namespaceId;
+
+               array_typename = makeArrayTypeName(NameStr(typtup->typname));
+               namespaceId = typtup->typnamespace;
+               ReleaseSysCache(tp);
+
+               tp = SearchSysCache(TYPENAMENSP,
+                                                       PointerGetDatum(array_typename),
+                                                       ObjectIdGetDatum(namespaceId),
+                                                       0, 0);
+
+               pfree(array_typename);
+
+               if (HeapTupleIsValid(tp))
+               {
+                       Oid                     result;
+
+                       typtup = (Form_pg_type) GETSTRUCT(tp);
+                       if (typtup->typlen == -1 && typtup->typelem == typid)
+                               result = HeapTupleGetOid(tp);
+                       else
+                               result = InvalidOid;
+                       ReleaseSysCache(tp);
+                       return result;
+               }
+       }
+       return InvalidOid;
+}
+
+/*
+ * getTypeInputInfo
+ *
+ *             Get info needed for converting values of a type to internal form
+ */
+void
+getTypeInputInfo(Oid type, Oid *typInput, Oid *typIOParam)
+{
+       HeapTuple       typeTuple;
+       Form_pg_type pt;
+
+       typeTuple = SearchSysCache(TYPEOID,
+                                                          ObjectIdGetDatum(type),
+                                                          0, 0, 0);
+       if (!HeapTupleIsValid(typeTuple))
+               elog(ERROR, "cache lookup failed for type %u", type);
+       pt = (Form_pg_type) GETSTRUCT(typeTuple);
+
+       if (!pt->typisdefined)
+               ereport(ERROR,
+                               (errcode(ERRCODE_UNDEFINED_OBJECT),
+                                errmsg("type %s is only a shell",
+                                               format_type_be(type))));
+       if (!OidIsValid(pt->typinput))
+               ereport(ERROR,
+                               (errcode(ERRCODE_UNDEFINED_FUNCTION),
+                                errmsg("no input function available for type %s",
+                                               format_type_be(type))));
+
+       *typInput = pt->typinput;
+       *typIOParam = getTypeIOParam(typeTuple);
+
+       ReleaseSysCache(typeTuple);
+}
+
+/*
+ * getTypeOutputInfo
+ *
+ *             Get info needed for printing values of a type
+ */
+void
+getTypeOutputInfo(Oid type, Oid *typOutput, Oid *typIOParam,
+                                 bool *typIsVarlena)
+{
+       HeapTuple       typeTuple;
+       Form_pg_type pt;
+
+       typeTuple = SearchSysCache(TYPEOID,
+                                                          ObjectIdGetDatum(type),
+                                                          0, 0, 0);
+       if (!HeapTupleIsValid(typeTuple))
+               elog(ERROR, "cache lookup failed for type %u", type);
+       pt = (Form_pg_type) GETSTRUCT(typeTuple);
+
+       if (!pt->typisdefined)
+               ereport(ERROR,
+                               (errcode(ERRCODE_UNDEFINED_OBJECT),
+                                errmsg("type %s is only a shell",
+                                               format_type_be(type))));
+       if (!OidIsValid(pt->typoutput))
+               ereport(ERROR,
+                               (errcode(ERRCODE_UNDEFINED_FUNCTION),
+                                errmsg("no output function available for type %s",
+                                               format_type_be(type))));
+
+       *typOutput = pt->typoutput;
+       *typIOParam = getTypeIOParam(typeTuple);
+       *typIsVarlena = (!pt->typbyval) && (pt->typlen == -1);
+
+       ReleaseSysCache(typeTuple);
+}
+
+/*
+ * getTypeBinaryInputInfo
+ *
+ *             Get info needed for binary input of values of a type
+ */
+void
+getTypeBinaryInputInfo(Oid type, Oid *typReceive, Oid *typIOParam)
+{
+       HeapTuple       typeTuple;
+       Form_pg_type pt;
+
+       typeTuple = SearchSysCache(TYPEOID,
+                                                          ObjectIdGetDatum(type),
+                                                          0, 0, 0);
+       if (!HeapTupleIsValid(typeTuple))
+               elog(ERROR, "cache lookup failed for type %u", type);
+       pt = (Form_pg_type) GETSTRUCT(typeTuple);
+
+       if (!pt->typisdefined)
+               ereport(ERROR,
+                               (errcode(ERRCODE_UNDEFINED_OBJECT),
+                                errmsg("type %s is only a shell",
+                                               format_type_be(type))));
+       if (!OidIsValid(pt->typreceive))
+               ereport(ERROR,
+                               (errcode(ERRCODE_UNDEFINED_FUNCTION),
+                                errmsg("no binary input function available for type %s",
+                                               format_type_be(type))));
+
+       *typReceive = pt->typreceive;
+       *typIOParam = getTypeIOParam(typeTuple);
+
+       ReleaseSysCache(typeTuple);
+}
+
+/*
+ * getTypeBinaryOutputInfo
+ *
+ *             Get info needed for binary output of values of a type
+ */
+void
+getTypeBinaryOutputInfo(Oid type, Oid *typSend, Oid *typIOParam,
+                                               bool *typIsVarlena)
+{
+       HeapTuple       typeTuple;
+       Form_pg_type pt;
+
+       typeTuple = SearchSysCache(TYPEOID,
+                                                          ObjectIdGetDatum(type),
+                                                          0, 0, 0);
+       if (!HeapTupleIsValid(typeTuple))
+               elog(ERROR, "cache lookup failed for type %u", type);
+       pt = (Form_pg_type) GETSTRUCT(typeTuple);
+
+       if (!pt->typisdefined)
+               ereport(ERROR,
+                               (errcode(ERRCODE_UNDEFINED_OBJECT),
+                                errmsg("type %s is only a shell",
+                                               format_type_be(type))));
+       if (!OidIsValid(pt->typsend))
+               ereport(ERROR,
+                               (errcode(ERRCODE_UNDEFINED_FUNCTION),
+                                errmsg("no binary output function available for type %s",
+                                               format_type_be(type))));
+
+       *typSend = pt->typsend;
+       *typIOParam = getTypeIOParam(typeTuple);
+       *typIsVarlena = (!pt->typbyval) && (pt->typlen == -1);
+
+       ReleaseSysCache(typeTuple);
+}
+
 
 /*                             ---------- STATISTICS CACHE ----------                                   */
 
@@ -1032,8 +1888,7 @@ get_attstatsslot(HeapTuple statstuple,
        ArrayType  *statarray;
        int                     narrayelem;
        HeapTuple       typeTuple;
-       FmgrInfo        inputproc;
-       Oid                     typelem;
+       Form_pg_type typeForm;
 
        for (i = 0; i < STATISTIC_NUM_SLOTS; i++)
        {
@@ -1050,49 +1905,42 @@ get_attstatsslot(HeapTuple statstuple,
                                                          Anum_pg_statistic_stavalues1 + i,
                                                          &isnull);
                if (isnull)
-                       elog(ERROR, "get_attstatsslot: stavalues is null");
+                       elog(ERROR, "stavalues is null");
                statarray = DatumGetArrayTypeP(val);
 
-               /*
-                * Do initial examination of the array.  This produces a list of
-                * text Datums --- ie, pointers into the text array value.
-                */
-               deconstruct_array(statarray, false, -1, 'i', values, nvalues);
-               narrayelem = *nvalues;
-
-               /*
-                * We now need to replace each text Datum by its internal
-                * equivalent.
-                *
-                * Get the type input proc and typelem for the column datatype.
-                */
+               /* Need to get info about the array element type */
                typeTuple = SearchSysCache(TYPEOID,
                                                                   ObjectIdGetDatum(atttype),
                                                                   0, 0, 0);
                if (!HeapTupleIsValid(typeTuple))
-                       elog(ERROR, "get_attstatsslot: Cache lookup failed for type %u",
-                                atttype);
-               fmgr_info(((Form_pg_type) GETSTRUCT(typeTuple))->typinput, &inputproc);
-               typelem = ((Form_pg_type) GETSTRUCT(typeTuple))->typelem;
-               ReleaseSysCache(typeTuple);
+                       elog(ERROR, "cache lookup failed for type %u", atttype);
+               typeForm = (Form_pg_type) GETSTRUCT(typeTuple);
+
+               /* Deconstruct array into Datum elements */
+               deconstruct_array(statarray,
+                                                 atttype,
+                                                 typeForm->typlen,
+                                                 typeForm->typbyval,
+                                                 typeForm->typalign,
+                                                 values, nvalues);
 
                /*
-                * Do the conversions.  The palloc'd array of Datums is reused in
-                * place.
+                * If the element type is pass-by-reference, we now have a bunch
+                * of Datums that are pointers into the syscache value.  Copy them
+                * to avoid problems if syscache decides to drop the entry.
                 */
-               for (j = 0; j < narrayelem; j++)
+               if (!typeForm->typbyval)
                {
-                       char       *strval;
-
-                       strval = DatumGetCString(DirectFunctionCall1(textout,
-                                                                                                                (*values)[j]));
-                       (*values)[j] = FunctionCall3(&inputproc,
-                                                                                CStringGetDatum(strval),
-                                                                                ObjectIdGetDatum(typelem),
-                                                                                Int32GetDatum(atttypmod));
-                       pfree(strval);
+                       for (j = 0; j < *nvalues; j++)
+                       {
+                               (*values)[j] = datumCopy((*values)[j],
+                                                                                typeForm->typbyval,
+                                                                                typeForm->typlen);
+                       }
                }
 
+               ReleaseSysCache(typeTuple);
+
                /*
                 * Free statarray if it's a detoasted copy.
                 */
@@ -1106,7 +1954,7 @@ get_attstatsslot(HeapTuple statstuple,
                                                          Anum_pg_statistic_stanumbers1 + i,
                                                          &isnull);
                if (isnull)
-                       elog(ERROR, "get_attstatsslot: stanumbers is null");
+                       elog(ERROR, "stanumbers is null");
                statarray = DatumGetArrayTypeP(val);
 
                /*
@@ -1116,8 +1964,8 @@ get_attstatsslot(HeapTuple statstuple,
                 */
                narrayelem = ARR_DIMS(statarray)[0];
                if (ARR_NDIM(statarray) != 1 || narrayelem <= 0 ||
-                       ARR_SIZE(statarray) != (ARR_OVERHEAD(1) + narrayelem * sizeof(float4)))
-                       elog(ERROR, "get_attstatsslot: stanumbers is bogus");
+                       ARR_ELEMTYPE(statarray) != FLOAT4OID)
+                       elog(ERROR, "stanumbers is not a 1-D float4 array");
                *numbers = (float4 *) palloc(narrayelem * sizeof(float4));
                memcpy(*numbers, ARR_DATA_PTR(statarray), narrayelem * sizeof(float4));
                *nnumbers = narrayelem;
@@ -1152,6 +2000,35 @@ free_attstatsslot(Oid atttype,
                pfree(numbers);
 }
 
+/*                             ---------- PG_NAMESPACE CACHE ----------                                 */
+
+/*
+ * get_namespace_name
+ *             Returns the name of a given namespace
+ *
+ * Returns a palloc'd copy of the string, or NULL if no such namespace.
+ */
+char *
+get_namespace_name(Oid nspid)
+{
+       HeapTuple       tp;
+
+       tp = SearchSysCache(NAMESPACEOID,
+                                               ObjectIdGetDatum(nspid),
+                                               0, 0, 0);
+       if (HeapTupleIsValid(tp))
+       {
+               Form_pg_namespace nsptup = (Form_pg_namespace) GETSTRUCT(tp);
+               char       *result;
+
+               result = pstrdup(NameStr(nsptup->nspname));
+               ReleaseSysCache(tp);
+               return result;
+       }
+       else
+               return NULL;
+}
+
 /*                             ---------- PG_SHADOW CACHE ----------                                    */
 
 /*
@@ -1165,21 +2042,53 @@ free_attstatsslot(Oid atttype,
  * someday.  It'd be reasonable to return zero on failure if we were
  * using Oid ...
  */
-int32
+AclId
 get_usesysid(const char *username)
 {
-       int32           result;
+       AclId           userId;
        HeapTuple       userTup;
 
        userTup = SearchSysCache(SHADOWNAME,
                                                         PointerGetDatum(username),
                                                         0, 0, 0);
        if (!HeapTupleIsValid(userTup))
-               elog(ERROR, "user \"%s\" does not exist", username);
+               ereport(ERROR,
+                               (errcode(ERRCODE_UNDEFINED_OBJECT),
+                                errmsg("user \"%s\" does not exist", username)));
 
-       result = ((Form_pg_shadow) GETSTRUCT(userTup))->usesysid;
+       userId = ((Form_pg_shadow) GETSTRUCT(userTup))->usesysid;
 
        ReleaseSysCache(userTup);
 
-       return result;
+       return userId;
+}
+
+/*
+ * get_grosysid
+ *
+ *       Given a group name, look up the group's sysid.
+ *       Raises an error if no such group (rather than returning zero,
+ *       which might possibly be a valid grosysid).
+ *
+ */
+AclId
+get_grosysid(char *groname)
+{
+       AclId           groupId;
+       HeapTuple       groupTup;
+
+       groupTup = SearchSysCache(GRONAME,
+                                                  PointerGetDatum(groname),
+                                                  0, 0, 0);
+       if (!HeapTupleIsValid(groupTup))
+               ereport(ERROR,
+                               (errcode(ERRCODE_UNDEFINED_OBJECT),
+                                errmsg("group \"%s\" does not exist", groname)));
+
+       groupId = ((Form_pg_group) GETSTRUCT(groupTup))->grosysid;
+
+       ReleaseSysCache(groupTup);
+
+       return groupId;
 }
+