From f01daa0c83256f31569506969ae74f1825516484 Mon Sep 17 00:00:00 2001 From: velioglu Date: Thu, 15 Mar 2018 16:51:37 +0300 Subject: [PATCH] Bump citus version to 7.4devel --- configure | 32 ++++++------------- configure.in | 2 +- src/test/regress/expected/multi_extension.out | 6 ++-- windows/include/citus_version.h | 10 +++--- 4 files changed, 19 insertions(+), 31 deletions(-) diff --git a/configure b/configure index 7c7a839cb..f414aa63b 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.3devel. +# Generated by GNU Autoconf 2.69 for Citus 7.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='7.3devel' -PACKAGE_STRING='Citus 7.3devel' +PACKAGE_VERSION='7.4devel' +PACKAGE_STRING='Citus 7.4devel' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -661,7 +661,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -738,7 +737,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -991,15 +989,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1137,7 +1126,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1250,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.3devel to adapt to many kinds of systems. +\`configure' configures Citus 7.4devel to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1290,7 +1279,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1312,7 +1300,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Citus 7.3devel:";; + short | recursive ) echo "Configuration of Citus 7.4devel:";; esac cat <<\_ACEOF @@ -1412,7 +1400,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Citus configure 7.3devel +Citus configure 7.4devel generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1895,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.3devel, which was +It was created by Citus $as_me 7.4devel, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4713,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.3devel, which was +This file was extended by Citus $as_me 7.4devel, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4775,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.3devel +Citus config.status 7.4devel configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index 75e4e0c88..def0c5847 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.3devel]) +AC_INIT([Citus], [7.4devel]) 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/test/regress/expected/multi_extension.out b/src/test/regress/expected/multi_extension.out index f3bc4edda..35d51da29 100644 --- a/src/test/regress/expected/multi_extension.out +++ b/src/test/regress/expected/multi_extension.out @@ -138,7 +138,7 @@ ALTER EXTENSION citus UPDATE TO '7.4-1'; SHOW citus.version; citus.version --------------- - 7.3devel + 7.4devel (1 row) -- ensure no objects were created outside pg_catalog @@ -160,7 +160,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.3, but 5.0 was specified. +DETAIL: Loaded library requires 7.4, 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'; @@ -203,7 +203,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.3, but the installed extension version is 6.2-1. +DETAIL: Loaded library requires 7.4, 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) diff --git a/windows/include/citus_version.h b/windows/include/citus_version.h index 0397ee538..fb3921196 100644 --- a/windows/include/citus_version.h +++ b/windows/include/citus_version.h @@ -5,19 +5,19 @@ #define CITUS_EDITION "community" /* Extension version expected by this Citus build */ -#define CITUS_EXTENSIONVERSION "7.3-1" +#define CITUS_EXTENSIONVERSION "7.4-1" /* Citus major version as a string */ -#define CITUS_MAJORVERSION "7.3" +#define CITUS_MAJORVERSION "7.4" /* Citus version as a string */ -#define CITUS_VERSION "7.3devel" +#define CITUS_VERSION "7.4devel" /* Citus version as a number */ -#define CITUS_VERSION_NUM 70300 +#define CITUS_VERSION_NUM 70400 /* A string containing the version number, platform, and C compiler */ -#define CITUS_VERSION_STR "Citus 7.3devel on x86_64-windows, compiled by Visual Studio" +#define CITUS_VERSION_STR "Citus 7.4devel on x86_64-windows, compiled by Visual Studio" /* Define to 1 if you have the `curl' library (-lcurl). */ #define HAVE_LIBCURL 0