mirror of
https://github.com/postgres/postgres.git
synced 2025-11-10 17:42:29 +03:00
Rename Aggreg to Aggref.
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.53 1999/01/21 22:55:41 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.54 1999/01/24 00:28:19 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -899,13 +899,13 @@ _copyFunc(Func *from)
|
||||
}
|
||||
|
||||
/* ----------------
|
||||
* _copyAggreg
|
||||
* _copyAggref
|
||||
* ----------------
|
||||
*/
|
||||
static Aggreg *
|
||||
_copyAggreg(Aggreg *from)
|
||||
static Aggref *
|
||||
_copyAggref(Aggref *from)
|
||||
{
|
||||
Aggreg *newnode = makeNode(Aggreg);
|
||||
Aggref *newnode = makeNode(Aggref);
|
||||
|
||||
/* ----------------
|
||||
* copy remainder of node
|
||||
@@ -1782,8 +1782,8 @@ copyObject(void *from)
|
||||
case T_ArrayRef:
|
||||
retval = _copyArrayRef(from);
|
||||
break;
|
||||
case T_Aggreg:
|
||||
retval = _copyAggreg(from);
|
||||
case T_Aggref:
|
||||
retval = _copyAggref(from);
|
||||
break;
|
||||
case T_SubLink:
|
||||
retval = _copySubLink(from);
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
*
|
||||
* Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $Id: outfuncs.c,v 1.60 1999/01/21 16:08:36 vadim Exp $
|
||||
* $Id: outfuncs.c,v 1.61 1999/01/24 00:28:20 momjian Exp $
|
||||
*
|
||||
* NOTES
|
||||
* Every (plan) node in POSTGRES has an associated "out" routine which
|
||||
@@ -686,10 +686,10 @@ _outConst(StringInfo str, Const *node)
|
||||
}
|
||||
|
||||
/*
|
||||
* Aggreg
|
||||
* Aggref
|
||||
*/
|
||||
static void
|
||||
_outAggreg(StringInfo str, Aggreg *node)
|
||||
_outAggref(StringInfo str, Aggref *node)
|
||||
{
|
||||
appendStringInfo(str,
|
||||
" AGGREG :aggname %s :basetype %u :aggtype %u :target ",
|
||||
@@ -1506,8 +1506,8 @@ _outNode(StringInfo str, void *obj)
|
||||
case T_Const:
|
||||
_outConst(str, obj);
|
||||
break;
|
||||
case T_Aggreg:
|
||||
_outAggreg(str, obj);
|
||||
case T_Aggref:
|
||||
_outAggref(str, obj);
|
||||
break;
|
||||
case T_SubLink:
|
||||
_outSubLink(str, obj);
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.42 1999/01/21 16:08:37 vadim Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.43 1999/01/24 00:28:20 momjian Exp $
|
||||
*
|
||||
* NOTES
|
||||
* Most of the read functions for plan nodes are tested. (In fact, they
|
||||
@@ -1161,19 +1161,19 @@ _readParam()
|
||||
}
|
||||
|
||||
/* ----------------
|
||||
* _readAggreg
|
||||
* _readAggref
|
||||
*
|
||||
* Aggreg is a subclass of Node
|
||||
* Aggref is a subclass of Node
|
||||
* ----------------
|
||||
*/
|
||||
static Aggreg *
|
||||
_readAggreg()
|
||||
static Aggref *
|
||||
_readAggref()
|
||||
{
|
||||
Aggreg *local_node;
|
||||
Aggref *local_node;
|
||||
char *token;
|
||||
int length;
|
||||
|
||||
local_node = makeNode(Aggreg);
|
||||
local_node = makeNode(Aggref);
|
||||
|
||||
token = lsptok(NULL, &length); /* eat :aggname */
|
||||
token = lsptok(NULL, &length); /* get aggname */
|
||||
@@ -2040,7 +2040,7 @@ parsePlanString(void)
|
||||
else if (!strncmp(token, "SORT", length))
|
||||
return_value = _readSort();
|
||||
else if (!strncmp(token, "AGGREG", length))
|
||||
return_value = _readAggreg();
|
||||
return_value = _readAggref();
|
||||
else if (!strncmp(token, "SUBLINK", length))
|
||||
return_value = _readSubLink();
|
||||
else if (!strncmp(token, "AGG", length))
|
||||
|
||||
Reference in New Issue
Block a user