提交 efc1052c 编写于 作者: H Heikki Linnakangas

Remove unused 'rewindPlanIDs' fields.

The copy/out/read functions for it were wrong: a Bitmapset is not a Node,
so one should use e.g. COPY_BITMAPSET_FIELD() instead of COPY_NODE_FIELD()
for them. But since the fields are currently unused, let's just remove them.

These fields will be resurrected soon, by the PostgreSQL 8.3 merge, as they
were introduced in PostgreSQL 8.3. Then they will actually be used, too.
上级 9122bf9d
......@@ -1016,7 +1016,6 @@ SubplanQueryDesc(QueryDesc * qd)
substmt->utilityStmt = stmt->utilityStmt;
substmt->intoClause = NULL;
substmt->subplans = stmt->subplans;
substmt->rewindPlanIDs = stmt->rewindPlanIDs;
substmt->returningLists = stmt->returningLists;
substmt->rowMarks = stmt->rowMarks;
substmt->relationOids = stmt->relationOids;
......
......@@ -167,7 +167,6 @@ _copyPlannedStmt(PlannedStmt *from)
COPY_NODE_FIELD(utilityStmt);
COPY_NODE_FIELD(intoClause);
COPY_NODE_FIELD(subplans);
COPY_NODE_FIELD(rewindPlanIDs);
COPY_NODE_FIELD(returningLists);
COPY_NODE_FIELD(result_partitions);
......
......@@ -336,7 +336,6 @@ _outPlannedStmt(StringInfo str, PlannedStmt *node)
WRITE_NODE_FIELD(utilityStmt);
WRITE_NODE_FIELD(intoClause);
WRITE_NODE_FIELD(subplans);
WRITE_NODE_FIELD(rewindPlanIDs);
WRITE_NODE_FIELD(returningLists);
WRITE_NODE_FIELD(result_partitions);
......
......@@ -301,7 +301,6 @@ _outPlannedStmt(StringInfo str, PlannedStmt *node)
WRITE_NODE_FIELD(utilityStmt);
WRITE_NODE_FIELD(intoClause);
WRITE_NODE_FIELD(subplans);
WRITE_NODE_FIELD(rewindPlanIDs);
WRITE_NODE_FIELD(returningLists);
WRITE_NODE_FIELD(result_partitions);
......@@ -1935,7 +1934,6 @@ _outPlannerGlobal(StringInfo str, PlannerGlobal *node)
WRITE_NODE_FIELD(paramlist);
WRITE_NODE_FIELD(subplans);
WRITE_NODE_FIELD(subrtables);
WRITE_BITMAPSET_FIELD(rewindPlanIDs);
WRITE_NODE_FIELD(finalrtable);
WRITE_NODE_FIELD(relationOids);
WRITE_NODE_FIELD(invalItems);
......
......@@ -1424,7 +1424,6 @@ _readPlannedStmt(void)
READ_NODE_FIELD(utilityStmt);
READ_NODE_FIELD(intoClause);
READ_NODE_FIELD(subplans);
READ_NODE_FIELD(rewindPlanIDs);
READ_NODE_FIELD(returningLists);
READ_NODE_FIELD(result_partitions);
READ_NODE_FIELD(result_aosegnos);
......
......@@ -178,7 +178,6 @@ static void postprocess_plan(PlannedStmt *plan)
/* initialize */
globNew->paramlist = NIL;
globNew->subrtables = NIL;
globNew->rewindPlanIDs = NULL;
globNew->finalrtable = NIL;
globNew->relationOids = NIL;
globNew->invalItems = NIL;
......@@ -344,7 +343,6 @@ standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
glob->paramlist = NIL;
glob->subplans = NIL;
glob->subrtables = NIL;
glob->rewindPlanIDs = NULL;
glob->finalrtable = NIL;
glob->relationOids = NIL;
glob->invalItems = NIL;
......@@ -486,7 +484,6 @@ standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
result->utilityStmt = parse->utilityStmt;
result->intoClause = parse->intoClause;
result->subplans = glob->subplans;
result->rewindPlanIDs = glob->rewindPlanIDs;
result->returningLists = root->returningLists;
result->result_partitions = root->result_partitions;
result->result_aosegnos = root->result_aosegnos;
......
......@@ -4505,7 +4505,6 @@ flatten_join_alias_var_optimizer(Query *query, int queryLevel)
root->glob->paramlist = NIL;
root->glob->subplans = NIL;
root->glob->subrtables = NIL;
root->glob->rewindPlanIDs = NULL;
root->glob->finalrtable = NIL;
root->glob->relationOids = NIL;
root->glob->invalItems = NIL;
......
......@@ -94,8 +94,6 @@ typedef struct PlannedStmt
List *subplans; /* Plan trees for SubPlan expressions */
Bitmapset *rewindPlanIDs; /* indices of subplans that require REWIND */
/*
* If the query has a returningList then the planner will store a list of
* processed targetlists (one per result relation) here. We must have a
......
......@@ -94,8 +94,6 @@ typedef struct PlannerGlobal
List *subrtables; /* Rangetables for SubPlan nodes */
Bitmapset *rewindPlanIDs; /* indices of subplans that require REWIND */
List *finalrtable; /* "flat" rangetable for executor */
List *relationOids; /* OIDs of relations the plan depends on */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册