Skip to content

Commit 3b8037e

Browse files
gaoxueyugaoxueyu
authored
Merge pull request #795 from jiaoshuntian/fix_tsdb
IvorySQL:rename ModifyTableContext and UpdateContext
2 parents 36890cb + 1cbea26 commit 3b8037e

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
{
@@ -186,7 +186,7 @@ IvyExecMergeMatched(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
186186
MergeActionState *relaction = (MergeActionState *) lfirst(l);
187187
CmdType commandType = relaction->mas_action->commandType;
188188
TM_Result result;
189-
UpdateContext updateCxt = {0};
189+
IvyUpdateContext updateCxt = {0};
190190

191191
/*
192192
* Test condition, if any.
@@ -908,7 +908,7 @@ IvytransformMergeStmt(ParseState *pstate, MergeStmt *stmt)
908908
}
909909

910910
static TM_Result
911-
execDelete4Merge(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
911+
execDelete4Merge(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
912912
ItemPointer tupleid, bool changingPart)
913913
{
914914
EState *estate = context->estate;

‎src/backend/executor/nodeModifyTable.c‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,13 @@ static void ExecBatchInsert(ModifyTableState *mtstate,
8585
EState *estate,
8686
bool canSetTag);
8787
static void ExecPendingInserts(EState *estate);
88-
static void ExecCrossPartitionUpdateForeignKey(ModifyTableContext *context,
88+
static void ExecCrossPartitionUpdateForeignKey(IvyModifyTableContext *context,
8989
ResultRelInfo *sourcePartInfo,
9090
ResultRelInfo *destPartInfo,
9191
ItemPointer tupleid,
9292
TupleTableSlot *oldslot,
9393
TupleTableSlot *newslot);
94-
static bool ExecOnConflictUpdate(ModifyTableContext *context,
94+
static bool ExecOnConflictUpdate(IvyModifyTableContext *context,
9595
ResultRelInfo *resultRelInfo,
9696
ItemPointer conflictTid,
9797
TupleTableSlot *excludedSlot,
@@ -104,13 +104,13 @@ static TupleTableSlot *ExecPrepareTupleRouting(ModifyTableState *mtstate,
104104
TupleTableSlot *slot,
105105
ResultRelInfo **partRelInfo);
106106

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

@@ -704,7 +704,7 @@ ExecGetUpdateNewTuple(ResultRelInfo *relinfo,
704704
* ----------------------------------------------------------------
705705
*/
706706
static TupleTableSlot *
707-
ExecInsert(ModifyTableContext *context,
707+
ExecInsert(IvyModifyTableContext *context,
708708
ResultRelInfo *resultRelInfo,
709709
TupleTableSlot *slot,
710710
bool canSetTag,
@@ -1262,7 +1262,7 @@ ExecPendingInserts(EState *estate)
12621262
* the delete a no-op; otherwise, return true.
12631263
*/
12641264
bool
1265-
ExecDeletePrologue(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
1265+
ExecDeletePrologue(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
12661266
ItemPointer tupleid, HeapTuple oldtuple,
12671267
TupleTableSlot **epqreturnslot, TM_Result *result)
12681268
{
@@ -1293,7 +1293,7 @@ ExecDeletePrologue(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
12931293
* Caller is in charge of doing EvalPlanQual as necessary
12941294
*/
12951295
TM_Result
1296-
ExecDeleteAct(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
1296+
ExecDeleteAct(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
12971297
ItemPointer tupleid, bool changingPart)
12981298
{
12991299
EState *estate = context->estate;
@@ -1315,7 +1315,7 @@ ExecDeleteAct(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
13151315
* cross-partition tuple move.
13161316
*/
13171317
void
1318-
ExecDeleteEpilogue(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
1318+
ExecDeleteEpilogue(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
13191319
ItemPointer tupleid, HeapTuple oldtuple, bool changingPart)
13201320
{
13211321
ModifyTableState *mtstate = context->mtstate;
@@ -1373,7 +1373,7 @@ ExecDeleteEpilogue(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
13731373
* ----------------------------------------------------------------
13741374
*/
13751375
static TupleTableSlot *
1376-
ExecDelete(ModifyTableContext *context,
1376+
ExecDelete(IvyModifyTableContext *context,
13771377
ResultRelInfo *resultRelInfo,
13781378
ItemPointer tupleid,
13791379
HeapTuple oldtuple,
@@ -1687,12 +1687,12 @@ ExecDelete(ModifyTableContext *context,
16871687
* logic.
16881688
*/
16891689
static bool
1690-
ExecCrossPartitionUpdate(ModifyTableContext *context,
1690+
ExecCrossPartitionUpdate(IvyModifyTableContext *context,
16911691
ResultRelInfo *resultRelInfo,
16921692
ItemPointer tupleid, HeapTuple oldtuple,
16931693
TupleTableSlot *slot,
16941694
bool canSetTag,
1695-
UpdateContext *updateCxt,
1695+
IvyUpdateContext *updateCxt,
16961696
TM_Result *tmresult,
16971697
TupleTableSlot **retry_slot,
16981698
TupleTableSlot **inserted_tuple,
@@ -1848,7 +1848,7 @@ ExecCrossPartitionUpdate(ModifyTableContext *context,
18481848
* otherwise, return true.
18491849
*/
18501850
bool
1851-
ExecUpdatePrologue(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
1851+
ExecUpdatePrologue(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
18521852
ItemPointer tupleid, HeapTuple oldtuple, TupleTableSlot *slot,
18531853
TM_Result *result)
18541854
{
@@ -1925,9 +1925,9 @@ ExecUpdatePrepareSlot(ResultRelInfo *resultRelInfo,
19251925
* this routine does it.
19261926
*/
19271927
TM_Result
1928-
ExecUpdateAct(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
1928+
ExecUpdateAct(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
19291929
ItemPointer tupleid, HeapTuple oldtuple, TupleTableSlot *slot,
1930-
bool canSetTag, UpdateContext *updateCxt)
1930+
bool canSetTag, IvyUpdateContext *updateCxt)
19311931
{
19321932
EState *estate = context->estate;
19331933
Relation resultRelationDesc = resultRelInfo->ri_RelationDesc;
@@ -2076,7 +2076,7 @@ ExecUpdateAct(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
20762076
* returns indicating that the tuple was updated.
20772077
*/
20782078
void
2079-
ExecUpdateEpilogue(ModifyTableContext *context, UpdateContext *updateCxt,
2079+
ExecUpdateEpilogue(IvyModifyTableContext *context, IvyUpdateContext *updateCxt,
20802080
ResultRelInfo *resultRelInfo, ItemPointer tupleid,
20812081
HeapTuple oldtuple, TupleTableSlot *slot)
20822082
{
@@ -2123,7 +2123,7 @@ ExecUpdateEpilogue(ModifyTableContext *context, UpdateContext *updateCxt,
21232123
* keys pointing into it.
21242124
*/
21252125
static void
2126-
ExecCrossPartitionUpdateForeignKey(ModifyTableContext *context,
2126+
ExecCrossPartitionUpdateForeignKey(IvyModifyTableContext *context,
21272127
ResultRelInfo *sourcePartInfo,
21282128
ResultRelInfo *destPartInfo,
21292129
ItemPointer tupleid,
@@ -2215,13 +2215,13 @@ ExecCrossPartitionUpdateForeignKey(ModifyTableContext *context,
22152215
* ----------------------------------------------------------------
22162216
*/
22172217
static TupleTableSlot *
2218-
ExecUpdate(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
2218+
ExecUpdate(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
22192219
ItemPointer tupleid, HeapTuple oldtuple, TupleTableSlot *slot,
22202220
bool canSetTag)
22212221
{
22222222
EState *estate = context->estate;
22232223
Relation resultRelationDesc = resultRelInfo->ri_RelationDesc;
2224-
UpdateContext updateCxt = {0};
2224+
IvyUpdateContext updateCxt = {0};
22252225
TM_Result result;
22262226

22272227
/*
@@ -2456,7 +2456,7 @@ ExecUpdate(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
24562456
* the caller must retry the INSERT from scratch.
24572457
*/
24582458
static bool
2459-
ExecOnConflictUpdate(ModifyTableContext *context,
2459+
ExecOnConflictUpdate(IvyModifyTableContext *context,
24602460
ResultRelInfo *resultRelInfo,
24612461
ItemPointer conflictTid,
24622462
TupleTableSlot *excludedSlot,
@@ -2668,7 +2668,7 @@ ExecOnConflictUpdate(ModifyTableContext *context,
26682668
* Perform MERGE.
26692669
*/
26702670
static TupleTableSlot *
2671-
ExecMerge(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
2671+
ExecMerge(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
26722672
ItemPointer tupleid, HeapTuple oldtuple, bool canSetTag)
26732673
{
26742674
TupleTableSlot *rslot = NULL;
@@ -2794,7 +2794,7 @@ ExecMerge(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
27942794
* to also execute a WHEN NOT MATCHED [BY TARGET] action.
27952795
*/
27962796
TupleTableSlot *
2797-
ExecMergeMatched(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
2797+
ExecMergeMatched(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
27982798
ItemPointer tupleid, HeapTuple oldtuple, bool canSetTag,
27992799
bool *matched)
28002800
{
@@ -2868,7 +2868,7 @@ ExecMergeMatched(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
28682868
MergeActionState *relaction = (MergeActionState *) lfirst(l);
28692869
CmdType commandType = relaction->mas_action->commandType;
28702870
TM_Result result;
2871-
UpdateContext updateCxt = {0};
2871+
IvyUpdateContext updateCxt = {0};
28722872

28732873
/*
28742874
* Test condition, if any.
@@ -3267,7 +3267,7 @@ ExecMergeMatched(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
32673267
* Execute the first qualifying NOT MATCHED [BY TARGET] action.
32683268
*/
32693269
static TupleTableSlot *
3270-
ExecMergeNotMatched(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
3270+
ExecMergeNotMatched(IvyModifyTableContext *context, ResultRelInfo *resultRelInfo,
32713271
bool canSetTag)
32723272
{
32733273
ModifyTableState *mtstate = context->mtstate;
@@ -3715,7 +3715,7 @@ static TupleTableSlot *
37153715
ExecModifyTable(PlanState *pstate)
37163716
{
37173717
ModifyTableState *node = castNode(ModifyTableState, pstate);
3718-
ModifyTableContext context;
3718+
IvyModifyTableContext context;
37193719
EState *estate = node->ps.state;
37203720
CmdType operation = node->operation;
37213721
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
@@ -1648,7 +1648,7 @@ MinimalTupleTableSlot
16481648
MinmaxMultiOpaque
16491649
MinmaxOpaque
16501650
ModifyTable
1651-
ModifyTableContext
1651+
IvyModifyTableContext
16521652
ModifyTablePath
16531653
ModifyTableState
16541654
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)