From: | Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us> |
---|---|
To: | pgsql-committers(at)postgresql(dot)org |
Subject: | pgsql: Revise collation derivation method and expression-tree represent |
Date: | 2011-03-20 00:31:11 |
Message-ID: | E1Q16Y3-0005SX-Vd@gemulon.postgresql.org |
Views: | Raw Message | Whole Thread | Download mbox | Resend email |
Thread: | |
Lists: | pgsql-committers |
Revise collation derivation method and expression-tree representation.
All expression nodes now have an explicit output-collation field, unless
they are known to only return a noncollatable data type (such as boolean
or record). Also, nodes that can invoke collation-aware functions store
a separate field that is the collation value to pass to the function.
This avoids confusion that arises when a function has collatable inputs
and noncollatable output type, or vice versa.
Also, replace the parser's on-the-fly collation assignment method with
a post-pass over the completed expression tree. This allows us to use
a more complex (and hopefully more nearly spec-compliant) assignment
rule without paying for it in extra storage in every expression node.
Fix assorted bugs in the planner's handling of collations by making
collation one of the defining properties of an EquivalenceClass and
by converting CollateExprs into discardable RelabelType nodes during
expression preprocessing.
Branch
------
master
Details
-------
http://git.postgresql.org/pg/commitdiff/b310b6e31ce5aa9e456c43c0e8e93248b0c84c02
Modified Files
--------------
src/backend/access/gin/ginutil.c | 2 +-
src/backend/access/index/indexam.c | 2 +-
src/backend/catalog/dependency.c | 23 +-
src/backend/catalog/heap.c | 11 +
src/backend/commands/analyze.c | 4 +-
src/backend/commands/functioncmds.c | 2 +
src/backend/commands/indexcmds.c | 25 +-
src/backend/commands/prepare.c | 4 +
src/backend/commands/tablecmds.c | 4 +
src/backend/commands/typecmds.c | 7 +
src/backend/commands/view.c | 16 +-
src/backend/executor/execQual.c | 86 +--
src/backend/executor/functions.c | 3 +
src/backend/executor/nodeAgg.c | 10 +-
src/backend/executor/nodeIndexscan.c | 12 +-
src/backend/executor/nodeMergejoin.c | 2 +-
src/backend/executor/nodeSubplan.c | 6 +-
src/backend/executor/nodeWindowAgg.c | 12 +-
src/backend/nodes/copyfuncs.c | 83 ++-
src/backend/nodes/equalfuncs.c | 95 ++--
src/backend/nodes/makefuncs.c | 10 +-
src/backend/nodes/nodeFuncs.c | 656 ++++++++++++-------
src/backend/nodes/outfuncs.c | 76 ++-
src/backend/nodes/readfuncs.c | 104 ++--
src/backend/optimizer/path/costsize.c | 6 +-
src/backend/optimizer/path/equivclass.c | 147 ++++-
src/backend/optimizer/path/indxpath.c | 60 ++-
src/backend/optimizer/path/pathkeys.c | 140 ++---
src/backend/optimizer/plan/createplan.c | 6 +-
src/backend/optimizer/plan/initsplan.c | 10 +-
src/backend/optimizer/plan/subselect.c | 48 +-
src/backend/optimizer/util/clauses.c | 176 +++---
src/backend/optimizer/util/predtest.c | 14 +-
src/backend/parser/Makefile | 6 +-
src/backend/parser/README | 1 +
src/backend/parser/analyze.c | 89 ++-
src/backend/parser/parse_agg.c | 15 +-
src/backend/parser/parse_clause.c | 23 +-
src/backend/parser/parse_coerce.c | 152 +----
src/backend/parser/parse_collate.c | 763 ++++++++++++++++++++++
src/backend/parser/parse_cte.c | 6 +-
src/backend/parser/parse_expr.c | 54 +-
src/backend/parser/parse_func.c | 17 +-
src/backend/parser/parse_node.c | 4 +-
src/backend/parser/parse_oper.c | 18 +-
src/backend/parser/parse_param.c | 6 +-
src/backend/parser/parse_target.c | 6 +-
src/backend/parser/parse_utilcmd.c | 4 +
src/backend/utils/adt/ruleutils.c | 25 +-
src/backend/utils/adt/selfuncs.c | 19 +-
src/backend/utils/fmgr/README | 13 +-
src/backend/utils/fmgr/fmgr.c | 36 +-
src/backend/utils/fmgr/funcapi.c | 25 +-
src/backend/utils/sort/tuplesort.c | 2 +-
src/include/catalog/catversion.h | 2 +-
src/include/fmgr.h | 30 +-
src/include/nodes/makefuncs.h | 6 +-
src/include/nodes/nodeFuncs.h | 12 +-
src/include/nodes/nodes.h | 2 +-
src/include/nodes/parsenodes.h | 7 +-
src/include/nodes/primnodes.h | 75 ++-
src/include/nodes/relation.h | 22 +-
src/include/optimizer/clauses.h | 3 +-
src/include/optimizer/paths.h | 5 +-
src/include/optimizer/planmain.h | 2 +
src/include/parser/parse_agg.h | 2 +-
src/include/parser/parse_coerce.h | 2 -
src/include/parser/parse_collate.h | 27 +
src/include/parser/parse_node.h | 1 -
src/pl/plpgsql/src/pl_comp.c | 1 +
src/pl/plpgsql/src/pl_exec.c | 27 +-
src/test/regress/expected/collate.linux.utf8.out | 25 +-
src/test/regress/sql/collate.linux.utf8.sql | 4 +
73 files changed, 2341 insertions(+), 1060 deletions(-)
From | Date | Subject | |
---|---|---|---|
Next Message | Bruce Momjian | 2011-03-20 03:59:33 | pgsql: Add links to documentation from 9.1 release notes. |
Previous Message | Bruce Momjian | 2011-03-19 21:22:16 | pgsql: Add SGML markup for keywords, terms, functions, commands, etc. |