From 527fdd9df11eb338fdd372d16f62cd067de5204b Mon Sep 17 00:00:00 2001 From: Bruce Momjian <bruce@momjian.us> Date: Thu, 19 Dec 2013 16:10:01 -0500 Subject: [PATCH] Move pg_upgrade_support global variables to their own include file Previously their declarations were spread around to avoid accidental access. --- .../pg_upgrade_support/pg_upgrade_support.c | 12 +------- src/backend/catalog/heap.c | 1 + src/backend/catalog/index.c | 1 + src/backend/catalog/pg_enum.c | 1 + src/backend/catalog/pg_type.c | 1 + src/backend/catalog/toasting.c | 3 +- src/backend/commands/typecmds.c | 1 + src/backend/commands/user.c | 1 + src/include/catalog/binary_upgrade.h | 29 +++++++++++++++++++ 9 files changed, 37 insertions(+), 13 deletions(-) create mode 100644 src/include/catalog/binary_upgrade.h diff --git a/contrib/pg_upgrade_support/pg_upgrade_support.c b/contrib/pg_upgrade_support/pg_upgrade_support.c index 99e64c4113f..6e30debf34e 100644 --- a/contrib/pg_upgrade_support/pg_upgrade_support.c +++ b/contrib/pg_upgrade_support/pg_upgrade_support.c @@ -11,6 +11,7 @@ #include "postgres.h" +#include "catalog/binary_upgrade.h" #include "catalog/namespace.h" #include "catalog/pg_type.h" #include "commands/extension.h" @@ -24,17 +25,6 @@ PG_MODULE_MAGIC; #endif -extern PGDLLIMPORT Oid binary_upgrade_next_pg_type_oid; -extern PGDLLIMPORT Oid binary_upgrade_next_array_pg_type_oid; -extern PGDLLIMPORT Oid binary_upgrade_next_toast_pg_type_oid; - -extern PGDLLIMPORT Oid binary_upgrade_next_heap_pg_class_oid; -extern PGDLLIMPORT Oid binary_upgrade_next_index_pg_class_oid; -extern PGDLLIMPORT Oid binary_upgrade_next_toast_pg_class_oid; - -extern PGDLLIMPORT Oid binary_upgrade_next_pg_enum_oid; -extern PGDLLIMPORT Oid binary_upgrade_next_pg_authid_oid; - Datum set_next_pg_type_oid(PG_FUNCTION_ARGS); Datum set_next_array_pg_type_oid(PG_FUNCTION_ARGS); Datum set_next_toast_pg_type_oid(PG_FUNCTION_ARGS); diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c index 6f2e1428ebe..032a20e78ee 100644 --- a/src/backend/catalog/heap.c +++ b/src/backend/catalog/heap.c @@ -34,6 +34,7 @@ #include "access/sysattr.h" #include "access/transam.h" #include "access/xact.h" +#include "catalog/binary_upgrade.h" #include "catalog/catalog.h" #include "catalog/dependency.h" #include "catalog/heap.h" diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index aa31429b8ac..7ad9720b2bb 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -30,6 +30,7 @@ #include "access/visibilitymap.h" #include "access/xact.h" #include "bootstrap/bootstrap.h" +#include "catalog/binary_upgrade.h" #include "catalog/catalog.h" #include "catalog/dependency.h" #include "catalog/heap.h" diff --git a/src/backend/catalog/pg_enum.c b/src/backend/catalog/pg_enum.c index 35899b4a9a7..23d2a4158e8 100644 --- a/src/backend/catalog/pg_enum.c +++ b/src/backend/catalog/pg_enum.c @@ -17,6 +17,7 @@ #include "access/heapam.h" #include "access/htup_details.h" #include "access/xact.h" +#include "catalog/binary_upgrade.h" #include "catalog/catalog.h" #include "catalog/indexing.h" #include "catalog/pg_enum.h" diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c index 23ac3dd3365..634915b507a 100644 --- a/src/backend/catalog/pg_type.c +++ b/src/backend/catalog/pg_type.c @@ -17,6 +17,7 @@ #include "access/heapam.h" #include "access/htup_details.h" #include "access/xact.h" +#include "catalog/binary_upgrade.h" #include "catalog/dependency.h" #include "catalog/indexing.h" #include "catalog/objectaccess.h" diff --git a/src/backend/catalog/toasting.c b/src/backend/catalog/toasting.c index 385d64d4c07..f58e4348f44 100644 --- a/src/backend/catalog/toasting.c +++ b/src/backend/catalog/toasting.c @@ -16,6 +16,7 @@ #include "access/tuptoaster.h" #include "access/xact.h" +#include "catalog/binary_upgrade.h" #include "catalog/dependency.h" #include "catalog/heap.h" #include "catalog/index.h" @@ -31,8 +32,6 @@ #include "utils/syscache.h" /* Potentially set by contrib/pg_upgrade_support functions */ -extern Oid binary_upgrade_next_toast_pg_class_oid; - Oid binary_upgrade_next_toast_pg_type_oid = InvalidOid; static bool create_toast_table(Relation rel, Oid toastOid, Oid toastIndexOid, diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c index d4a14cabff2..959b3f2252d 100644 --- a/src/backend/commands/typecmds.c +++ b/src/backend/commands/typecmds.c @@ -35,6 +35,7 @@ #include "access/heapam.h" #include "access/htup_details.h" #include "access/xact.h" +#include "catalog/binary_upgrade.h" #include "catalog/catalog.h" #include "catalog/dependency.h" #include "catalog/heap.h" diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c index e101a8669ed..ca1906df41c 100644 --- a/src/backend/commands/user.c +++ b/src/backend/commands/user.c @@ -16,6 +16,7 @@ #include "access/heapam.h" #include "access/htup_details.h" #include "access/xact.h" +#include "catalog/binary_upgrade.h" #include "catalog/dependency.h" #include "catalog/indexing.h" #include "catalog/objectaccess.h" diff --git a/src/include/catalog/binary_upgrade.h b/src/include/catalog/binary_upgrade.h new file mode 100644 index 00000000000..169d7696e35 --- /dev/null +++ b/src/include/catalog/binary_upgrade.h @@ -0,0 +1,29 @@ +/*------------------------------------------------------------------------- + * + * binary_upgrade.h + * variables used for binary upgrades + * + * + * Portions Copyright (c) 1996-2013, PostgreSQL Global Development Group + * Portions Copyright (c) 1994, Regents of the University of California + * + * src/include/catalog/binary_upgrade.h + * + *------------------------------------------------------------------------- + */ +#ifndef BINARY_UPGRADE_H +#define BINARY_UPGRADE_H + +extern PGDLLIMPORT Oid binary_upgrade_next_pg_type_oid; +extern PGDLLIMPORT Oid binary_upgrade_next_array_pg_type_oid; +extern PGDLLIMPORT Oid binary_upgrade_next_toast_pg_type_oid; + +extern PGDLLIMPORT Oid binary_upgrade_next_heap_pg_class_oid; +extern PGDLLIMPORT Oid binary_upgrade_next_index_pg_class_oid; +extern PGDLLIMPORT Oid binary_upgrade_next_toast_pg_class_oid; + +extern PGDLLIMPORT Oid binary_upgrade_next_pg_enum_oid; +extern PGDLLIMPORT Oid binary_upgrade_next_pg_authid_oid; + +#endif /* BINARY_UPGRADE_H */ + -- GitLab