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

Commitbe8eafa

Browse files
author
Neil Conway
committed
ExecProcAppend() wasn't called ExecAppend() because the latter name was
formerly used in execMain. Since that is no longer the case, this patchrenames ExecProcAppend() to ExecAppend() for the sake of consistency.
1 parent1d1b819 commitbe8eafa

File tree

5 files changed

+14
-16
lines changed

5 files changed

+14
-16
lines changed

‎src/backend/executor/execProcnode.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
*
1414
* IDENTIFICATION
15-
* $PostgreSQL: pgsql/src/backend/executor/execProcnode.c,v 1.44 2004/08/29 04:12:31 momjian Exp $
15+
* $PostgreSQL: pgsql/src/backend/executor/execProcnode.c,v 1.45 2004/09/24 01:36:30 neilc Exp $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
@@ -293,7 +293,7 @@ ExecProcNode(PlanState *node)
293293
break;
294294

295295
caseT_AppendState:
296-
result=ExecProcAppend((AppendState*)node);
296+
result=ExecAppend((AppendState*)node);
297297
break;
298298

299299
/*

‎src/backend/executor/nodeAppend.c

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/executor/nodeAppend.c,v 1.59 2004/08/29 04:12:31 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/executor/nodeAppend.c,v 1.60 2004/09/24 01:36:30 neilc Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
1515
/* INTERFACE ROUTINES
1616
*ExecInitAppend- initialize the append node
17-
*ExecProcAppend- retrieve the next tuple from the node
17+
*ExecAppend- retrieve the next tuple from the node
1818
*ExecEndAppend- shut down the append node
1919
*ExecReScanAppend - rescan the append node
2020
*
@@ -90,7 +90,7 @@ exec_append_initialize_next(AppendState *appendstate)
9090
/*
9191
* if scanning in reverse, we start at the last scan in the list
9292
* and then proceed back to the first.. in any case we inform
93-
*ExecProcAppend that we are at the end of the line by returning
93+
*ExecAppend that we are at the end of the line by returning
9494
* FALSE
9595
*/
9696
appendstate->as_whichplan=appendstate->as_firstplan;
@@ -134,7 +134,7 @@ exec_append_initialize_next(AppendState *appendstate)
134134
* (This is potentially wasteful, since the entire result of the
135135
*append node may not be scanned, but this way all of the
136136
*structures get allocated in the executor's top level memory
137-
*block instead of that of the call toExecProcAppend.)
137+
*block instead of that of the call toExecAppend.)
138138
*
139139
*Special case: during an EvalPlanQual recheck query of an inherited
140140
*target relation, we only want to initialize and scan the single
@@ -246,15 +246,13 @@ ExecCountSlotsAppend(Append *node)
246246
}
247247

248248
/* ----------------------------------------------------------------
249-
*ExecProcAppend
249+
*ExecAppend
250250
*
251251
*Handles the iteration over the multiple scans.
252-
*
253-
* NOTE: Can't call this ExecAppend, that name is used in execMain.
254252
* ----------------------------------------------------------------
255253
*/
256254
TupleTableSlot*
257-
ExecProcAppend(AppendState*node)
255+
ExecAppend(AppendState*node)
258256
{
259257
EState*estate;
260258
intwhichplan;
@@ -310,7 +308,7 @@ ExecProcAppend(AppendState *node)
310308
if (exec_append_initialize_next(node))
311309
{
312310
ExecSetSlotDescriptorIsNew(result_slot, true);
313-
returnExecProcAppend(node);
311+
returnExecAppend(node);
314312
}
315313
else
316314
returnExecClearTuple(result_slot);

‎src/backend/po/cs.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4961,7 +4961,7 @@ msgid "Unable to identify an equality operator for type '%s'"
49614961
msgstr""
49624962

49634963
#:../executor/nodeAppend.c:293
4964-
msgid"ExecProcAppend: subnode is NULL"
4964+
msgid"ExecAppend: subnode is NULL"
49654965
msgstr""
49664966

49674967
#:../executor/nodeHash.c:66

‎src/backend/po/hu.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Zoltan Kovacs <kovzol@math.u-szeged.hu>, 2001.
33
# Robert Zana <zerobert@freemail.hu>, 2001.
44
#
5-
# $PostgreSQL: pgsql/src/backend/po/hu.po,v 1.6 2003/11/29 19:51:53 pgsql Exp $
5+
# $PostgreSQL: pgsql/src/backend/po/hu.po,v 1.7 2004/09/24 01:36:34 neilc Exp $
66
#
77
msgid ""
88
msgstr ""
@@ -4925,7 +4925,7 @@ msgid "Unable to identify an equality operator for type '%s'"
49254925
msgstr""
49264926

49274927
#:../executor/nodeAppend.c:293
4928-
msgid"ExecProcAppend: subnode is NULL"
4928+
msgid"ExecAppend: subnode is NULL"
49294929
msgstr""
49304930

49314931
#:../executor/nodeHash.c:66

‎src/include/executor/nodeAppend.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/include/executor/nodeAppend.h,v 1.21 2004/08/29 04:13:06 momjian Exp $
10+
* $PostgreSQL: pgsql/src/include/executor/nodeAppend.h,v 1.22 2004/09/24 01:36:37 neilc Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -18,7 +18,7 @@
1818

1919
externintExecCountSlotsAppend(Append*node);
2020
externAppendState*ExecInitAppend(Append*node,EState*estate);
21-
externTupleTableSlot*ExecProcAppend(AppendState*node);
21+
externTupleTableSlot*ExecAppend(AppendState*node);
2222
externvoidExecEndAppend(AppendState*node);
2323
externvoidExecReScanAppend(AppendState*node,ExprContext*exprCtxt);
2424

0 commit comments

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