diff options
| author | Tom Lane | 2003-12-28 21:57:37 +0000 |
|---|---|---|
| committer | Tom Lane | 2003-12-28 21:57:37 +0000 |
| commit | c607bd693ffcf225b7ef696ca44b537076038854 (patch) | |
| tree | 5284d0d0f9b8d671dedd379199bdbba114f8a352 /src/include | |
| parent | d167fb10153a2f00c9a8b46df537a202f7755cb9 (diff) | |
Clean up the usage of canonicalize_qual(): in particular, be consistent
about whether it is applied before or after eval_const_expressions().
I believe there were some corner cases where the system would fail to
recognize that a partial index is applicable because of the previous
inconsistency. Store normal rather than 'implicit AND' representations
of constraints and index predicates in the catalogs.
initdb forced due to representation change of constraints/predicates.
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/catalog/catversion.h | 4 | ||||
| -rw-r--r-- | src/include/nodes/relation.h | 5 | ||||
| -rw-r--r-- | src/include/optimizer/prep.h | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index 0af05e01d6..b5f0da8d0d 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -37,7 +37,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.213 2003/12/03 18:53:52 joe Exp $ + * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.214 2003/12/28 21:57:37 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -53,6 +53,6 @@ */ /* yyyymmddN */ -#define CATALOG_VERSION_NO 200312031 +#define CATALOG_VERSION_NO 200312281 #endif diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h index 62e77afcd2..6b205b20da 100644 --- a/src/include/nodes/relation.h +++ b/src/include/nodes/relation.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/relation.h,v 1.86 2003/11/29 22:41:06 pgsql Exp $ + * $PostgreSQL: pgsql/src/include/nodes/relation.h,v 1.87 2003/12/28 21:57:37 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -245,7 +245,8 @@ typedef struct RelOptInfo * zero entry, rather than looking at ncolumns. * * The indexprs and indpred expressions have been run through - * eval_const_expressions() for ease of matching to WHERE clauses. + * prepqual.c and eval_const_expressions() for ease of matching to + * WHERE clauses. indpred is in implicit-AND form. */ typedef struct IndexOptInfo diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.h index 060b25b314..6255c36230 100644 --- a/src/include/optimizer/prep.h +++ b/src/include/optimizer/prep.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/prep.h,v 1.42 2003/11/29 22:41:07 pgsql Exp $ + * $PostgreSQL: pgsql/src/include/optimizer/prep.h,v 1.43 2003/12/28 21:57:37 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -36,8 +36,8 @@ extern Relids get_relids_for_join(Query *parse, int joinrelid); /* * prototypes for prepqual.c */ -extern List *canonicalize_qual(Expr *qual, bool removeAndFlag); -extern List *cnfify(Expr *qual, bool removeAndFlag); +extern Expr *canonicalize_qual(Expr *qual); +extern Node *flatten_andors(Node *node); /* * prototypes for preptlist.c |