diff options
| author | Simon Riggs | 2018-04-05 08:54:07 +0000 |
|---|---|---|
| committer | Simon Riggs | 2018-04-05 08:54:07 +0000 |
| commit | 4b2d44031f8c005f6f86364d7663858b6b5bdd14 (patch) | |
| tree | 821dec0027fe8caa8ce50250e20a1e594d738e7e /src/include | |
| parent | 1fd8690668635bab9dfa16b2885e6e474f8451ba (diff) | |
MERGE post-commit review
Review comments from Andres Freund
* Consolidate code into AfterTriggerGetTransitionTable()
* Rename nodeMerge.c to execMerge.c
* Rename nodeMerge.h to execMerge.h
* Move MERGE handling in ExecInitModifyTable()
into a execMerge.c ExecInitMerge()
* Move mt_merge_subcommands flags into execMerge.h
* Rename opt_and_condition to opt_merge_when_and_condition
* Wordsmith various comments
Author: Pavan Deolasee
Reviewer: Simon Riggs
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/executor/execMerge.h | 31 | ||||
| -rw-r--r-- | src/include/executor/nodeMerge.h | 22 | ||||
| -rw-r--r-- | src/include/executor/nodeModifyTable.h | 1 |
3 files changed, 32 insertions, 22 deletions
diff --git a/src/include/executor/execMerge.h b/src/include/executor/execMerge.h new file mode 100644 index 0000000000..5ea8c4e50a --- /dev/null +++ b/src/include/executor/execMerge.h @@ -0,0 +1,31 @@ +/*------------------------------------------------------------------------- + * + * execMerge.h + * + * + * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group + * Portions Copyright (c) 1994, Regents of the University of California + * + * src/include/executor/execMerge.h + * + *------------------------------------------------------------------------- + */ +#ifndef EXECMERGE_H +#define EXECMERGE_H + +#include "nodes/execnodes.h" + +/* flags for mt_merge_subcommands */ +#define MERGE_INSERT 0x01 +#define MERGE_UPDATE 0x02 +#define MERGE_DELETE 0x04 + +extern void ExecMerge(ModifyTableState *mtstate, EState *estate, + TupleTableSlot *slot, JunkFilter *junkfilter, + ResultRelInfo *resultRelInfo); + +extern void ExecInitMerge(ModifyTableState *mtstate, + EState *estate, + ResultRelInfo *resultRelInfo); + +#endif /* NODEMERGE_H */ diff --git a/src/include/executor/nodeMerge.h b/src/include/executor/nodeMerge.h deleted file mode 100644 index c222e9ee65..0000000000 --- a/src/include/executor/nodeMerge.h +++ /dev/null @@ -1,22 +0,0 @@ -/*------------------------------------------------------------------------- - * - * nodeMerge.h - * - * - * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group - * Portions Copyright (c) 1994, Regents of the University of California - * - * src/include/executor/nodeMerge.h - * - *------------------------------------------------------------------------- - */ -#ifndef NODEMERGE_H -#define NODEMERGE_H - -#include "nodes/execnodes.h" - -extern void -ExecMerge(ModifyTableState *mtstate, EState *estate, TupleTableSlot *slot, - JunkFilter *junkfilter, ResultRelInfo *resultRelInfo); - -#endif /* NODEMERGE_H */ diff --git a/src/include/executor/nodeModifyTable.h b/src/include/executor/nodeModifyTable.h index 686cfa6171..94fd60c38c 100644 --- a/src/include/executor/nodeModifyTable.h +++ b/src/include/executor/nodeModifyTable.h @@ -39,5 +39,6 @@ extern TupleTableSlot *ExecInsert(ModifyTableState *mtstate, EState *estate, MergeActionState *actionState, bool canSetTag); +extern void ExecCheckPlanOutput(Relation resultRel, List *targetList); #endif /* NODEMODIFYTABLE_H */ |