diff options
| author | Bruce Momjian <bruce@momjian.us> | 1999-02-10 03:52:54 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1999-02-10 03:52:54 +0000 |
| commit | f859c81c18669d05ac53f2c1e0163c6b804fddd5 (patch) | |
| tree | 0999719e856f47a5c8d84c7a29be3a488a5b3d8a /src/backend/optimizer/path/mergeutils.c | |
| parent | 318e593f03c4e8b8b52bc6792403c0a4909f3213 (diff) | |
| download | postgresql-f859c81c18669d05ac53f2c1e0163c6b804fddd5.tar.gz postgresql-f859c81c18669d05ac53f2c1e0163c6b804fddd5.zip | |
Rename Path.keys to Path.pathkeys. Too many 'keys' used for other things.
Diffstat (limited to 'src/backend/optimizer/path/mergeutils.c')
| -rw-r--r-- | src/backend/optimizer/path/mergeutils.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/backend/optimizer/path/mergeutils.c b/src/backend/optimizer/path/mergeutils.c index 70c230aef3a..00cc5e23994 100644 --- a/src/backend/optimizer/path/mergeutils.c +++ b/src/backend/optimizer/path/mergeutils.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/mergeutils.c,v 1.15 1999/02/09 03:51:20 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/mergeutils.c,v 1.16 1999/02/10 03:52:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -57,7 +57,7 @@ group_clauses_by_order(List *restrictinfo_list, Expr *clause = restrictinfo->clause; Var *leftop = get_leftop(clause); Var *rightop = get_rightop(clause); - JoinKey *keys; + JoinKey *jmkeys; path_order = makeNode(PathOrder); path_order->ordtype = MERGE_ORDER; @@ -65,15 +65,15 @@ group_clauses_by_order(List *restrictinfo_list, xmergeinfo = match_order_mergeinfo(path_order, mergeinfo_list); if (inner_relid == leftop->varno) { - keys = makeNode(JoinKey); - keys->outer = rightop; - keys->inner = leftop; + jmkeys = makeNode(JoinKey); + jmkeys->outer = rightop; + jmkeys->inner = leftop; } else { - keys = makeNode(JoinKey); - keys->outer = leftop; - keys->inner = rightop; + jmkeys = makeNode(JoinKey); + jmkeys->outer = leftop; + jmkeys->inner = rightop; } if (xmergeinfo == NULL) @@ -87,7 +87,7 @@ group_clauses_by_order(List *restrictinfo_list, ((JoinMethod *) xmergeinfo)->clauses = lcons(clause, ((JoinMethod *) xmergeinfo)->clauses); - ((JoinMethod *) xmergeinfo)->jmkeys = lcons(keys, + ((JoinMethod *) xmergeinfo)->jmkeys = lcons(jmkeys, ((JoinMethod *) xmergeinfo)->jmkeys); } } |