diff --git a/src/cache_invalidate.c b/src/cache_invalidate.c index 891e3e298..731aad68e 100644 --- a/src/cache_invalidate.c +++ b/src/cache_invalidate.c @@ -31,7 +31,7 @@ #define CACHE_INVAL_PROXY_SCHEMA "_timescaledb_cache" #define CACHE_INVAL_PROXY_SCHEMA_OID get_namespace_oid(CACHE_INVAL_PROXY_SCHEMA, false) -bool IobeamLoaded(void); +bool extension_is_loaded(void); void _cache_invalidate_init(void); void _cache_invalidate_fini(void); void _cache_invalidate_extload(void); @@ -53,7 +53,7 @@ static void inval_cache_callback(Datum arg, Oid relid) { /* TODO: look at IsTransactionState should this be necessary? */ - if (!IobeamLoaded()) + if (!extension_is_loaded()) return; if (relid == InvalidOid || relid == hypertable_cache_inval_proxy_oid) diff --git a/src/init.c b/src/init.c index 022248c47..d0145a778 100644 --- a/src/init.c +++ b/src/init.c @@ -28,7 +28,7 @@ extern void _xact_fini(void); extern void _PG_init(void); extern void _PG_fini(void); -extern bool IobeamLoaded(void); +extern bool extension_is_loaded(void); void _PG_init(void) @@ -53,12 +53,12 @@ _PG_fini(void) _chunk_cache_fini(); } -static bool isLoaded = false; +static bool is_loaded = false; bool -IobeamLoaded(void) +extension_is_loaded(void) { - if (!isLoaded) + if (!is_loaded) { Oid id; @@ -71,9 +71,9 @@ IobeamLoaded(void) if (id != InvalidOid && !(creating_extension && id == CurrentExtensionObject)) { - isLoaded = true; + is_loaded = true; _cache_invalidate_extload(); } } - return isLoaded; + return is_loaded; } diff --git a/src/planner.c b/src/planner.c index a3ffba3d3..bfd3dc2c1 100644 --- a/src/planner.c +++ b/src/planner.c @@ -20,7 +20,7 @@ void _planner_init(void); void _planner_fini(void); -bool IobeamLoaded(void); +bool extension_is_loaded(void); static planner_hook_type prev_planner_hook; @@ -273,7 +273,7 @@ timescaledb_planner(Query *parse, int cursorOptions, ParamListInfo boundParams) { PlannedStmt *rv = NULL; - if (IobeamLoaded()) + if (extension_is_loaded()) { change_table_name_context context; char *printParse = GetConfigOptionByName("io.print_parse", NULL, true); diff --git a/src/process_utility.c b/src/process_utility.c index 4417b26e0..265161ac9 100644 --- a/src/process_utility.c +++ b/src/process_utility.c @@ -6,7 +6,7 @@ #include "utils.h" #include "hypertable_cache.h" -bool IobeamLoaded(void); +bool extension_is_loaded(void); void _process_utility_init(void); void _process_utility_fini(void); @@ -44,7 +44,7 @@ timescaledb_ProcessUtility(Node *parsetree, DestReceiver *dest, char *completionTag) { - if (!IobeamLoaded()) + if (!extension_is_loaded()) { prev_ProcessUtility(parsetree, queryString, context, params, dest, completionTag); return;