From 495096ef5ebecb2ca75dd54080bad3277affb2f0 Mon Sep 17 00:00:00 2001 From: Onur Tirtir Date: Tue, 23 Feb 2021 21:20:18 +0300 Subject: [PATCH] Remove useless pg version checks (#4741) --- src/backend/columnar/cstore_reader.c | 9 ++------- src/include/columnar/columnar_version_compat.h | 13 ------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/src/backend/columnar/cstore_reader.c b/src/backend/columnar/cstore_reader.c index 8caff6017..71e8fb845 100644 --- a/src/backend/columnar/cstore_reader.c +++ b/src/backend/columnar/cstore_reader.c @@ -578,7 +578,6 @@ SelectedChunkMask(StripeSkipList *stripeSkipList, List *projectedColumnList, Node *baseConstraint = BuildBaseConstraint(column); for (chunkIndex = 0; chunkIndex < stripeSkipList->chunkCount; chunkIndex++) { - bool predicateRefuted = false; ColumnChunkSkipNode *chunkSkipNodeArray = stripeSkipList->chunkSkipNodeArray[columnIndex]; ColumnChunkSkipNode *chunkSkipNode = &chunkSkipNodeArray[chunkIndex]; @@ -596,12 +595,8 @@ SelectedChunkMask(StripeSkipList *stripeSkipList, List *projectedColumnList, chunkSkipNode->maximumValue); List *constraintList = list_make1(baseConstraint); -#if (PG_VERSION_NUM >= 100000) - predicateRefuted = predicate_refuted_by(constraintList, restrictInfoList, - false); -#else - predicateRefuted = predicate_refuted_by(constraintList, restrictInfoList); -#endif + bool predicateRefuted = + predicate_refuted_by(constraintList, restrictInfoList, false); if (predicateRefuted && selectedChunkMask[chunkIndex]) { selectedChunkMask[chunkIndex] = false; diff --git a/src/include/columnar/columnar_version_compat.h b/src/include/columnar/columnar_version_compat.h index f6cce5e49..0dd6f14eb 100644 --- a/src/include/columnar/columnar_version_compat.h +++ b/src/include/columnar/columnar_version_compat.h @@ -14,23 +14,10 @@ #ifndef COLUMNAR_COMPAT_H #define COLUMNAR_COMPAT_H -#if PG_VERSION_NUM < 100000 - -/* Accessor for the i'th attribute of tupdesc. */ -#define TupleDescAttr(tupdesc, i) ((tupdesc)->attrs[(i)]) - -#endif - -#if PG_VERSION_NUM < 110000 -#define ALLOCSET_DEFAULT_SIZES ALLOCSET_DEFAULT_MINSIZE, ALLOCSET_DEFAULT_INITSIZE, \ - ALLOCSET_DEFAULT_MAXSIZE -#define ACLCHECK_OBJECT_TABLE ACL_KIND_CLASS -#else #define ACLCHECK_OBJECT_TABLE OBJECT_TABLE #define ExplainPropertyLong(qlabel, value, es) \ ExplainPropertyInteger(qlabel, NULL, value, es) -#endif #if PG_VERSION_NUM < 120000 #define TTS_EMPTY(slot) ((slot)->tts_isempty)