Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit6e2edaf

Browse files
committed
Optimizer cleanup.
1 parentd5db881 commit6e2edaf

File tree

10 files changed

+28
-28
lines changed

10 files changed

+28
-28
lines changed

‎src/backend/nodes/copyfuncs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.61 1999/02/04 03:19:06 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.62 1999/02/0519:59:25 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1343,7 +1343,7 @@ _copyRestrictInfo(RestrictInfo * from)
13431343
Node_Copy(from,newnode,indexids);
13441344
Node_Copy(from,newnode,mergejoinorder);
13451345
newnode->hashjoinoperator=from->hashjoinoperator;
1346-
newnode->cinfojoinid=listCopy(from->cinfojoinid);
1346+
newnode->restrictinfojoinid=listCopy(from->restrictinfojoinid);
13471347

13481348
returnnewnode;
13491349
}

‎src/backend/nodes/outfuncs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Copyright (c) 1994, Regents of the University of California
77
*
8-
* $Id: outfuncs.c,v 1.64 1999/02/04 01:46:54 momjian Exp $
8+
* $Id: outfuncs.c,v 1.65 1999/02/05 19:59:25 momjian Exp $
99
*
1010
* NOTES
1111
* Every (plan) node in POSTGRES has an associated "out" routine which
@@ -1107,7 +1107,7 @@ _outMergeOrder(StringInfo str, MergeOrder *node)
11071107
staticvoid
11081108
_outRestrictInfo(StringInfostr,RestrictInfo*node)
11091109
{
1110-
appendStringInfo(str,"CINFO :clause ");
1110+
appendStringInfo(str,"RESTRICTINFO :clause ");
11111111
_outNode(str,node->clause);
11121112

11131113
appendStringInfo(str,

‎src/backend/nodes/readfuncs.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.48 1999/02/04 03:19:06 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.49 1999/02/0519:59:25 momjian Exp $
1111
*
1212
* NOTES
1313
* Most of the read functions for plan nodes are tested. (In fact, they
@@ -2087,13 +2087,13 @@ parsePlanString(void)
20872087
return_value=_readJoinKey();
20882088
elseif (!strncmp(token,"MERGEORDER",length))
20892089
return_value=_readMergeOrder();
2090-
elseif (!strncmp(token,"CLAUSEINFO",length))
2090+
elseif (!strncmp(token,"RETRICTINFO",length))
20912091
return_value=_readRestrictInfo();
20922092
elseif (!strncmp(token,"JOINMETHOD",length))
20932093
return_value=_readJoinMethod();
20942094
elseif (!strncmp(token,"JOININFO",length))
20952095
return_value=_readJoinInfo();
2096-
elseif (!strncmp(token,"HINFO",length))
2096+
elseif (!strncmp(token,"HASHINFO",length))
20972097
return_value=_readHashInfo();
20982098
elseif (!strncmp(token,"ITER",length))
20992099
return_value=_readIter();

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.37 1999/02/03 21:16:26 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.38 1999/02/05 19:59:26 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -56,7 +56,7 @@ static List *group_clauses_by_indexkey(RelOptInfo * rel, RelOptInfo * index,
5656
staticList*group_clauses_by_ikey_for_joins(RelOptInfo*rel,RelOptInfo*index,
5757
int*indexkeys,Oid*classes,List*join_cinfo_list,List*restr_cinfo_list);
5858
staticRestrictInfo*match_clause_to_indexkey(RelOptInfo*rel,RelOptInfo*index,intindexkey,
59-
intxclass,RestrictInfo*clauseInfo,booljoin);
59+
intxclass,RestrictInfo*restrictInfo,booljoin);
6060
staticboolpred_test(List*predicate_list,List*restrictinfo_list,
6161
List*joininfo_list);
6262
staticboolone_pred_test(Expr*predicate,List*restrictinfo_list);
@@ -571,14 +571,14 @@ group_clauses_by_ikey_for_joins(RelOptInfo * rel,
571571
*
572572
*/
573573
staticRestrictInfo*
574-
match_clause_to_indexkey(RelOptInfo*rel,
575-
RelOptInfo*index,
574+
match_clause_to_indexkey(RelOptInfo*rel,
575+
RelOptInfo*index,
576576
intindexkey,
577577
intxclass,
578-
RestrictInfo*clauseInfo,
578+
RestrictInfo*restrictInfo,
579579
booljoin)
580580
{
581-
Expr*clause=clauseInfo->clause;
581+
Expr*clause=restrictInfo->clause;
582582
Var*leftop,
583583
*rightop;
584584
Oidjoin_op=InvalidOid;
@@ -761,7 +761,7 @@ match_clause_to_indexkey(RelOptInfo * rel,
761761
}
762762

763763
if (isIndexable)
764-
returnclauseInfo;
764+
returnrestrictInfo;
765765

766766
returnNULL;
767767
}
@@ -1208,7 +1208,7 @@ indexable_joinclauses(RelOptInfo * rel, RelOptInfo * index,
12081208
{
12091209
List*clauses=lfirst(clausegroups);
12101210

1211-
((RestrictInfo*)lfirst(clauses))->cinfojoinid=joininfo->otherrels;
1211+
((RestrictInfo*)lfirst(clauses))->restrictinfojoinid=joininfo->otherrels;
12121212
}
12131213
cg_list=nconc(cg_list,clausegroups);
12141214
}
@@ -1298,7 +1298,7 @@ index_innerjoin(Query *root, RelOptInfo * rel, List *clausegroup_list,
12981298
pathnode->indexkeys=index->indexkeys;
12991299
pathnode->indexqual=clausegroup;
13001300

1301-
pathnode->path.joinid= ((RestrictInfo*)lfirst(clausegroup))->cinfojoinid;
1301+
pathnode->path.joinid= ((RestrictInfo*)lfirst(clausegroup))->restrictinfojoinid;
13021302

13031303
pathnode->path.path_cost=cost_index((Oid)lfirsti(index->relids),
13041304
(int)temp_pages,

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

Lines changed: 3 additions & 3 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/prune.c,v 1.21 1999/02/0503:43:05 tgl Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.22 1999/02/0519:59:26 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -64,9 +64,9 @@ prune_joinrel(RelOptInfo *rel, List *other_rels)
6464
List*r1=NIL;
6565
List*result=NIL;
6666

67-
foreach(r1,other_rels)
67+
foreach(i,other_rels)
6868
{
69-
RelOptInfo*other_rel= (RelOptInfo*)lfirst(r1);
69+
RelOptInfo*other_rel= (RelOptInfo*)lfirst(i);
7070

7171
if (same(rel->relids,other_rel->relids))
7272
/*

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

Lines changed: 2 additions & 2 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.36 1999/02/03 21:16:30 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.37 1999/02/05 19:59:27 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -321,7 +321,7 @@ create_indexscan_node(IndexPath *best_path,
321321

322322
/*
323323
* Extract the(first if conjunct, only if disjunct) clause from the
324-
*clauseinfo list.
324+
*restrictinfo list.
325325
*/
326326
Expr*index_clause= (Expr*)NULL;
327327
List*indxqual=NIL;

‎src/backend/optimizer/util/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for optimizer/util
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/optimizer/util/Makefile,v 1.7 1998/07/20 20:01:48 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/optimizer/util/Makefile,v 1.8 1999/02/05 19:59:28 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,7 +13,7 @@ include ../../../Makefile.global
1313

1414
CFLAGS += -I../..
1515

16-
OBJS =clauseinfo.o clauses.o indexnode.o plancat.o\
16+
OBJS =restrictinfo.o clauses.o indexnode.o plancat.o\
1717
joininfo.o keys.o ordering.o pathnode.o relnode.o tlist.o var.o
1818

1919
# not ready yet: predmig.o xfunc.o

‎src/backend/optimizer/util/ordering.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/ordering.c,v 1.9 1999/02/03 21:16:51 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/ordering.c,v 1.10 1999/02/05 19:59:30 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -44,7 +44,7 @@ equal_path_path_ordering(PathOrder *path_ordering1,
4444
path_ordering2->ordtype==SORTOP_ORDER)
4545
{
4646
return (equal_sortops_order(path_ordering1->ord.sortop,
47-
path_ordering2->ord.sortop));
47+
path_ordering2->ord.sortop));
4848
}
4949
elseif (path_ordering1->ordtype==MERGE_ORDER&&
5050
path_ordering2->ordtype==SORTOP_ORDER)

‎src/backend/optimizer/util/clauseinfo.crenamed to‎src/backend/optimizer/util/restrictinfo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/clauseinfo.c,v 1.11 1999/02/03 21:16:50 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/restrictinfo.c,v 1.1 1999/02/05 19:59:31 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/

‎src/include/nodes/relation.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: relation.h,v 1.14 1999/02/04 03:19:10 momjian Exp $
9+
* $Id: relation.h,v 1.15 1999/02/0519:59:31 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -219,7 +219,7 @@ typedef struct RestrictInfo
219219

220220
/* hashjoin only */
221221
Oidhashjoinoperator;
222-
Relidcinfojoinid;
222+
Relidrestrictinfojoinid;
223223
}RestrictInfo;
224224

225225
typedefstructJoinMethod

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp