Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit318e593

Browse files
committed
Rename Temp to Noname for noname tables.
1 parent78511d8 commit318e593

File tree

21 files changed

+198
-198
lines changed

21 files changed

+198
-198
lines changed

‎src/backend/catalog/heap.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.72 1999/02/03 21:15:54 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.73 1999/02/09 17:02:42 momjian Exp $
1111
*
1212
*
1313
* INTERFACE ROUTINES
@@ -149,7 +149,7 @@ typedef struct tempRelList
149149
* array */
150150
}TempRelList;
151151

152-
#defineTEMP_REL_LIST_SIZE32
152+
#defineNONAME_REL_LIST_SIZE32
153153

154154
staticTempRelList*tempRels=NULL;
155155

@@ -1392,7 +1392,7 @@ InitNoNameRelList(void)
13921392
}
13931393

13941394
tempRels= (TempRelList*)malloc(sizeof(TempRelList));
1395-
tempRels->size=TEMP_REL_LIST_SIZE;
1395+
tempRels->size=NONAME_REL_LIST_SIZE;
13961396
tempRels->rels= (Relation*)malloc(sizeof(Relation)*tempRels->size);
13971397
MemSet(tempRels->rels,0,sizeof(Relation)*tempRels->size);
13981398
tempRels->num=0;
@@ -1436,7 +1436,7 @@ AddToNoNameRelList(Relation r)
14361436

14371437
if (tempRels->num==tempRels->size)
14381438
{
1439-
tempRels->size+=TEMP_REL_LIST_SIZE;
1439+
tempRels->size+=NONAME_REL_LIST_SIZE;
14401440
tempRels->rels=realloc(tempRels->rels,
14411441
sizeof(Relation)*tempRels->size);
14421442
}

‎src/backend/commands/explain.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* Copyright (c) 1994-5, Regents of the University of California
66
*
7-
* $Id: explain.c,v 1.30 1998/12/18 14:45:07 wieck Exp $
7+
* $Id: explain.c,v 1.31 1999/02/09 17:02:43 momjian Exp $
88
*
99
*/
1010
#include<stdio.h>
@@ -176,8 +176,8 @@ explain_outNode(StringInfo str, Plan *plan, int indent, ExplainState *es)
176176
caseT_IndexScan:
177177
pname="Index Scan";
178178
break;
179-
caseT_Temp:
180-
pname="Temp Scan";
179+
caseT_Noname:
180+
pname="Noname Scan";
181181
break;
182182
caseT_Sort:
183183
pname="Sort";

‎src/backend/executor/execAmi.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Copyright (c) 1994, Regents of the University of California
77
*
8-
* $Id: execAmi.c,v 1.30 1999/02/02 03:44:23 momjian Exp $
8+
* $Id: execAmi.c,v 1.31 1999/02/09 17:02:44 momjian Exp $
99
*
1010
*-------------------------------------------------------------------------
1111
*/
@@ -50,7 +50,7 @@
5050
#include"executor/nodeAppend.h"
5151
#include"executor/nodeSubplan.h"
5252
#include"executor/execdebug.h"
53-
#include"optimizer/internal.h"/* for_TEMP_RELATION_ID_ */
53+
#include"optimizer/internal.h"/* for_NONAME_RELATION_ID_ */
5454
#include"access/genam.h"
5555
#include"access/heapam.h"
5656
#include"catalog/heap.h"
@@ -509,11 +509,11 @@ ExecCreatR(TupleDesc tupType,
509509

510510
relDesc=NULL;
511511

512-
if (relationOid==_TEMP_RELATION_ID_)
512+
if (relationOid==_NONAME_RELATION_ID_)
513513
{
514514
/* ----------------
515515
* create a temporary relation
516-
* (currently the planner always puts a_TEMP_RELATION_ID
516+
* (currently the planner always puts a_NONAME_RELATION_ID
517517
* in the relation argument so we expect this to be the case although
518518
* it's possible that someday we'll get the name from
519519
* from the range table.. -cim 10/12/89)

‎src/backend/executor/nodeMaterial.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.19 1999/02/03 21:16:14 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.20 1999/02/09 17:02:44 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -25,7 +25,7 @@
2525
#include"executor/nodeMaterial.h"
2626
#include"catalog/catalog.h"
2727
#include"catalog/heap.h"
28-
#include"optimizer/internal.h"/* for_TEMP_RELATION_ID_ */
28+
#include"optimizer/internal.h"/* for_NONAME_RELATION_ID_ */
2929
#include"access/heapam.h"
3030

3131
/* ----------------------------------------------------------------
@@ -265,7 +265,7 @@ ExecInitMaterial(Material *node, EState *estate, Plan *parent)
265265

266266
/* ----------------
267267
*ExecCreatR wants it's second argument to be an object id of
268-
*a relation in the range table or a_TEMP_RELATION_ID
268+
*a relation in the range table or a_NONAME_RELATION_ID
269269
*indicating that the relation is not in the range table.
270270
*
271271
*In the second case ExecCreatR creates a temp relation.
@@ -277,7 +277,7 @@ ExecInitMaterial(Material *node, EState *estate, Plan *parent)
277277
* ----------------
278278
*/
279279
/* len = ExecTargetListLength(node->plan.targetlist); */
280-
tempDesc=ExecCreatR(tupType,_TEMP_RELATION_ID_);
280+
tempDesc=ExecCreatR(tupType,_NONAME_RELATION_ID_);
281281

282282
/* ----------------
283283
*save the relation descriptor in the sortstate

‎src/backend/executor/nodeSort.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.16 1998/09/01 03:22:30 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.17 1999/02/09 17:02:45 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -22,7 +22,7 @@
2222
#include"catalog/catalog.h"
2323
#include"catalog/heap.h"
2424
#include"storage/bufmgr.h"
25-
#include"optimizer/internal.h"/* for_TEMP_RELATION_ID_ */
25+
#include"optimizer/internal.h"/* for_NONAME_RELATION_ID_ */
2626

2727
/* ----------------------------------------------------------------
2828
*FormSortKeys(node)

‎src/backend/nodes/copyfuncs.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.64 1999/02/0903:51:12 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.65 1999/02/0917:02:46 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -372,36 +372,36 @@ _copyHashJoin(HashJoin *from)
372372

373373

374374
/* ----------------
375-
*CopyTempFields
375+
*CopyNonameFields
376376
*
377-
*This function copies the fields of theTemp node. It is used by
378-
*all the copy functions for classes which inherit fromTemp.
377+
*This function copies the fields of theNoname node. It is used by
378+
*all the copy functions for classes which inherit fromNoname.
379379
* ----------------
380380
*/
381381
staticvoid
382-
CopyTempFields(Temp*from,Temp*newnode)
382+
CopyNonameFields(Noname*from,Noname*newnode)
383383
{
384-
newnode->tempid=from->tempid;
384+
newnode->nonameid=from->nonameid;
385385
newnode->keycount=from->keycount;
386386
return;
387387
}
388388

389389

390390
/* ----------------
391-
*_copyTemp
391+
*_copyNoname
392392
* ----------------
393393
*/
394-
staticTemp*
395-
_copyTemp(Temp*from)
394+
staticNoname*
395+
_copyNoname(Noname*from)
396396
{
397-
Temp*newnode=makeNode(Temp);
397+
Noname*newnode=makeNode(Noname);
398398

399399
/* ----------------
400400
*copy node superclass fields
401401
* ----------------
402402
*/
403403
CopyPlanFields((Plan*)from, (Plan*)newnode);
404-
CopyTempFields(from,newnode);
404+
CopyNonameFields(from,newnode);
405405

406406
returnnewnode;
407407
}
@@ -420,7 +420,7 @@ _copyMaterial(Material *from)
420420
* ----------------
421421
*/
422422
CopyPlanFields((Plan*)from, (Plan*)newnode);
423-
CopyTempFields((Temp*)from, (Temp*)newnode);
423+
CopyNonameFields((Noname*)from, (Noname*)newnode);
424424

425425
returnnewnode;
426426
}
@@ -440,7 +440,7 @@ _copySort(Sort *from)
440440
* ----------------
441441
*/
442442
CopyPlanFields((Plan*)from, (Plan*)newnode);
443-
CopyTempFields((Temp*)from, (Temp*)newnode);
443+
CopyNonameFields((Noname*)from, (Noname*)newnode);
444444

445445
returnnewnode;
446446
}
@@ -511,7 +511,7 @@ _copyUnique(Unique *from)
511511
* ----------------
512512
*/
513513
CopyPlanFields((Plan*)from, (Plan*)newnode);
514-
CopyTempFields((Temp*)from, (Temp*)newnode);
514+
CopyNonameFields((Noname*)from, (Noname*)newnode);
515515

516516
/* ----------------
517517
*copy remainder of node
@@ -1688,8 +1688,8 @@ copyObject(void *from)
16881688
caseT_HashJoin:
16891689
retval=_copyHashJoin(from);
16901690
break;
1691-
caseT_Temp:
1692-
retval=_copyTemp(from);
1691+
caseT_Noname:
1692+
retval=_copyNoname(from);
16931693
break;
16941694
caseT_Material:
16951695
retval=_copyMaterial(from);

‎src/backend/nodes/freefuncs.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.3 1999/02/0903:51:12 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.4 1999/02/0917:02:49 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -298,32 +298,32 @@ _freeHashJoin(HashJoin *node)
298298

299299

300300
/* ----------------
301-
*FreeTempFields
301+
*FreeNonameFields
302302
*
303-
*This function frees the fields of theTemp node. It is used by
304-
*all the free functions for classes which inherit nodeTemp.
303+
*This function frees the fields of theNoname node. It is used by
304+
*all the free functions for classes which inherit nodeNoname.
305305
* ----------------
306306
*/
307307
staticvoid
308-
FreeTempFields(Temp*node)
308+
FreeNonameFields(Noname*node)
309309
{
310310
return;
311311
}
312312

313313

314314
/* ----------------
315-
*_freeTemp
315+
*_freeNoname
316316
* ----------------
317317
*/
318318
staticvoid
319-
_freeTemp(Temp*node)
319+
_freeNoname(Noname*node)
320320
{
321321
/* ----------------
322322
*free node superclass fields
323323
* ----------------
324324
*/
325325
FreePlanFields((Plan*)node);
326-
FreeTempFields(node);
326+
FreeNonameFields(node);
327327

328328
pfree(node);
329329
}
@@ -340,7 +340,7 @@ _freeMaterial(Material *node)
340340
* ----------------
341341
*/
342342
FreePlanFields((Plan*)node);
343-
FreeTempFields((Temp*)node);
343+
FreeNonameFields((Noname*)node);
344344

345345
pfree(node);
346346
}
@@ -358,7 +358,7 @@ _freeSort(Sort *node)
358358
* ----------------
359359
*/
360360
FreePlanFields((Plan*)node);
361-
FreeTempFields((Temp*)node);
361+
FreeNonameFields((Noname*)node);
362362

363363
pfree(node);
364364
}
@@ -417,7 +417,7 @@ _freeUnique(Unique *node)
417417
* ----------------
418418
*/
419419
FreePlanFields((Plan*)node);
420-
FreeTempFields((Temp*)node);
420+
FreeNonameFields((Noname*)node);
421421

422422
/* ----------------
423423
*free remainder of node
@@ -1207,8 +1207,8 @@ freeObject(void *node)
12071207
caseT_HashJoin:
12081208
_freeHashJoin(node);
12091209
break;
1210-
caseT_Temp:
1211-
_freeTemp(node);
1210+
caseT_Noname:
1211+
_freeNoname(node);
12121212
break;
12131213
caseT_Material:
12141214
_freeMaterial(node);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp