database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-09 22:41:56 +03:00
Code Activity

Remove 'func_tlist' from Func expression nodes, likewise 'param_tlist'

Browse Source 
from Param nodes, per discussion a few days ago on pghackers.  Add new
expression node type FieldSelect that implements the functionality where
it's actually needed.  Clean up some other unused fields in Func nodes
as well.
NOTE: initdb forced due to change in stored expression trees for rules.
This commit is contained in:
Tom Lane
2000-08-08 15:43:12 +00:00
parent 8fc32374be
commit 62e29fe2e7
31 changed files with 378 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/backend/nodes/readfuncs.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.94 2000/07/22 04:22:46 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.95 2000/08/08 15:41:27 tgl Exp $
*
* NOTES
* Most of the read functions for plan nodes are tested. (In fact, they
@ -942,29 +942,7 @@ _readFunc()
token = lsptok(NULL, &length); /* now read it */
local_node->functype = (Oid) atol(token);
token = lsptok(NULL, &length); /* get :funcisindex */
token = lsptok(NULL, &length); /* now read it */
if (!strncmp(token, "true", 4))
local_node->funcisindex = true;
else
local_node->funcisindex = false;
token = lsptok(NULL, &length); /* get :funcsize */
token = lsptok(NULL, &length); /* now read it */
local_node->funcsize = atol(token);
token = lsptok(NULL, &length); /* get :func_fcache */
token = lsptok(NULL, &length); /* get @ */
token = lsptok(NULL, &length); /* now read it */
local_node->func_fcache = (FunctionCache *) NULL;
token = lsptok(NULL, &length); /* get :func_tlist */
local_node->func_tlist = nodeRead(true); /* now read it */
token = lsptok(NULL, &length); /* get :func_planlist */
local_node->func_planlist = nodeRead(true); /* now read it */
local_node->func_fcache = NULL;
return local_node;
}
@ -996,11 +974,7 @@ _readOper()
token = lsptok(NULL, &length); /* now read it */
local_node->opresulttype = (Oid) atol(token);
/*
* NOTE: Alternatively we can call 'replace_opid' which initializes
* both 'opid' and 'op_fcache'.
*/
local_node->op_fcache = (FunctionCache *) NULL;
local_node->op_fcache = NULL;
return local_node;
}
@ -1039,9 +1013,6 @@ _readParam()
token = lsptok(NULL, &length); /* now read it */
local_node->paramtype = (Oid) atol(token);
token = lsptok(NULL, &length); /* get :param_tlist */
local_node->param_tlist = nodeRead(true); /* now read it */
return local_node;
}
@ -1121,6 +1092,39 @@ _readSubLink()
return local_node;
}
/* ----------------
* _readFieldSelect
*
* FieldSelect is a subclass of Node
* ----------------
*/
static FieldSelect *
_readFieldSelect()
{
FieldSelect *local_node;
char *token;
int length;
local_node = makeNode(FieldSelect);
token = lsptok(NULL, &length); /* eat :arg */
local_node->arg = nodeRead(true); /* now read it */
token = lsptok(NULL, &length); /* eat :fieldnum */
token = lsptok(NULL, &length); /* get fieldnum */
local_node->fieldnum = (AttrNumber) atoi(token);
token = lsptok(NULL, &length); /* eat :resulttype */
token = lsptok(NULL, &length); /* get resulttype */
local_node->resulttype = (Oid) atol(token);
token = lsptok(NULL, &length); /* eat :resulttypmod */
token = lsptok(NULL, &length); /* get resulttypmod */
local_node->resulttypmod = atoi(token);
return local_node;
}
/* ----------------
* _readRelabelType
*
@ -1781,6 +1785,8 @@ parsePlanString(void)
return_value = _readAggref();
else if (length == 7 && strncmp(token, "SUBLINK", length) == 0)
return_value = _readSubLink();
else if (length == 11 && strncmp(token, "FIELDSELECT", length) == 0)
return_value = _readFieldSelect();
else if (length == 11 && strncmp(token, "RELABELTYPE", length) == 0)
return_value = _readRelabelType();
else if (length == 3 && strncmp(token, "AGG", length) == 0)