From 2e927bd6b77b0c9a107a0ade719785f354b6738f Mon Sep 17 00:00:00 2001 From: Onur Tirtir Date: Wed, 22 Apr 2020 12:50:00 +0300 Subject: [PATCH] Bump Citus to 9.4devel (#3788) --- configure | 18 +++++++++--------- configure.in | 2 +- src/backend/distributed/citus.control | 2 +- .../distributed/sql/citus--9.3-2--9.4-1.sql | 3 +++ src/test/regress/expected/multi_extension.out | 7 ++++--- src/test/regress/sql/multi_extension.sql | 1 + src/test/regress/upgrade/config.py | 2 +- 7 files changed, 20 insertions(+), 15 deletions(-) create mode 100644 src/backend/distributed/sql/citus--9.3-2--9.4-1.sql diff --git a/configure b/configure index ba10b52e9..b63cb5957 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Citus 9.3devel. +# Generated by GNU Autoconf 2.69 for Citus 9.4devel. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Citus' PACKAGE_TARNAME='citus' -PACKAGE_VERSION='9.3devel' -PACKAGE_STRING='Citus 9.3devel' +PACKAGE_VERSION='9.4devel' +PACKAGE_STRING='Citus 9.4devel' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1242,7 +1242,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Citus 9.3devel to adapt to many kinds of systems. +\`configure' configures Citus 9.4devel to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1303,7 +1303,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Citus 9.3devel:";; + short | recursive ) echo "Configuration of Citus 9.4devel:";; esac cat <<\_ACEOF @@ -1403,7 +1403,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Citus configure 9.3devel +Citus configure 9.4devel generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1886,7 +1886,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Citus $as_me 9.3devel, which was +It was created by Citus $as_me 9.4devel, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -5055,7 +5055,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Citus $as_me 9.3devel, which was +This file was extended by Citus $as_me 9.4devel, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5117,7 +5117,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Citus config.status 9.3devel +Citus config.status 9.4devel configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index 14a657446..0fd0c2f4c 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ # everyone needing autoconf installed, the resulting files are checked # into the SCM. -AC_INIT([Citus], [9.3devel]) +AC_INIT([Citus], [9.4devel]) AC_COPYRIGHT([Copyright (c) Citus Data, Inc.]) # we'll need sed and awk for some of the version commands diff --git a/src/backend/distributed/citus.control b/src/backend/distributed/citus.control index 0dca89cb5..47d72d1e0 100644 --- a/src/backend/distributed/citus.control +++ b/src/backend/distributed/citus.control @@ -1,6 +1,6 @@ # Citus extension comment = 'Citus distributed database' -default_version = '9.3-2' +default_version = '9.4-1' module_pathname = '$libdir/citus' relocatable = false schema = pg_catalog diff --git a/src/backend/distributed/sql/citus--9.3-2--9.4-1.sql b/src/backend/distributed/sql/citus--9.3-2--9.4-1.sql new file mode 100644 index 000000000..bf25128ff --- /dev/null +++ b/src/backend/distributed/sql/citus--9.3-2--9.4-1.sql @@ -0,0 +1,3 @@ +-- citus--9.3-2--9.4-1 + +-- bump version to 9.4-1 diff --git a/src/test/regress/expected/multi_extension.out b/src/test/regress/expected/multi_extension.out index e0bfb91b2..2b728f10d 100644 --- a/src/test/regress/expected/multi_extension.out +++ b/src/test/regress/expected/multi_extension.out @@ -130,11 +130,12 @@ ALTER EXTENSION citus UPDATE TO '9.2-4'; ALTER EXTENSION citus UPDATE TO '9.3-1'; ERROR: extension "citus" has no update path from version "9.2-4" to version "9.3-1" ALTER EXTENSION citus UPDATE TO '9.3-2'; +ALTER EXTENSION citus UPDATE TO '9.4-1'; -- show running version SHOW citus.version; citus.version --------------------------------------------------------------------- - 9.3devel + 9.4devel (1 row) -- ensure no objects were created outside pg_catalog @@ -156,7 +157,7 @@ RESET citus.enable_version_checks; DROP EXTENSION citus; CREATE EXTENSION citus VERSION '7.0-1'; ERROR: specified version incompatible with loaded Citus library -DETAIL: Loaded library requires 9.3, but 7.0-1 was specified. +DETAIL: Loaded library requires 9.4, but 7.0-1 was specified. HINT: If a newer library is present, restart the database and try the command again. -- Test non-distributed queries work even in version mismatch SET citus.enable_version_checks TO 'false'; @@ -199,7 +200,7 @@ ORDER BY 1; -- We should not distribute table in version mistmatch SELECT create_distributed_table('version_mismatch_table', 'column1'); ERROR: loaded Citus library version differs from installed extension version -DETAIL: Loaded library requires 9.3, but the installed extension version is 7.1-1. +DETAIL: Loaded library requires 9.4, but the installed extension version is 7.1-1. HINT: Run ALTER EXTENSION citus UPDATE and try again. -- This function will cause fail in next ALTER EXTENSION CREATE OR REPLACE FUNCTION pg_catalog.master_dist_authinfo_cache_invalidate() diff --git a/src/test/regress/sql/multi_extension.sql b/src/test/regress/sql/multi_extension.sql index 28c53294c..97ff982c4 100644 --- a/src/test/regress/sql/multi_extension.sql +++ b/src/test/regress/sql/multi_extension.sql @@ -130,6 +130,7 @@ ALTER EXTENSION citus UPDATE TO '9.2-4'; */ ALTER EXTENSION citus UPDATE TO '9.3-1'; ALTER EXTENSION citus UPDATE TO '9.3-2'; +ALTER EXTENSION citus UPDATE TO '9.4-1'; -- show running version SHOW citus.version; diff --git a/src/test/regress/upgrade/config.py b/src/test/regress/upgrade/config.py index 55e97a4e1..08af40b01 100644 --- a/src/test/regress/upgrade/config.py +++ b/src/test/regress/upgrade/config.py @@ -9,7 +9,7 @@ BEFORE_CITUS_UPGRADE_COORD_SCHEDULE = './before_citus_upgrade_coord_schedule' MASTER = 'master' # This should be updated when citus version changes -MASTER_VERSION = '9.3' +MASTER_VERSION = '9.4' HOME = expanduser("~")