From 1ed8c1d4e555b0ef7854d61eb1ca9c356e66587a Mon Sep 17 00:00:00 2001 From: Sait Talha Nisanci Date: Fri, 27 Aug 2021 00:01:04 +0300 Subject: [PATCH] fixup! Introduces ExecSimpleRelationInsert_compat and modifyStateResultRelInfo macros --- src/backend/columnar/columnar_metadata.c | 4 ++-- src/include/columnar/columnar_version_compat.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/backend/columnar/columnar_metadata.c b/src/backend/columnar/columnar_metadata.c index c0058f3f7..7ec5ca3f9 100644 --- a/src/backend/columnar/columnar_metadata.c +++ b/src/backend/columnar/columnar_metadata.c @@ -1196,7 +1196,7 @@ static void DeleteTupleAndEnforceConstraints(ModifyState *state, HeapTuple heapTuple) { EState *estate = state->estate; - ResultRelInfo *resultRelInfo = modifyStateResultRelInfo(state); + ResultRelInfo *resultRelInfo = modifyStateResultRelInfo_compat(state); ItemPointer tid = &(heapTuple->t_self); simple_heap_delete(state->rel, tid); @@ -1212,7 +1212,7 @@ DeleteTupleAndEnforceConstraints(ModifyState *state, HeapTuple heapTuple) static void FinishModifyRelation(ModifyState *state) { - ExecCloseIndices(modifyStateResultRelInfo(state)); + ExecCloseIndices(modifyStateResultRelInfo_compat(state)); AfterTriggerEndQuery(state->estate); #if PG_VERSION_NUM >= PG_VERSION_14 diff --git a/src/include/columnar/columnar_version_compat.h b/src/include/columnar/columnar_version_compat.h index f42abc724..89d22b999 100644 --- a/src/include/columnar/columnar_version_compat.h +++ b/src/include/columnar/columnar_version_compat.h @@ -23,7 +23,7 @@ GetOldestNonRemovableTransactionId(a) #define ExecSimpleRelationInsert_compat(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) \ index_insert(a, b, c, d, e, f, g, h) #else @@ -34,7 +34,7 @@ #define GetOldestNonRemovableTransactionId_compat(a, b) GetOldestXmin(a, b) #define ExecSimpleRelationInsert_compat(a, 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) \ index_insert(a, b, c, d, e, f, h) #endif