From c1093e2929a4b9e2e07849f4188b68880d56b1e1 Mon Sep 17 00:00:00 2001 From: Marc Munro Date: Mon, 9 Nov 2015 11:27:33 -0800 Subject: [PATCH] Updates for PG 9.4 --- COPYRIGHT | 2 +- GNUmakefile | 13 +++++-------- docs/Makefile | 7 ++----- src/Makefile | 7 +++---- src/veil_bitmap.d | 4 ---- src/veil_config.d | 0 src/veil_datatypes.d | 0 src/veil_interface.d | 5 ----- src/veil_mainpage.c | 27 ++++++++++++++++++++++----- src/veil_mainpage.d | 2 -- src/veil_query.d | 0 src/veil_serialise.d | 5 ----- src/veil_shmem.c | 20 +++++++++++--------- src/veil_shmem.d | 0 src/veil_utils.d | 0 src/veil_variables.d | 0 src/veil_version.h | 4 ++-- veil.control | 4 ++-- 18 files changed, 48 insertions(+), 52 deletions(-) delete mode 100644 src/veil_bitmap.d delete mode 100644 src/veil_config.d delete mode 100644 src/veil_datatypes.d delete mode 100644 src/veil_interface.d delete mode 100644 src/veil_mainpage.d delete mode 100644 src/veil_query.d delete mode 100644 src/veil_serialise.d delete mode 100644 src/veil_shmem.d delete mode 100644 src/veil_utils.d delete mode 100644 src/veil_variables.d diff --git a/COPYRIGHT b/COPYRIGHT index 2f6cb89..2725c20 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,6 @@ Veil - A data security API for the PostgreSQL Database Management System -Copyright (c) 2005 - 2011 +Copyright (c) 2005 - 2015 Marc Munro, Munro Information Services Ltd, Vancouver BC, Canada diff --git a/GNUmakefile b/GNUmakefile index 213a050..7f56603 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -2,7 +2,7 @@ # # PGXS-based makefile for Veil # -# Copyright (c) 2005 - 2014 Marc Munro +# Copyright (c) 2005 - 2015 Marc Munro # Author: Marc Munro # License: BSD # @@ -74,7 +74,7 @@ deps: $(MAKE) MAKEFLAGS="$(MAKEFLAGS)" make_deps # Define some variables for the following tarball targets. -tarball tarball_clean: VEIL_DIR=veil_$(VEIL_VERSION) +VEIL_DIR=veil_$(VEIL_VERSION) # Create a version numbered tarball of source (including deps), tools, # and possibly docs. @@ -93,13 +93,10 @@ tarball: @tar czhf veil_$(VEIL_VERSION).tgz $(VEIL_DIR) @rm -rf $(VEIL_DIR) -# Cleanup after creating a tarball -tarball_clean: - rm -rf $(VEIL_DIR) veil_$(VEIL_VERSION).tgz - # Ensure that tarball tmp files and dirs are removed by the clean target -clean: tarball_clean - @rm -f PG_VERSION veil--*sql veil_demon--*sql +EXTRA_CLEAN = $(VEIL_DIR) regress.log $(DEPS) \ + PG_VERSION veil--*sql veil_demo--*sql \ + veil_$(VEIL_VERSION).tgz # Install veil_demo as well as veil install: demo_install diff --git a/docs/Makefile b/docs/Makefile index 6907c6e..b958c15 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -2,7 +2,7 @@ # # Makefile for docs directory of Veil # -# Copyright (c) 2005 - 2011 Marc Munro +# Copyright (c) 2005 - 2015 Marc Munro # Author: Marc Munro # License: BSD # @@ -24,13 +24,10 @@ docs/html: $(SOURCES) $(HEADERS) demo/veil_demo.png (echo "Doxygen fails: is it installed?"; exit 2) @rm -f NO # Don't know why this file is generated but it can go. -# Clean this directory and ensure generated docs are removed -clean: docs_clean - docs_clean: @echo Cleaning docs... @rm -f $(DOCS_GARBAGE) NO @rm -rf $(DOCS_DIR)/html docs_distclean: docs_clean - @rm -f Doxyfile \ No newline at end of file + @rm -f Doxyfile diff --git a/src/Makefile b/src/Makefile index 97d9962..c50a621 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2,7 +2,7 @@ # # Makefile for src directory of Veil # -# Copyright (c) 2005 - 2011 Marc Munro +# Copyright (c) 2005 - 2015 Marc Munro # Author: Marc Munro # License: BSD # @@ -30,10 +30,9 @@ else endif INSTALLED_LIB = $(LIBDIR)/$(addsuffix $(DLSUFFIX), veil) -TRIAL_LIB = $(BUILD_DIR)/$(addsuffix $(DLSUFFIX), veil_trial) -VEIL_LIB = $(BUILD_DIR)/$(addsuffix $(DLSUFFIX), veil) +TRIAL_LIB = $(addsuffix $(DLSUFFIX), veil_trial) +VEIL_LIB = $(addsuffix $(DLSUFFIX), veil) HEADERS = $(wildcard src/*.h) -SRC_CLEAN = $(VEIL_LIB) all: $(VEIL_CONTROL) diff --git a/src/veil_bitmap.d b/src/veil_bitmap.d deleted file mode 100644 index 870b553..0000000 --- a/src/veil_bitmap.d +++ /dev/null @@ -1,4 +0,0 @@ -src/veil_bitmap.o src/veil_bitmap.d: \ - src/veil_bitmap.c \ - src/veil_datatypes.h \ - src/veil_funcs.h diff --git a/src/veil_config.d b/src/veil_config.d deleted file mode 100644 index e69de29..0000000 diff --git a/src/veil_datatypes.d b/src/veil_datatypes.d deleted file mode 100644 index e69de29..0000000 diff --git a/src/veil_interface.d b/src/veil_interface.d deleted file mode 100644 index a242884..0000000 --- a/src/veil_interface.d +++ /dev/null @@ -1,5 +0,0 @@ -src/veil_interface.o src/veil_interface.d: \ - src/veil_interface.c \ - src/veil_version.h \ - src/veil_funcs.h \ - src/veil_datatypes.h diff --git a/src/veil_mainpage.c b/src/veil_mainpage.c index 688fbf8..011dff4 100644 --- a/src/veil_mainpage.c +++ b/src/veil_mainpage.c @@ -3,7 +3,7 @@ * * Doxygen documentation root for Veil * - * Copyright (c) 2005 - 2014 Marc Munro + * Copyright (c) 2005 - 2015 Marc Munro * Author: Marc Munro * License: BSD * @@ -11,7 +11,7 @@ /*! \mainpage Veil -\version 9.3.0 (Stable)) +\version 9.4.0 (Stable)) \section license License BSD \section intro_sec Introduction @@ -1949,7 +1949,7 @@ work out which version of Postgres to build for. If it fails to figure this out, add PG_VERSION= to the make command. eg: \verbatim -$ make PG_VERSION="9.3" +$ make PG_VERSION="9.4" \endverbatim To build the veil documentation (the documentation you are now reading) @@ -2031,6 +2031,11 @@ Next: \ref History */ /*! \page History History and Compatibility \section past Changes History +\subsection v9_4 Version 9.4.0 (Stable) (2015-11-09) +This version supports PostgreSQL V9.4. + +Minor changes made to enable a build against the latest Postgres +codebase. \subsection v9_3 Version 9.3.0 (Stable) (2014-06-30) This version supports PostgreSQL V9.3. @@ -2070,36 +2075,48 @@ Major changes include: \section forecast Change Forecast New versions will be released with each new major version of -PostgreSQL. +PostgreSQL if there is demand for them. If you would like such a +version, please ask. \section compatibility Supported versions of Postgres - + + + + + + + + + + + +
Veil versionPostgres VersionPostgres Version
9.1 9.2 9.39.4
9.1.0 (Stable) Yes Yes - -
9.2.0 (Stable) Yes Yes - -
9.3.0 (Stable) - - Yes-
9.4.0 (Stable)- - - Yes
diff --git a/src/veil_mainpage.d b/src/veil_mainpage.d deleted file mode 100644 index f9995de..0000000 --- a/src/veil_mainpage.d +++ /dev/null @@ -1,2 +0,0 @@ -src/veil_mainpage.o src/veil_mainpage.d: \ - src/veil_mainpage.c diff --git a/src/veil_query.d b/src/veil_query.d deleted file mode 100644 index e69de29..0000000 diff --git a/src/veil_serialise.d b/src/veil_serialise.d deleted file mode 100644 index 232592e..0000000 --- a/src/veil_serialise.d +++ /dev/null @@ -1,5 +0,0 @@ -src/veil_serialise.o src/veil_serialise.d: \ - src/veil_serialise.c \ - src/veil_version.h \ - src/veil_funcs.h \ - src/veil_datatypes.h diff --git a/src/veil_shmem.c b/src/veil_shmem.c index 292e817..3ae1086 100644 --- a/src/veil_shmem.c +++ b/src/veil_shmem.c @@ -2,7 +2,7 @@ * @file veil_shmem.c * \code * Author: Marc Munro - * Copyright (c) 2005 - 2011 Marc Munro + * Copyright (c) 2005 - 2015 Marc Munro * License: BSD * * \endcode @@ -79,16 +79,17 @@ static bool prepared_for_switch = false; /** * The LWLock that Veil will use for managing concurrent access to - * shared memory. It is initialised to a lock id that is distinct - * from any tha twill be dynamically allocated. + * shared memory. It is initialised in _PG_init() to a lock id that is + * distinct from any that will be dynamically allocated. */ -static LWLockId VeilLWLock = AddinShmemInitLock; +static LWLockId VeilLWLock; /** * The LWLock to be used while initially setting up shared memory and - * allocating a veil database-specific LWLock. + * allocating a veil database-specific LWLock. Initialised in + * _PG_Init() */ -static LWLockId InitialLWLock = AddinShmemInitLock; +static LWLockId InitialLWLock; /** * Return the index of the other context from the one supplied. @@ -103,15 +104,16 @@ static LWLockId InitialLWLock = AddinShmemInitLock; * Veil's startup function. This should be run when the Veil shared * library is loaded by postgres. * - * If shared_preload_libraries is not defined, Veil may still be run but - * it will steal shared memory from postgres, potentially exhausting it. - * */ void _PG_init() { int veil_dbs; + /* See definitions of the following two variables, for comments. */ + VeilLWLock = AddinShmemInitLock; + InitialLWLock = AddinShmemInitLock; + /* Define GUCs for veil */ veil_config_init(); veil_dbs = veil_dbs_in_cluster(); diff --git a/src/veil_shmem.d b/src/veil_shmem.d deleted file mode 100644 index e69de29..0000000 diff --git a/src/veil_utils.d b/src/veil_utils.d deleted file mode 100644 index e69de29..0000000 diff --git a/src/veil_variables.d b/src/veil_variables.d deleted file mode 100644 index e69de29..0000000 diff --git a/src/veil_version.h b/src/veil_version.h index 2b72c08..40a132d 100644 --- a/src/veil_version.h +++ b/src/veil_version.h @@ -2,7 +2,7 @@ * @file veil_version.h * \code * Author: Marc Munro - * Copyright (c) 2005 - 2014 Marc Munro + * Copyright (c) 2005 - 2015 Marc Munro * License: BSD * * \endcode @@ -13,7 +13,7 @@ /** The version number for this version of veil */ -#define VEIL_VERSION "9.3.0" +#define VEIL_VERSION "9.4.0" /** The version number suffix, indicating stability. */ #define VEIL_VERSION_INFO "Stable" diff --git a/veil.control b/veil.control index 8d6c8c2..148c21d 100644 --- a/veil.control +++ b/veil.control @@ -2,13 +2,13 @@ # # Postgres extension control file for Veil # -# Copyright (c) 2011 - 2014 Marc Munro +# Copyright (c) 2011 - 2015 Marc Munro # Author: Marc Munro # License: BSD # directory = 'extension' -default_version = '9.3.0' +default_version = '9.4.0' module_pathname = '$libdir/veil' superuser = true relocatable = false -- 2.39.5