Remove obsolete backwards-compatibility code.

There's no need to be able to read nodes generated by an old version. We're
not going to handle upgrades that way.

src/backend/nodes/outfuncs.c

@@ -1191,22 +1191,8 @@ _outAggref(StringInfo str, Aggref *node)
 	WRITE_UINT_FIELD(agglevelsup);
 	WRITE_BOOL_FIELD(aggstar);
 	WRITE_BOOL_FIELD(aggdistinct);
-
-    /*
-     * CDB: This field was added after the MPP 2.1p2 release.  Upstream of
-     * the planner, it's unused and zero, in which case we skip writing it
-     * because we don't want it written into the catalog.  Allows downward
-     * compatibility in case the database is opened using an older release.
-     */
-    if (node->aggstage != 0)
-	    WRITE_ENUM_FIELD(aggstage, AggStage);
-
-    /* 
-     * CDB: to minimize upgrade impact we only write out the aggorder
-     * field when it is present
-     */
-    if (node->aggorder != NULL)
-        WRITE_NODE_FIELD(aggorder);
+	WRITE_ENUM_FIELD(aggstage, AggStage);
+	WRITE_NODE_FIELD(aggorder);
 }
 #endif /* COMPILING_BINARY_FUNCS */
 
@@ -1261,11 +1247,7 @@ _outFuncExpr(StringInfo str, FuncExpr *node)
 	WRITE_BOOL_FIELD(funcretset);
 	WRITE_ENUM_FIELD(funcformat, CoercionForm);
 	WRITE_NODE_FIELD(args);
-	
-	if (node->is_tablefunc)
-	{
-		WRITE_BOOL_FIELD(is_tablefunc);  /* GPDB */
-	}
+	WRITE_BOOL_FIELD(is_tablefunc);  /* GPDB */
 }
 #endif /* COMPILING_BINARY_FUNCS */
 
@@ -3498,21 +3480,10 @@ _outQuery(StringInfo str, Query *node)
 	WRITE_NODE_FIELD(windowClause);
 	WRITE_NODE_FIELD(distinctClause);
 	WRITE_NODE_FIELD(sortClause);
-	if (node->scatterClause != NIL)
-	{
-		WRITE_NODE_FIELD(scatterClause);
-	}
-
-	/*
-	 * To minimize the upgrade impact, we only write out cteList, hasRecursive,
-	 * hasModifyingCTE when cteList is present..
-	 */
-	if (node->cteList != NIL)
-	{
-		WRITE_NODE_FIELD(cteList);
-		WRITE_BOOL_FIELD(hasRecursive);
-		WRITE_BOOL_FIELD(hasModifyingCTE);
-	}
+	WRITE_NODE_FIELD(scatterClause);
+	WRITE_NODE_FIELD(cteList);
+	WRITE_BOOL_FIELD(hasRecursive);
+	WRITE_BOOL_FIELD(hasModifyingCTE);
 	WRITE_NODE_FIELD(limitOffset);
 	WRITE_NODE_FIELD(limitCount);
 	WRITE_NODE_FIELD(rowMarks);

src/backend/nodes/readfuncs.c

@@ -319,55 +319,7 @@ _readQuery(void)
 	READ_BOOL_FIELD(canSetTag);
 	READ_NODE_FIELD(utilityStmt);
 	READ_INT_FIELD(resultRelation);
-
-	if ( ! pg_strtok_peek_fldname("intoClause"))
-	{
-		/* If the Query node was written with 3.3 or earlier, there is no intoClause,
-		 * but its content lies in several now-absent fields that we must scan over.
-		 *
-		 * Though we can't have a view defined on a SELECT ... INTO ... query,
-		 * there may be some other rule (?) that has these fields defined.
-		 */
-		RangeVar *rv = READ_NODE_VALUE(into);
-		List *op = READ_NODE_VALUE(intoOptions);
-		OnCommitAction oc = READ_ENUM_VALUE(intoOnCommit, OnCommitAction);
-		char * ts = READ_STRING_VALUE(intoTableSpaceName);
-
-		if ( rv == NULL && op == NIL && oc == ONCOMMIT_NOOP && ts == NULL )
-		{
-			/* Nothing to say. */
-			local_node->intoClause = NULL;
-		}
-		else
-		{
-			local_node->intoClause = makeNode(IntoClause);
-			local_node->intoClause->rel = rv;
-			local_node->intoClause->options = op;
-			local_node->intoClause->onCommit = oc;
-			local_node->intoClause->tableSpaceName = ts;
-			local_node->intoClause->oidInfo.relOid = InvalidOid;
-			local_node->intoClause->oidInfo.comptypeOid = InvalidOid;
-			local_node->intoClause->oidInfo.comptypeArrayOid = InvalidOid;
-			local_node->intoClause->oidInfo.toastOid = InvalidOid;
-			local_node->intoClause->oidInfo.toastIndexOid = InvalidOid;
-			local_node->intoClause->oidInfo.toastComptypeOid = InvalidOid;
-			local_node->intoClause->oidInfo.aosegOid = InvalidOid;
-			local_node->intoClause->oidInfo.aosegIndexOid = InvalidOid;
-			local_node->intoClause->oidInfo.aosegComptypeOid = InvalidOid;
-			local_node->intoClause->oidInfo.aoblkdirOid = InvalidOid;
-			local_node->intoClause->oidInfo.aoblkdirIndexOid = InvalidOid;
-			local_node->intoClause->oidInfo.aoblkdirComptypeOid = InvalidOid;
-			local_node->intoClause->oidInfo.aovisimapOid = InvalidOid;
-			local_node->intoClause->oidInfo.aovisimapIndexOid = InvalidOid;
-			local_node->intoClause->oidInfo.aovisimapComptypeOid = InvalidOid;
-		}
-	}
-	else
-	{
-		/* Post 3.3, it's easier. */
-		READ_NODE_FIELD(intoClause);
-	}
-
+	READ_NODE_FIELD(intoClause);
 	READ_BOOL_FIELD(hasAggs);
 	READ_BOOL_FIELD(hasWindFuncs);
 	READ_BOOL_FIELD(hasSubLinks);
@@ -380,32 +332,10 @@ _readQuery(void)
 	READ_NODE_FIELD(windowClause);
 	READ_NODE_FIELD(distinctClause);
 	READ_NODE_FIELD(sortClause);
-    if (pg_strtok_peek_fldname("scatterClause"))
-    {
-        READ_NODE_FIELD(scatterClause);
-    }
-
-	if (!pg_strtok_peek_fldname("cteList"))
-	{
-		/*
-		 * If the Query node does not contain cteList, it means that this query
-		 * does not contain WITH clause. We simple initialize relevant variables
-		 * here.
-		 *
-		 * Note that if the Query node does not contain cteList, it should not
-		 * contain hasRecursive or hasModifyingCTE.
-		 */
-		local_node->cteList = NULL;
-		local_node->hasRecursive = false;
-		local_node->hasModifyingCTE = false;
-	}
-	else
-	{
-		READ_NODE_FIELD(cteList);
-		READ_BOOL_FIELD(hasRecursive);
-		READ_BOOL_FIELD(hasModifyingCTE);
-	}
-
+	READ_NODE_FIELD(scatterClause);
+	READ_NODE_FIELD(cteList);
+	READ_BOOL_FIELD(hasRecursive);
+	READ_BOOL_FIELD(hasModifyingCTE);
 	READ_NODE_FIELD(limitOffset);
 	READ_NODE_FIELD(limitCount);
 	READ_NODE_FIELD(rowMarks);
@@ -415,35 +345,6 @@ _readQuery(void)
 	READ_NODE_FIELD(result_aosegnos);
 	READ_NODE_FIELD(returningLists);
 
-    /* In some earlier releases (including 3.3) a TableOidInfo was held in the
-     * Query node.  Maybe some values got stored in the catalog as part of a
-     * rule (possible?)  Maybe the Query was a CTAS. In any case, we don't want
-     * to remember the OIDs assigned in the past.
-     *
-     * Now TableOidInfo is in the node's intoClause. As noted, we don't actually
-     * need the values but, if they exist, we need scan over them.
-     */
-    if (pg_strtok_peek_fldname("intoOidInfo.relOid"))
-    {
-		(void) READ_SCALAR_VALUE(intoOidInfo.relOid, InvalidOid);
-		(void) READ_SCALAR_VALUE(intoOidInfo.comptypeOid, InvalidOid);
-		(void) READ_SCALAR_VALUE(intoOidInfo.toastOid, InvalidOid);
-		(void) READ_SCALAR_VALUE(intoOidInfo.toastIndexOid, InvalidOid);
-		(void) READ_SCALAR_VALUE(intoOidInfo.toastComptypeOid, InvalidOid);
-		(void) READ_SCALAR_VALUE(intoOidInfo.aosegOid, InvalidOid);
-		(void) READ_SCALAR_VALUE(intoOidInfo.aosegIndexOid, InvalidOid);
-		(void) READ_SCALAR_VALUE(intoOidInfo.aosegComptypeOid, InvalidOid);
-		(void) READ_SCALAR_VALUE(intoOidInfo.aovisimapOid, InvalidOid);
-		(void) READ_SCALAR_VALUE(intoOidInfo.aovisimapIndexOid, InvalidOid);
-		(void) READ_SCALAR_VALUE(intoOidInfo.aovisimapComptypeOid, InvalidOid);
-	}
-    if (pg_strtok_peek_fldname("intoOidInfo.aoblkdirOid"))
-	{
-		(void) READ_SCALAR_VALUE(intoOidInfo.aoblkdirOid, InvalidOid);
-		(void) READ_SCALAR_VALUE(intoOidInfo.aoblkdirIndexOid, InvalidOid);
-		(void) READ_SCALAR_VALUE(intoOidInfo.aoblkdirComptypeOid, InvalidOid);
-    }
-
 	local_node->intoPolicy = NULL;
 
 	READ_DONE();
@@ -606,12 +507,7 @@ _readWindowSpec(void)
 	READ_NODE_FIELD(partition);
 	READ_NODE_FIELD(order);
 	READ_NODE_FIELD(frame);
-
-    /* CDB: location field added in 3.2; missing from older serialized trees */
-    if (pg_strtok_peek_fldname("location"))
-    	READ_INT_FIELD(location);
-    else
-        local_node->location = -1;
+	READ_INT_FIELD(location);
 
 	READ_DONE();
 }
@@ -751,12 +647,7 @@ _readRangeVar(void)
 	READ_ENUM_FIELD(inhOpt, InhOption);
 	READ_BOOL_FIELD(istemp);
 	READ_NODE_FIELD(alias);
-
-    /* CDB: location field added in 3.2; missing from older serialized trees */
-    if (pg_strtok_peek_fldname("location"))
-    	READ_INT_FIELD(location);
-    else
-        local_node->location = -1;
+	READ_INT_FIELD(location);
 
 	READ_DONE();
 }
@@ -785,13 +676,9 @@ _readIntoClause(void)
 	READ_OID_FIELD(oidInfo.aovisimapOid);
 	READ_OID_FIELD(oidInfo.aovisimapIndexOid);
 	READ_OID_FIELD(oidInfo.aovisimapComptypeOid);
-
-    if (pg_strtok_peek_fldname("oidInfo.aoblkdirOid"))
-	{
-        READ_OID_FIELD(oidInfo.aoblkdirOid);
-        READ_OID_FIELD(oidInfo.aoblkdirIndexOid);
-        READ_OID_FIELD(oidInfo.aoblkdirComptypeOid);
-    }
+	READ_OID_FIELD(oidInfo.aoblkdirOid);
+	READ_OID_FIELD(oidInfo.aoblkdirIndexOid);
+	READ_OID_FIELD(oidInfo.aoblkdirComptypeOid);
 	/* policy not serialized */
 
 	/* Is this code, carried over from 3.3, actually needed?
@@ -1493,26 +1380,8 @@ _readAggref(void)
 	READ_UINT_FIELD(agglevelsup);
 	READ_BOOL_FIELD(aggstar);
 	READ_BOOL_FIELD(aggdistinct);
-
-    /*
-     * CDB: This field was added after the MPP 2.1p2 release.  It's filled in
-     * by the planner and not present in nodes stored persistently.  So if
-     * it's missing, just let the field stay 0.
-     */
-    if (pg_strtok_peek_fldname("aggstage"))
-    {                           /* braces required, macro doesn't have 'em */
-        READ_ENUM_FIELD(aggstage, AggStage);
-    }
-
-    /*
-     * CDB: This field was added after the 4.0 release, it is only filled in
-     * when an aggregate uses the agg(<parameter-list> order by <sort-lits>)
-     * syntax.
-     */
-    if (pg_strtok_peek_fldname("aggorder"))
-    {                           /* braces required, macro doesn't have 'em */
-        READ_NODE_FIELD(aggorder);
-    }
+	READ_ENUM_FIELD(aggstage, AggStage);
+	READ_NODE_FIELD(aggorder);
 
 	READ_DONE();
 }
@@ -1588,11 +1457,7 @@ _readFuncExpr(void)
 	READ_BOOL_FIELD(funcretset);
 	READ_ENUM_FIELD(funcformat, CoercionForm);
 	READ_NODE_FIELD(args);
-
-	if (pg_strtok_peek_fldname("is_tablefunc"))
-	{
-		READ_BOOL_FIELD(is_tablefunc);  /* GPDB */
-	}
+	READ_BOOL_FIELD(is_tablefunc);  /* GPDB */
 
 	READ_DONE();
 }