From 20acee2cd4570e51d7c134814ae1980e2d44ac18 Mon Sep 17 00:00:00 2001 From: velioglu Date: Tue, 15 May 2018 14:28:55 +0300 Subject: [PATCH] Bump citus version to 7.5devel --- configure | 18 +++++++++--------- configure.in | 2 +- src/backend/distributed/Makefile | 7 +++++-- .../distributed/citus--7.4-3--7.5-1.sql | 4 ++++ src/backend/distributed/citus.control | 2 +- src/test/regress/expected/multi_extension.out | 6 +++--- 6 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 src/backend/distributed/citus--7.4-3--7.5-1.sql diff --git a/configure b/configure index f414aa63b..3df331dc9 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 7.4devel. +# Generated by GNU Autoconf 2.69 for Citus 7.5devel. # # # 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='7.4devel' -PACKAGE_STRING='Citus 7.4devel' +PACKAGE_VERSION='7.5devel' +PACKAGE_STRING='Citus 7.5devel' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1239,7 +1239,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 7.4devel to adapt to many kinds of systems. +\`configure' configures Citus 7.5devel to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1300,7 +1300,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Citus 7.4devel:";; + short | recursive ) echo "Configuration of Citus 7.5devel:";; esac cat <<\_ACEOF @@ -1400,7 +1400,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Citus configure 7.4devel +Citus configure 7.5devel generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1883,7 +1883,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 7.4devel, which was +It was created by Citus $as_me 7.5devel, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4701,7 +4701,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 7.4devel, which was +This file was extended by Citus $as_me 7.5devel, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4763,7 +4763,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 7.4devel +Citus config.status 7.5devel configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index def0c5847..798ffc443 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], [7.4devel]) +AC_INIT([Citus], [7.5devel]) AC_COPYRIGHT([Copyright (c) 2012-2017, Citus Data, Inc.]) # we'll need sed and awk for some of the version commands diff --git a/src/backend/distributed/Makefile b/src/backend/distributed/Makefile index 710bead37..41985bf61 100644 --- a/src/backend/distributed/Makefile +++ b/src/backend/distributed/Makefile @@ -13,9 +13,10 @@ EXTVERSIONS = 5.0 5.0-1 5.0-2 \ 6.2-1 6.2-2 6.2-3 6.2-4 \ 7.0-1 7.0-2 7.0-3 7.0-4 7.0-5 7.0-6 7.0-7 7.0-8 7.0-9 7.0-10 7.0-11 7.0-12 7.0-13 7.0-14 7.0-15 \ 7.1-1 7.1-2 7.1-3 7.1-4 \ - 7.2-1 7.2-2 7.2-3 \ + 7.2-1 7.2-2 7.2-3 \ 7.3-1 7.3-2 7.3-3 \ - 7.4-1 7.4-2 7.4-3 + 7.4-1 7.4-2 7.4-3 \ + 7.5-1 # All citus--*.sql files in the source directory DATA = $(patsubst $(citus_abs_srcdir)/%.sql,%.sql,$(wildcard $(citus_abs_srcdir)/$(EXTENSION)--*--*.sql)) @@ -199,6 +200,8 @@ $(EXTENSION)--7.4-2.sql: $(EXTENSION)--7.4-1.sql $(EXTENSION)--7.4-1--7.4-2.sql cat $^ > $@ $(EXTENSION)--7.4-3.sql: $(EXTENSION)--7.4-2.sql $(EXTENSION)--7.4-2--7.4-3.sql cat $^ > $@ +$(EXTENSION)--7.5-1.sql: $(EXTENSION)--7.4-3.sql $(EXTENSION)--7.4-3--7.5-1.sql + cat $^ > $@ NO_PGXS = 1 diff --git a/src/backend/distributed/citus--7.4-3--7.5-1.sql b/src/backend/distributed/citus--7.4-3--7.5-1.sql new file mode 100644 index 000000000..3d9583741 --- /dev/null +++ b/src/backend/distributed/citus--7.4-3--7.5-1.sql @@ -0,0 +1,4 @@ +/* citus--7.4-3--7.5-1 */ + +/* bump version to 7.5-1 */ + diff --git a/src/backend/distributed/citus.control b/src/backend/distributed/citus.control index 71a541d86..b2105c054 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 = '7.4-3' +default_version = '7.5-1' module_pathname = '$libdir/citus' relocatable = false schema = pg_catalog diff --git a/src/test/regress/expected/multi_extension.out b/src/test/regress/expected/multi_extension.out index ade89fc55..e4d12de6f 100644 --- a/src/test/regress/expected/multi_extension.out +++ b/src/test/regress/expected/multi_extension.out @@ -140,7 +140,7 @@ ALTER EXTENSION citus UPDATE TO '7.4-3'; SHOW citus.version; citus.version --------------- - 7.4devel + 7.5devel (1 row) -- ensure no objects were created outside pg_catalog @@ -162,7 +162,7 @@ RESET citus.enable_version_checks; DROP EXTENSION citus; CREATE EXTENSION citus VERSION '5.0'; ERROR: specified version incompatible with loaded Citus library -DETAIL: Loaded library requires 7.4, but 5.0 was specified. +DETAIL: Loaded library requires 7.5, but 5.0 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'; @@ -205,7 +205,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 7.4, but the installed extension version is 6.2-1. +DETAIL: Loaded library requires 7.5, but the installed extension version is 6.2-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.citus_table_size(table_name regclass)