diff options
| author | Bruce Momjian <bruce@momjian.us> | 1999-02-15 03:22:37 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1999-02-15 03:22:37 +0000 |
| commit | ba2883b264d7bc392604bc9f76abfc30de89f5f8 (patch) | |
| tree | 67aaa53cf2b12967f12b8fabaad7088ffcddb550 /src/backend/optimizer/util | |
| parent | 944d3c395e292c213c1a2be617af1b8473299b1b (diff) | |
| download | postgresql-ba2883b264d7bc392604bc9f76abfc30de89f5f8.tar.gz postgresql-ba2883b264d7bc392604bc9f76abfc30de89f5f8.zip | |
Remove duplicate geqo functions, and more optimizer cleanup
Diffstat (limited to 'src/backend/optimizer/util')
| -rw-r--r-- | src/backend/optimizer/util/joininfo.c | 4 | ||||
| -rw-r--r-- | src/backend/optimizer/util/pathnode.c | 18 | ||||
| -rw-r--r-- | src/backend/optimizer/util/relnode.c | 4 |
3 files changed, 12 insertions, 14 deletions
diff --git a/src/backend/optimizer/util/joininfo.c b/src/backend/optimizer/util/joininfo.c index 4b9dce6e5a3..339a4550182 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.15 1999/02/13 23:16:45 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.16 1999/02/15 03:22:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -74,7 +74,7 @@ find_joininfo_node(RelOptInfo *this_rel, List *join_relids) joininfo->jinfo_restrictinfo = NIL; joininfo->mergejoinable = false; joininfo->hashjoinable = false; - joininfo->inactive = false; + joininfo->bushy_inactive = false; this_rel->joininfo = lcons(joininfo, this_rel->joininfo); } return joininfo; diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c index cf3072a8be7..8e72cabb740 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.35 1999/02/13 23:16:46 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.36 1999/02/15 03:22:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -381,15 +381,15 @@ create_index_path(Query *root, /* is the statement above really true? what about IndexScan as the inner of a join? */ pathnode->path.path_cost = cost_index(lfirsti(index->relids), - index->pages, - 1.0, - rel->pages, - rel->tuples, - index->pages, - index->tuples, - false); - /* add in expensive functions cost! -- JMH, 7/7/92 */ + index->pages, + 1.0, + rel->pages, + rel->tuples, + index->pages, + index->tuples, + false); #if 0 + /* add in expensive functions cost! -- JMH, 7/7/92 */ if (XfuncMode != XFUNC_OFF) { pathnode->path_cost = (pathnode->path_cost + diff --git a/src/backend/optimizer/util/relnode.c b/src/backend/optimizer/util/relnode.c index 1b0c1d69474..63c0ca4f47b 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.13 1999/02/13 23:16:48 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/relnode.c,v 1.14 1999/02/15 03:22:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -64,14 +64,12 @@ get_base_rel(Query *root, int relid) */ if (relid < 0) { - /* * If the relation is a materialized relation, assume * constants for sizes. */ rel->pages = _NONAME_RELATION_PAGES_; rel->tuples = _NONAME_RELATION_TUPLES_; - } else { |