aboutsummaryrefslogtreecommitdiff
path: root/src/backend/optimizer/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/optimizer/util')
-rw-r--r--src/backend/optimizer/util/clauseinfo.c6
-rw-r--r--src/backend/optimizer/util/clauses.c56
-rw-r--r--src/backend/optimizer/util/indexnode.c4
-rw-r--r--src/backend/optimizer/util/internal.c4
-rw-r--r--src/backend/optimizer/util/joininfo.c8
-rw-r--r--src/backend/optimizer/util/keys.c6
-rw-r--r--src/backend/optimizer/util/pathnode.c8
-rw-r--r--src/backend/optimizer/util/plancat.c6
-rw-r--r--src/backend/optimizer/util/relnode.c8
-rw-r--r--src/backend/optimizer/util/tlist.c26
-rw-r--r--src/backend/optimizer/util/var.c20
11 files changed, 76 insertions, 76 deletions
diff --git a/src/backend/optimizer/util/clauseinfo.c b/src/backend/optimizer/util/clauseinfo.c
index 3dfa5de4f9a..7b7fdfc407a 100644
--- a/src/backend/optimizer/util/clauseinfo.c
+++ b/src/backend/optimizer/util/clauseinfo.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/clauseinfo.c,v 1.6 1997/09/08 21:45:44 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/clauseinfo.c,v 1.7 1998/02/26 04:33:09 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -44,7 +44,7 @@ valid_or_clause(CInfo *clauseinfo)
* Returns a list containing the clauses from 'clauseinfo-list'.
*
*/
-List *
+List *
get_actual_clauses(List *clauseinfo_list)
{
List *temp = NIL;
@@ -173,7 +173,7 @@ get_joinvars(Oid relid,
* of a list of clauseinfo nodes to be used with an index.
*
*/
-List *
+List *
get_opnos(List *clauseinfo_list)
{
CInfo *temp = (CInfo *) NULL;
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
index aa77085c55e..17b6113be83 100644
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.15 1998/02/13 03:40:19 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.16 1998/02/26 04:33:11 momjian Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -38,7 +38,7 @@
static bool agg_clause(Node *clause);
-Expr *
+Expr *
make_clause(int type, Node *oper, List *args)
{
if (type == AND_EXPR || type == OR_EXPR || type == NOT_EXPR ||
@@ -58,7 +58,7 @@ make_clause(int type, Node *oper, List *args)
}
else
{
- elog (ERROR, "make_clause: unsupported type %d", type);
+ elog(ERROR, "make_clause: unsupported type %d", type);
/* will this ever happen? translated from lispy C code - ay 10/94 */
return ((Expr *) args);
}
@@ -94,7 +94,7 @@ is_opclause(Node *clause)
* operand (if it is non-null).
*
*/
-Expr *
+Expr *
make_opclause(Oper *op, Var *leftop, Var *rightop)
{
Expr *expr = makeNode(Expr);
@@ -113,7 +113,7 @@ make_opclause(Oper *op, Var *leftop, Var *rightop)
* or (op expr)
* NB: it is assumed (for now) that all expr must be Var nodes
*/
-Var *
+Var *
get_leftop(Expr *clause)
{
if (clause->args != NULL)
@@ -128,7 +128,7 @@ get_leftop(Expr *clause)
* Returns the right operand in a clause of the form (op expr expr).
*
*/
-Var *
+Var *
get_rightop(Expr *clause)
{
if (clause->args != NULL && lnext(clause->args) != NULL)
@@ -173,7 +173,7 @@ is_funcclause(Node *clause)
* arguments.
*
*/
-Expr *
+Expr *
make_funcclause(Func *func, List *funcargs)
{
Expr *expr = makeNode(Expr);
@@ -209,7 +209,7 @@ or_clause(Node *clause)
* Creates an 'or' clause given a list of its subclauses.
*
*/
-Expr *
+Expr *
make_orclause(List *orclauses)
{
Expr *expr = makeNode(Expr);
@@ -245,7 +245,7 @@ not_clause(Node *clause)
* Create a 'not' clause given the expression to be negated.
*
*/
-Expr *
+Expr *
make_notclause(Expr *notclause)
{
Expr *expr = makeNode(Expr);
@@ -263,7 +263,7 @@ make_notclause(Expr *notclause)
* Retrieve the clause within a 'not' clause
*
*/
-Expr *
+Expr *
get_notclausearg(Expr *notclause)
{
return (lfirst(notclause->args));
@@ -294,7 +294,7 @@ and_clause(Node *clause)
* Create an 'and' clause given its arguments in a list.
*
*/
-Expr *
+Expr *
make_andclause(List *andclauses)
{
Expr *expr = makeNode(Expr);
@@ -322,7 +322,7 @@ make_andclause(List *andclauses)
* quals as the return value.
*
*/
-List *
+List *
pull_constant_clauses(List *quals, List **constantQual)
{
List *q;
@@ -377,8 +377,8 @@ clause_relids_vars(Node *clause, List **relids, List **vars)
foreach(vi, var_list)
{
Var *in_list = (Var *) lfirst(vi);
-
- Assert (var->varlevelsup == 0);
+
+ Assert(var->varlevelsup == 0);
if (in_list->varno == var->varno &&
in_list->varattno == var->varattno)
break;
@@ -553,15 +553,15 @@ fix_opid(Node *clause)
{
fix_opid(((Aggreg *) clause)->target);
}
- else if (is_subplan(clause) &&
- ((SubPlan*) ((Expr*) clause)->oper)->sublink->subLinkType != EXISTS_SUBLINK)
+ else if (is_subplan(clause) &&
+ ((SubPlan *) ((Expr *) clause)->oper)->sublink->subLinkType != EXISTS_SUBLINK)
{
- List *lst;
-
- foreach (lst, ((SubPlan*) ((Expr*) clause)->oper)->sublink->oper)
+ List *lst;
+
+ foreach(lst, ((SubPlan *) ((Expr *) clause)->oper)->sublink->oper)
{
- replace_opid((Oper*) ((Expr*) lfirst(lst))->oper);
- fix_opid((Node*) get_leftop((Expr*) lfirst(lst)));
+ replace_opid((Oper *) ((Expr *) lfirst(lst))->oper);
+ fix_opid((Node *) get_leftop((Expr *) lfirst(lst)));
}
}
@@ -574,7 +574,7 @@ fix_opid(Node *clause)
* Returns its argument.
*
*/
-List *
+List *
fix_opids(List *clauses)
{
List *clause;
@@ -642,7 +642,7 @@ get_relattval(Node *clause,
}
}
- else if (is_opclause(clause) && IsA(left, Var) && IsA(right, Param))
+ else if (is_opclause(clause) && IsA(left, Var) &&IsA(right, Param))
{
*relid = left->varno;
*attno = left->varattno;
@@ -653,8 +653,8 @@ get_relattval(Node *clause,
is_funcclause((Node *) left) &&
IsA(right, Const))
{
- List *vars = pull_var_clause((Node*)left);
-
+ List *vars = pull_var_clause((Node *) left);
+
*relid = ((Var *) lfirst(vars))->varno;
*attno = InvalidAttrNumber;
*constval = ((Const *) right)->constvalue;
@@ -664,8 +664,8 @@ get_relattval(Node *clause,
is_funcclause((Node *) right) &&
IsA(left, Const))
{
- List *vars = pull_var_clause((Node*)right);
-
+ List *vars = pull_var_clause((Node *) right);
+
*relid = ((Var *) lfirst(vars))->varno;
*attno = InvalidAttrNumber;
*constval = ((Const *) left)->constvalue;
@@ -692,7 +692,7 @@ get_relattval(Node *clause,
*flag = (_SELEC_NOT_CONSTANT_);
}
}
- else if (is_opclause(clause) && IsA(right, Var) && IsA(left, Param))
+ else if (is_opclause(clause) && IsA(right, Var) &&IsA(left, Param))
{
*relid = right->varno;
*attno = right->varattno;
diff --git a/src/backend/optimizer/util/indexnode.c b/src/backend/optimizer/util/indexnode.c
index 0c4b370db16..3b3c44c3be5 100644
--- a/src/backend/optimizer/util/indexnode.c
+++ b/src/backend/optimizer/util/indexnode.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/indexnode.c,v 1.5 1997/09/08 21:45:48 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/indexnode.c,v 1.6 1998/02/26 04:33:13 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -32,7 +32,7 @@ static List *find_secondary_index(Query *root, Oid relid);
* each (secondary) index defined on a relation.
*
*/
-List *
+List *
find_relation_indices(Query *root, Rel *rel)
{
if (rel->indexed)
diff --git a/src/backend/optimizer/util/internal.c b/src/backend/optimizer/util/internal.c
index 258f745a81e..fdb094a3db9 100644
--- a/src/backend/optimizer/util/internal.c
+++ b/src/backend/optimizer/util/internal.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/internal.c,v 1.6 1997/09/08 21:45:49 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/internal.c,v 1.7 1998/02/26 04:33:17 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -48,7 +48,7 @@ MakeTLE(Resdom *resdom, Node *expr)
return rt;
}
-Var *
+Var *
get_expr(TargetEntry *tle)
{
Assert(tle != NULL);
diff --git a/src/backend/optimizer/util/joininfo.c b/src/backend/optimizer/util/joininfo.c
index 03ec95db618..90c03f3f8eb 100644
--- a/src/backend/optimizer/util/joininfo.c
+++ b/src/backend/optimizer/util/joininfo.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.5 1997/09/08 21:45:50 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.6 1998/02/26 04:33:18 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -35,7 +35,7 @@
* exists.
*
*/
-JInfo *
+JInfo *
joininfo_member(List *join_relids, List *joininfo_list)
{
List *i = NIL;
@@ -61,7 +61,7 @@ joininfo_member(List *join_relids, List *joininfo_list)
* Returns a joininfo node.
*
*/
-JInfo *
+JInfo *
find_joininfo_node(Rel *this_rel, List *join_relids)
{
JInfo *joininfo = joininfo_member(join_relids,
@@ -88,7 +88,7 @@ find_joininfo_node(Rel *this_rel, List *join_relids)
* Returns the other var node in the joinclause if it is, nil if not.
*
*/
-Var *
+Var *
other_join_clause_var(Var *var, Expr *clause)
{
Var *retval;
diff --git a/src/backend/optimizer/util/keys.c b/src/backend/optimizer/util/keys.c
index 2699ec98b31..eb49cb5ad3b 100644
--- a/src/backend/optimizer/util/keys.c
+++ b/src/backend/optimizer/util/keys.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/keys.c,v 1.5 1997/09/08 21:45:51 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/keys.c,v 1.6 1998/02/26 04:33:19 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -85,7 +85,7 @@ equal_indexkey_var(int index_key, Var *var)
* lelation.
*
*/
-Var *
+Var *
extract_subkey(JoinKey *jk, int which_subkey)
{
Var *retval;
@@ -178,7 +178,7 @@ matching2_tlvar(int var, List *tlist, bool (*test) ())
}
-List *
+List *
collect_index_pathkeys(int *index_keys, List *tlist)
{
List *retval = NIL;
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
index 61cd7be84c9..96a5bb9a126 100644
--- a/src/backend/optimizer/util/pathnode.c
+++ b/src/backend/optimizer/util/pathnode.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.6 1997/09/08 21:45:53 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.7 1998/02/26 04:33:20 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -61,7 +61,7 @@ path_is_cheaper(Path *path1, Path *path2)
* is minimum.
*
*/
-Path *
+Path *
set_cheapest(Rel *parent_rel, List *pathlist)
{
List *p;
@@ -100,7 +100,7 @@ set_cheapest(Rel *parent_rel, List *pathlist)
* Returns the list of unique pathnodes.
*
*/
-List *
+List *
add_pathlist(Rel *parent_rel, List *unique_paths, List *new_paths)
{
List *x;
@@ -207,7 +207,7 @@ better_path(Path *new_path, List *unique_paths, bool *noOther)
* pathnode.
*
*/
-Path *
+Path *
create_seqscan_path(Rel *rel)
{
int relid = 0;
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index f00a9a9f280..2237d6c1b35 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.15 1998/02/11 19:10:47 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.16 1998/02/26 04:33:21 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -403,7 +403,7 @@ join_selectivity(Oid functionObjectId,
* Returns a LISP list containing the OIDs of all relations which
* inherits from the relation with OID 'inhparent'.
*/
-List *
+List *
find_inheritance_children(Oid inhparent)
{
static ScanKeyData key[1] = {
@@ -440,7 +440,7 @@ find_inheritance_children(Oid inhparent)
* Returns a LISP list containing the OIDs of all relations which are
* base relations of the relation with OID 'verrelid'.
*/
-List *
+List *
VersionGetParents(Oid verrelid)
{
static ScanKeyData key[1] = {
diff --git a/src/backend/optimizer/util/relnode.c b/src/backend/optimizer/util/relnode.c
index dc242e531e6..b18f3342015 100644
--- a/src/backend/optimizer/util/relnode.c
+++ b/src/backend/optimizer/util/relnode.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/relnode.c,v 1.4 1997/09/08 21:45:54 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/relnode.c,v 1.5 1998/02/26 04:33:21 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -27,7 +27,7 @@
* necessary. This is for base relations.
*
*/
-Rel *
+Rel *
get_base_rel(Query *root, int relid)
{
List *relids;
@@ -100,7 +100,7 @@ get_base_rel(Query *root, int relid)
* creating a new one if necessary. This is for join relations.
*
*/
-Rel *
+Rel *
get_join_rel(Query *root, List *relid)
{
return rel_member(relid, root->join_relation_list_);
@@ -114,7 +114,7 @@ get_join_rel(Query *root, List *relid)
* Returns the corresponding entry in 'rels' if it is there.
*
*/
-Rel *
+Rel *
rel_member(List *relid, List *rels)
{
List *temp = NIL;
diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c
index a98ee8f22cc..2ed37d5f5c5 100644
--- a/src/backend/optimizer/util/tlist.c
+++ b/src/backend/optimizer/util/tlist.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.11 1998/02/13 03:40:21 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.12 1998/02/26 04:33:22 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -68,7 +68,7 @@ tlistentry_member(Var *var, List *targetlist)
* REQUIRES: "test" operates on lispval unions,
*
*/
-Expr *
+Expr *
matching_tlvar(Var *var, List *targetlist)
{
TargetEntry *tlentry;
@@ -153,7 +153,7 @@ create_tl_element(Var *var, int resdomno)
* Returns the targetlist elements from a relation tlist.
*
*/
-List *
+List *
get_actual_tlist(List *tlist)
{
@@ -200,7 +200,7 @@ get_actual_tlist(List *tlist)
* Returns the resdom entry of the matching var node.
*
*/
-Resdom *
+Resdom *
tlist_member(Var *var, List *tlist)
{
List *i = NIL;
@@ -230,7 +230,7 @@ tlist_member(Var *var, List *tlist)
/*
* Routine to get the resdom out of a targetlist.
*/
-Resdom *
+Resdom *
tlist_resdom(List *tlist, Resdom *resnode)
{
Resdom *resdom = (Resdom *) NULL;
@@ -273,7 +273,7 @@ match_varid(Var *test_var, List *tlist)
type_var = (Oid) test_var->vartype;
- Assert (test_var->varlevelsup == 0);
+ Assert(test_var->varlevelsup == 0);
foreach(tl, tlist)
{
TargetEntry *entry;
@@ -289,9 +289,9 @@ match_varid(Var *test_var, List *tlist)
* we test the original varno (instead of varno which might be
* changed to INNER/OUTER.
*/
- Assert (tlvar->varlevelsup == 0);
+ Assert(tlvar->varlevelsup == 0);
if (tlvar->varnoold == test_var->varnoold &&
- tlvar->varoattno == test_var->varoattno)
+ tlvar->varoattno == test_var->varoattno)
{
if (tlvar->vartype == type_var)
@@ -313,7 +313,7 @@ match_varid(Var *test_var, List *tlist)
* Returns the resulting target list.
*
*/
-List *
+List *
new_unsorted_tlist(List *targetlist)
{
List *new_targetlist = (List *) copyObject((Node *) targetlist);
@@ -341,7 +341,7 @@ new_unsorted_tlist(List *targetlist)
* Returns a new target list.
*
*/
-List *
+List *
copy_vars(List *target, List *source)
{
List *result = NIL;
@@ -369,7 +369,7 @@ copy_vars(List *target, List *source)
* Returns the "flattened" new target list.
*
*/
-List *
+List *
flatten_tlist(List *tlist)
{
int last_resdomno = 1;
@@ -425,7 +425,7 @@ flatten_tlist(List *tlist)
* Returns the modified actual target list.
*
*/
-List *
+List *
flatten_tlist_vars(List *full_tlist, List *flat_tlist)
{
List *x = NIL;
@@ -556,7 +556,7 @@ MakeTLE(Resdom *resdom, Node *expr)
return rt;
}
-Var *
+Var *
get_expr(TargetEntry *tle)
{
Assert(tle != NULL);
diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c
index 4c3ebe7f326..346e1635892 100644
--- a/src/backend/optimizer/util/var.c
+++ b/src/backend/optimizer/util/var.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/var.c,v 1.10 1998/02/13 03:40:23 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/var.c,v 1.11 1998/02/26 04:33:22 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -35,7 +35,7 @@
* XXX assumes varno's are always integers, which shouldn't be true...
* (though it currently is, see primnodes.h)
*/
-List *
+List *
pull_varnos(Node *me)
{
List *i,
@@ -107,9 +107,9 @@ contain_var_clause(Node *clause)
return TRUE;
}
/* Ok - check left sides of Oper-s */
- foreach(temp, ((SubPlan*) ((Expr *) clause)->oper)->sublink->oper)
+ foreach(temp, ((SubPlan *) ((Expr *) clause)->oper)->sublink->oper)
{
- if (contain_var_clause(lfirst(((Expr*) lfirst(temp))->args)))
+ if (contain_var_clause(lfirst(((Expr *) lfirst(temp))->args)))
return TRUE;
}
return FALSE;
@@ -150,7 +150,7 @@ contain_var_clause(Node *clause)
*
* Returns list of varnodes found.
*/
-List *
+List *
pull_var_clause(Node *clause)
{
List *retval = NIL;
@@ -174,12 +174,12 @@ pull_var_clause(Node *clause)
{
List *temp;
- foreach(temp, ((Expr*) clause)->args)
+ foreach(temp, ((Expr *) clause)->args)
retval = nconc(retval, pull_var_clause(lfirst(temp)));
/* Ok - get Var-s from left sides of Oper-s */
- foreach(temp, ((SubPlan*) ((Expr*) clause)->oper)->sublink->oper)
- retval = nconc(retval,
- pull_var_clause(lfirst(((Expr*) lfirst(temp))->args)));
+ foreach(temp, ((SubPlan *) ((Expr *) clause)->oper)->sublink->oper)
+ retval = nconc(retval,
+ pull_var_clause(lfirst(((Expr *) lfirst(temp))->args)));
}
else if (IsA(clause, Aggreg))
{
@@ -224,7 +224,7 @@ var_equal(Var *var1, Var *var2)
(((Var *) var1)->varlevelsup == ((Var *) var2)->varlevelsup) &&
(((Var *) var1)->varattno == ((Var *) var2)->varattno))
{
- Assert (((Var *) var1)->varlevelsup == 0);
+ Assert(((Var *) var1)->varlevelsup == 0);
return (true);
}
else
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-03 03:39:28 +0000