Fix whitespace

Nikita Glukhov · Nikita Glukhov · commit f4e27a09f2a9 · 2016-09-01T20:06:29.000+04:00
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
@@ -264,16 +264,18 @@ static Datum ExecEvalGroupingFuncExpr(GroupingFuncExprState *gstate,
 
 static Datum
 ExecEvalSubscriptionRef(SubscriptionRefExprState *sbstate,
-				 ExprContext *econtext,
-				 bool *isNull,
-				 ExprDoneCond *isDone)
+						ExprContext *econtext,
+						bool *isNull,
+						ExprDoneCond *isDone)
 {
-	SubscriptionRef			*sbsRef = (SubscriptionRef *) sbstate->xprstate.expr;
-	Oid						containerType, typsubscription;
+	SubscriptionRef		   *sbsRef = (SubscriptionRef *) sbstate->xprstate.expr;
+	Oid						containerType,
+							typsubscription;
 	bool					isAssignment = (sbsRef->refassgnexpr != NULL);
 	bool					eisnull;
-	Datum					*upper, *lower;
-	ListCell				*l;
+	Datum				   *upper,
+						   *lower;
+	ListCell			   *l;
 	int						i = 0,
 							j = 0;
 	SubscriptionExecData	sbsdata;
@@ -288,10 +290,8 @@ ExecEvalSubscriptionRef(SubscriptionRefExprState *sbstate,
 
 	sbsdata.xprcontext = econtext;
 	sbsdata.isNull = isNull;
-	sbsdata.containerSource = ExecEvalExpr(sbstate->refexpr,
-								econtext,
-								isNull,
-								isDone);
+	sbsdata.containerSource = ExecEvalExpr(sbstate->refexpr, econtext,
+										   isNull, isDone);
 
 	/*
 	 * If refexpr yields NULL, and it's a fetch, then result is NULL. In the
@@ -322,12 +322,10 @@ ExecEvalSubscriptionRef(SubscriptionRefExprState *sbstate,
 			upperProvided[i++] = false;
 			continue;
 		}
+
 		upperProvided[i] = true;
+		upper[i++] = ExecEvalExpr(eltstate, econtext, &eisnull, NULL);
 
-		upper[i++] = ExecEvalExpr(eltstate,
-													 econtext,
-													 &eisnull,
-													 NULL);
 		/* If any index expr yields NULL, result is NULL or error */
 		if (eisnull)
 		{
@@ -358,12 +356,10 @@ ExecEvalSubscriptionRef(SubscriptionRefExprState *sbstate,
 				lowerProvided[j++] = false;
 				continue;
 			}
+
 			lowerProvided[j] = true;
+			lower[j++] = ExecEvalExpr(eltstate, econtext, &eisnull, NULL);
 
-			lower[j++] = ExecEvalExpr(eltstate,
-														 econtext,
-														 &eisnull,
-														 NULL);
 			/* If any index expr yields NULL, result is NULL or error */
 			if (eisnull)
 			{
@@ -375,6 +371,7 @@ ExecEvalSubscriptionRef(SubscriptionRefExprState *sbstate,
 				return (Datum) NULL;
 			}
 		}
+
 		/* this can't happen unless parser messed up */
 		if (i != j)
 			elog(ERROR, "upper and lower index lists are not same length");
@@ -389,19 +386,15 @@ ExecEvalSubscriptionRef(SubscriptionRefExprState *sbstate,
 	containerType = getBaseTypeAndTypmod(sbsRef->refcontainertype, &sbsRef->reftypmod);
 	typsubscription = get_subscription(containerType);
 
-	if(OidIsValid(typsubscription))
-	{
-		return OidFunctionCall3(typsubscription,
-								Int32GetDatum(SBS_EXEC),
-								PointerGetDatum(sbstate),
-								PointerGetDatum(&sbsdata));
-	}
-	else
-	{
+	if (!OidIsValid(typsubscription))
 		/* this can't happen */
 		elog(ERROR, "can not find subscription procedure for type %s",
 					format_type_be(containerType));
-	}
+
+	return OidFunctionCall3(typsubscription,
+							Int32GetDatum(SBS_EXEC),
+							PointerGetDatum(sbstate),
+							PointerGetDatum(&sbsdata));
 }
 
 /* ----------------------------------------------------------------
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
@@ -482,7 +482,6 @@ transformIndirection(ParseState *pstate, Node *basenode, List *indirection)
 	}
 	/* process trailing subscripts, if any */
 	if (subscripts)
-	{
 		result = (Node *) transformContainerSubscripts(pstate,
 												       result,
 												       exprType(result),
@@ -491,8 +490,6 @@ transformIndirection(ParseState *pstate, Node *basenode, List *indirection)
 												       subscripts,
 												       NULL);
 
-	}
-
 	return result;
 }
 
diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c
@@ -284,27 +284,26 @@ transformArrayType(Oid *containerType, int32 *containerTypmod)
 
 SubscriptionRef *
 transformContainerSubscripts(ParseState *pstate,
-						 Node *containerBase,
-						 Oid containerType,
-						 Oid elementType,
-						 int32 containerTypMod,
-						 List *indirection,
-						 Node *assignFrom)
+							 Node *containerBase,
+							 Oid containerType,
+							 Oid elementType,
+							 int32 containerTypMod,
+							 List *indirection,
+							 Node *assignFrom)
 {
-	bool		isSlice = false;
-	List	   *upperIndexpr = NIL;
-	List	   *lowerIndexpr = NIL;
-	ListCell   *idx;
-	SubscriptionRef   *sbsref, *prepared_sbsref;
+	bool				isSlice = false;
+	List			   *upperIndexpr = NIL;
+	List			   *lowerIndexpr = NIL;
+	ListCell		   *idx;
+	SubscriptionRef	   *sbsref,
+					   *prepared_sbsref;
+	Oid					typsubscription = get_subscription(containerType);
 
-	Oid			typsubscription = get_subscription(containerType);
 	if (!OidIsValid(typsubscription))
-	{
 		ereport(ERROR,
 				(errcode(ERRCODE_DATATYPE_MISMATCH),
 				 errmsg("cannot subscript type %s because it does not support subscription",
 						format_type_be(containerType))));
-	}
 
 	/*
 	 * Caller may or may not have bothered to determine elementType.  Note
@@ -375,7 +374,6 @@ transformContainerSubscripts(ParseState *pstate,
 	sbsref->refexpr = (Expr *) containerBase;
 	sbsref->refassgnexpr = (Expr *) assignFrom;
 
-
 	prepared_sbsref = (SubscriptionRef *) OidFunctionCall3(typsubscription,
 														   Int32GetDatum(SBS_VALIDATION),
 														   PointerGetDatum(sbsref),

Original file line number	Diff line number	Diff line change
`@@ -482,7 +482,6 @@ transformIndirection(ParseState pstate, Node basenode, List *indirection)`
`482`	`482`	`}`
`483`	`483`	`/* process trailing subscripts, if any */`
`484`	`484`	`if (subscripts)`
`485`		`- {`
`486`	`485`	`result = (Node *) transformContainerSubscripts(pstate,`
`487`	`486`	`result,`
`488`	`487`	`exprType(result),`
`@@ -491,8 +490,6 @@ transformIndirection(ParseState pstate, Node basenode, List *indirection)`
`491`	`490`	`subscripts,`
`492`	`491`	`NULL);`
`493`	`492`
`494`		`- }`
`495`		`-`
`496`	`493`	`return result;`
`497`	`494`	`}`
`498`	`495`