Skip to content

Commit d5a785c

Browse files
bmomjianbmomjian
committed
Update find_typedefs for bsdi 4.0.
1 parent f859c81 commit d5a785c

File tree

4 files changed

+30
-31
lines changed

4 files changed

+30
-31
lines changed

‎src/backend/optimizer/path/joinpath.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.17 1999/02/10 03:52:40 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.18 1999/02/10 17:14:30 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -606,11 +606,11 @@ hash_inner_and_outer(RelOptInfo * joinrel,
606606
innerrel->size,
607607
outerrel->width,
608608
innerrel->width,
609-
(Path *) outerrel->cheapestpath,
610-
(Path *) innerrel->cheapestpath,
609+
(Path *) outerrel->cheapestpath,
610+
(Path *) innerrel->cheapestpath,
611611
hash_pathkeys,
612612
xhashinfo->hashop,
613-
((JoinMethod *) xhashinfo)->clauses,
613+
((JoinMethod *) xhashinfo)->clauses,
614614
outerkeys,
615615
innerkeys);
616616
hjoin_list = lappend(hjoin_list, temp_node);

‎src/backend/optimizer/path/joinutils.c

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/joinutils.c,v 1.14 1999/02/10 03:52:40 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/joinutils.c,v 1.15 1999/02/10 17:14:30 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -27,14 +27,13 @@
2727

2828

2929
static int match_pathkey_joinkeys(List *pathkey, List *joinkeys,
30-
int which_subkey);
30+
int which_subkey);
3131
static bool every_func(List *joinkeys, List *pathkey,
32-
int which_subkey);
33-
static List *new_join_pathkey(List *subkeys,
34-
List *considered_subkeys, List *join_rel_tlist,
35-
List *joinclauses);
32+
int which_subkey);
33+
static List *new_join_pathkey(List *subkeys, List *considered_subkeys,
34+
List *join_rel_tlist, List *joinclauses);
3635
static List *new_matching_subkeys(Var *subkey, List *considered_subkeys,
37-
List *join_rel_tlist, List *joinclauses);
36+
List *join_rel_tlist, List *joinclauses);
3837

3938
/****************************************************************************
4039
* KEY COMPARISONS
@@ -219,8 +218,7 @@ match_paths_joinkeys(List *joinkeys,
219218
key_match = every_func(joinkeys, path->pathkeys, which_subkey);
220219

221220
if (equal_path_ordering(ordering, path->path_order) &&
222-
length(joinkeys) == length(path->pathkeys) &&
223-
key_match)
221+
length(joinkeys) == length(path->pathkeys) && key_match)
224222
{
225223

226224
if (matched_path)
@@ -273,7 +271,7 @@ extract_path_keys(List *joinkeys,
273271
key = (Var *) matching_tlvar(var, tlist);
274272

275273
/*
276-
* include it in the pathkeys list if we haven't already done so
274+
* Include it in the pathkeys list if we haven't already done so
277275
*/
278276
foreach(p, pathkeys)
279277
{
@@ -381,7 +379,7 @@ new_join_pathkey(List *subkeys,
381379
else
382380
newly_considered_subkeys = matched_subkeys;
383381

384-
considered_subkeys = append(considered_subkeys, newly_considered_subkeys);
382+
considered_subkeys = append(considered_subkeys, newly_considered_subkeys);
385383

386384
t_list = nconc(t_list, newly_considered_subkeys);
387385
}

‎src/backend/optimizer/plan/createplan.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.41 1999/02/10 03:52:44 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.42 1999/02/10 17:14:30 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -870,28 +870,28 @@ make_noname(List *tlist,
870870

871871
/* Create a new target list for the noname, with keys set. */
872872
noname_tlist = set_noname_tlist_operators(new_unsorted_tlist(tlist),
873-
pathkeys,
874-
operators);
873+
pathkeys,
874+
operators);
875875
switch (nonametype)
876876
{
877877
case NONAME_SORT:
878878
retval = (Noname *) make_seqscan(tlist,
879879
NIL,
880880
_NONAME_RELATION_ID_,
881881
(Plan *) make_sort(noname_tlist,
882-
_NONAME_RELATION_ID_,
883-
plan_node,
884-
length(pathkeys)));
882+
_NONAME_RELATION_ID_,
883+
plan_node,
884+
length(pathkeys)));
885885
break;
886886

887887
case NONAME_MATERIAL:
888888
retval = (Noname *) make_seqscan(tlist,
889889
NIL,
890890
_NONAME_RELATION_ID_,
891891
(Plan *) make_material(noname_tlist,
892-
_NONAME_RELATION_ID_,
893-
plan_node,
894-
length(pathkeys)));
892+
_NONAME_RELATION_ID_,
893+
plan_node,
894+
length(pathkeys)));
895895
break;
896896

897897
default:

‎src/tools/find_typedef

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
# For this program to work, you must have compiled all binaries with
66
# debugging symbols.
77
#
8-
# This is run on BSD/OS 3.0, so you may need to make changes for your
9-
# version of nm.
8+
# This is run on BSD/OS 4.0, so you may need to make changes.
109
#
1110
# Ignore the nm errors about a file not being a binary file.
1211
#
@@ -18,10 +17,12 @@ then echo "Usage: $0 postgres_binary_directory" 1>&2
1817
exit 1
1918
fi
2019

21-
nm -a "$1"/* |
22-
grep LSYM |
20+
objdump --stabs "$1"/* |
21+
grep "LSYM" |
22+
awk '{print $7}' |
2323
grep ':t' |
24-
sed 's/^.*LSYM \([^:]*\):.*$/\1/' |
25-
grep -v ' ' | # some typedefs have spaces, revove them
26-
sort |
24+
sed 's/^\([^:]*\).*$/\1/' |
25+
grep -v ' ' | # some typedefs have spaces, remove them
26+
sort |
2727
uniq
28+

0 commit comments

Comments
 (0)