diff --git a/configure b/configure index d9633bb12..2b50d9fad 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 8.0devel. +# Generated by GNU Autoconf 2.69 for Citus 8.2devel. # # # 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='8.0devel' -PACKAGE_STRING='Citus 8.0devel' +PACKAGE_VERSION='8.2devel' +PACKAGE_STRING='Citus 8.2devel' 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 8.0devel to adapt to many kinds of systems. +\`configure' configures Citus 8.2devel 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 8.0devel:";; + short | recursive ) echo "Configuration of Citus 8.2devel:";; 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 8.0devel +Citus configure 8.2devel 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 8.0devel, which was +It was created by Citus $as_me 8.2devel, 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 8.0devel, which was +This file was extended by Citus $as_me 8.2devel, 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 8.0devel +Citus config.status 8.2devel configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index fb8576852..741966245 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], [8.0devel]) +AC_INIT([Citus], [8.2devel]) 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 603888082..1289cfd33 100644 --- a/src/backend/distributed/Makefile +++ b/src/backend/distributed/Makefile @@ -17,7 +17,9 @@ EXTVERSIONS = 5.0 5.0-1 5.0-2 \ 7.3-1 7.3-2 7.3-3 \ 7.4-1 7.4-2 7.4-3 \ 7.5-1 7.5-2 7.5-3 7.5-4 7.5-5 7.5-6 7.5-7 \ - 8.0-1 8.0-2 8.0-3 8.0-4 8.0-5 8.0-6 8.0-7 8.0-8 8.0-9 8.0-10 8.0-11 8.0-12 8.0-13 + 8.0-1 8.0-2 8.0-3 8.0-4 8.0-5 8.0-6 8.0-7 8.0-8 8.0-9 8.0-10 8.0-11 8.0-12 8.0-13 \ + 8.1-1\ + 8.2-1 # All citus--*.sql files in the source directory DATA = $(patsubst $(citus_abs_srcdir)/%.sql,%.sql,$(wildcard $(citus_abs_srcdir)/$(EXTENSION)--*--*.sql)) @@ -241,6 +243,10 @@ $(EXTENSION)--8.0-12.sql: $(EXTENSION)--8.0-11.sql $(EXTENSION)--8.0-11--8.0-12. cat $^ > $@ $(EXTENSION)--8.0-13.sql: $(EXTENSION)--8.0-12.sql $(EXTENSION)--8.0-12--8.0-13.sql cat $^ > $@ +$(EXTENSION)--8.1-1.sql: $(EXTENSION)--8.0-13.sql $(EXTENSION)--8.0-13--8.1-1.sql + cat $^ > $@ +$(EXTENSION)--8.2-1.sql: $(EXTENSION)--8.1-1.sql $(EXTENSION)--8.1-1--8.2-1.sql + cat $^ > $@ NO_PGXS = 1 diff --git a/src/backend/distributed/citus--8.1-1--8.2-1.sql b/src/backend/distributed/citus--8.1-1--8.2-1.sql new file mode 100644 index 000000000..4f4a1af80 --- /dev/null +++ b/src/backend/distributed/citus--8.1-1--8.2-1.sql @@ -0,0 +1,4 @@ +/* citus--8.1-1--8.2-1.sql */ + +/* bump version to 8.2-1 */ + diff --git a/src/backend/distributed/citus.control b/src/backend/distributed/citus.control index 7e2d565c8..0e1d8e305 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 = '8.1-1' +default_version = '8.2-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 76fad830c..8834f4e11 100644 --- a/src/test/regress/expected/multi_extension.out +++ b/src/test/regress/expected/multi_extension.out @@ -159,7 +159,7 @@ ALTER EXTENSION citus UPDATE TO '8.0-12'; SHOW citus.version; citus.version --------------- - 8.0devel + 8.2devel (1 row) -- ensure no objects were created outside pg_catalog @@ -181,7 +181,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 8.0, but 5.0 was specified. +DETAIL: Loaded library requires 8.2, 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'; @@ -224,7 +224,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 8.0, but the installed extension version is 6.2-1. +DETAIL: Loaded library requires 8.2, 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)