1 files changed, 70 insertions, 62 deletions

diff --git a/src/backend/optimizer/util/joininfo.c b/src/backend/optimizer/util/joininfo.c
index a4fd6913752..cf206d80094 100644
--- a/src/backend/optimizer/util/joininfo.c
+++ b/src/backend/optimizer/util/joininfo.c
@@ -1,13 +1,13 @@
 /*-------------------------------------------------------------------------
  *
  * joininfo.c--
- *    JoinInfo node manipulation routines
+ *	  JoinInfo node manipulation routines
  *
  * Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.2 1996/11/10 03:01:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.3 1997/09/07 04:44:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,88 +21,96 @@
 #include "optimizer/clauses.h"
 
 
-/*    
+/*
  * joininfo-member--
- *    Determines whether a node has already been created for a join
- *    between a set of join relations and the relation described by
- *    'joininfo-list'.
- *    
+ *	  Determines whether a node has already been created for a join
+ *	  between a set of join relations and the relation described by
+ *	  'joininfo-list'.
+ *
  * 'join-relids' is a list of relids corresponding to the join relation
- * 'joininfo-list' is the list of joininfo nodes against which this is 
- *   		checked
- *    
+ * 'joininfo-list' is the list of joininfo nodes against which this is
+ *				checked
+ *
  * Returns the corresponding node in 'joininfo-list' if such a node
  * exists.
- *    
+ *
  */
-JInfo *
-joininfo_member(List *join_relids, List *joininfo_list)
+JInfo		   *
+joininfo_member(List * join_relids, List * joininfo_list)
 {
-    List *i = NIL;
-    List *other_rels = NIL;
+	List		   *i = NIL;
+	List		   *other_rels = NIL;
 
-    foreach(i,joininfo_list) {
-	other_rels = lfirst(i);
-	if(same(join_relids, ((JInfo*)other_rels)->otherrels))
-	    return((JInfo*)other_rels);
-    }
-    return((JInfo*)NULL);
+	foreach(i, joininfo_list)
+	{
+		other_rels = lfirst(i);
+		if (same(join_relids, ((JInfo *) other_rels)->otherrels))
+			return ((JInfo *) other_rels);
+	}
+	return ((JInfo *) NULL);
 }
 
 
-/*    
+/*
  * find-joininfo-node--
- *    Find the joininfo node within a relation entry corresponding
- *    to a join between 'this_rel' and the relations in 'join-relids'.  A
- *    new node is created and added to the relation entry's joininfo
- *    field if the desired one can't be found.
- *    
+ *	  Find the joininfo node within a relation entry corresponding
+ *	  to a join between 'this_rel' and the relations in 'join-relids'.	A
+ *	  new node is created and added to the relation entry's joininfo
+ *	  field if the desired one can't be found.
+ *
  * Returns a joininfo node.
- *    
+ *
  */
-JInfo *
-find_joininfo_node(Rel *this_rel, List *join_relids)
+JInfo		   *
+find_joininfo_node(Rel * this_rel, List * join_relids)
 {
-    JInfo *joininfo = joininfo_member(join_relids,
-				      this_rel->joininfo);
-    if( joininfo == NULL ) {
-	joininfo = makeNode(JInfo);
-	joininfo->otherrels = join_relids;
-	joininfo->jinfoclauseinfo = NIL;
-	joininfo->mergesortable = false;
-	joininfo->hashjoinable = false;
-	joininfo->inactive = false;
-	this_rel->joininfo = lcons(joininfo, this_rel->joininfo);
-    }
-    return(joininfo);
+	JInfo		   *joininfo = joininfo_member(join_relids,
+											   this_rel->joininfo);
+
+	if (joininfo == NULL)
+	{
+		joininfo = makeNode(JInfo);
+		joininfo->otherrels = join_relids;
+		joininfo->jinfoclauseinfo = NIL;
+		joininfo->mergesortable = false;
+		joininfo->hashjoinable = false;
+		joininfo->inactive = false;
+		this_rel->joininfo = lcons(joininfo, this_rel->joininfo);
+	}
+	return (joininfo);
 }
 
-/*    
+/*
  * other-join-clause-var--
- *    Determines whether a var node is contained within a joinclause
- *    of the form(op var var).
- *    
+ *	  Determines whether a var node is contained within a joinclause
+ *	  of the form(op var var).
+ *
  * Returns the other var node in the joinclause if it is, nil if not.
- *    
+ *
  */
-Var *
-other_join_clause_var(Var *var, Expr *clause)
+Var			   *
+other_join_clause_var(Var * var, Expr * clause)
 {
-     Var *retval;
-     Var *l, *r;
+	Var			   *retval;
+	Var			   *l,
+				   *r;
 
-     retval = (Var*) NULL;
+	retval = (Var *) NULL;
 
-     if( var != NULL  && join_clause_p((Node*)clause)) {
-	  l = (Var *) get_leftop(clause);
-	  r = (Var *) get_rightop(clause);
+	if (var != NULL && join_clause_p((Node *) clause))
+	{
+		l = (Var *) get_leftop(clause);
+		r = (Var *) get_rightop(clause);
 
-	  if(var_equal(var, l)) {
-	       retval = r;
-	  } else if(var_equal(var, r)) {
-	       retval = l;
-	  }
-     }
+		if (var_equal(var, l))
+		{
+			retval = r;
+		}
+		else if (var_equal(var, r))
+		{
+			retval = l;
+		}
+	}
 
-     return(retval);
+	return (retval);
 }