From c9ee1860f040395368693bc1d90062ff6ad7c4e2 Mon Sep 17 00:00:00 2001 From: Gurkan Indibay Date: Thu, 8 Apr 2021 20:53:51 +0000 Subject: [PATCH] Bump citus version to 10.2.0 --- configure | 20 ++++++++++--------- configure.in | 2 +- .../distributed/citus--10.1-1--10.2-1.sql | 4 ++++ src/backend/distributed/citus.control | 2 +- src/test/regress/expected/multi_extension.out | 6 +++--- src/test/regress/sql/multi_extension.sql | 4 ++-- src/test/regress/upgrade/config.py | 2 +- 7 files changed, 23 insertions(+), 17 deletions(-) create mode 100644 src/backend/distributed/citus--10.1-1--10.2-1.sql diff --git a/configure b/configure index 3bd60aacc..f7521f7de 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 10.1devel. +# Generated by GNU Autoconf 2.69 for Citus 10.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='10.1devel' -PACKAGE_STRING='Citus 10.1devel' +PACKAGE_VERSION='10.2devel' +PACKAGE_STRING='Citus 10.2devel' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1261,7 +1261,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 10.1devel to adapt to many kinds of systems. +\`configure' configures Citus 10.2devel to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1323,7 +1323,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Citus 10.1devel:";; + short | recursive ) echo "Configuration of Citus 10.2devel:";; esac cat <<\_ACEOF @@ -1426,7 +1426,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Citus configure 10.1devel +Citus configure 10.2devel generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1909,7 +1909,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 10.1devel, which was +It was created by Citus $as_me 10.2devel, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4534,8 +4534,10 @@ _ACEOF HAS_TABLEAM=yes + $as_echo "#define HAS_TABLEAM 1" >>confdefs.h + # Require lz4 & zstd only if we are compiling columnar if test "$HAS_TABLEAM" == 'yes'; then # @@ -5366,7 +5368,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 10.1devel, which was +This file was extended by Citus $as_me 10.2devel, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5428,7 +5430,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 10.1devel +Citus config.status 10.2devel configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index 4b2e1d6dc..96c78ed36 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], [10.1devel]) +AC_INIT([Citus], [10.2devel]) 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--10.1-1--10.2-1.sql b/src/backend/distributed/citus--10.1-1--10.2-1.sql new file mode 100644 index 000000000..983ad8d17 --- /dev/null +++ b/src/backend/distributed/citus--10.1-1--10.2-1.sql @@ -0,0 +1,4 @@ +/* citus--10.1-1--10.2-1 */ + +-- bump version to 10.2-1 + diff --git a/src/backend/distributed/citus.control b/src/backend/distributed/citus.control index a004b145c..624694d19 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 = '10.1-1' +default_version = '10.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 72256f545..920b6e422 100644 --- a/src/test/regress/expected/multi_extension.out +++ b/src/test/regress/expected/multi_extension.out @@ -549,7 +549,7 @@ SELECT * FROM print_extension_changes(); (1 row) -- Test downgrade to 10.0-3 from 10.1-1 -ALTER EXTENSION citus UPDATE TO '10.1-1'; +ALTER EXTENSION citus UPDATE TO '10.2-1'; ALTER EXTENSION citus UPDATE TO '10.0-3'; -- Should be empty result since upgrade+downgrade should be a no-op SELECT * FROM print_extension_changes(); @@ -558,7 +558,7 @@ SELECT * FROM print_extension_changes(); (0 rows) -- Snapshot of state at 10.1-1 -ALTER EXTENSION citus UPDATE TO '10.1-1'; +ALTER EXTENSION citus UPDATE TO '10.2-1'; SELECT * FROM print_extension_changes(); previous_object | current_object --------------------------------------------------------------------- @@ -571,7 +571,7 @@ DROP TABLE prev_objects, extension_diff; SHOW citus.version; citus.version --------------------------------------------------------------------- - 10.1devel + 10.2devel (1 row) -- ensure no unexpected objects were created outside pg_catalog diff --git a/src/test/regress/sql/multi_extension.sql b/src/test/regress/sql/multi_extension.sql index 20e0e1df9..730a8731a 100644 --- a/src/test/regress/sql/multi_extension.sql +++ b/src/test/regress/sql/multi_extension.sql @@ -219,13 +219,13 @@ ALTER EXTENSION citus UPDATE TO '10.0-3'; SELECT * FROM print_extension_changes(); -- Test downgrade to 10.0-3 from 10.1-1 -ALTER EXTENSION citus UPDATE TO '10.1-1'; +ALTER EXTENSION citus UPDATE TO '10.2-1'; ALTER EXTENSION citus UPDATE TO '10.0-3'; -- Should be empty result since upgrade+downgrade should be a no-op SELECT * FROM print_extension_changes(); -- Snapshot of state at 10.1-1 -ALTER EXTENSION citus UPDATE TO '10.1-1'; +ALTER EXTENSION citus UPDATE TO '10.2-1'; SELECT * FROM print_extension_changes(); DROP TABLE prev_objects, extension_diff; diff --git a/src/test/regress/upgrade/config.py b/src/test/regress/upgrade/config.py index 8069ef5cb..56bd1f844 100644 --- a/src/test/regress/upgrade/config.py +++ b/src/test/regress/upgrade/config.py @@ -11,7 +11,7 @@ MIXED_AFTER_CITUS_UPGRADE_SCHEDULE = './mixed_after_citus_upgrade_schedule' MASTER = 'master' # This should be updated when citus version changes -MASTER_VERSION = '10.1' +MASTER_VERSION = '10.2' HOME = expanduser("~")