Merge branch 'PGPROEE9_6' into use-64bit-xid-in-regress

Author: ligurio

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for PostgreSQL 9.6.1.
+# Generated by GNU Autoconf 2.69 for PostgreSQL 9.6.2.
 #
 # Report bugs to <bugs@postgrespro.ru>.
 #
@@ -583,8 +583,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='PostgreSQL'
 PACKAGE_TARNAME='postgrespro'
-PACKAGE_VERSION='9.6.1'
-PACKAGE_STRING='PostgreSQL 9.6.1'
+PACKAGE_VERSION='9.6.2'
+PACKAGE_STRING='PostgreSQL 9.6.2'
 PACKAGE_BUGREPORT='bugs@postgrespro.ru'
 PACKAGE_URL=''
 
@@ -1406,7 +1406,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 PostgreSQL 9.6.1 to adapt to many kinds of systems.
+\`configure' configures PostgreSQL 9.6.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1471,7 +1471,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of PostgreSQL 9.6.1:";;
+     short | recursive ) echo "Configuration of PostgreSQL 9.6.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1625,7 +1625,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-PostgreSQL configure 9.6.1
+PostgreSQL configure 9.6.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2337,7 +2337,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 PostgreSQL $as_me 9.6.1, which was
+It was created by PostgreSQL $as_me 9.6.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2754,7 +2754,7 @@ else
 fi
 
 
-PGPRO_VERSION="$PACKAGE_VERSION.3"
+PGPRO_VERSION="$PACKAGE_VERSION.1"
 PGPRO_PACKAGE_NAME="PostgresPro"
 PGPRO_EDITION="enterprise"
 
@@ -7244,7 +7244,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 # When Autoconf chooses install-sh as install program it tries to generate
-# a relative path to it in each makefile where it subsitutes it. This clashes
+# a relative path to it in each makefile where it substitutes it. This clashes
 # with our Makefile.global concept. This workaround helps.
 case $INSTALL in
   *install-sh*) install_bin='';;
@@ -7388,7 +7388,7 @@ fi
 $as_echo "$MKDIR_P" >&6; }
 
 # When Autoconf chooses install-sh as mkdir -p program it tries to generate
-# a relative path to it in each makefile where it subsitutes it. This clashes
+# a relative path to it in each makefile where it substitutes it. This clashes
 # with our Makefile.global concept. This workaround helps.
 case $MKDIR_P in
   *install-sh*) MKDIR_P='\${SHELL} \${top_srcdir}/config/install-sh -c -d';;
@@ -9898,9 +9898,9 @@ done
 fi
 
 if test "$with_icu" = yes ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_58" >&5
-$as_echo_n "checking for library containing ucol_open_58... " >&6; }
-if ${ac_cv_search_ucol_open_58+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open" >&5
+$as_echo_n "checking for library containing ucol_open... " >&6; }
+if ${ac_cv_search_ucol_open+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -9913,11 +9913,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char ucol_open_58 ();
+char ucol_open ();
 int
 main ()
 {
-return ucol_open_58 ();
+return ucol_open ();
   ;
   return 0;
 }
@@ -9930,25 +9930,25 @@ for ac_lib in '' icui18n icuin; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
   if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_ucol_open_58=$ac_res
+  ac_cv_search_ucol_open=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if ${ac_cv_search_ucol_open_58+:} false; then :
+  if ${ac_cv_search_ucol_open+:} false; then :
   break
 fi
 done
-if ${ac_cv_search_ucol_open_58+:} false; then :
+if ${ac_cv_search_ucol_open+:} false; then :
 
 else
-  ac_cv_search_ucol_open_58=no
+  ac_cv_search_ucol_open=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucol_open_58" >&5
-$as_echo "$ac_cv_search_ucol_open_58" >&6; }
-ac_res=$ac_cv_search_ucol_open_58
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucol_open" >&5
+$as_echo "$ac_cv_search_ucol_open" >&6; }
+ac_res=$ac_cv_search_ucol_open
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
@@ -10959,9 +10959,9 @@ fi
 
 fi
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_58 in -licuuc" >&5
-$as_echo_n "checking for ucnv_fromUChars_58 in -licuuc... " >&6; }
-if ${ac_cv_lib_icuuc_ucnv_fromUChars_58+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars in -licuuc" >&5
+$as_echo_n "checking for ucnv_fromUChars in -licuuc... " >&6; }
+if ${ac_cv_lib_icuuc_ucnv_fromUChars+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -10975,27 +10975,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char ucnv_fromUChars_58 ();
+char ucnv_fromUChars ();
 int
 main ()
 {
-return ucnv_fromUChars_58 ();
+return ucnv_fromUChars ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_icuuc_ucnv_fromUChars_58=yes
+  ac_cv_lib_icuuc_ucnv_fromUChars=yes
 else
-  ac_cv_lib_icuuc_ucnv_fromUChars_58=no
+  ac_cv_lib_icuuc_ucnv_fromUChars=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_icuuc_ucnv_fromUChars_58" >&5
-$as_echo "$ac_cv_lib_icuuc_ucnv_fromUChars_58" >&6; }
-if test "x$ac_cv_lib_icuuc_ucnv_fromUChars_58" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_icuuc_ucnv_fromUChars" >&5
+$as_echo "$ac_cv_lib_icuuc_ucnv_fromUChars" >&6; }
+if test "x$ac_cv_lib_icuuc_ucnv_fromUChars" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBICUUC 1
 _ACEOF
@@ -18558,7 +18558,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 PostgreSQL $as_me 9.6.1, which was
+This file was extended by PostgreSQL $as_me 9.6.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18628,7 +18628,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="\\
-PostgreSQL config.status 9.6.1
+PostgreSQL config.status 9.6.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.in

@@ -17,7 +17,7 @@ dnl Read the Autoconf manual for details.
 dnl
 m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
 
-AC_INIT([PostgreSQL], [9.6.1], [bugs@postgrespro.ru],[postgrespro])
+AC_INIT([PostgreSQL], [9.6.2], [bugs@postgrespro.ru],[postgrespro])
 PACKAGE_TARNAME=postgrespro
 
 m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
@@ -38,7 +38,7 @@ AC_DEFINE_UNQUOTED(PG_MAJORVERSION, "$PG_MAJORVERSION", [PostgreSQL major versio
 PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version],
              [PG_VERSION="$PACKAGE_VERSION$withval"],
              [PG_VERSION="$PACKAGE_VERSION"])
-PGPRO_VERSION="$PACKAGE_VERSION.3"
+PGPRO_VERSION="$PACKAGE_VERSION.1"
 PGPRO_PACKAGE_NAME="PostgresPro"
 PGPRO_EDITION="enterprise"
 AC_SUBST(PGPRO_PACKAGE_NAME)
@@ -925,7 +925,7 @@ fi
 
 AC_PROG_INSTALL
 # When Autoconf chooses install-sh as install program it tries to generate
-# a relative path to it in each makefile where it subsitutes it. This clashes
+# a relative path to it in each makefile where it substitutes it. This clashes
 # with our Makefile.global concept. This workaround helps.
 case $INSTALL in
   *install-sh*) install_bin='';;
@@ -938,7 +938,7 @@ AC_PROG_LN_S
 AC_PROG_AWK
 AC_PROG_MKDIR_P
 # When Autoconf chooses install-sh as mkdir -p program it tries to generate
-# a relative path to it in each makefile where it subsitutes it. This clashes
+# a relative path to it in each makefile where it substitutes it. This clashes
 # with our Makefile.global concept. This workaround helps.
 case $MKDIR_P in
   *install-sh*) MKDIR_P='\${SHELL} \${top_srcdir}/config/install-sh -c -d';;
@@ -1162,7 +1162,7 @@ if test "$with_openssl" = yes ; then
 fi
 
 if test "$with_icu" = yes ; then
- AC_SEARCH_LIBS(ucol_open_58, [icui18n icuin], [], [
+ AC_SEARCH_LIBS(ucol_open, [icui18n icuin], [], [
  AC_SEARCH_LIBS(ucol_open_57, [icui18n icuin], [], [
  AC_SEARCH_LIBS(ucol_open_56, [icui18n icuin], [], [
  AC_SEARCH_LIBS(ucol_open_55, [icui18n icuin], [], [
@@ -1197,7 +1197,7 @@ if test "$with_icu" = yes ; then
  ])
  ])
 ])
- AC_CHECK_LIB(icuuc, ucnv_fromUChars_58, [], [
+ AC_CHECK_LIB(icuuc, ucnv_fromUChars, [], [
  AC_CHECK_LIB(icuuc, ucnv_fromUChars_57, [], [
  AC_CHECK_LIB(icuuc, ucnv_fromUChars_56, [], [
  AC_CHECK_LIB(icuuc, ucnv_fromUChars_55, [], [

contrib/Makefile

@@ -43,13 +43,15 @@ SUBDIRS = \
 		pgrowlocks	\
 		pgstattuple	\
 		pg_visibility	\
+		pg_wait_sampling \
 		postgres_fdw	\
 		rum		\
 		seg		\
 		spi		\
 		tablefunc	\
 		tcn		\
 		test_decoding	\
+		test_partitioning \
 		tsm_system_rows \
 		tsm_system_time \
 		tsearch2	\

contrib/aqo/aqo.c

@@ -13,6 +13,7 @@ static const struct config_enum_entry format_options[] = {
 	{"intelligent", AQO_MODE_INTELLIGENT, false},
 	{"forced", AQO_MODE_FORCED, false},
 	{"manual", AQO_MODE_MANUAL, false},
+	{"disabled", AQO_MODE_DISABLED, false},
 	{NULL, 0, false}
 };
 
@@ -42,6 +43,7 @@ bool		auto_tuning;
 bool		collect_stat;
 bool		adding_query;
 bool		explain_only;
+bool		explain_aqo;
 
 /* Query execution time */
 instr_time	query_starttime;
@@ -57,6 +59,7 @@ get_parameterized_baserel_size_hook_type prev_get_parameterized_baserel_size_hoo
 set_joinrel_size_estimates_hook_type prev_set_joinrel_size_estimates_hook;
 get_parameterized_joinrel_size_hook_type prev_get_parameterized_joinrel_size_hook;
 copy_generic_path_info_hook_type prev_copy_generic_path_info_hook;
+ExplainOnePlan_hook_type prev_ExplainOnePlan_hook;
 
 /*****************************************************************************
  *
@@ -101,6 +104,8 @@ _PG_init(void)
 		&aqo_get_parameterized_joinrel_size;
 	prev_copy_generic_path_info_hook = copy_generic_path_info_hook;
 	copy_generic_path_info_hook = &aqo_copy_generic_path_info;
+	prev_ExplainOnePlan_hook = ExplainOnePlan_hook;
+	ExplainOnePlan_hook = print_into_explain;
 	init_deactivated_queries_storage();
 }
 
@@ -118,6 +123,7 @@ _PG_fini(void)
 	get_parameterized_joinrel_size_hook =
 		prev_get_parameterized_joinrel_size_hook;
 	copy_generic_path_info_hook = prev_copy_generic_path_info_hook;
+	ExplainOnePlan_hook = prev_ExplainOnePlan_hook;
 	fini_deactivated_queries_storage();
 }
 

contrib/aqo/aqo.h

@@ -121,6 +121,7 @@
 #include "catalog/indexing.h"
 #include "catalog/pg_type.h"
 #include "catalog/pg_operator.h"
+#include "commands/explain.h"
 #include "executor/executor.h"
 #include "executor/execdesc.h"
 #include "nodes/makefuncs.h"
@@ -148,6 +149,8 @@ typedef enum
 	AQO_MODE_FORCED,
 	/* New query types are not linked with any feature space */
 	AQO_MODE_MANUAL,
+	/* Aqo is disabled for all queries */
+	AQO_MODE_DISABLED,
 }	AQO_MODE;
 extern int	aqo_mode;
 
@@ -193,6 +196,7 @@ extern bool auto_tuning;
 extern bool collect_stat;
 extern bool adding_query;
 extern bool explain_only;
+extern bool explain_aqo;
 
 /* Query execution time */
 extern instr_time query_starttime;
@@ -213,6 +217,7 @@ extern		get_parameterized_joinrel_size_hook_type
 			prev_get_parameterized_joinrel_size_hook;
 extern		copy_generic_path_info_hook_type
 			prev_copy_generic_path_info_hook;
+extern ExplainOnePlan_hook_type prev_ExplainOnePlan_hook;
 
 
 /* Hash functions */
@@ -252,6 +257,9 @@ PlannedStmt *call_default_planner(Query *parse,
 PlannedStmt *aqo_planner(Query *parse,
 			int cursorOptions,
 			ParamListInfo boundParams);
+void print_into_explain(PlannedStmt *plannedstmt, IntoClause *into,
+			   ExplainState *es, const char *queryString,
+			   ParamListInfo params, const instr_time *planduration);
 void		disable_aqo_for_query(void);
 
 /* Cardinality estimation hooks */

contrib/aqo/auto_tuning.c

@@ -85,7 +85,7 @@ converged_cq(double *elems, int nelems)
 bool
 is_in_infinite_loop_cq(double *elems, int nelems)
 {
-	if (nelems - auto_tuning_infinite_loop > auto_tuning_window_size + 2)
+	if (nelems - auto_tuning_infinite_loop < auto_tuning_window_size + 2)
 		return false;
 
 	return !converged_cq(elems, nelems) &&