Skip to content

Commit 8b83f2f

Browse files
dmpgprodmpgpro
committed
Merge branch 'PGPRO9_6' into PGPRO9_6_winedit
2 parents f3525cb + a4cacfe commit 8b83f2f

File tree

594 files changed

+57507
-19879
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

594 files changed

+57507
-19879
lines changed

‎GNUmakefile.in

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,11 @@ GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
7676

7777
##########################################################################
7878

79-
distdir = postgrespro-$(VERSION)
79+
ifeq ($PGPRO_VERSION,)
80+
distdir = postgrespro-$(VERSION)
81+
else
82+
distdir = postgrespro-$(PGPRO_VERSION)
83+
endif
8084
dummy = =install=
8185
garbage = =* "#"* ."#"* *~* *.orig *.rej core postgrespro-*
8286

‎configure

Lines changed: 62 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.69 for PostgreSQL 9.6rc1.
3+
# Generated by GNU Autoconf 2.69 for PostgreSQL 9.6.0.
44
#
55
# Report bugs to <bugs@postgrespro.ru>.
66
#
@@ -583,8 +583,8 @@ MAKEFLAGS=
583583
# Identity of this package.
584584
PACKAGE_NAME='PostgreSQL'
585585
PACKAGE_TARNAME='postgrespro'
586-
PACKAGE_VERSION='9.6rc1'
587-
PACKAGE_STRING='PostgreSQL 9.6rc1'
586+
PACKAGE_VERSION='9.6.0'
587+
PACKAGE_STRING='PostgreSQL 9.6.0'
588588
PACKAGE_BUGREPORT='bugs@postgrespro.ru'
589589
PACKAGE_URL=''
590590

@@ -1403,7 +1403,7 @@ if test "$ac_init_help" = "long"; then
14031403
# Omit some internal or obsolete options to make the list less imposing.
14041404
# This message is too long to be a string in the A/UX 3.1 sh.
14051405
cat <<_ACEOF
1406-
\`configure' configures PostgreSQL 9.6rc1 to adapt to many kinds of systems.
1406+
\`configure' configures PostgreSQL 9.6.0 to adapt to many kinds of systems.
14071407

14081408
Usage: $0 [OPTION]... [VAR=VALUE]...
14091409

@@ -1468,7 +1468,7 @@ fi
14681468

14691469
if test -n "$ac_init_help"; then
14701470
case $ac_init_help in
1471-
short | recursive ) echo "Configuration of PostgreSQL 9.6rc1:";;
1471+
short | recursive ) echo "Configuration of PostgreSQL 9.6.0:";;
14721472
esac
14731473
cat <<\_ACEOF
14741474

@@ -1621,7 +1621,7 @@ fi
16211621
test -n "$ac_init_help" && exit $ac_status
16221622
if $ac_init_version; then
16231623
cat <<\_ACEOF
1624-
PostgreSQL configure 9.6rc1
1624+
PostgreSQL configure 9.6.0
16251625
generated by GNU Autoconf 2.69
16261626

16271627
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2333,7 +2333,7 @@ cat >config.log <<_ACEOF
23332333
This file contains any messages produced by compilers while
23342334
running configure, to aid debugging if configure makes a mistake.
23352335

2336-
It was created by PostgreSQL $as_me 9.6rc1, which was
2336+
It was created by PostgreSQL $as_me 9.6.0, which was
23372337
generated by GNU Autoconf 2.69. Invocation command line was
23382338

23392339
$ $0 $@
@@ -9595,9 +9595,9 @@ else
95959595
as_fn_error $? "library 'crypto' is required for OpenSSL" "$LINENO" 5
95969596
fi
95979597

9598-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
9599-
$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
9600-
if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :
9598+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssl" >&5
9599+
$as_echo_n "checking for SSL_new in -lssl... " >&6; }
9600+
if ${ac_cv_lib_ssl_SSL_new+:} false; then :
96019601
$as_echo_n "(cached) " >&6
96029602
else
96039603
ac_check_lib_save_LIBS=$LIBS
@@ -9611,27 +9611,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
96119611
#ifdef __cplusplus
96129612
extern "C"
96139613
#endif
9614-
char SSL_library_init ();
9614+
char SSL_new ();
96159615
int
96169616
main ()
96179617
{
9618-
return SSL_library_init ();
9618+
return SSL_new ();
96199619
;
96209620
return 0;
96219621
}
96229622
_ACEOF
96239623
if ac_fn_c_try_link "$LINENO"; then :
9624-
ac_cv_lib_ssl_SSL_library_init=yes
9624+
ac_cv_lib_ssl_SSL_new=yes
96259625
else
9626-
ac_cv_lib_ssl_SSL_library_init=no
9626+
ac_cv_lib_ssl_SSL_new=no
96279627
fi
96289628
rm -f core conftest.err conftest.$ac_objext \
96299629
conftest$ac_exeext conftest.$ac_ext
96309630
LIBS=$ac_check_lib_save_LIBS
96319631
fi
9632-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
9633-
$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
9634-
if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
9632+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5
9633+
$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; }
9634+
if test "x$ac_cv_lib_ssl_SSL_new" = xyes; then :
96359635
cat >>confdefs.h <<_ACEOF
96369636
#define HAVE_LIBSSL 1
96379637
_ACEOF
@@ -9701,9 +9701,9 @@ else
97019701
as_fn_error $? "library 'eay32' or 'crypto' is required for OpenSSL" "$LINENO" 5
97029702
fi
97039703

9704-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSL_library_init" >&5
9705-
$as_echo_n "checking for library containing SSL_library_init... " >&6; }
9706-
if ${ac_cv_search_SSL_library_init+:} false; then :
9704+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSL_new" >&5
9705+
$as_echo_n "checking for library containing SSL_new... " >&6; }
9706+
if ${ac_cv_search_SSL_new+:} false; then :
97079707
$as_echo_n "(cached) " >&6
97089708
else
97099709
ac_func_search_save_LIBS=$LIBS
@@ -9716,11 +9716,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
97169716
#ifdef __cplusplus
97179717
extern "C"
97189718
#endif
9719-
char SSL_library_init ();
9719+
char SSL_new ();
97209720
int
97219721
main ()
97229722
{
9723-
return SSL_library_init ();
9723+
return SSL_new ();
97249724
;
97259725
return 0;
97269726
}
@@ -9733,25 +9733,25 @@ for ac_lib in '' ssleay32 ssl; do
97339733
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
97349734
fi
97359735
if ac_fn_c_try_link "$LINENO"; then :
9736-
ac_cv_search_SSL_library_init=$ac_res
9736+
ac_cv_search_SSL_new=$ac_res
97379737
fi
97389738
rm -f core conftest.err conftest.$ac_objext \
97399739
conftest$ac_exeext
9740-
if ${ac_cv_search_SSL_library_init+:} false; then :
9740+
if ${ac_cv_search_SSL_new+:} false; then :
97419741
break
97429742
fi
97439743
done
9744-
if ${ac_cv_search_SSL_library_init+:} false; then :
9744+
if ${ac_cv_search_SSL_new+:} false; then :
97459745

97469746
else
9747-
ac_cv_search_SSL_library_init=no
9747+
ac_cv_search_SSL_new=no
97489748
fi
97499749
rm conftest.$ac_ext
97509750
LIBS=$ac_func_search_save_LIBS
97519751
fi
9752-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSL_library_init" >&5
9753-
$as_echo "$ac_cv_search_SSL_library_init" >&6; }
9754-
ac_res=$ac_cv_search_SSL_library_init
9752+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSL_new" >&5
9753+
$as_echo "$ac_cv_search_SSL_new" >&6; }
9754+
ac_res=$ac_cv_search_SSL_new
97559755
if test "$ac_res" != no; then :
97569756
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
97579757

@@ -9768,6 +9768,37 @@ if test "x$ac_cv_func_SSL_get_current_compression" = xyes; then :
97689768
#define HAVE_SSL_GET_CURRENT_COMPRESSION 1
97699769
_ACEOF
97709770

9771+
fi
9772+
done
9773+
9774+
# Functions introduced in OpenSSL 1.1.0. We used to check for
9775+
# OPENSSL_VERSION_NUMBER, but that didn't work with 1.1.0, because LibreSSL
9776+
# defines OPENSSL_VERSION_NUMBER to claim version 2.0.0, even though it
9777+
# doesn't have these OpenSSL 1.1.0 functions. So check for individual
9778+
# functions.
9779+
for ac_func in OPENSSL_init_ssl BIO_get_data BIO_meth_new ASN1_STRING_get0_data RAND_OpenSSL
9780+
do :
9781+
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
9782+
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
9783+
if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
9784+
cat >>confdefs.h <<_ACEOF
9785+
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
9786+
_ACEOF
9787+
9788+
fi
9789+
done
9790+
9791+
# OpenSSL versions before 1.1.0 required setting callback functions, for
9792+
# thread-safety. In 1.1.0, it's no longer required, and CRYPTO_lock()
9793+
# function was removed.
9794+
for ac_func in CRYPTO_lock
9795+
do :
9796+
ac_fn_c_check_func "$LINENO" "CRYPTO_lock" "ac_cv_func_CRYPTO_lock"
9797+
if test "x$ac_cv_func_CRYPTO_lock" = xyes; then :
9798+
cat >>confdefs.h <<_ACEOF
9799+
#define HAVE_CRYPTO_LOCK 1
9800+
_ACEOF
9801+
97719802
fi
97729803
done
97739804

@@ -18327,7 +18358,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1832718358
# report actual input values of CONFIG_FILES etc. instead of their
1832818359
# values after options handling.
1832918360
ac_log="
18330-
This file was extended by PostgreSQL $as_me 9.6rc1, which was
18361+
This file was extended by PostgreSQL $as_me 9.6.0, which was
1833118362
generated by GNU Autoconf 2.69. Invocation command line was
1833218363

1833318364
CONFIG_FILES = $CONFIG_FILES
@@ -18397,7 +18428,7 @@ _ACEOF
1839718428
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1839818429
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1839918430
ac_cs_version="\\
18400-
PostgreSQL config.status 9.6rc1
18431+
PostgreSQL config.status 9.6.0
1840118432
configured by $0, generated by GNU Autoconf 2.69,
1840218433
with options \\"\$ac_cs_config\\"
1840318434

‎configure.in

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dnl Read the Autoconf manual for details.
1717
dnl
1818
m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
1919

20-
AC_INIT([PostgreSQL], [9.6rc1], [bugs@postgrespro.ru],[postgrespro])
20+
AC_INIT([PostgreSQL], [9.6.0], [bugs@postgrespro.ru],[postgrespro])
2121
PACKAGE_TARNAME=postgrespro
2222

2323
m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
@@ -1129,12 +1129,22 @@ if test "$with_openssl" = yes ; then
11291129
dnl Order matters!
11301130
if test "$PORTNAME" != "win32"; then
11311131
AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])])
1132-
AC_CHECK_LIB(ssl, SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])])
1132+
AC_CHECK_LIB(ssl, SSL_new, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])])
11331133
else
11341134
AC_SEARCH_LIBS(CRYPTO_new_ex_data, eay32 crypto, [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])])
1135-
AC_SEARCH_LIBS(SSL_library_init, ssleay32 ssl, [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])])
1135+
AC_SEARCH_LIBS(SSL_new, ssleay32 ssl, [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])])
11361136
fi
11371137
AC_CHECK_FUNCS([SSL_get_current_compression])
1138+
# Functions introduced in OpenSSL 1.1.0. We used to check for
1139+
# OPENSSL_VERSION_NUMBER, but that didn't work with 1.1.0, because LibreSSL
1140+
# defines OPENSSL_VERSION_NUMBER to claim version 2.0.0, even though it
1141+
# doesn't have these OpenSSL 1.1.0 functions. So check for individual
1142+
# functions.
1143+
AC_CHECK_FUNCS([OPENSSL_init_ssl BIO_get_data BIO_meth_new ASN1_STRING_get0_data RAND_OpenSSL])
1144+
# OpenSSL versions before 1.1.0 required setting callback functions, for
1145+
# thread-safety. In 1.1.0, it's no longer required, and CRYPTO_lock()
1146+
# function was removed.
1147+
AC_CHECK_FUNCS([CRYPTO_lock])
11381148
fi
11391149

11401150
if test "$with_icu" = yes ; then

‎contrib/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ SUBDIRS = \
3232
pg_buffercache \
3333
pg_freespacemap \
3434
pg_prewarm \
35+
pg_query_state \
3536
pg_standby \
3637
pg_stat_statements \
3738
pg_trgm \
@@ -58,6 +59,8 @@ SUBDIRS = \
5859
pg_variables \
5960
jsquery \
6061
sr_plan \
62+
pg_arman \
63+
pg_pathman \
6164
shared_ispell
6265

6366
ifeq ($(with_openssl),yes)

‎contrib/pg_arman/Makefile

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,43 @@ OBJS = backup.o \
2121
pgut/pgut.o \
2222
pgut/pgut-port.o
2323

24-
EXTRA_CLEAN = datapagemap.c datapagemap.h xlogreader.c receivelog.h streamutil.h logging.h
25-
26-
PG_CPPFLAGS = -I$(libpq_srcdir) ${PTHREAD_CFLAGS}
27-
override CPPFLAGS := -DFRONTEND $(CPPFLAGS)
28-
PG_LIBS = $(libpq_pgport) ${PTHREAD_LIBS} ${PTHREAD_CFLAGS}
24+
EXTRA_CLEAN = datapagemap.c datapagemap.h xlogreader.c receivelog.c receivelog.h streamutil.c streamutil.h logging.h
2925

3026
REGRESS = init option show delete backup restore
3127

3228
all: checksrcdir datapagemap.h logging.h receivelog.h streamutil.h pg_arman
3329

30+
MAKE_GLOBAL="../../src/Makefile.global"
31+
TEST_GLOBAL:=$(shell test -e ../../src/Makefile.global)
32+
ifeq ($(.SHELLSTATUS),1)
33+
PG_CONFIG = pg_config
34+
PGXS := $(shell $(PG_CONFIG) --pgxs)
35+
include $(PGXS)
36+
37+
.PHONY: checksrcdir
38+
checksrcdir:
39+
ifndef top_srcdir
40+
@echo "You must have PostgreSQL source tree available to compile."
41+
@echo "Pass the path to the PostgreSQL source tree to make, in the top_srcdir"
42+
@echo "variable: \"make top_srcdir=<path to PostgreSQL source tree>\""
43+
@exit 1
44+
endif
45+
else
46+
#TODO: fix me
47+
REGRESS =
48+
subdir=contrib/pg_arman
49+
top_builddir=../..
50+
include $(top_builddir)/src/Makefile.global
51+
include $(top_srcdir)/contrib/contrib-global.mk
52+
endif
53+
PG_CPPFLAGS = -I$(libpq_srcdir) ${PTHREAD_CFLAGS}
54+
override CPPFLAGS := -DFRONTEND $(CPPFLAGS) $(PG_CPPFLAGS)
55+
PG_LIBS = $(libpq_pgport) ${PTHREAD_CFLAGS}
56+
57+
envtest:
58+
: top_srcdir=$(top_srcdir)
59+
: libpq_srcdir = $(libpq_srcdir)
60+
3461
# This rule's only purpose is to give the user instructions on how to pass
3562
# the path to PostgreSQL source tree to the makefile.
3663
.PHONY: checksrcdir
@@ -61,8 +88,3 @@ streamutil.c: % : $(top_srcdir)/src/bin/pg_basebackup/%
6188
rm -f && $(LN_S) $< .
6289
streamutil.h: % : $(top_srcdir)/src/bin/pg_basebackup/%
6390
rm -f && $(LN_S) $< .
64-
65-
PG_CONFIG = pg_config
66-
PGXS := $(shell $(PG_CONFIG) --pgxs)
67-
include $(PGXS)
68-

‎contrib/pg_arman/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ some overhead to PostgreSQL performance. On our experiments it appears to be
7575
less than 3%.
7676

7777
These two approaches were implemented in this fork of pg_arman. The second
78-
approach requires [patch for PostgreSQL](https://gist.github.com/stalkerg/7ce2394c4f3b36f995895190a633b4fa).
78+
approach requires [patch for PostgreSQL 9.5](https://gist.github.com/stalkerg/44703dbcbac1da08f448b7e6966646c0).
7979

8080
Testing block level incremental backup
8181
--------------------------------------
8282

83-
You need build and install [PGPRO9_5_ptrack branch of PostgreSQL](https://github.com/postgrespro/postgrespro/tree/PGPRO9_5_ptrack) or [apply this patch to PostgreSQL 9.5](https://gist.github.com/stalkerg/7ce2394c4f3b36f995895190a633b4fa).
83+
You need build and install [PGPRO9_5 branch of PostgreSQL](https://github.com/postgrespro/postgrespro) or [apply this patch to PostgreSQL 9.5](https://gist.github.com/stalkerg/44703dbcbac1da08f448b7e6966646c0).
8484

8585
### Retrieving changed blocks from WAL archive
8686

0 commit comments

Comments
 (0)