]> granicus.if.org Git - postgresql/blobdiff - src/backend/nodes/copyfuncs.c
Refactor planner's pathkeys data structure to create a separate, explicit
[postgresql] / src / backend / nodes / copyfuncs.c
index 71cea4bc2f374f2dd83665657c6a25630cbd924f..7b003dc095c8446fb4ef0deea1a527c2d36020cc 100644 (file)
  * be handled easily in a simple depth-first traversal.
  *
  *
- * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.302 2005/04/19 22:35:13 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.362 2007/01/20 20:45:38 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
-#include "nodes/parsenodes.h"
 #include "nodes/plannodes.h"
 #include "nodes/relation.h"
 #include "utils/datum.h"
@@ -154,7 +153,7 @@ _copyAppend(Append *from)
 static BitmapAnd *
 _copyBitmapAnd(BitmapAnd *from)
 {
-       BitmapAnd          *newnode = makeNode(BitmapAnd);
+       BitmapAnd  *newnode = makeNode(BitmapAnd);
 
        /*
         * copy node superclass fields
@@ -175,7 +174,7 @@ _copyBitmapAnd(BitmapAnd *from)
 static BitmapOr *
 _copyBitmapOr(BitmapOr *from)
 {
-       BitmapOr           *newnode = makeNode(BitmapOr);
+       BitmapOr   *newnode = makeNode(BitmapOr);
 
        /*
         * copy node superclass fields
@@ -253,13 +252,12 @@ _copyIndexScan(IndexScan *from)
        /*
         * copy remainder of node
         */
-       COPY_NODE_FIELD(indxid);
-       COPY_NODE_FIELD(indxqual);
-       COPY_NODE_FIELD(indxqualorig);
-       COPY_NODE_FIELD(indxstrategy);
-       COPY_NODE_FIELD(indxsubtype);
-       COPY_NODE_FIELD(indxlossy);
-       COPY_SCALAR_FIELD(indxorderdir);
+       COPY_SCALAR_FIELD(indexid);
+       COPY_NODE_FIELD(indexqual);
+       COPY_NODE_FIELD(indexqualorig);
+       COPY_NODE_FIELD(indexstrategy);
+       COPY_NODE_FIELD(indexsubtype);
+       COPY_SCALAR_FIELD(indexorderdir);
 
        return newnode;
 }
@@ -270,7 +268,7 @@ _copyIndexScan(IndexScan *from)
 static BitmapIndexScan *
 _copyBitmapIndexScan(BitmapIndexScan *from)
 {
-       BitmapIndexScan  *newnode = makeNode(BitmapIndexScan);
+       BitmapIndexScan *newnode = makeNode(BitmapIndexScan);
 
        /*
         * copy node superclass fields
@@ -280,11 +278,11 @@ _copyBitmapIndexScan(BitmapIndexScan *from)
        /*
         * copy remainder of node
         */
-       COPY_SCALAR_FIELD(indxid);
-       COPY_NODE_FIELD(indxqual);
-       COPY_NODE_FIELD(indxqualorig);
-       COPY_NODE_FIELD(indxstrategy);
-       COPY_NODE_FIELD(indxsubtype);
+       COPY_SCALAR_FIELD(indexid);
+       COPY_NODE_FIELD(indexqual);
+       COPY_NODE_FIELD(indexqualorig);
+       COPY_NODE_FIELD(indexstrategy);
+       COPY_NODE_FIELD(indexsubtype);
 
        return newnode;
 }
@@ -295,7 +293,7 @@ _copyBitmapIndexScan(BitmapIndexScan *from)
 static BitmapHeapScan *
 _copyBitmapHeapScan(BitmapHeapScan *from)
 {
-       BitmapHeapScan  *newnode = makeNode(BitmapHeapScan);
+       BitmapHeapScan *newnode = makeNode(BitmapHeapScan);
 
        /*
         * copy node superclass fields
@@ -326,7 +324,7 @@ _copyTidScan(TidScan *from)
        /*
         * copy remainder of node
         */
-       COPY_NODE_FIELD(tideval);
+       COPY_NODE_FIELD(tidquals);
 
        return newnode;
 }
@@ -368,6 +366,22 @@ _copyFunctionScan(FunctionScan *from)
        return newnode;
 }
 
+/*
+ * _copyValuesScan
+ */
+static ValuesScan *
+_copyValuesScan(ValuesScan *from)
+{
+       ValuesScan *newnode = makeNode(ValuesScan);
+
+       /*
+        * copy node superclass fields
+        */
+       CopyScanFields((Scan *) from, (Scan *) newnode);
+
+       return newnode;
+}
+
 /*
  * CopyJoinFields
  *
@@ -425,6 +439,7 @@ static MergeJoin *
 _copyMergeJoin(MergeJoin *from)
 {
        MergeJoin  *newnode = makeNode(MergeJoin);
+       int                     numCols;
 
        /*
         * copy node superclass fields
@@ -435,6 +450,10 @@ _copyMergeJoin(MergeJoin *from)
         * copy remainder of node
         */
        COPY_NODE_FIELD(mergeclauses);
+       numCols = list_length(from->mergeclauses);
+       COPY_POINTER_FIELD(mergeFamilies, numCols * sizeof(Oid));
+       COPY_POINTER_FIELD(mergeStrategies, numCols * sizeof(int));
+       COPY_POINTER_FIELD(mergeNullsFirst, numCols * sizeof(bool));
 
        return newnode;
 }
@@ -494,6 +513,7 @@ _copySort(Sort *from)
        COPY_SCALAR_FIELD(numCols);
        COPY_POINTER_FIELD(sortColIdx, from->numCols * sizeof(AttrNumber));
        COPY_POINTER_FIELD(sortOperators, from->numCols * sizeof(Oid));
+       COPY_POINTER_FIELD(nullsFirst, from->numCols * sizeof(bool));
 
        return newnode;
 }
@@ -511,6 +531,7 @@ _copyGroup(Group *from)
 
        COPY_SCALAR_FIELD(numCols);
        COPY_POINTER_FIELD(grpColIdx, from->numCols * sizeof(AttrNumber));
+       COPY_POINTER_FIELD(grpOperators, from->numCols * sizeof(Oid));
 
        return newnode;
 }
@@ -528,7 +549,10 @@ _copyAgg(Agg *from)
        COPY_SCALAR_FIELD(aggstrategy);
        COPY_SCALAR_FIELD(numCols);
        if (from->numCols > 0)
+       {
                COPY_POINTER_FIELD(grpColIdx, from->numCols * sizeof(AttrNumber));
+               COPY_POINTER_FIELD(grpOperators, from->numCols * sizeof(Oid));
+       }
        COPY_SCALAR_FIELD(numGroups);
 
        return newnode;
@@ -552,6 +576,7 @@ _copyUnique(Unique *from)
         */
        COPY_SCALAR_FIELD(numCols);
        COPY_POINTER_FIELD(uniqColIdx, from->numCols * sizeof(AttrNumber));
+       COPY_POINTER_FIELD(uniqOperators, from->numCols * sizeof(Oid));
 
        return newnode;
 }
@@ -595,6 +620,7 @@ _copySetOp(SetOp *from)
        COPY_SCALAR_FIELD(cmd);
        COPY_SCALAR_FIELD(numCols);
        COPY_POINTER_FIELD(dupColIdx, from->numCols * sizeof(AttrNumber));
+       COPY_POINTER_FIELD(dupOperators, from->numCols * sizeof(Oid));
        COPY_SCALAR_FIELD(flagColIdx);
 
        return newnode;
@@ -730,8 +756,8 @@ _copyParam(Param *from)
 
        COPY_SCALAR_FIELD(paramkind);
        COPY_SCALAR_FIELD(paramid);
-       COPY_STRING_FIELD(paramname);
        COPY_SCALAR_FIELD(paramtype);
+       COPY_SCALAR_FIELD(paramtypmod);
 
        return newnode;
 }
@@ -746,7 +772,7 @@ _copyAggref(Aggref *from)
 
        COPY_SCALAR_FIELD(aggfnoid);
        COPY_SCALAR_FIELD(aggtype);
-       COPY_NODE_FIELD(target);
+       COPY_NODE_FIELD(args);
        COPY_SCALAR_FIELD(agglevelsup);
        COPY_SCALAR_FIELD(aggstar);
        COPY_SCALAR_FIELD(aggdistinct);
@@ -863,10 +889,8 @@ _copySubLink(SubLink *from)
        SubLink    *newnode = makeNode(SubLink);
 
        COPY_SCALAR_FIELD(subLinkType);
-       COPY_SCALAR_FIELD(useOr);
-       COPY_NODE_FIELD(lefthand);
+       COPY_NODE_FIELD(testexpr);
        COPY_NODE_FIELD(operName);
-       COPY_NODE_FIELD(operOids);
        COPY_NODE_FIELD(subselect);
 
        return newnode;
@@ -881,8 +905,7 @@ _copySubPlan(SubPlan *from)
        SubPlan    *newnode = makeNode(SubPlan);
 
        COPY_SCALAR_FIELD(subLinkType);
-       COPY_SCALAR_FIELD(useOr);
-       COPY_NODE_FIELD(exprs);
+       COPY_NODE_FIELD(testexpr);
        COPY_NODE_FIELD(paramIds);
        COPY_NODE_FIELD(plan);
        COPY_SCALAR_FIELD(plan_id);
@@ -1034,6 +1057,23 @@ _copyRowExpr(RowExpr *from)
        return newnode;
 }
 
+/*
+ * _copyRowCompareExpr
+ */
+static RowCompareExpr *
+_copyRowCompareExpr(RowCompareExpr *from)
+{
+       RowCompareExpr *newnode = makeNode(RowCompareExpr);
+
+       COPY_SCALAR_FIELD(rctype);
+       COPY_NODE_FIELD(opnos);
+       COPY_NODE_FIELD(opfamilies);
+       COPY_NODE_FIELD(largs);
+       COPY_NODE_FIELD(rargs);
+
+       return newnode;
+}
+
 /*
  * _copyCoalesceExpr
  */
@@ -1048,6 +1088,38 @@ _copyCoalesceExpr(CoalesceExpr *from)
        return newnode;
 }
 
+/*
+ * _copyMinMaxExpr
+ */
+static MinMaxExpr *
+_copyMinMaxExpr(MinMaxExpr *from)
+{
+       MinMaxExpr *newnode = makeNode(MinMaxExpr);
+
+       COPY_SCALAR_FIELD(minmaxtype);
+       COPY_SCALAR_FIELD(op);
+       COPY_NODE_FIELD(args);
+
+       return newnode;
+}
+
+/*
+ * _copyXmlExpr
+ */
+static XmlExpr *
+_copyXmlExpr(XmlExpr *from)
+{
+       XmlExpr *newnode = makeNode(XmlExpr);
+
+       COPY_SCALAR_FIELD(op);
+       COPY_STRING_FIELD(name);
+       COPY_NODE_FIELD(named_args);
+       COPY_NODE_FIELD(arg_names);
+       COPY_NODE_FIELD(args);
+
+       return newnode;
+}
+
 /*
  * _copyNullIfExpr (same as OpExpr)
  */
@@ -1212,15 +1284,18 @@ _copyFromExpr(FromExpr *from)
  */
 
 /*
- * _copyPathKeyItem
+ * _copyPathKey
  */
-static PathKeyItem *
-_copyPathKeyItem(PathKeyItem *from)
+static PathKey *
+_copyPathKey(PathKey *from)
 {
-       PathKeyItem *newnode = makeNode(PathKeyItem);
+       PathKey *newnode = makeNode(PathKey);
 
-       COPY_NODE_FIELD(key);
-       COPY_SCALAR_FIELD(sortop);
+       /* EquivalenceClasses are never moved, so just shallow-copy the pointer */
+       COPY_SCALAR_FIELD(pk_eclass);
+       COPY_SCALAR_FIELD(pk_opfamily);
+       COPY_SCALAR_FIELD(pk_strategy);
+       COPY_SCALAR_FIELD(pk_nulls_first);
 
        return newnode;
 }
@@ -1235,27 +1310,23 @@ _copyRestrictInfo(RestrictInfo *from)
 
        COPY_NODE_FIELD(clause);
        COPY_SCALAR_FIELD(is_pushed_down);
-       COPY_SCALAR_FIELD(valid_everywhere);
+       COPY_SCALAR_FIELD(outerjoin_delayed);
        COPY_SCALAR_FIELD(can_join);
+       COPY_SCALAR_FIELD(pseudoconstant);
        COPY_BITMAPSET_FIELD(clause_relids);
+       COPY_BITMAPSET_FIELD(required_relids);
        COPY_BITMAPSET_FIELD(left_relids);
        COPY_BITMAPSET_FIELD(right_relids);
        COPY_NODE_FIELD(orclause);
+       /* EquivalenceClasses are never copied, so shallow-copy the pointers */
+       COPY_SCALAR_FIELD(parent_ec);
        COPY_SCALAR_FIELD(eval_cost);
        COPY_SCALAR_FIELD(this_selec);
-       COPY_SCALAR_FIELD(mergejoinoperator);
-       COPY_SCALAR_FIELD(left_sortop);
-       COPY_SCALAR_FIELD(right_sortop);
-
-       /*
-        * Do not copy pathkeys, since they'd not be canonical in a copied
-        * query
-        */
-       newnode->left_pathkey = NIL;
-       newnode->right_pathkey = NIL;
-
-       COPY_SCALAR_FIELD(left_mergescansel);
-       COPY_SCALAR_FIELD(right_mergescansel);
+       COPY_NODE_FIELD(mergeopfamilies);
+       /* EquivalenceClasses are never copied, so shallow-copy the pointers */
+       COPY_SCALAR_FIELD(left_ec);
+       COPY_SCALAR_FIELD(right_ec);
+       COPY_SCALAR_FIELD(outer_is_left);
        COPY_SCALAR_FIELD(hashjoinoperator);
        COPY_SCALAR_FIELD(left_bucketsize);
        COPY_SCALAR_FIELD(right_bucketsize);
@@ -1264,15 +1335,17 @@ _copyRestrictInfo(RestrictInfo *from)
 }
 
 /*
- * _copyJoinInfo
+ * _copyOuterJoinInfo
  */
-static JoinInfo *
-_copyJoinInfo(JoinInfo *from)
+static OuterJoinInfo *
+_copyOuterJoinInfo(OuterJoinInfo *from)
 {
-       JoinInfo   *newnode = makeNode(JoinInfo);
+       OuterJoinInfo *newnode = makeNode(OuterJoinInfo);
 
-       COPY_BITMAPSET_FIELD(unjoined_relids);
-       COPY_NODE_FIELD(jinfo_restrictinfo);
+       COPY_BITMAPSET_FIELD(min_lefthand);
+       COPY_BITMAPSET_FIELD(min_righthand);
+       COPY_SCALAR_FIELD(is_full_join);
+       COPY_SCALAR_FIELD(lhs_strict);
 
        return newnode;
 }
@@ -1288,6 +1361,26 @@ _copyInClauseInfo(InClauseInfo *from)
        COPY_BITMAPSET_FIELD(lefthand);
        COPY_BITMAPSET_FIELD(righthand);
        COPY_NODE_FIELD(sub_targetlist);
+       COPY_NODE_FIELD(in_operators);
+
+       return newnode;
+}
+
+/*
+ * _copyAppendRelInfo
+ */
+static AppendRelInfo *
+_copyAppendRelInfo(AppendRelInfo *from)
+{
+       AppendRelInfo *newnode = makeNode(AppendRelInfo);
+
+       COPY_SCALAR_FIELD(parent_relid);
+       COPY_SCALAR_FIELD(child_relid);
+       COPY_SCALAR_FIELD(parent_reltype);
+       COPY_SCALAR_FIELD(child_reltype);
+       COPY_NODE_FIELD(col_mappings);
+       COPY_NODE_FIELD(translated_vars);
+       COPY_SCALAR_FIELD(parent_reloid);
 
        return newnode;
 }
@@ -1306,7 +1399,9 @@ _copyRangeTblEntry(RangeTblEntry *from)
        COPY_SCALAR_FIELD(relid);
        COPY_NODE_FIELD(subquery);
        COPY_NODE_FIELD(funcexpr);
-       COPY_NODE_FIELD(coldeflist);
+       COPY_NODE_FIELD(funccoltypes);
+       COPY_NODE_FIELD(funccoltypmods);
+       COPY_NODE_FIELD(values_lists);
        COPY_SCALAR_FIELD(jointype);
        COPY_NODE_FIELD(joinaliasvars);
        COPY_NODE_FIELD(alias);
@@ -1345,6 +1440,7 @@ _copySortClause(SortClause *from)
 
        COPY_SCALAR_FIELD(tleSortGroupRef);
        COPY_SCALAR_FIELD(sortop);
+       COPY_SCALAR_FIELD(nulls_first);
 
        return newnode;
 }
@@ -1356,6 +1452,19 @@ _copyGroupClause(GroupClause *from)
 
        COPY_SCALAR_FIELD(tleSortGroupRef);
        COPY_SCALAR_FIELD(sortop);
+       COPY_SCALAR_FIELD(nulls_first);
+
+       return newnode;
+}
+
+static RowMarkClause *
+_copyRowMarkClause(RowMarkClause *from)
+{
+       RowMarkClause *newnode = makeNode(RowMarkClause);
+
+       COPY_SCALAR_FIELD(rti);
+       COPY_SCALAR_FIELD(forUpdate);
+       COPY_SCALAR_FIELD(noWait);
 
        return newnode;
 }
@@ -1369,6 +1478,7 @@ _copyAExpr(A_Expr *from)
        COPY_NODE_FIELD(name);
        COPY_NODE_FIELD(lexpr);
        COPY_NODE_FIELD(rexpr);
+       COPY_SCALAR_FIELD(location);
 
        return newnode;
 }
@@ -1379,6 +1489,7 @@ _copyColumnRef(ColumnRef *from)
        ColumnRef  *newnode = makeNode(ColumnRef);
 
        COPY_NODE_FIELD(fields);
+       COPY_SCALAR_FIELD(location);
 
        return newnode;
 }
@@ -1433,6 +1544,7 @@ _copyFuncCall(FuncCall *from)
        COPY_NODE_FIELD(args);
        COPY_SCALAR_FIELD(agg_star);
        COPY_SCALAR_FIELD(agg_distinct);
+       COPY_SCALAR_FIELD(location);
 
        return newnode;
 }
@@ -1467,6 +1579,7 @@ _copyResTarget(ResTarget *from)
        COPY_STRING_FIELD(name);
        COPY_NODE_FIELD(indirection);
        COPY_NODE_FIELD(val);
+       COPY_SCALAR_FIELD(location);
 
        return newnode;
 }
@@ -1481,8 +1594,10 @@ _copyTypeName(TypeName *from)
        COPY_SCALAR_FIELD(timezone);
        COPY_SCALAR_FIELD(setof);
        COPY_SCALAR_FIELD(pct_type);
-       COPY_SCALAR_FIELD(typmod);
+       COPY_NODE_FIELD(typmods);
+       COPY_SCALAR_FIELD(typemod);
        COPY_NODE_FIELD(arrayBounds);
+       COPY_SCALAR_FIELD(location);
 
        return newnode;
 }
@@ -1492,7 +1607,8 @@ _copySortBy(SortBy *from)
 {
        SortBy     *newnode = makeNode(SortBy);
 
-       COPY_SCALAR_FIELD(sortby_kind);
+       COPY_SCALAR_FIELD(sortby_dir);
+       COPY_SCALAR_FIELD(sortby_nulls);
        COPY_NODE_FIELD(useOp);
        COPY_NODE_FIELD(node);
 
@@ -1541,6 +1657,8 @@ _copyIndexElem(IndexElem *from)
        COPY_STRING_FIELD(name);
        COPY_NODE_FIELD(expr);
        COPY_NODE_FIELD(opclass);
+       COPY_SCALAR_FIELD(ordering);
+       COPY_SCALAR_FIELD(nulls_ordering);
 
        return newnode;
 }
@@ -1558,7 +1676,6 @@ _copyColumnDef(ColumnDef *from)
        COPY_NODE_FIELD(raw_default);
        COPY_STRING_FIELD(cooked_default);
        COPY_NODE_FIELD(constraints);
-       COPY_NODE_FIELD(support);
 
        return newnode;
 }
@@ -1573,6 +1690,7 @@ _copyConstraint(Constraint *from)
        COPY_NODE_FIELD(raw_expr);
        COPY_STRING_FIELD(cooked_expr);
        COPY_NODE_FIELD(keys);
+       COPY_NODE_FIELD(options);
        COPY_STRING_FIELD(indexspace);
 
        return newnode;
@@ -1589,6 +1707,18 @@ _copyDefElem(DefElem *from)
        return newnode;
 }
 
+static LockingClause *
+_copyLockingClause(LockingClause *from)
+{
+       LockingClause *newnode = makeNode(LockingClause);
+
+       COPY_NODE_FIELD(lockedRels);
+       COPY_SCALAR_FIELD(forUpdate);
+       COPY_SCALAR_FIELD(noWait);
+
+       return newnode;
+}
+
 static Query *
 _copyQuery(Query *from)
 {
@@ -1600,33 +1730,25 @@ _copyQuery(Query *from)
        COPY_NODE_FIELD(utilityStmt);
        COPY_SCALAR_FIELD(resultRelation);
        COPY_NODE_FIELD(into);
-       COPY_SCALAR_FIELD(intoHasOids);
+       COPY_NODE_FIELD(intoOptions);
+       COPY_SCALAR_FIELD(intoOnCommit);
+       COPY_STRING_FIELD(intoTableSpaceName);
        COPY_SCALAR_FIELD(hasAggs);
        COPY_SCALAR_FIELD(hasSubLinks);
        COPY_NODE_FIELD(rtable);
        COPY_NODE_FIELD(jointree);
-       COPY_NODE_FIELD(rowMarks);
        COPY_NODE_FIELD(targetList);
+       COPY_NODE_FIELD(returningList);
        COPY_NODE_FIELD(groupClause);
        COPY_NODE_FIELD(havingQual);
        COPY_NODE_FIELD(distinctClause);
        COPY_NODE_FIELD(sortClause);
        COPY_NODE_FIELD(limitOffset);
        COPY_NODE_FIELD(limitCount);
+       COPY_NODE_FIELD(rowMarks);
        COPY_NODE_FIELD(setOperations);
        COPY_NODE_FIELD(resultRelations);
-       COPY_NODE_FIELD(in_info_list);
-       COPY_SCALAR_FIELD(hasJoinRTEs);
-       COPY_SCALAR_FIELD(hasHavingQual);
-
-       /*
-        * We do not copy the other planner internal fields: base_rel_list,
-        * other_rel_list, join_rel_list, equi_key_list, query_pathkeys. That
-        * would get us into copying RelOptInfo/Path trees, which we don't
-        * want to do.  It is necessary to copy in_info_list, hasJoinRTEs,
-        * and hasHavingQual for the benefit of inheritance_planner(), which
-        * may try to copy a Query in which these are already set.
-        */
+       COPY_NODE_FIELD(returningLists);
 
        return newnode;
 }
@@ -1638,8 +1760,8 @@ _copyInsertStmt(InsertStmt *from)
 
        COPY_NODE_FIELD(relation);
        COPY_NODE_FIELD(cols);
-       COPY_NODE_FIELD(targetList);
        COPY_NODE_FIELD(selectStmt);
+       COPY_NODE_FIELD(returningList);
 
        return newnode;
 }
@@ -1650,8 +1772,9 @@ _copyDeleteStmt(DeleteStmt *from)
        DeleteStmt *newnode = makeNode(DeleteStmt);
 
        COPY_NODE_FIELD(relation);
-       COPY_NODE_FIELD(whereClause);
        COPY_NODE_FIELD(usingClause);
+       COPY_NODE_FIELD(whereClause);
+       COPY_NODE_FIELD(returningList);
 
        return newnode;
 }
@@ -1665,6 +1788,7 @@ _copyUpdateStmt(UpdateStmt *from)
        COPY_NODE_FIELD(targetList);
        COPY_NODE_FIELD(whereClause);
        COPY_NODE_FIELD(fromClause);
+       COPY_NODE_FIELD(returningList);
 
        return newnode;
 }
@@ -1677,16 +1801,19 @@ _copySelectStmt(SelectStmt *from)
        COPY_NODE_FIELD(distinctClause);
        COPY_NODE_FIELD(into);
        COPY_NODE_FIELD(intoColNames);
-       COPY_SCALAR_FIELD(intoHasOids);
+       COPY_NODE_FIELD(intoOptions);
+       COPY_SCALAR_FIELD(intoOnCommit);
+       COPY_STRING_FIELD(intoTableSpaceName);
        COPY_NODE_FIELD(targetList);
        COPY_NODE_FIELD(fromClause);
        COPY_NODE_FIELD(whereClause);
        COPY_NODE_FIELD(groupClause);
        COPY_NODE_FIELD(havingClause);
+       COPY_NODE_FIELD(valuesLists);
        COPY_NODE_FIELD(sortClause);
        COPY_NODE_FIELD(limitOffset);
        COPY_NODE_FIELD(limitCount);
-       COPY_NODE_FIELD(forUpdate);
+       COPY_NODE_FIELD(lockingClause);
        COPY_SCALAR_FIELD(op);
        COPY_SCALAR_FIELD(all);
        COPY_NODE_FIELD(larg);
@@ -1705,6 +1832,7 @@ _copySetOperationStmt(SetOperationStmt *from)
        COPY_NODE_FIELD(larg);
        COPY_NODE_FIELD(rarg);
        COPY_NODE_FIELD(colTypes);
+       COPY_NODE_FIELD(colTypmods);
 
        return newnode;
 }
@@ -1770,8 +1898,7 @@ _copyPrivGrantee(PrivGrantee *from)
 {
        PrivGrantee *newnode = makeNode(PrivGrantee);
 
-       COPY_STRING_FIELD(username);
-       COPY_STRING_FIELD(groupname);
+       COPY_STRING_FIELD(rolname);
 
        return newnode;
 }
@@ -1787,6 +1914,21 @@ _copyFuncWithArgs(FuncWithArgs *from)
        return newnode;
 }
 
+static GrantRoleStmt *
+_copyGrantRoleStmt(GrantRoleStmt *from)
+{
+       GrantRoleStmt *newnode = makeNode(GrantRoleStmt);
+
+       COPY_NODE_FIELD(granted_roles);
+       COPY_NODE_FIELD(grantee_roles);
+       COPY_SCALAR_FIELD(is_grant);
+       COPY_SCALAR_FIELD(admin_opt);
+       COPY_STRING_FIELD(grantor);
+       COPY_SCALAR_FIELD(behavior);
+
+       return newnode;
+}
+
 static DeclareCursorStmt *
 _copyDeclareCursorStmt(DeclareCursorStmt *from)
 {
@@ -1826,6 +1968,7 @@ _copyCopyStmt(CopyStmt *from)
        CopyStmt   *newnode = makeNode(CopyStmt);
 
        COPY_NODE_FIELD(relation);
+       COPY_NODE_FIELD(query);
        COPY_NODE_FIELD(attlist);
        COPY_SCALAR_FIELD(is_from);
        COPY_STRING_FIELD(filename);
@@ -1843,7 +1986,7 @@ _copyCreateStmt(CreateStmt *from)
        COPY_NODE_FIELD(tableElts);
        COPY_NODE_FIELD(inhRelations);
        COPY_NODE_FIELD(constraints);
-       COPY_SCALAR_FIELD(hasoids);
+       COPY_NODE_FIELD(options);
        COPY_SCALAR_FIELD(oncommit);
        COPY_STRING_FIELD(tablespacename);
 
@@ -1856,7 +1999,7 @@ _copyInhRelation(InhRelation *from)
        InhRelation *newnode = makeNode(InhRelation);
 
        COPY_NODE_FIELD(relation);
-       COPY_SCALAR_FIELD(including_defaults);
+       COPY_NODE_FIELD(options);
 
        return newnode;
 }
@@ -1867,7 +2010,9 @@ _copyDefineStmt(DefineStmt *from)
        DefineStmt *newnode = makeNode(DefineStmt);
 
        COPY_SCALAR_FIELD(kind);
+       COPY_SCALAR_FIELD(oldstyle);
        COPY_NODE_FIELD(defnames);
+       COPY_NODE_FIELD(args);
        COPY_NODE_FIELD(definition);
 
        return newnode;
@@ -1881,6 +2026,7 @@ _copyDropStmt(DropStmt *from)
        COPY_NODE_FIELD(objects);
        COPY_SCALAR_FIELD(removeType);
        COPY_SCALAR_FIELD(behavior);
+       COPY_SCALAR_FIELD(missing_ok);
 
        return newnode;
 }
@@ -1891,6 +2037,7 @@ _copyTruncateStmt(TruncateStmt *from)
        TruncateStmt *newnode = makeNode(TruncateStmt);
 
        COPY_NODE_FIELD(relations);
+       COPY_SCALAR_FIELD(behavior);
 
        return newnode;
 }
@@ -1931,11 +2078,13 @@ _copyIndexStmt(IndexStmt *from)
        COPY_STRING_FIELD(accessMethod);
        COPY_STRING_FIELD(tableSpace);
        COPY_NODE_FIELD(indexParams);
+       COPY_NODE_FIELD(options);
        COPY_NODE_FIELD(whereClause);
        COPY_NODE_FIELD(rangetable);
        COPY_SCALAR_FIELD(unique);
        COPY_SCALAR_FIELD(primary);
        COPY_SCALAR_FIELD(isconstraint);
+       COPY_SCALAR_FIELD(concurrent);
 
        return newnode;
 }
@@ -1978,38 +2127,16 @@ _copyAlterFunctionStmt(AlterFunctionStmt *from)
        return newnode;
 }
 
-static RemoveAggrStmt *
-_copyRemoveAggrStmt(RemoveAggrStmt *from)
-{
-       RemoveAggrStmt *newnode = makeNode(RemoveAggrStmt);
-
-       COPY_NODE_FIELD(aggname);
-       COPY_NODE_FIELD(aggtype);
-       COPY_SCALAR_FIELD(behavior);
-
-       return newnode;
-}
-
 static RemoveFuncStmt *
 _copyRemoveFuncStmt(RemoveFuncStmt *from)
 {
        RemoveFuncStmt *newnode = makeNode(RemoveFuncStmt);
 
-       COPY_NODE_FIELD(funcname);
-       COPY_NODE_FIELD(args);
-       COPY_SCALAR_FIELD(behavior);
-
-       return newnode;
-}
-
-static RemoveOperStmt *
-_copyRemoveOperStmt(RemoveOperStmt *from)
-{
-       RemoveOperStmt *newnode = makeNode(RemoveOperStmt);
-
-       COPY_NODE_FIELD(opname);
+       COPY_SCALAR_FIELD(kind);
+       COPY_NODE_FIELD(name);
        COPY_NODE_FIELD(args);
        COPY_SCALAR_FIELD(behavior);
+       COPY_SCALAR_FIELD(missing_ok);
 
        return newnode;
 }
@@ -2022,6 +2149,7 @@ _copyRemoveOpClassStmt(RemoveOpClassStmt *from)
        COPY_NODE_FIELD(opclassname);
        COPY_STRING_FIELD(amname);
        COPY_SCALAR_FIELD(behavior);
+       COPY_SCALAR_FIELD(missing_ok);
 
        return newnode;
 }
@@ -2031,12 +2159,27 @@ _copyRenameStmt(RenameStmt *from)
 {
        RenameStmt *newnode = makeNode(RenameStmt);
 
+       COPY_SCALAR_FIELD(renameType);
        COPY_NODE_FIELD(relation);
        COPY_NODE_FIELD(object);
        COPY_NODE_FIELD(objarg);
        COPY_STRING_FIELD(subname);
        COPY_STRING_FIELD(newname);
-       COPY_SCALAR_FIELD(renameType);
+
+       return newnode;
+}
+
+static AlterObjectSchemaStmt *
+_copyAlterObjectSchemaStmt(AlterObjectSchemaStmt *from)
+{
+       AlterObjectSchemaStmt *newnode = makeNode(AlterObjectSchemaStmt);
+
+       COPY_SCALAR_FIELD(objectType);
+       COPY_NODE_FIELD(relation);
+       COPY_NODE_FIELD(object);
+       COPY_NODE_FIELD(objarg);
+       COPY_STRING_FIELD(addname);
+       COPY_STRING_FIELD(newschema);
 
        return newnode;
 }
@@ -2046,12 +2189,12 @@ _copyAlterOwnerStmt(AlterOwnerStmt *from)
 {
        AlterOwnerStmt *newnode = makeNode(AlterOwnerStmt);
 
+       COPY_SCALAR_FIELD(objectType);
        COPY_NODE_FIELD(relation);
        COPY_NODE_FIELD(object);
        COPY_NODE_FIELD(objarg);
        COPY_STRING_FIELD(addname);
        COPY_STRING_FIELD(newowner);
-       COPY_SCALAR_FIELD(objectType);
 
        return newnode;
 }
@@ -2109,6 +2252,7 @@ _copyTransactionStmt(TransactionStmt *from)
 
        COPY_SCALAR_FIELD(kind);
        COPY_NODE_FIELD(options);
+       COPY_STRING_FIELD(gid);
 
        return newnode;
 }
@@ -2165,6 +2309,7 @@ _copyCreateOpClassStmt(CreateOpClassStmt *from)
        CreateOpClassStmt *newnode = makeNode(CreateOpClassStmt);
 
        COPY_NODE_FIELD(opclassname);
+       COPY_NODE_FIELD(opfamilyname);
        COPY_STRING_FIELD(amname);
        COPY_NODE_FIELD(datatype);
        COPY_NODE_FIELD(items);
@@ -2199,6 +2344,17 @@ _copyCreatedbStmt(CreatedbStmt *from)
        return newnode;
 }
 
+static AlterDatabaseStmt *
+_copyAlterDatabaseStmt(AlterDatabaseStmt *from)
+{
+       AlterDatabaseStmt *newnode = makeNode(AlterDatabaseStmt);
+
+       COPY_STRING_FIELD(dbname);
+       COPY_NODE_FIELD(options);
+
+       return newnode;
+}
+
 static AlterDatabaseSetStmt *
 _copyAlterDatabaseSetStmt(AlterDatabaseSetStmt *from)
 {
@@ -2217,6 +2373,7 @@ _copyDropdbStmt(DropdbStmt *from)
        DropdbStmt *newnode = makeNode(DropdbStmt);
 
        COPY_STRING_FIELD(dbname);
+       COPY_SCALAR_FIELD(missing_ok);
 
        return newnode;
 }
@@ -2229,8 +2386,8 @@ _copyVacuumStmt(VacuumStmt *from)
        COPY_SCALAR_FIELD(vacuum);
        COPY_SCALAR_FIELD(full);
        COPY_SCALAR_FIELD(analyze);
-       COPY_SCALAR_FIELD(freeze);
        COPY_SCALAR_FIELD(verbose);
+       COPY_SCALAR_FIELD(freeze_min_age);
        COPY_NODE_FIELD(relation);
        COPY_NODE_FIELD(va_cols);
 
@@ -2321,6 +2478,7 @@ _copyDropTableSpaceStmt(DropTableSpaceStmt *from)
        DropTableSpaceStmt *newnode = makeNode(DropTableSpaceStmt);
 
        COPY_STRING_FIELD(tablespacename);
+       COPY_SCALAR_FIELD(missing_ok);
 
        return newnode;
 }
@@ -2354,6 +2512,7 @@ _copyDropPropertyStmt(DropPropertyStmt *from)
        COPY_STRING_FIELD(property);
        COPY_SCALAR_FIELD(removeType);
        COPY_SCALAR_FIELD(behavior);
+       COPY_SCALAR_FIELD(missing_ok);
 
        return newnode;
 }
@@ -2378,50 +2537,54 @@ _copyDropPLangStmt(DropPLangStmt *from)
 
        COPY_STRING_FIELD(plname);
        COPY_SCALAR_FIELD(behavior);
+       COPY_SCALAR_FIELD(missing_ok);
 
        return newnode;
 }
 
-static CreateUserStmt *
-_copyCreateUserStmt(CreateUserStmt *from)
+static CreateRoleStmt *
+_copyCreateRoleStmt(CreateRoleStmt *from)
 {
-       CreateUserStmt *newnode = makeNode(CreateUserStmt);
+       CreateRoleStmt *newnode = makeNode(CreateRoleStmt);
 
-       COPY_STRING_FIELD(user);
+       COPY_SCALAR_FIELD(stmt_type);
+       COPY_STRING_FIELD(role);
        COPY_NODE_FIELD(options);
 
        return newnode;
 }
 
-static AlterUserStmt *
-_copyAlterUserStmt(AlterUserStmt *from)
+static AlterRoleStmt *
+_copyAlterRoleStmt(AlterRoleStmt *from)
 {
-       AlterUserStmt *newnode = makeNode(AlterUserStmt);
+       AlterRoleStmt *newnode = makeNode(AlterRoleStmt);
 
-       COPY_STRING_FIELD(user);
+       COPY_STRING_FIELD(role);
        COPY_NODE_FIELD(options);
+       COPY_SCALAR_FIELD(action);
 
        return newnode;
 }
 
-static AlterUserSetStmt *
-_copyAlterUserSetStmt(AlterUserSetStmt *from)
+static AlterRoleSetStmt *
+_copyAlterRoleSetStmt(AlterRoleSetStmt *from)
 {
-       AlterUserSetStmt *newnode = makeNode(AlterUserSetStmt);
+       AlterRoleSetStmt *newnode = makeNode(AlterRoleSetStmt);
 
-       COPY_STRING_FIELD(user);
+       COPY_STRING_FIELD(role);
        COPY_STRING_FIELD(variable);
        COPY_NODE_FIELD(value);
 
        return newnode;
 }
 
-static DropUserStmt *
-_copyDropUserStmt(DropUserStmt *from)
+static DropRoleStmt *
+_copyDropRoleStmt(DropRoleStmt *from)
 {
-       DropUserStmt *newnode = makeNode(DropUserStmt);
+       DropRoleStmt *newnode = makeNode(DropRoleStmt);
 
-       COPY_NODE_FIELD(users);
+       COPY_NODE_FIELD(roles);
+       COPY_SCALAR_FIELD(missing_ok);
 
        return newnode;
 }
@@ -2449,39 +2612,6 @@ _copyConstraintsSetStmt(ConstraintsSetStmt *from)
        return newnode;
 }
 
-static CreateGroupStmt *
-_copyCreateGroupStmt(CreateGroupStmt *from)
-{
-       CreateGroupStmt *newnode = makeNode(CreateGroupStmt);
-
-       COPY_STRING_FIELD(name);
-       COPY_NODE_FIELD(options);
-
-       return newnode;
-}
-
-static AlterGroupStmt *
-_copyAlterGroupStmt(AlterGroupStmt *from)
-{
-       AlterGroupStmt *newnode = makeNode(AlterGroupStmt);
-
-       COPY_STRING_FIELD(name);
-       COPY_SCALAR_FIELD(action);
-       COPY_NODE_FIELD(listUsers);
-
-       return newnode;
-}
-
-static DropGroupStmt *
-_copyDropGroupStmt(DropGroupStmt *from)
-{
-       DropGroupStmt *newnode = makeNode(DropGroupStmt);
-
-       COPY_STRING_FIELD(name);
-
-       return newnode;
-}
-
 static ReindexStmt *
 _copyReindexStmt(ReindexStmt *from)
 {
@@ -2490,8 +2620,8 @@ _copyReindexStmt(ReindexStmt *from)
        COPY_SCALAR_FIELD(kind);
        COPY_NODE_FIELD(relation);
        COPY_STRING_FIELD(name);
-       COPY_SCALAR_FIELD(force);
-       COPY_SCALAR_FIELD(all);
+       COPY_SCALAR_FIELD(do_system);
+       COPY_SCALAR_FIELD(do_user);
 
        return newnode;
 }
@@ -2543,6 +2673,7 @@ _copyDropCastStmt(DropCastStmt *from)
        COPY_NODE_FIELD(sourcetype);
        COPY_NODE_FIELD(targettype);
        COPY_SCALAR_FIELD(behavior);
+       COPY_SCALAR_FIELD(missing_ok);
 
        return newnode;
 }
@@ -2567,6 +2698,9 @@ _copyExecuteStmt(ExecuteStmt *from)
 
        COPY_STRING_FIELD(name);
        COPY_NODE_FIELD(into);
+       COPY_NODE_FIELD(intoOptions);
+       COPY_SCALAR_FIELD(into_on_commit);
+       COPY_STRING_FIELD(into_tbl_space);
        COPY_NODE_FIELD(params);
 
        return newnode;
@@ -2582,6 +2716,27 @@ _copyDeallocateStmt(DeallocateStmt *from)
        return newnode;
 }
 
+static DropOwnedStmt *
+_copyDropOwnedStmt(DropOwnedStmt *from)
+{
+       DropOwnedStmt *newnode = makeNode(DropOwnedStmt);
+
+       COPY_NODE_FIELD(roles);
+       COPY_SCALAR_FIELD(behavior);
+
+       return newnode;
+}
+
+static ReassignOwnedStmt *
+_copyReassignOwnedStmt(ReassignOwnedStmt *from)
+{
+       ReassignOwnedStmt *newnode = makeNode(ReassignOwnedStmt);
+
+       COPY_NODE_FIELD(roles);
+       COPY_SCALAR_FIELD(newrole);
+
+       return newnode;
+}
 
 /* ****************************************************************
  *                                     pg_list.h copy functions
@@ -2716,6 +2871,9 @@ copyObject(void *from)
                case T_FunctionScan:
                        retval = _copyFunctionScan(from);
                        break;
+               case T_ValuesScan:
+                       retval = _copyValuesScan(from);
+                       break;
                case T_Join:
                        retval = _copyJoin(from);
                        break;
@@ -2825,9 +2983,18 @@ copyObject(void *from)
                case T_RowExpr:
                        retval = _copyRowExpr(from);
                        break;
+               case T_RowCompareExpr:
+                       retval = _copyRowCompareExpr(from);
+                       break;
                case T_CoalesceExpr:
                        retval = _copyCoalesceExpr(from);
                        break;
+               case T_MinMaxExpr:
+                       retval = _copyMinMaxExpr(from);
+                       break;
+               case T_XmlExpr:
+                       retval = _copyXmlExpr(from);
+                       break;
                case T_NullIfExpr:
                        retval = _copyNullIfExpr(from);
                        break;
@@ -2862,18 +3029,21 @@ copyObject(void *from)
                        /*
                         * RELATION NODES
                         */
-               case T_PathKeyItem:
-                       retval = _copyPathKeyItem(from);
+               case T_PathKey:
+                       retval = _copyPathKey(from);
                        break;
                case T_RestrictInfo:
                        retval = _copyRestrictInfo(from);
                        break;
-               case T_JoinInfo:
-                       retval = _copyJoinInfo(from);
+               case T_OuterJoinInfo:
+                       retval = _copyOuterJoinInfo(from);
                        break;
                case T_InClauseInfo:
                        retval = _copyInClauseInfo(from);
                        break;
+               case T_AppendRelInfo:
+                       retval = _copyAppendRelInfo(from);
+                       break;
 
                        /*
                         * VALUE NODES
@@ -2894,8 +3064,8 @@ copyObject(void *from)
                        break;
 
                        /*
-                        * Lists of integers and OIDs don't need to be deep-copied, so
-                        * we perform a shallow copy via list_copy()
+                        * Lists of integers and OIDs don't need to be deep-copied, so we
+                        * perform a shallow copy via list_copy()
                         */
                case T_IntList:
                case T_OidList:
@@ -2935,6 +3105,9 @@ copyObject(void *from)
                case T_GrantStmt:
                        retval = _copyGrantStmt(from);
                        break;
+               case T_GrantRoleStmt:
+                       retval = _copyGrantRoleStmt(from);
+                       break;
                case T_DeclareCursorStmt:
                        retval = _copyDeclareCursorStmt(from);
                        break;
@@ -2980,21 +3153,18 @@ copyObject(void *from)
                case T_AlterFunctionStmt:
                        retval = _copyAlterFunctionStmt(from);
                        break;
-               case T_RemoveAggrStmt:
-                       retval = _copyRemoveAggrStmt(from);
-                       break;
                case T_RemoveFuncStmt:
                        retval = _copyRemoveFuncStmt(from);
                        break;
-               case T_RemoveOperStmt:
-                       retval = _copyRemoveOperStmt(from);
-                       break;
                case T_RemoveOpClassStmt:
                        retval = _copyRemoveOpClassStmt(from);
                        break;
                case T_RenameStmt:
                        retval = _copyRenameStmt(from);
                        break;
+               case T_AlterObjectSchemaStmt:
+                       retval = _copyAlterObjectSchemaStmt(from);
+                       break;
                case T_AlterOwnerStmt:
                        retval = _copyAlterOwnerStmt(from);
                        break;
@@ -3034,6 +3204,9 @@ copyObject(void *from)
                case T_CreatedbStmt:
                        retval = _copyCreatedbStmt(from);
                        break;
+               case T_AlterDatabaseStmt:
+                       retval = _copyAlterDatabaseStmt(from);
+                       break;
                case T_AlterDatabaseSetStmt:
                        retval = _copyAlterDatabaseSetStmt(from);
                        break;
@@ -3079,17 +3252,17 @@ copyObject(void *from)
                case T_DropPLangStmt:
                        retval = _copyDropPLangStmt(from);
                        break;
-               case T_CreateUserStmt:
-                       retval = _copyCreateUserStmt(from);
+               case T_CreateRoleStmt:
+                       retval = _copyCreateRoleStmt(from);
                        break;
-               case T_AlterUserStmt:
-                       retval = _copyAlterUserStmt(from);
+               case T_AlterRoleStmt:
+                       retval = _copyAlterRoleStmt(from);
                        break;
-               case T_AlterUserSetStmt:
-                       retval = _copyAlterUserSetStmt(from);
+               case T_AlterRoleSetStmt:
+                       retval = _copyAlterRoleSetStmt(from);
                        break;
-               case T_DropUserStmt:
-                       retval = _copyDropUserStmt(from);
+               case T_DropRoleStmt:
+                       retval = _copyDropRoleStmt(from);
                        break;
                case T_LockStmt:
                        retval = _copyLockStmt(from);
@@ -3097,15 +3270,6 @@ copyObject(void *from)
                case T_ConstraintsSetStmt:
                        retval = _copyConstraintsSetStmt(from);
                        break;
-               case T_CreateGroupStmt:
-                       retval = _copyCreateGroupStmt(from);
-                       break;
-               case T_AlterGroupStmt:
-                       retval = _copyAlterGroupStmt(from);
-                       break;
-               case T_DropGroupStmt:
-                       retval = _copyDropGroupStmt(from);
-                       break;
                case T_ReindexStmt:
                        retval = _copyReindexStmt(from);
                        break;
@@ -3133,6 +3297,12 @@ copyObject(void *from)
                case T_DeallocateStmt:
                        retval = _copyDeallocateStmt(from);
                        break;
+               case T_DropOwnedStmt:
+                       retval = _copyDropOwnedStmt(from);
+                       break;
+               case T_ReassignOwnedStmt:
+                       retval = _copyReassignOwnedStmt(from);
+                       break;
 
                case T_A_Expr:
                        retval = _copyAExpr(from);
@@ -3185,6 +3355,9 @@ copyObject(void *from)
                case T_DefElem:
                        retval = _copyDefElem(from);
                        break;
+               case T_LockingClause:
+                       retval = _copyLockingClause(from);
+                       break;
                case T_RangeTblEntry:
                        retval = _copyRangeTblEntry(from);
                        break;
@@ -3194,6 +3367,9 @@ copyObject(void *from)
                case T_GroupClause:
                        retval = _copyGroupClause(from);
                        break;
+               case T_RowMarkClause:
+                       retval = _copyRowMarkClause(from);
+                       break;
                case T_FkConstraint:
                        retval = _copyFkConstraint(from);
                        break;