From 63b7a93a52e3a4977ae7ad7ae3c4d823ee85da90 Mon Sep 17 00:00:00 2001 From: Sait Talha Nisanci Date: Thu, 26 Aug 2021 23:46:43 +0300 Subject: [PATCH] fixup! Introduces macros for vacuum options --- src/backend/columnar/columnar_tableam.c | 4 ++-- src/backend/distributed/commands/vacuum.c | 28 +++++++++++------------ src/include/distributed/version_compat.h | 12 ++++------ 3 files changed, 20 insertions(+), 24 deletions(-) diff --git a/src/backend/columnar/columnar_tableam.c b/src/backend/columnar/columnar_tableam.c index 0e1bb4f3f..39b06ae4a 100644 --- a/src/backend/columnar/columnar_tableam.c +++ b/src/backend/columnar/columnar_tableam.c @@ -886,7 +886,7 @@ columnar_vacuum_rel(Relation rel, VacuumParams *params, int elevel = (params->options & VACOPT_VERBOSE) ? INFO : DEBUG2; /* this should have been resolved by vacuum.c until now */ - Assert(params->truncate != VACOPTVALUE_UNSPECIFIED_COMPAT); + Assert(params->truncate != VACOPTVALUE_UNSPECIFIED); LogRelationStats(rel, elevel); @@ -894,7 +894,7 @@ columnar_vacuum_rel(Relation rel, VacuumParams *params, * We don't have updates, deletes, or concurrent updates, so all we * care for now is truncating the unused space at the end of storage. */ - if (params->truncate == VACOPTVALUE_ENABLED_COMPAT) + if (params->truncate == VACOPTVALUE_ENABLED) { TruncateColumnar(rel, elevel); } diff --git a/src/backend/distributed/commands/vacuum.c b/src/backend/distributed/commands/vacuum.c index f0c8f4eed..f6fabfe2b 100644 --- a/src/backend/distributed/commands/vacuum.c +++ b/src/backend/distributed/commands/vacuum.c @@ -39,8 +39,8 @@ typedef struct CitusVacuumParams { int options; - VacOptValue_compat truncate; - VacOptValue_compat index_cleanup; + VacOptValue truncate; + VacOptValue index_cleanup; #if PG_VERSION_NUM >= PG_VERSION_13 int nworkers; @@ -346,8 +346,8 @@ DeparseVacuumStmtPrefix(CitusVacuumParams vacuumParams) /* if no flags remain, exit early */ if (vacuumFlags == 0 && - vacuumParams.truncate == VACOPTVALUE_UNSPECIFIED_COMPAT && - vacuumParams.index_cleanup == VACOPTVALUE_UNSPECIFIED_COMPAT + vacuumParams.truncate == VACOPTVALUE_UNSPECIFIED && + vacuumParams.index_cleanup == VACOPTVALUE_UNSPECIFIED #if PG_VERSION_NUM >= PG_VERSION_13 && vacuumParams.nworkers == VACUUM_PARALLEL_NOTSET #endif @@ -389,18 +389,18 @@ DeparseVacuumStmtPrefix(CitusVacuumParams vacuumParams) appendStringInfoString(vacuumPrefix, "SKIP_LOCKED,"); } - if (vacuumParams.truncate != VACOPTVALUE_UNSPECIFIED_COMPAT) + if (vacuumParams.truncate != VACOPTVALUE_UNSPECIFIED) { appendStringInfoString(vacuumPrefix, - vacuumParams.truncate == VACOPTVALUE_ENABLED_COMPAT ? + vacuumParams.truncate == VACOPTVALUE_ENABLED ? "TRUNCATE," : "TRUNCATE false," ); } - if (vacuumParams.index_cleanup != VACOPTVALUE_UNSPECIFIED_COMPAT) + if (vacuumParams.index_cleanup != VACOPTVALUE_UNSPECIFIED) { appendStringInfoString(vacuumPrefix, - vacuumParams.index_cleanup == VACOPTVALUE_ENABLED_COMPAT ? + vacuumParams.index_cleanup == VACOPTVALUE_ENABLED ? "INDEX_CLEANUP," : "INDEX_CLEANUP false," ); } @@ -506,8 +506,8 @@ VacuumStmtParams(VacuumStmt *vacstmt) bool disable_page_skipping = false; /* Set default value */ - params.index_cleanup = VACOPTVALUE_UNSPECIFIED_COMPAT; - params.truncate = VACOPTVALUE_UNSPECIFIED_COMPAT; + params.index_cleanup = VACOPTVALUE_UNSPECIFIED; + params.truncate = VACOPTVALUE_UNSPECIFIED; #if PG_VERSION_NUM >= PG_VERSION_13 params.nworkers = VACUUM_PARALLEL_NOTSET; #endif @@ -551,13 +551,13 @@ VacuumStmtParams(VacuumStmt *vacstmt) } else if (strcmp(opt->defname, "index_cleanup") == 0) { - params.index_cleanup = defGetBoolean(opt) ? VACOPTVALUE_ENABLED_COMPAT : - VACOPTVALUE_DISABLED_COMPAT; + params.index_cleanup = defGetBoolean(opt) ? VACOPTVALUE_ENABLED : + VACOPTVALUE_DISABLED; } else if (strcmp(opt->defname, "truncate") == 0) { - params.truncate = defGetBoolean(opt) ? VACOPTVALUE_ENABLED_COMPAT : - VACOPTVALUE_DISABLED_COMPAT; + params.truncate = defGetBoolean(opt) ? VACOPTVALUE_ENABLED : + VACOPTVALUE_DISABLED; } #if PG_VERSION_NUM >= PG_VERSION_13 else if (strcmp(opt->defname, "parallel") == 0) diff --git a/src/include/distributed/version_compat.h b/src/include/distributed/version_compat.h index 0a4b3a68d..697f8dbbc 100644 --- a/src/include/distributed/version_compat.h +++ b/src/include/distributed/version_compat.h @@ -40,10 +40,6 @@ #define FuncnameGetCandidates_compat(a, b, c, d, e, f, g) \ FuncnameGetCandidates(a, b, c, d, e, f, g) #define expand_function_arguments_compat(a, b, c, d) expand_function_arguments(a, b, c, d) -#define VacOptValue_compat VacOptValue -#define VACOPTVALUE_UNSPECIFIED_COMPAT VACOPTVALUE_UNSPECIFIED -#define VACOPTVALUE_DISABLED_COMPAT VACOPTVALUE_DISABLED -#define VACOPTVALUE_ENABLED_COMPAT VACOPTVALUE_ENABLED #define IsReindexWithParam_compat(reindex, param) IsReindexWithParam(reindex, param) #define CopyFromState_compat CopyFromState #define BeginCopyFrom_compat(a, b, c, d, e, f, g, h) BeginCopyFrom(a, b, c, d, e, f, g, h) @@ -73,10 +69,10 @@ #define FuncnameGetCandidates_compat(a, b, c, d, e, f, g) \ FuncnameGetCandidates(a, b, c, d, e, g) #define expand_function_arguments_compat(a, b, c, d) expand_function_arguments(a, c, d) -#define VacOptValue_compat VacOptTernaryValue -#define VACOPTVALUE_UNSPECIFIED_COMPAT VACOPT_TERNARY_DEFAULT -#define VACOPTVALUE_DISABLED_COMPAT VACOPT_TERNARY_DISABLED -#define VACOPTVALUE_ENABLED_COMPAT VACOPT_TERNARY_ENABLED +#define VacOptValue VacOptTernaryValue +#define VACOPTVALUE_UNSPECIFIED VACOPT_TERNARY_DEFAULT +#define VACOPTVALUE_DISABLED VACOPT_TERNARY_DISABLED +#define VACOPTVALUE_ENABLED VACOPT_TERNARY_ENABLED #define IsReindexWithParam_compat(reindex, param) \ ((strcmp(param, "concurrently") == 0) ? ((reindex)->concurrent) : \ ((strcmp(param, "verbose") == 0) ? ((reindex)->options == REINDEXOPT_VERBOSE) : \