summaryrefslogtreecommitdiff
path: root/src/backend/nodes
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/nodes')
-rw-r--r--src/backend/nodes/copyfuncs.c32
-rw-r--r--src/backend/nodes/freefuncs.c26
-rw-r--r--src/backend/nodes/outfuncs.c30
-rw-r--r--src/backend/nodes/print.c6
-rw-r--r--src/backend/nodes/readfuncs.c42
5 files changed, 68 insertions, 68 deletions
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index 23f9e424d1..8a0ac031fb 100644
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.64 1999/02/09 03:51:12 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.65 1999/02/09 17:02:46 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -372,36 +372,36 @@ _copyHashJoin(HashJoin *from)
/* ----------------
- * CopyTempFields
+ * CopyNonameFields
*
- * This function copies the fields of the Temp node. It is used by
- * all the copy functions for classes which inherit from Temp.
+ * This function copies the fields of the Noname node. It is used by
+ * all the copy functions for classes which inherit from Noname.
* ----------------
*/
static void
-CopyTempFields(Temp *from, Temp *newnode)
+CopyNonameFields(Noname *from, Noname *newnode)
{
- newnode->tempid = from->tempid;
+ newnode->nonameid = from->nonameid;
newnode->keycount = from->keycount;
return;
}
/* ----------------
- * _copyTemp
+ * _copyNoname
* ----------------
*/
-static Temp *
-_copyTemp(Temp *from)
+static Noname *
+_copyNoname(Noname *from)
{
- Temp *newnode = makeNode(Temp);
+ Noname *newnode = makeNode(Noname);
/* ----------------
* copy node superclass fields
* ----------------
*/
CopyPlanFields((Plan *) from, (Plan *) newnode);
- CopyTempFields(from, newnode);
+ CopyNonameFields(from, newnode);
return newnode;
}
@@ -420,7 +420,7 @@ _copyMaterial(Material *from)
* ----------------
*/
CopyPlanFields((Plan *) from, (Plan *) newnode);
- CopyTempFields((Temp *) from, (Temp *) newnode);
+ CopyNonameFields((Noname *) from, (Noname *) newnode);
return newnode;
}
@@ -440,7 +440,7 @@ _copySort(Sort *from)
* ----------------
*/
CopyPlanFields((Plan *) from, (Plan *) newnode);
- CopyTempFields((Temp *) from, (Temp *) newnode);
+ CopyNonameFields((Noname *) from, (Noname *) newnode);
return newnode;
}
@@ -511,7 +511,7 @@ _copyUnique(Unique *from)
* ----------------
*/
CopyPlanFields((Plan *) from, (Plan *) newnode);
- CopyTempFields((Temp *) from, (Temp *) newnode);
+ CopyNonameFields((Noname *) from, (Noname *) newnode);
/* ----------------
* copy remainder of node
@@ -1688,8 +1688,8 @@ copyObject(void *from)
case T_HashJoin:
retval = _copyHashJoin(from);
break;
- case T_Temp:
- retval = _copyTemp(from);
+ case T_Noname:
+ retval = _copyNoname(from);
break;
case T_Material:
retval = _copyMaterial(from);
diff --git a/src/backend/nodes/freefuncs.c b/src/backend/nodes/freefuncs.c
index 1a0b2ca754..a7d3bf6305 100644
--- a/src/backend/nodes/freefuncs.c
+++ b/src/backend/nodes/freefuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.3 1999/02/09 03:51:12 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.4 1999/02/09 17:02:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -298,32 +298,32 @@ _freeHashJoin(HashJoin *node)
/* ----------------
- * FreeTempFields
+ * FreeNonameFields
*
- * This function frees the fields of the Temp node. It is used by
- * all the free functions for classes which inherit node Temp.
+ * This function frees the fields of the Noname node. It is used by
+ * all the free functions for classes which inherit node Noname.
* ----------------
*/
static void
-FreeTempFields(Temp *node)
+FreeNonameFields(Noname *node)
{
return;
}
/* ----------------
- * _freeTemp
+ * _freeNoname
* ----------------
*/
static void
-_freeTemp(Temp *node)
+_freeNoname(Noname *node)
{
/* ----------------
* free node superclass fields
* ----------------
*/
FreePlanFields((Plan *) node);
- FreeTempFields(node);
+ FreeNonameFields(node);
pfree(node);
}
@@ -340,7 +340,7 @@ _freeMaterial(Material *node)
* ----------------
*/
FreePlanFields((Plan *) node);
- FreeTempFields((Temp *) node);
+ FreeNonameFields((Noname *) node);
pfree(node);
}
@@ -358,7 +358,7 @@ _freeSort(Sort *node)
* ----------------
*/
FreePlanFields((Plan *) node);
- FreeTempFields((Temp *) node);
+ FreeNonameFields((Noname *) node);
pfree(node);
}
@@ -417,7 +417,7 @@ _freeUnique(Unique *node)
* ----------------
*/
FreePlanFields((Plan *) node);
- FreeTempFields((Temp *) node);
+ FreeNonameFields((Noname *) node);
/* ----------------
* free remainder of node
@@ -1207,8 +1207,8 @@ freeObject(void *node)
case T_HashJoin:
_freeHashJoin(node);
break;
- case T_Temp:
- _freeTemp(node);
+ case T_Noname:
+ _freeNoname(node);
break;
case T_Material:
_freeMaterial(node);
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index ef3dccab35..854a2011cb 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: outfuncs.c,v 1.66 1999/02/09 03:51:13 momjian Exp $
+ * $Id: outfuncs.c,v 1.67 1999/02/09 17:02:49 momjian Exp $
*
* NOTES
* Every (plan) node in POSTGRES has an associated "out" routine which
@@ -472,21 +472,21 @@ _outIndexScan(StringInfo str, IndexScan *node)
}
/*
- * Temp is a subclass of Plan
+ * Noname is a subclass of Plan
*/
static void
-_outTemp(StringInfo str, Temp *node)
+_outNoname(StringInfo str, Noname *node)
{
- appendStringInfo(str, " TEMP ");
+ appendStringInfo(str, " NONAME ");
_outPlanInfo(str, (Plan *) node);
- appendStringInfo(str, " :tempid %u :keycount %d ",
- node->tempid,
+ appendStringInfo(str, " :nonameid %u :keycount %d ",
+ node->nonameid,
node->keycount);
}
/*
- * Sort is a subclass of Temp
+ * Sort is a subclass of Noname
*/
static void
_outSort(StringInfo str, Sort *node)
@@ -494,8 +494,8 @@ _outSort(StringInfo str, Sort *node)
appendStringInfo(str, " SORT ");
_outPlanInfo(str, (Plan *) node);
- appendStringInfo(str, " :tempid %u :keycount %d ",
- node->tempid,
+ appendStringInfo(str, " :nonameid %u :keycount %d ",
+ node->nonameid,
node->keycount);
}
@@ -523,7 +523,7 @@ _outGroup(StringInfo str, Group *node)
}
/*
- * For some reason, unique is a subclass of Temp.
+ * For some reason, unique is a subclass of Noname.
*/
static void
_outUnique(StringInfo str, Unique *node)
@@ -531,14 +531,14 @@ _outUnique(StringInfo str, Unique *node)
appendStringInfo(str, " UNIQUE ");
_outPlanInfo(str, (Plan *) node);
- appendStringInfo(str, " :tempid %u :keycount %d ",
- node->tempid,
+ appendStringInfo(str, " :nonameid %u :keycount %d ",
+ node->nonameid,
node->keycount);
}
/*
- * Hash is a subclass of Temp
+ * Hash is a subclass of Noname
*/
static void
_outHash(StringInfo str, Hash *node)
@@ -1517,8 +1517,8 @@ _outNode(StringInfo str, void *obj)
case T_IndexScan:
_outIndexScan(str, obj);
break;
- case T_Temp:
- _outTemp(str, obj);
+ case T_Noname:
+ _outNoname(str, obj);
break;
case T_Sort:
_outSort(str, obj);
diff --git a/src/backend/nodes/print.c b/src/backend/nodes/print.c
index 3acf895e7c..175b4a5fdf 100644
--- a/src/backend/nodes/print.c
+++ b/src/backend/nodes/print.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.19 1999/01/27 00:36:28 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.20 1999/02/09 17:02:49 momjian Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -313,8 +313,8 @@ plannode_type(Plan *p)
case T_HashJoin:
return "HASHJOIN";
break;
- case T_Temp:
- return "TEMP";
+ case T_Noname:
+ return "NONAME";
break;
case T_Material:
return "MATERIAL";
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index caebc29b1d..02e7547ab1 100644
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.51 1999/02/09 03:51:13 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.52 1999/02/09 17:02:50 momjian Exp $
*
* NOTES
* Most of the read functions for plan nodes are tested. (In fact, they
@@ -565,25 +565,25 @@ _readIndexScan()
}
/* ----------------
- * _readTemp
+ * _readNoname
*
- * Temp is a subclass of Plan
+ * Noname is a subclass of Plan
* ----------------
*/
-static Temp *
-_readTemp()
+static Noname *
+_readNoname()
{
- Temp *local_node;
+ Noname *local_node;
char *token;
int length;
- local_node = makeNode(Temp);
+ local_node = makeNode(Noname);
_getPlan((Plan *) local_node);
- token = lsptok(NULL, &length); /* eat :tempid */
- token = lsptok(NULL, &length); /* get tempid */
- local_node->tempid = atol(token);
+ token = lsptok(NULL, &length); /* eat :nonameid */
+ token = lsptok(NULL, &length); /* get nonameid */
+ local_node->nonameid = atol(token);
token = lsptok(NULL, &length); /* eat :keycount */
token = lsptok(NULL, &length); /* get keycount */
@@ -595,7 +595,7 @@ _readTemp()
/* ----------------
* _readSort
*
- * Sort is a subclass of Temp
+ * Sort is a subclass of Noname
* ----------------
*/
static Sort *
@@ -609,9 +609,9 @@ _readSort()
_getPlan((Plan *) local_node);
- token = lsptok(NULL, &length); /* eat :tempid */
- token = lsptok(NULL, &length); /* get tempid */
- local_node->tempid = atol(token);
+ token = lsptok(NULL, &length); /* eat :nonameid */
+ token = lsptok(NULL, &length); /* get nonameid */
+ local_node->nonameid = atol(token);
token = lsptok(NULL, &length); /* eat :keycount */
token = lsptok(NULL, &length); /* get keycount */
@@ -639,7 +639,7 @@ _readAgg()
/* ----------------
* _readUnique
*
- * For some reason, unique is a subclass of Temp.
+ * For some reason, unique is a subclass of Noname.
*/
static Unique *
_readUnique()
@@ -652,9 +652,9 @@ _readUnique()
_getPlan((Plan *) local_node);
- token = lsptok(NULL, &length); /* eat :tempid */
- token = lsptok(NULL, &length); /* get :tempid */
- local_node->tempid = atol(token);
+ token = lsptok(NULL, &length); /* eat :nonameid */
+ token = lsptok(NULL, &length); /* get :nonameid */
+ local_node->nonameid = atol(token);
token = lsptok(NULL, &length); /* eat :keycount */
token = lsptok(NULL, &length); /* get :keycount */
@@ -666,7 +666,7 @@ _readUnique()
/* ----------------
* _readHash
*
- * Hash is a subclass of Temp
+ * Hash is a subclass of Noname
* ----------------
*/
static Hash *
@@ -2070,8 +2070,8 @@ parsePlanString(void)
return_value = _readSeqScan();
else if (!strncmp(token, "INDEXSCAN", length))
return_value = _readIndexScan();
- else if (!strncmp(token, "TEMP", length))
- return_value = _readTemp();
+ else if (!strncmp(token, "NONAME", length))
+ return_value = _readNoname();
else if (!strncmp(token, "SORT", length))
return_value = _readSort();
else if (!strncmp(token, "AGGREG", length))
View Lorry Controller Status