external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixup! Introduces ExecSimpleRelationInsert_compat and modifyStateResultRelInfo macros

talha_testpg14
Sait Talha Nisanci 2021-08-27 00:01:04 +03:00
parent 32c2d138fc
commit 1ed8c1d4e5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/columnar/columnar_metadata.c
View File

@ -1196,7 +1196,7 @@ static void
DeleteTupleAndEnforceConstraints(ModifyState *state, HeapTuple heapTuple) DeleteTupleAndEnforceConstraints(ModifyState *state, HeapTuple heapTuple)
{ {
EState *estate = state->estate; EState *estate = state->estate;
ResultRelInfo *resultRelInfo = modifyStateResultRelInfo(state); ResultRelInfo *resultRelInfo = modifyStateResultRelInfo_compat(state);
ItemPointer tid = &(heapTuple->t_self); ItemPointer tid = &(heapTuple->t_self);
simple_heap_delete(state->rel, tid); simple_heap_delete(state->rel, tid);
@ -1212,7 +1212,7 @@ DeleteTupleAndEnforceConstraints(ModifyState *state, HeapTuple heapTuple)
static void static void
FinishModifyRelation(ModifyState *state) FinishModifyRelation(ModifyState *state)
{ {
ExecCloseIndices(modifyStateResultRelInfo(state)); ExecCloseIndices(modifyStateResultRelInfo_compat(state));
AfterTriggerEndQuery(state->estate); AfterTriggerEndQuery(state->estate);
#if PG_VERSION_NUM >= PG_VERSION_14 #if PG_VERSION_NUM >= PG_VERSION_14

4
src/include/columnar/columnar_version_compat.h
View File

@ -23,7 +23,7 @@
GetOldestNonRemovableTransactionId(a) GetOldestNonRemovableTransactionId(a)
#define ExecSimpleRelationInsert_compat(a, b, c) \ #define ExecSimpleRelationInsert_compat(a, b, c) \
ExecSimpleRelationInsert(a, b, c) ExecSimpleRelationInsert(a, b, c)
#define modifyStateResultRelInfo(a) ((a)->resultRelInfo) #define modifyStateResultRelInfo_compat(a) ((a)->resultRelInfo)
#define index_insert_compat(a, b, c, d, e, f, g, h) \ #define index_insert_compat(a, b, c, d, e, f, g, h) \
index_insert(a, b, c, d, e, f, g, h) index_insert(a, b, c, d, e, f, g, h)
#else #else
@ -34,7 +34,7 @@
#define GetOldestNonRemovableTransactionId_compat(a, b) GetOldestXmin(a, b) #define GetOldestNonRemovableTransactionId_compat(a, b) GetOldestXmin(a, b)
#define ExecSimpleRelationInsert_compat(a, b, c) \ #define ExecSimpleRelationInsert_compat(a, b, c) \
ExecSimpleRelationInsert(b, c) ExecSimpleRelationInsert(b, c)
#define modifyStateResultRelInfo(a) ((a)->estate->es_result_relation_info) #define modifyStateResultRelInfo_compat(a) ((a)->estate->es_result_relation_info)
#define index_insert_compat(a, b, c, d, e, f, g, h) \ #define index_insert_compat(a, b, c, d, e, f, g, h) \
index_insert(a, b, c, d, e, f, h) index_insert(a, b, c, d, e, f, h)
#endif #endif