diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2008-10-31 21:07:55 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2008-10-31 21:07:55 +0000 |
| commit | df5a99612d2d4ba7ed080eb4dd02ce7e09a45f9b (patch) | |
| tree | 19e8899cc33e133d97e52ec29d66b91b4402e789 /src/include/executor | |
| parent | e9816533e39be464227b748ee5eeb3d9f688cd76 (diff) | |
| download | postgresql-df5a99612d2d4ba7ed080eb4dd02ce7e09a45f9b.tar.gz postgresql-df5a99612d2d4ba7ed080eb4dd02ce7e09a45f9b.zip | |
Simplify ExecutorRun's API and save some trivial number of cycles by having
it just return void instead of sometimes returning a TupleTableSlot. SQL
functions don't need that anymore, and noplace else does either. Eliminating
the return value also means one less hassle for the ExecutorRun hook functions
that will be supported beginning in 8.4.
Diffstat (limited to 'src/include/executor')
| -rw-r--r-- | src/include/executor/executor.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index ac1b81cd9be..2fdaddda4da 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/executor.h,v 1.151 2008/10/29 00:00:39 tgl Exp $ + * $PostgreSQL: pgsql/src/include/executor/executor.h,v 1.152 2008/10/31 21:07:55 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -61,9 +61,9 @@ /* Hook for plugins to get control in ExecutorRun() */ -typedef TupleTableSlot *(*ExecutorRun_hook_type) (QueryDesc *queryDesc, - ScanDirection direction, - long count); +typedef void (*ExecutorRun_hook_type) (QueryDesc *queryDesc, + ScanDirection direction, + long count); extern PGDLLIMPORT ExecutorRun_hook_type ExecutorRun_hook; @@ -140,10 +140,10 @@ extern HeapTuple ExecRemoveJunk(JunkFilter *junkfilter, TupleTableSlot *slot); * prototypes from functions in execMain.c */ extern void ExecutorStart(QueryDesc *queryDesc, int eflags); -extern TupleTableSlot *ExecutorRun(QueryDesc *queryDesc, - ScanDirection direction, long count); -extern TupleTableSlot *standard_ExecutorRun(QueryDesc *queryDesc, - ScanDirection direction, long count); +extern void ExecutorRun(QueryDesc *queryDesc, + ScanDirection direction, long count); +extern void standard_ExecutorRun(QueryDesc *queryDesc, + ScanDirection direction, long count); extern void ExecutorEnd(QueryDesc *queryDesc); extern void ExecutorRewind(QueryDesc *queryDesc); extern void InitResultRelInfo(ResultRelInfo *resultRelInfo, |