Remove uneeded warnings

Author: Rafa de la Torre

contrib/postgres_fdw/deparse.c

@@ -340,10 +340,8 @@ foreign_expr_walker(Node *node,
 					 */
 					if (var->varattno < 0 &&
 						var->varattno != SelfItemPointerAttributeNumber &&
-						var->varattno != ObjectIdAttributeNumber) {
-						elog(WARNING, "RTORRE return false 1");
+						var->varattno != ObjectIdAttributeNumber)
 						return false;
-					}
 
 					/* Else check the collation */
 					collation = var->varcollid;
@@ -411,31 +409,23 @@ foreign_expr_walker(Node *node,
 				ArrayRef   *ar = (ArrayRef *) node;
 
 				/* Assignment should not be in restrictions. */
-				if (ar->refassgnexpr != NULL) {
-					elog(WARNING, "RTORRE return false 2");
+				if (ar->refassgnexpr != NULL)
 					return false;
-				}
 
 				/*
 				 * Recurse to remaining subexpressions.  Since the array
 				 * subscripts must yield (noncollatable) integers, they won't
 				 * affect the inner_cxt state.
 				 */
 				if (!foreign_expr_walker((Node *) ar->refupperindexpr,
-										 glob_cxt, &inner_cxt)) {
-					elog(WARNING, "RTORRE return false 3");
+										 glob_cxt, &inner_cxt))
 					return false;
-				}
 				if (!foreign_expr_walker((Node *) ar->reflowerindexpr,
-										 glob_cxt, &inner_cxt)) {
-					elog(WARNING, "RTORRE return false 4");
+										 glob_cxt, &inner_cxt))
 					return false;
-				}
 				if (!foreign_expr_walker((Node *) ar->refexpr,
 										 glob_cxt, &inner_cxt))
-					elog(WARNING, "RTORRE return false 5"); {
 					return false;
-				}
 
 				/*
 				 * Array subscripting should yield same collation as input,
@@ -462,19 +452,15 @@ foreign_expr_walker(Node *node,
 				 * can't be sent to remote because it might have incompatible
 				 * semantics on remote side.
 				 */
-				if (!is_shippable(fe->funcid, ProcedureRelationId, fpinfo)) {
-					elog(WARNING, "RTORRE return false 6");
+				if (!is_shippable(fe->funcid, ProcedureRelationId, fpinfo))
 					return false;
-				}
 
 				/*
 				 * Recurse to input subexpressions.
 				 */
 				if (!foreign_expr_walker((Node *) fe->args,
-										 glob_cxt, &inner_cxt)) {
-					elog(WARNING, "RTORRE return false 7");
+										 glob_cxt, &inner_cxt))
 					return false;
-				}
 
 				/*
 				 * If function's input collation is not derived from a foreign
@@ -483,10 +469,8 @@ foreign_expr_walker(Node *node,
 				if (fe->inputcollid == InvalidOid)
 					 /* OK, inputs are all noncollatable */ ;
 				else if (inner_cxt.state != FDW_COLLATE_SAFE ||
-						 fe->inputcollid != inner_cxt.collation) {
-					elog(WARNING, "RTORRE return false 8");
+						 fe->inputcollid != inner_cxt.collation)
 					return false;
-				}
 
 				/*
 				 * Detect whether node is introducing a collation not derived
@@ -516,19 +500,15 @@ foreign_expr_walker(Node *node,
 				 * (If the operator is shippable, we assume its underlying
 				 * function is too.)
 				 */
-				if (!is_shippable(oe->opno, OperatorRelationId, fpinfo)) {
-					elog(WARNING, "RTORRE return false 9");
+				if (!is_shippable(oe->opno, OperatorRelationId, fpinfo))
 					return false;
-				}
 
 				/*
 				 * Recurse to input subexpressions.
 				 */
 				if (!foreign_expr_walker((Node *) oe->args,
-										 glob_cxt, &inner_cxt)) {
-					elog(WARNING, "RTORRE return false 10");
+										 glob_cxt, &inner_cxt))
 					return false;
-				}
 
 				/*
 				 * If operator's input collation is not derived from a foreign
@@ -537,10 +517,8 @@ foreign_expr_walker(Node *node,
 				if (oe->inputcollid == InvalidOid)
 					 /* OK, inputs are all noncollatable */ ;
 				else if (inner_cxt.state != FDW_COLLATE_SAFE ||
-						 oe->inputcollid != inner_cxt.collation) {
-					elog(WARNING, "RTORRE return false 11");
+						 oe->inputcollid != inner_cxt.collation)
 					return false;
-				}
 
 				/* Result-collation handling is same as for functions */
 				collation = oe->opcollid;
@@ -562,19 +540,15 @@ foreign_expr_walker(Node *node,
 				/*
 				 * Again, only shippable operators can be sent to remote.
 				 */
-				if (!is_shippable(oe->opno, OperatorRelationId, fpinfo)) {
-					elog(WARNING, "RTORRE return false 12");
+				if (!is_shippable(oe->opno, OperatorRelationId, fpinfo))
 					return false;
-				}
 
 				/*
 				 * Recurse to input subexpressions.
 				 */
 				if (!foreign_expr_walker((Node *) oe->args,
-										 glob_cxt, &inner_cxt)) {
-					elog(WARNING, "RTORRE return false 13");
+										 glob_cxt, &inner_cxt))
 					return false;
-				}
 
 				/*
 				 * If operator's input collation is not derived from a foreign
@@ -583,10 +557,8 @@ foreign_expr_walker(Node *node,
 				if (oe->inputcollid == InvalidOid)
 					 /* OK, inputs are all noncollatable */ ;
 				else if (inner_cxt.state != FDW_COLLATE_SAFE ||
-						 oe->inputcollid != inner_cxt.collation) {
-					elog(WARNING, "RTORRE return false 14");
+						 oe->inputcollid != inner_cxt.collation)
 					return false;
-				}
 
 				/* Output is always boolean and so noncollatable. */
 				collation = InvalidOid;
@@ -601,10 +573,8 @@ foreign_expr_walker(Node *node,
 				 * Recurse to input subexpression.
 				 */
 				if (!foreign_expr_walker((Node *) r->arg,
-										 glob_cxt, &inner_cxt)) {
-					elog(WARNING, "RTORRE return false 15");
+										 glob_cxt, &inner_cxt))
 					return false;
-				}
 
 				/*
 				 * RelabelType must not introduce a collation not derived from
@@ -630,10 +600,8 @@ foreign_expr_walker(Node *node,
 				 * Recurse to input subexpressions.
 				 */
 				if (!foreign_expr_walker((Node *) b->args,
-										 glob_cxt, &inner_cxt)) {
-					elog(WARNING, "RTORRE return false 16");
+										 glob_cxt, &inner_cxt))
 					return false;
-				}
 
 				/* Output is always boolean and so noncollatable. */
 				collation = InvalidOid;
@@ -648,10 +616,8 @@ foreign_expr_walker(Node *node,
 				 * Recurse to input subexpressions.
 				 */
 				if (!foreign_expr_walker((Node *) nt->arg,
-										 glob_cxt, &inner_cxt)) {
-					elog(WARNING, "RTORRE return false 17");
+										 glob_cxt, &inner_cxt))
 					return false;
-				}
 
 				/* Output is always boolean and so noncollatable. */
 				collation = InvalidOid;
@@ -666,10 +632,8 @@ foreign_expr_walker(Node *node,
 				 * Recurse to input subexpressions.
 				 */
 				if (!foreign_expr_walker((Node *) a->elements,
-										 glob_cxt, &inner_cxt)) {
-					elog(WARNING, "RTORRE return false 18");
+										 glob_cxt, &inner_cxt))
 					return false;
-				}
 
 				/*
 				 * ArrayExpr must not introduce a collation not derived from
@@ -698,10 +662,8 @@ foreign_expr_walker(Node *node,
 				foreach(lc, l)
 				{
 					if (!foreign_expr_walker((Node *) lfirst(lc),
-											 glob_cxt, &inner_cxt)) {
-						elog(WARNING, "RTORRE return false 19");
+											 glob_cxt, &inner_cxt))
 						return false;
-					}
 				}
 
 				/*
@@ -721,22 +683,16 @@ foreign_expr_walker(Node *node,
 				ListCell   *lc;
 
 				/* Not safe to pushdown when not in grouping context */
-				if (!IS_UPPER_REL(glob_cxt->foreignrel)) {
-					elog(WARNING, "RTORRE return false 20");
+				if (!IS_UPPER_REL(glob_cxt->foreignrel))
 					return false;
-				}
 
 				/* Only non-split aggregates are pushable. */
-				if (agg->aggsplit != AGGSPLIT_SIMPLE) {
-					elog(WARNING, "RTORRE return false 21");
+				if (agg->aggsplit != AGGSPLIT_SIMPLE)
 					return false;
-				}
 
 				/* As usual, it must be shippable. */
-				if (!is_shippable(agg->aggfnoid, ProcedureRelationId, fpinfo)) {
-					elog(WARNING, "RTORRE return false 22");
+				if (!is_shippable(agg->aggfnoid, ProcedureRelationId, fpinfo))
 					return false;
-				}
 
 				/*
 				 * Recurse to input args. aggdirectargs, aggorder and
@@ -755,10 +711,8 @@ foreign_expr_walker(Node *node,
 						n = (Node *) tle->expr;
 					}
 
-					if (!foreign_expr_walker(n, glob_cxt, &inner_cxt)) {
-						elog(WARNING, "RTORRE return false 23");
+					if (!foreign_expr_walker(n, glob_cxt, &inner_cxt))
 						return false;
-					}
 				}
 
 				/*
@@ -785,19 +739,15 @@ foreign_expr_walker(Node *node,
 						if (srt->sortop != typentry->lt_opr &&
 							srt->sortop != typentry->gt_opr &&
 							!is_shippable(srt->sortop, OperatorRelationId,
-										  fpinfo)) {
-							elog(WARNING, "RTORRE return false 24");
+										  fpinfo))
 							return false;
-						}
 					}
 				}
 
 				/* Check aggregate filter */
 				if (!foreign_expr_walker((Node *) agg->aggfilter,
-										 glob_cxt, &inner_cxt)) {
-					elog(WARNING, "RTORRE return false 25");
+										 glob_cxt, &inner_cxt))
 					return false;
-				}
 
 				/*
 				 * If aggregate's input collation is not derived from a
@@ -806,10 +756,8 @@ foreign_expr_walker(Node *node,
 				if (agg->inputcollid == InvalidOid || inner_cxt.state == FDW_COLLATE_NONE)
 					 /* OK, inputs are all noncollatable */ ;
 				else if (inner_cxt.state != FDW_COLLATE_SAFE ||
-						 agg->inputcollid != inner_cxt.collation) {
-					elog(WARNING, "RTORRE return false 26");
+						 agg->inputcollid != inner_cxt.collation)
 					return false;
-				}
 
 				/*
 				 * Detect whether node is introducing a collation not derived
@@ -835,15 +783,13 @@ foreign_expr_walker(Node *node,
 			 * cover the st_asmvt(ROW(st_asmvtgeom(...)) case. I guess the
 			 * proper solution is to examine the row expression carefully.
 			 */
-			ereport(WARNING, (errmsg_internal("RTORRE in a T_RowExpr")));
 			return true;
 	    default:
 
 			/*
 			 * If it's anything else, assume it's unsafe.  This list can be
 			 * expanded later, but don't forget to add deparse support below.
 			 */
-			elog(WARNING, "RTORRE unrecognized node type: %d", (int) nodeTag(node));
 			return false;
 	}