Skip to content

Commit 666b03f

Browse files
gaoxueyugaoxueyu
authored
Merge pull request IvorySQL#794 from jiaoshuntian/IVORY_REL_4_STABLE
IvorySQL:rename ModifyTableContext and UpdateContext
2 parents 706bc02 + 3827886 commit 666b03f

File tree

5 files changed

+44
-44
lines changed

5 files changed

+44
-44
lines changed

‎contrib/ivorysql_ora/src/include/ivorysql_ora.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
/* Hooks */
2727
extern bool pg_compatible_oracle_precedence(Oid arg1, Oid arg2, char *opname_p, Oid *result_arg1, Oid *result_arg2);
28-
extern TupleTableSlot *IvyExecMergeMatched(ModifyTableContext *context,
28+
extern TupleTableSlot *IvyExecMergeMatched(IvyModifyTableContext *context,
2929
ResultRelInfo *resultRelInfo,
3030
ItemPointer tupleid,
3131
HeapTuple oldtuple,

‎contrib/ivorysql_ora/src/merge/ora_merge.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
#include "nodes/nodes.h"
6565

6666

67-
static TM_Result execDelete4Merge(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
67+
static TM_Result execDelete4Merge(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
6868
ItemPointer tupleid, bool changingPart);
6969
static TM_Result heapDelete4Merge(Relation relation, ItemPointer tid,
7070
CommandId cid, Snapshot crosscheck, bool wait,
@@ -114,7 +114,7 @@ IvyExecProcessReturning(ResultRelInfo *resultRelInfo,
114114
* execute oracle Merge UPDATE/UPDATE
115115
*/
116116
TupleTableSlot *
117-
IvyExecMergeMatched(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
117+
IvyExecMergeMatched(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
118118
ItemPointer tupleid, HeapTuple oldtuple, bool canSetTag,
119119
bool *matched)
120120
{
@@ -205,7 +205,7 @@ IvyExecMergeMatched(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
205205
MergeActionState *relaction = (MergeActionState *) lfirst(l);
206206
CmdType commandType = relaction->mas_action->commandType;
207207
TM_Result result;
208-
UpdateContext updateCxt = {0};
208+
IvyUpdateContext updateCxt = {0};
209209

210210
/*
211211
* Test condition, if any.
@@ -940,7 +940,7 @@ IvytransformMergeStmt(ParseState *pstate, MergeStmt *stmt)
940940
}
941941

942942
static TM_Result
943-
execDelete4Merge(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
943+
execDelete4Merge(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
944944
ItemPointer tupleid, bool changingPart)
945945
{
946946
EState *estate = context->estate;

‎src/backend/executor/nodeModifyTable.c‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@ static void ExecBatchInsert(ModifyTableState *mtstate,
8686
EState *estate,
8787
bool canSetTag);
8888
static void ExecPendingInserts(EState *estate);
89-
static void ExecCrossPartitionUpdateForeignKey(ModifyTableContext *context,
89+
static void ExecCrossPartitionUpdateForeignKey(IvyModifyTableContext *context,
9090
ResultRelInfo *sourcePartInfo,
9191
ResultRelInfo *destPartInfo,
9292
ItemPointer tupleid,
9393
TupleTableSlot *oldslot,
9494
TupleTableSlot *newslot);
95-
static bool ExecOnConflictUpdate(ModifyTableContext *context,
95+
static bool ExecOnConflictUpdate(IvyModifyTableContext *context,
9696
ResultRelInfo *resultRelInfo,
9797
ItemPointer conflictTid,
9898
TupleTableSlot *excludedSlot,
@@ -105,13 +105,13 @@ static TupleTableSlot *ExecPrepareTupleRouting(ModifyTableState *mtstate,
105105
TupleTableSlot *slot,
106106
ResultRelInfo **partRelInfo);
107107

108-
static TupleTableSlot *ExecMerge(ModifyTableContext *context,
108+
static TupleTableSlot *ExecMerge(IvyModifyTableContext *context,
109109
ResultRelInfo *resultRelInfo,
110110
ItemPointer tupleid,
111111
HeapTuple oldtuple,
112112
bool canSetTag);
113113
static void ExecInitMerge(ModifyTableState *mtstate, EState *estate);
114-
static TupleTableSlot *ExecMergeNotMatched(ModifyTableContext *context,
114+
static TupleTableSlot *ExecMergeNotMatched(IvyModifyTableContext *context,
115115
ResultRelInfo *resultRelInfo,
116116
bool canSetTag);
117117

@@ -705,7 +705,7 @@ ExecGetUpdateNewTuple(ResultRelInfo *relinfo,
705705
* ----------------------------------------------------------------
706706
*/
707707
static TupleTableSlot *
708-
ExecInsert(ModifyTableContext *context,
708+
ExecInsert(IvyModifyTableContext *context,
709709
ResultRelInfo *resultRelInfo,
710710
TupleTableSlot *slot,
711711
bool canSetTag,
@@ -1263,7 +1263,7 @@ ExecPendingInserts(EState *estate)
12631263
* the delete a no-op; otherwise, return true.
12641264
*/
12651265
bool
1266-
ExecDeletePrologue(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
1266+
ExecDeletePrologue(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
12671267
ItemPointer tupleid, HeapTuple oldtuple,
12681268
TupleTableSlot **epqreturnslot, TM_Result *result)
12691269
{
@@ -1294,7 +1294,7 @@ ExecDeletePrologue(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
12941294
* Caller is in charge of doing EvalPlanQual as necessary
12951295
*/
12961296
TM_Result
1297-
ExecDeleteAct(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
1297+
ExecDeleteAct(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
12981298
ItemPointer tupleid, bool changingPart)
12991299
{
13001300
EState *estate = context->estate;
@@ -1316,7 +1316,7 @@ ExecDeleteAct(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
13161316
* cross-partition tuple move.
13171317
*/
13181318
void
1319-
ExecDeleteEpilogue(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
1319+
ExecDeleteEpilogue(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
13201320
ItemPointer tupleid, HeapTuple oldtuple, bool changingPart)
13211321
{
13221322
ModifyTableState *mtstate = context->mtstate;
@@ -1374,7 +1374,7 @@ ExecDeleteEpilogue(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
13741374
* ----------------------------------------------------------------
13751375
*/
13761376
static TupleTableSlot *
1377-
ExecDelete(ModifyTableContext *context,
1377+
ExecDelete(IvyModifyTableContext *context,
13781378
ResultRelInfo *resultRelInfo,
13791379
ItemPointer tupleid,
13801380
HeapTuple oldtuple,
@@ -1688,12 +1688,12 @@ ExecDelete(ModifyTableContext *context,
16881688
* logic.
16891689
*/
16901690
static bool
1691-
ExecCrossPartitionUpdate(ModifyTableContext *context,
1691+
ExecCrossPartitionUpdate(IvyModifyTableContext *context,
16921692
ResultRelInfo *resultRelInfo,
16931693
ItemPointer tupleid, HeapTuple oldtuple,
16941694
TupleTableSlot *slot,
16951695
bool canSetTag,
1696-
UpdateContext *updateCxt,
1696+
IvyUpdateContext *updateCxt,
16971697
TM_Result *tmresult,
16981698
TupleTableSlot **retry_slot,
16991699
TupleTableSlot **inserted_tuple,
@@ -1849,7 +1849,7 @@ ExecCrossPartitionUpdate(ModifyTableContext *context,
18491849
* otherwise, return true.
18501850
*/
18511851
bool
1852-
ExecUpdatePrologue(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
1852+
ExecUpdatePrologue(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
18531853
ItemPointer tupleid, HeapTuple oldtuple, TupleTableSlot *slot,
18541854
TM_Result *result)
18551855
{
@@ -1926,9 +1926,9 @@ ExecUpdatePrepareSlot(ResultRelInfo *resultRelInfo,
19261926
* this routine does it.
19271927
*/
19281928
TM_Result
1929-
ExecUpdateAct(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
1929+
ExecUpdateAct(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
19301930
ItemPointer tupleid, HeapTuple oldtuple, TupleTableSlot *slot,
1931-
bool canSetTag, UpdateContext *updateCxt)
1931+
bool canSetTag, IvyUpdateContext *updateCxt)
19321932
{
19331933
EState *estate = context->estate;
19341934
Relation resultRelationDesc = resultRelInfo->ri_RelationDesc;
@@ -2077,7 +2077,7 @@ ExecUpdateAct(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
20772077
* returns indicating that the tuple was updated.
20782078
*/
20792079
void
2080-
ExecUpdateEpilogue(ModifyTableContext *context, UpdateContext *updateCxt,
2080+
ExecUpdateEpilogue(IvyModifyTableContext *context, IvyUpdateContext *updateCxt,
20812081
ResultRelInfo *resultRelInfo, ItemPointer tupleid,
20822082
HeapTuple oldtuple, TupleTableSlot *slot)
20832083
{
@@ -2124,7 +2124,7 @@ ExecUpdateEpilogue(ModifyTableContext *context, UpdateContext *updateCxt,
21242124
* keys pointing into it.
21252125
*/
21262126
static void
2127-
ExecCrossPartitionUpdateForeignKey(ModifyTableContext *context,
2127+
ExecCrossPartitionUpdateForeignKey(IvyModifyTableContext *context,
21282128
ResultRelInfo *sourcePartInfo,
21292129
ResultRelInfo *destPartInfo,
21302130
ItemPointer tupleid,
@@ -2216,13 +2216,13 @@ ExecCrossPartitionUpdateForeignKey(ModifyTableContext *context,
22162216
* ----------------------------------------------------------------
22172217
*/
22182218
static TupleTableSlot *
2219-
ExecUpdate(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
2219+
ExecUpdate(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
22202220
ItemPointer tupleid, HeapTuple oldtuple, TupleTableSlot *slot,
22212221
bool canSetTag)
22222222
{
22232223
EState *estate = context->estate;
22242224
Relation resultRelationDesc = resultRelInfo->ri_RelationDesc;
2225-
UpdateContext updateCxt = {0};
2225+
IvyUpdateContext updateCxt = {0};
22262226
TM_Result result;
22272227

22282228
/*
@@ -2468,7 +2468,7 @@ ExecUpdate(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
24682468
* the caller must retry the INSERT from scratch.
24692469
*/
24702470
static bool
2471-
ExecOnConflictUpdate(ModifyTableContext *context,
2471+
ExecOnConflictUpdate(IvyModifyTableContext *context,
24722472
ResultRelInfo *resultRelInfo,
24732473
ItemPointer conflictTid,
24742474
TupleTableSlot *excludedSlot,
@@ -2688,7 +2688,7 @@ ExecOnConflictUpdate(ModifyTableContext *context,
26882688
* Perform MERGE.
26892689
*/
26902690
static TupleTableSlot *
2691-
ExecMerge(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
2691+
ExecMerge(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
26922692
ItemPointer tupleid, HeapTuple oldtuple, bool canSetTag)
26932693
{
26942694
TupleTableSlot *rslot = NULL;
@@ -2814,7 +2814,7 @@ ExecMerge(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
28142814
* to also execute a WHEN NOT MATCHED [BY TARGET] action.
28152815
*/
28162816
TupleTableSlot *
2817-
ExecMergeMatched(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
2817+
ExecMergeMatched(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
28182818
ItemPointer tupleid, HeapTuple oldtuple, bool canSetTag,
28192819
bool *matched)
28202820
{
@@ -2904,7 +2904,7 @@ ExecMergeMatched(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
29042904
MergeActionState *relaction = (MergeActionState *) lfirst(l);
29052905
CmdType commandType = relaction->mas_action->commandType;
29062906
TM_Result result;
2907-
UpdateContext updateCxt = {0};
2907+
IvyUpdateContext updateCxt = {0};
29082908

29092909
/*
29102910
* Test condition, if any.
@@ -3325,7 +3325,7 @@ ExecMergeMatched(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
33253325
* Execute the first qualifying NOT MATCHED [BY TARGET] action.
33263326
*/
33273327
static TupleTableSlot *
3328-
ExecMergeNotMatched(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
3328+
ExecMergeNotMatched(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
33293329
bool canSetTag)
33303330
{
33313331
ModifyTableState *mtstate = context->mtstate;
@@ -3773,7 +3773,7 @@ static TupleTableSlot *
37733773
ExecModifyTable(PlanState *pstate)
37743774
{
37753775
ModifyTableState *node = castNode(ModifyTableState, pstate);
3776-
ModifyTableContext context;
3776+
IvyModifyTableContext context;
37773777
EState *estate = node->ps.state;
37783778
CmdType operation = node->operation;
37793779
ResultRelInfo *resultRelInfo;

‎src/include/executor/nodeModifyTable.h‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* state and some output variables populated by ExecUpdateAct() and
2323
* ExecDeleteAct() to report the result of their actions to callers.
2424
*/
25-
typedef struct ModifyTableContext
25+
typedef struct IvyModifyTableContext
2626
{
2727
/* Operation state */
2828
ModifyTableState *mtstate;
@@ -52,12 +52,12 @@ typedef struct ModifyTableContext
5252
* cross-partition UPDATE
5353
*/
5454
TupleTableSlot *cpUpdateReturningSlot;
55-
} ModifyTableContext;
55+
} IvyModifyTableContext;
5656

5757
/*
5858
* Context struct containing output data specific to UPDATE operations.
5959
*/
60-
typedef struct UpdateContext
60+
typedef struct IvyUpdateContext
6161
{
6262
bool crossPartUpdate; /* was it a cross-partition update? */
6363
TU_UpdateIndexes updateIndexes; /* Which index updates are required? */
@@ -67,7 +67,7 @@ typedef struct UpdateContext
6767
* EvalPlanQual on it
6868
*/
6969
LockTupleMode lockmode;
70-
} UpdateContext;
70+
} IvyUpdateContext;
7171

7272
extern void ExecInitStoredGenerated(ResultRelInfo *resultRelInfo,
7373
EState *estate,
@@ -84,31 +84,31 @@ extern void ExecReScanModifyTable(ModifyTableState *node);
8484
extern void ExecInitMergeTupleSlots(ModifyTableState *mtstate,
8585
ResultRelInfo *resultRelInfo);
8686

87-
extern bool ExecDeletePrologue(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
87+
extern bool ExecDeletePrologue(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
8888
ItemPointer tupleid, HeapTuple oldtuple,
8989
TupleTableSlot **epqreturnslot, TM_Result *result);
90-
extern TM_Result ExecDeleteAct(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
90+
extern TM_Result ExecDeleteAct(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
9191
ItemPointer tupleid, bool changingPart);
92-
extern void ExecDeleteEpilogue(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
92+
extern void ExecDeleteEpilogue(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
9393
ItemPointer tupleid, HeapTuple oldtuple, bool changingPart);
94-
extern TM_Result ExecUpdateAct(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
94+
extern TM_Result ExecUpdateAct(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
9595
ItemPointer tupleid, HeapTuple oldtuple, TupleTableSlot *slot,
96-
bool canSetTag, UpdateContext *updateCxt);
97-
extern void ExecUpdateEpilogue(ModifyTableContext *context, UpdateContext *updateCxt,
96+
bool canSetTag, IvyUpdateContext *updateCxt);
97+
extern void ExecUpdateEpilogue(IvyModifyTableContext *context, IvyUpdateContext *updateCxt,
9898
ResultRelInfo *resultRelInfo, ItemPointer tupleid,
9999
HeapTuple oldtuple, TupleTableSlot *slot);
100-
extern bool ExecUpdatePrologue(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
100+
extern bool ExecUpdatePrologue(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
101101
ItemPointer tupleid, HeapTuple oldtuple, TupleTableSlot *slot,
102102
TM_Result *result);
103103
extern void ExecUpdatePrepareSlot(ResultRelInfo *resultRelInfo,
104104
TupleTableSlot *slot, EState *estate);
105-
extern TupleTableSlot *ExecMergeMatched(ModifyTableContext *context,
105+
extern TupleTableSlot *ExecMergeMatched(IvyModifyTableContext *context,
106106
ResultRelInfo *resultRelInfo,
107107
ItemPointer tupleid,
108108
HeapTuple oldtuple,
109109
bool canSetTag,
110110
bool *matched);
111-
typedef TupleTableSlot *(* exec_merge_matched_hook_type)(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
111+
typedef TupleTableSlot *(* exec_merge_matched_hook_type)(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
112112
ItemPointer tupleid, HeapTuple oldtuple,
113113
bool canSetTag, bool *matched);
114114
extern PGDLLIMPORT exec_merge_matched_hook_type pg_exec_merge_matched_hook;

‎src/tools/pgindent/typedefs.list‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1650,7 +1650,7 @@ MinimalTupleTableSlot
16501650
MinmaxMultiOpaque
16511651
MinmaxOpaque
16521652
ModifyTable
1653-
ModifyTableContext
1653+
IvyModifyTableContext
16541654
ModifyTablePath
16551655
ModifyTableState
16561656
MonotonicFunction
@@ -3027,7 +3027,7 @@ UniqueState
30273027
UnlistenStmt
30283028
UnresolvedTup
30293029
UnresolvedTupData
3030-
UpdateContext
3030+
IvyUpdateContext
30313031
UpdateStmt
30323032
UploadManifestCmd
30333033
UpperRelationKind

0 commit comments

Comments
 (0)