mirror of
https://github.com/postgres/postgres.git
synced 2025-08-22 21:53:06 +03:00
Restructure representation of aggregate functions so that they have pg_proc
entries, per pghackers discussion. This fixes aggregates to live in namespaces, and also simplifies/speeds up lookup in parse_func.c. Also, add a 'proimplicit' flag to pg_proc that controls whether a type coercion function may be invoked implicitly, or only explicitly. The current settings of these flags are more permissive than I would like, but we will need to debate and refine the behavior; for now, I avoided breaking regression tests as much as I could.
This commit is contained in:
@@ -15,7 +15,7 @@
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.176 2002/04/09 20:35:49 tgl Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.177 2002/04/11 19:59:59 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -852,11 +852,7 @@ _copyAggref(Aggref *from)
|
||||
{
|
||||
Aggref *newnode = makeNode(Aggref);
|
||||
|
||||
/*
|
||||
* copy remainder of node
|
||||
*/
|
||||
newnode->aggname = pstrdup(from->aggname);
|
||||
newnode->basetype = from->basetype;
|
||||
newnode->aggfnoid = from->aggfnoid;
|
||||
newnode->aggtype = from->aggtype;
|
||||
Node_Copy(from, newnode, target);
|
||||
newnode->aggstar = from->aggstar;
|
||||
|
@@ -20,7 +20,7 @@
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.124 2002/04/09 20:35:50 tgl Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.125 2002/04/11 19:59:59 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -220,9 +220,7 @@ _equalFunc(Func *a, Func *b)
|
||||
static bool
|
||||
_equalAggref(Aggref *a, Aggref *b)
|
||||
{
|
||||
if (strcmp(a->aggname, b->aggname) != 0)
|
||||
return false;
|
||||
if (a->basetype != b->basetype)
|
||||
if (a->aggfnoid != b->aggfnoid)
|
||||
return false;
|
||||
if (a->aggtype != b->aggtype)
|
||||
return false;
|
||||
|
@@ -5,7 +5,7 @@
|
||||
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.153 2002/04/09 20:35:50 tgl Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.154 2002/04/11 19:59:59 tgl Exp $
|
||||
*
|
||||
* NOTES
|
||||
* Every (plan) node in POSTGRES has an associated "out" routine which
|
||||
@@ -785,10 +785,8 @@ _outConst(StringInfo str, Const *node)
|
||||
static void
|
||||
_outAggref(StringInfo str, Aggref *node)
|
||||
{
|
||||
appendStringInfo(str, " AGGREG :aggname ");
|
||||
_outToken(str, node->aggname);
|
||||
appendStringInfo(str, " :basetype %u :aggtype %u :target ",
|
||||
node->basetype, node->aggtype);
|
||||
appendStringInfo(str, " AGGREG :aggfnoid %u :aggtype %u :target ",
|
||||
node->aggfnoid, node->aggtype);
|
||||
_outNode(str, node->target);
|
||||
|
||||
appendStringInfo(str, " :aggstar %s :aggdistinct %s ",
|
||||
|
@@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.118 2002/03/22 02:56:32 tgl Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.119 2002/04/11 20:00:00 tgl Exp $
|
||||
*
|
||||
* NOTES
|
||||
* Most of the read functions for plan nodes are tested. (In fact, they
|
||||
@@ -1159,13 +1159,9 @@ _readAggref(void)
|
||||
|
||||
local_node = makeNode(Aggref);
|
||||
|
||||
token = pg_strtok(&length); /* eat :aggname */
|
||||
token = pg_strtok(&length); /* get aggname */
|
||||
local_node->aggname = debackslash(token, length);
|
||||
|
||||
token = pg_strtok(&length); /* eat :basetype */
|
||||
token = pg_strtok(&length); /* get basetype */
|
||||
local_node->basetype = atooid(token);
|
||||
token = pg_strtok(&length); /* eat :aggfnoid */
|
||||
token = pg_strtok(&length); /* get aggfnoid */
|
||||
local_node->aggfnoid = atooid(token);
|
||||
|
||||
token = pg_strtok(&length); /* eat :aggtype */
|
||||
token = pg_strtok(&length); /* get aggtype */
|
||||
|
Reference in New Issue
Block a user