1
0
mirror of https://github.com/postgres/postgres.git synced 2025-10-27 00:12:01 +03:00

Fix prototypes so they don't look like function definitions.

This commit is contained in:
Bruce Momjian
1998-01-24 22:50:57 +00:00
parent 27317a0d7c
commit 7229513943
82 changed files with 289 additions and 499 deletions

View File

@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: clauseinfo.h,v 1.5 1997/11/26 01:13:12 momjian Exp $
* $Id: clauseinfo.h,v 1.6 1998/01/24 22:49:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,11 +18,9 @@
extern bool valid_or_clause(CInfo *clauseinfo);
extern List *get_actual_clauses(List *clauseinfo_list);
extern void
get_relattvals(List *clauseinfo_list, List **attnos,
extern void get_relattvals(List *clauseinfo_list, List **attnos,
List **values, List **flags);
extern void
get_joinvars(Oid relid, List *clauseinfo_list,
extern void get_joinvars(Oid relid, List *clauseinfo_list,
List **attnos, List **values, List **flags);
extern List *get_opnos(List *clauseinfo_list);

View File

@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: clauses.h,v 1.7 1997/09/08 21:53:06 momjian Exp $
* $Id: clauses.h,v 1.8 1998/01/24 22:49:39 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -42,11 +42,9 @@ extern bool join_clause_p(Node *clause);
extern bool qual_clause_p(Node *clause);
extern void fix_opid(Node *clause);
extern List *fix_opids(List *clauses);
extern void
get_relattval(Node *clause, int *relid,
extern void get_relattval(Node *clause, int *relid,
AttrNumber *attno, Datum *constval, int *flag);
extern void
get_rels_atts(Node *clause, int *relid1,
extern void get_rels_atts(Node *clause, int *relid1,
AttrNumber *attno1, int *relid2, AttrNumber *attno2);
extern void CommuteClause(Node *clause);

View File

@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: cost.h,v 1.6 1997/11/26 01:13:16 momjian Exp $
* $Id: cost.h,v 1.7 1998/01/24 22:49:41 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -31,20 +31,16 @@ extern bool _enable_mergesort_;
extern bool _enable_hashjoin_;
extern Cost cost_seqscan(int relid, int relpages, int reltuples);
extern Cost
cost_index(Oid indexid, int expected_indexpages, Cost selec,
extern Cost cost_index(Oid indexid, int expected_indexpages, Cost selec,
int relpages, int reltuples, int indexpages,
int indextuples, bool is_injoin);
extern Cost cost_sort(List *keys, int tuples, int width, bool noread);
extern Cost
cost_nestloop(Cost outercost, Cost innercost, int outertuples,
extern Cost cost_nestloop(Cost outercost, Cost innercost, int outertuples,
int innertuples, int outerpages, bool is_indexjoin);
extern Cost
cost_mergesort(Cost outercost, Cost innercost,
extern Cost cost_mergesort(Cost outercost, Cost innercost,
List *outersortkeys, List *innersortkeys,
int outersize, int innersize, int outerwidth, int innerwidth);
extern Cost
cost_hashjoin(Cost outercost, Cost innercost, List *outerkeys,
extern Cost cost_hashjoin(Cost outercost, Cost innercost, List *outerkeys,
List *innerkeys, int outersize, int innersize,
int outerwidth, int innerwidth);
extern int compute_rel_size(Rel *rel);
@@ -60,8 +56,7 @@ extern void set_clause_selectivities(List *clauseinfo_list, Cost new_selectivity
extern Cost product_selec(List *clauseinfo_list);
extern void set_rest_relselec(Query *root, List *rel_list);
extern void set_rest_selec(Query *root, List *clauseinfo_list);
extern Cost
compute_clause_selec(Query *root,
extern Cost compute_clause_selec(Query *root,
Node *clause, List *or_selectivities);
#endif /* COST_H */

View File

@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: ordering.h,v 1.6 1997/09/08 21:53:19 momjian Exp $
* $Id: ordering.h,v 1.7 1998/01/24 22:49:43 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,14 +15,11 @@
#include <nodes/relation.h>
extern bool
equal_path_path_ordering(PathOrder *path_ordering1,
extern bool equal_path_path_ordering(PathOrder *path_ordering1,
PathOrder *path_ordering2);
extern bool
equal_path_merge_ordering(Oid *path_ordering,
extern bool equal_path_merge_ordering(Oid *path_ordering,
MergeOrder *merge_ordering);
extern bool
equal_merge_merge_ordering(MergeOrder *merge_ordering1,
extern bool equal_merge_merge_ordering(MergeOrder *merge_ordering1,
MergeOrder *merge_ordering2);
#endif /* ORDERING_H */

View File

@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: pathnode.h,v 1.5 1997/11/26 01:13:46 momjian Exp $
* $Id: pathnode.h,v 1.6 1998/01/24 22:49:46 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,24 +22,19 @@
*/
extern bool path_is_cheaper(Path *path1, Path *path2);
extern Path *set_cheapest(Rel *parent_rel, List *pathlist);
extern List *
add_pathlist(Rel *parent_rel, List *unique_paths,
extern List * add_pathlist(Rel *parent_rel, List *unique_paths,
List *new_paths);
extern Path *create_seqscan_path(Rel *rel);
extern IndexPath *
create_index_path(Query *root, Rel *rel, Rel *index,
extern IndexPath * create_index_path(Query *root, Rel *rel, Rel *index,
List *restriction_clauses, bool is_join_scan);
extern JoinPath *
create_nestloop_path(Rel *joinrel, Rel *outer_rel,
extern JoinPath * create_nestloop_path(Rel *joinrel, Rel *outer_rel,
Path *outer_path, Path *inner_path, List *keys);
extern MergePath *
create_mergesort_path(Rel *joinrel, int outersize,
extern MergePath * create_mergesort_path(Rel *joinrel, int outersize,
int innersize, int outerwidth, int innerwidth, Path *outer_path,
Path *inner_path, List *keys, MergeOrder *order,
List *mergeclauses, List *outersortkeys, List *innersortkeys);
extern HashPath *
create_hashjoin_path(Rel *joinrel, int outersize,
extern HashPath * create_hashjoin_path(Rel *joinrel, int outersize,
int innersize, int outerwidth, int innerwidth, Path *outer_path,
Path *inner_path, List *keys, Oid operator, List *hashclauses,
List *outerkeys, List *innerkeys);

View File

@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: paths.h,v 1.6 1997/12/21 05:18:48 momjian Exp $
* $Id: paths.h,v 1.7 1998/01/24 22:49:48 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -27,8 +27,7 @@ extern List *find_paths(Query *root, List *rels);
* indxpath.h
* routines to generate index paths
*/
extern List *
find_index_paths(Query *root, Rel *rel, List *indices,
extern List * find_index_paths(Query *root, Rel *rel, List *indices,
List *clauseinfo_list,
List *joininfo_list);
@@ -48,37 +47,30 @@ extern List *create_or_index_paths(Query *root, Rel *rel, List *clauses);
* hashutils.h
* routines to deal with hash keys and clauses
*/
extern List *
group_clauses_by_hashop(List *clauseinfo_list,
extern List * group_clauses_by_hashop(List *clauseinfo_list,
int inner_relid);
/*
* joinutils.h
* generic join method key/clause routines
*/
extern List *
match_pathkeys_joinkeys(List *pathkeys,
extern List * match_pathkeys_joinkeys(List *pathkeys,
List *joinkeys, List *joinclauses, int which_subkey,
List **matchedJoinClausesPtr);
extern List *
extract_path_keys(List *joinkeys, List *tlist,
extern List * extract_path_keys(List *joinkeys, List *tlist,
int which_subkey);
extern Path *
match_paths_joinkeys(List *joinkeys, PathOrder *ordering,
extern Path * match_paths_joinkeys(List *joinkeys, PathOrder *ordering,
List *paths, int which_subkey);
extern List *
new_join_pathkeys(List *outer_pathkeys,
extern List * new_join_pathkeys(List *outer_pathkeys,
List *join_rel_tlist, List *joinclauses);
/*
* mergeutils.h
* routines to deal with merge keys and clauses
*/
extern List *
group_clauses_by_order(List *clauseinfo_list,
extern List * group_clauses_by_order(List *clauseinfo_list,
int inner_relid);
extern MInfo *
match_order_mergeinfo(PathOrder *ordering,
extern MInfo * match_order_mergeinfo(PathOrder *ordering,
List *mergeinfo_list);
/*

View File

@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: plancat.h,v 1.6 1997/09/08 21:53:27 momjian Exp $
* $Id: plancat.h,v 1.7 1998/01/24 22:49:50 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -34,31 +34,26 @@ typedef struct IdxInfoRetval
} IdxInfoRetval;
extern void
relation_info(Query *root,
extern void relation_info(Query *root,
Oid relid,
bool *hashindex, int *pages,
int *tuples);
extern bool
index_info(Query *root,
extern bool index_info(Query *root,
bool first, int relid, IdxInfoRetval *info);
extern Cost
restriction_selectivity(Oid functionObjectId,
extern Cost restriction_selectivity(Oid functionObjectId,
Oid operatorObjectId,
Oid relationObjectId,
AttrNumber attributeNumber,
char *constValue,
int32 constFlag);
extern void
index_selectivity(Oid indid, Oid *classes, List *opnos,
extern void index_selectivity(Oid indid, Oid *classes, List *opnos,
Oid relid, List *attnos, List *values, List *flags,
int32 nkeys, float *idxPages, float *idxSelec);
extern Cost
join_selectivity(Oid functionObjectId, Oid operatorObjectId,
extern Cost join_selectivity(Oid functionObjectId, Oid operatorObjectId,
Oid relationObjectId1, AttrNumber attributeNumber1,
Oid relationObjectId2, AttrNumber attributeNumber2);

View File

@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: tlist.h,v 1.6 1997/11/26 01:13:51 momjian Exp $
* $Id: tlist.h,v 1.7 1998/01/24 22:49:51 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -33,8 +33,7 @@ extern TargetEntry *match_varid(Var *test_var, List *tlist);
extern List *new_unsorted_tlist(List *targetlist);
extern List *copy_vars(List *target, List *source);
extern List *flatten_tlist(List *tlist);
extern List *
flatten_tlist_vars(List *full_tlist,
extern List * flatten_tlist_vars(List *full_tlist,
List *flat_tlist);
#endif /* TLIST_H */

View File

@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: xfunc.h,v 1.5 1997/09/08 21:53:33 momjian Exp $
* $Id: xfunc.h,v 1.6 1998/01/24 22:49:52 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -50,11 +50,9 @@ extern int XfuncMode; /* defined in tcop/postgres.c */
/* function prototypes from planner/path/xfunc.c */
extern void xfunc_trypullup(Rel *rel);
extern int
xfunc_shouldpull(Path *childpath, JoinPath *parentpath,
extern int xfunc_shouldpull(Path *childpath, JoinPath *parentpath,
int whichchild, CInfo *maxcinfopt);
extern CInfo *
xfunc_pullup(Path *childpath, JoinPath *parentpath, CInfo *cinfo,
extern CInfo * xfunc_pullup(Path *childpath, JoinPath *parentpath, CInfo *cinfo,
int whichchild, int clausetype);
extern Cost xfunc_rank(Expr *clause);
extern Cost xfunc_expense(Query *queryInfo, Expr *clause);