From 6658048b367447a552c90b6329fc2ac6a8b4f20f Mon Sep 17 00:00:00 2001 From: Onder Kalaci Date: Wed, 19 Oct 2016 18:03:27 +0300 Subject: [PATCH] Fix compile time warnings --- .../distributed/planner/multi_router_planner.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/backend/distributed/planner/multi_router_planner.c b/src/backend/distributed/planner/multi_router_planner.c index 58d3330cd..cb7e20fb1 100644 --- a/src/backend/distributed/planner/multi_router_planner.c +++ b/src/backend/distributed/planner/multi_router_planner.c @@ -411,13 +411,14 @@ RouterModifyTaskForShardInterval(Query *originalQuery, ShardInterval *shardInter static RangeTblEntry * ExtractSelectRangeTableEntry(Query *query) { - Assert(InsertSelectQuery(query)); - - List *fromList = query->jointree->fromlist; + List *fromList = NULL; RangeTblRef *reference = NULL; RangeTblEntry *subqueryRte = NULL; + Assert(InsertSelectQuery(query)); + /* since we already aseerted InsertSelectQuery() it is safe to access both lists */ + fromList = query->jointree->fromlist; reference = linitial(fromList); subqueryRte = rt_fetch(reference->rtindex, query->rtable); @@ -433,11 +434,13 @@ ExtractSelectRangeTableEntry(Query *query) static RangeTblEntry * ExtractInsertRangeTableEntry(Query *query) { - AssertArg(InsertSelectQuery(query)); - int resultRelation = query->resultRelation; List *rangeTableList = query->rtable; - RangeTblEntry *insertRTE = rt_fetch(resultRelation, rangeTableList); + RangeTblEntry *insertRTE = NULL; + + AssertArg(InsertSelectQuery(query)); + + insertRTE = rt_fetch(resultRelation, rangeTableList); return insertRTE; }