Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit12f744a

Browse files
committed
Merge branch 'PGPROEE9_6' of git.postgrespro.ru:pgpro-dev/postgrespro into PGPROEE9_6
2 parents581aedb +b960b8b commit12f744a

File tree

894 files changed

+94270
-24671
lines changed

Some content is hidden

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

894 files changed

+94270
-24671
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-ee-$(VERSION)
79+
ifeq ($PGPRO_VERSION,)
80+
distdir = postgrespro-enterprise-$(VERSION)
81+
else
82+
distdir = postgrespro-enterprise-$(PGPRO_VERSION)
83+
endif
8084
dummy= =install=
8185
garbage = =* "#"* ."#"* *~* *.orig *.rej core postgrespro-ee-*
8286

‎configure

Lines changed: 70 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

@@ -756,6 +756,7 @@ build_os
756756
build_vendor
757757
build_cpu
758758
build
759+
PGPRO_EDITION
759760
PGPRO_PACKAGE_NAME
760761
PG_MAJORVERSION
761762
configure_args
@@ -1403,7 +1404,7 @@ if test "$ac_init_help" = "long"; then
14031404
# Omit some internal or obsolete options to make the list less imposing.
14041405
# This message is too long to be a string in the A/UX 3.1 sh.
14051406
cat <<_ACEOF
1406-
\`configure' configures PostgreSQL 9.6rc1 to adapt to many kinds of systems.
1407+
\`configure' configures PostgreSQL 9.6.0 to adapt to many kinds of systems.
14071408

14081409
Usage: $0 [OPTION]... [VAR=VALUE]...
14091410

@@ -1468,7 +1469,7 @@ fi
14681469

14691470
if test -n "$ac_init_help"; then
14701471
case $ac_init_help in
1471-
short | recursive ) echo "Configuration of PostgreSQL 9.6rc1:";;
1472+
short | recursive ) echo "Configuration of PostgreSQL 9.6.0:";;
14721473
esac
14731474
cat <<\_ACEOF
14741475

@@ -1621,7 +1622,7 @@ fi
16211622
test -n "$ac_init_help" && exit $ac_status
16221623
if $ac_init_version; then
16231624
cat <<\_ACEOF
1624-
PostgreSQL configure 9.6rc1
1625+
PostgreSQL configure 9.6.0
16251626
generated by GNU Autoconf 2.69
16261627

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

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

23392340
$ $0 $@
@@ -2752,6 +2753,8 @@ fi
27522753

27532754
PGPRO_VERSION="$PACKAGE_VERSION.1"
27542755
PGPRO_PACKAGE_NAME="PostgresPro"
2756+
PGPRO_EDITION="enterprise"
2757+
27552758

27562759

27572760
cat >>confdefs.h <<_ACEOF
@@ -2764,6 +2767,11 @@ cat >>confdefs.h <<_ACEOF
27642767
_ACEOF
27652768

27662769

2770+
cat >>confdefs.h <<_ACEOF
2771+
#define PGPRO_EDITION "$PGPRO_EDITION"
2772+
_ACEOF
2773+
2774+
27672775
cat >>confdefs.h <<_ACEOF
27682776
#define PGPRO_VERSION "$PGPRO_VERSION"
27692777
_ACEOF
@@ -9595,9 +9603,9 @@ else
95959603
as_fn_error $? "library 'crypto' is required for OpenSSL" "$LINENO" 5
95969604
fi
95979605

9598-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking forSSL_library_init in -lssl" >&5
9599-
$as_echo_n "checking forSSL_library_init in -lssl... " >&6; }
9600-
if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :
9606+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking forSSL_new in -lssl" >&5
9607+
$as_echo_n "checking forSSL_new in -lssl... " >&6; }
9608+
if ${ac_cv_lib_ssl_SSL_new+:} false; then :
96019609
$as_echo_n "(cached) " >&6
96029610
else
96039611
ac_check_lib_save_LIBS=$LIBS
@@ -9611,27 +9619,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
96119619
#ifdef __cplusplus
96129620
extern "C"
96139621
#endif
9614-
charSSL_library_init ();
9622+
charSSL_new ();
96159623
int
96169624
main ()
96179625
{
9618-
returnSSL_library_init ();
9626+
returnSSL_new ();
96199627
;
96209628
return 0;
96219629
}
96229630
_ACEOF
96239631
if ac_fn_c_try_link "$LINENO"; then :
9624-
ac_cv_lib_ssl_SSL_library_init=yes
9632+
ac_cv_lib_ssl_SSL_new=yes
96259633
else
9626-
ac_cv_lib_ssl_SSL_library_init=no
9634+
ac_cv_lib_ssl_SSL_new=no
96279635
fi
96289636
rm -f core conftest.err conftest.$ac_objext \
96299637
conftest$ac_exeext conftest.$ac_ext
96309638
LIBS=$ac_check_lib_save_LIBS
96319639
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 :
9640+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5
9641+
$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; }
9642+
if test "x$ac_cv_lib_ssl_SSL_new" = xyes; then :
96359643
cat >>confdefs.h <<_ACEOF
96369644
#define HAVE_LIBSSL 1
96379645
_ACEOF
@@ -9701,9 +9709,9 @@ else
97019709
as_fn_error $? "library 'eay32' or 'crypto' is required for OpenSSL" "$LINENO" 5
97029710
fi
97039711

9704-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containingSSL_library_init" >&5
9705-
$as_echo_n "checking for library containingSSL_library_init... " >&6; }
9706-
if ${ac_cv_search_SSL_library_init+:} false; then :
9712+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containingSSL_new" >&5
9713+
$as_echo_n "checking for library containingSSL_new... " >&6; }
9714+
if ${ac_cv_search_SSL_new+:} false; then :
97079715
$as_echo_n "(cached) " >&6
97089716
else
97099717
ac_func_search_save_LIBS=$LIBS
@@ -9716,11 +9724,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
97169724
#ifdef __cplusplus
97179725
extern "C"
97189726
#endif
9719-
charSSL_library_init ();
9727+
charSSL_new ();
97209728
int
97219729
main ()
97229730
{
9723-
returnSSL_library_init ();
9731+
returnSSL_new ();
97249732
;
97259733
return 0;
97269734
}
@@ -9733,25 +9741,25 @@ for ac_lib in '' ssleay32 ssl; do
97339741
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
97349742
fi
97359743
if ac_fn_c_try_link "$LINENO"; then :
9736-
ac_cv_search_SSL_library_init=$ac_res
9744+
ac_cv_search_SSL_new=$ac_res
97379745
fi
97389746
rm -f core conftest.err conftest.$ac_objext \
97399747
conftest$ac_exeext
9740-
if ${ac_cv_search_SSL_library_init+:} false; then :
9748+
if ${ac_cv_search_SSL_new+:} false; then :
97419749
break
97429750
fi
97439751
done
9744-
if ${ac_cv_search_SSL_library_init+:} false; then :
9752+
if ${ac_cv_search_SSL_new+:} false; then :
97459753

97469754
else
9747-
ac_cv_search_SSL_library_init=no
9755+
ac_cv_search_SSL_new=no
97489756
fi
97499757
rm conftest.$ac_ext
97509758
LIBS=$ac_func_search_save_LIBS
97519759
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
9760+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSL_new" >&5
9761+
$as_echo "$ac_cv_search_SSL_new" >&6; }
9762+
ac_res=$ac_cv_search_SSL_new
97559763
if test "$ac_res" != no; then :
97569764
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
97579765

@@ -9768,6 +9776,37 @@ if test "x$ac_cv_func_SSL_get_current_compression" = xyes; then :
97689776
#define HAVE_SSL_GET_CURRENT_COMPRESSION 1
97699777
_ACEOF
97709778

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

@@ -18327,7 +18366,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1832718366
# report actual input values of CONFIG_FILES etc. instead of their
1832818367
# values after options handling.
1832918368
ac_log="
18330-
This file was extended by PostgreSQL $as_me 9.6rc1, which was
18369+
This file was extended by PostgreSQL $as_me 9.6.0, which was
1833118370
generated by GNU Autoconf 2.69. Invocation command line was
1833218371

1833318372
CONFIG_FILES = $CONFIG_FILES
@@ -18397,7 +18436,7 @@ _ACEOF
1839718436
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1839818437
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1839918438
ac_cs_version="\\
18400-
PostgreSQL config.status 9.6rc1
18439+
PostgreSQL config.status 9.6.0
1840118440
configured by $0, generated by GNU Autoconf 2.69,
1840218441
with options \\"\$ac_cs_config\\"
1840318442

‎configure.in

Lines changed: 16 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.
@@ -40,9 +40,12 @@ PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version],
4040
[PG_VERSION="$PACKAGE_VERSION"])
4141
PGPRO_VERSION="$PACKAGE_VERSION.1"
4242
PGPRO_PACKAGE_NAME="PostgresPro"
43+
PGPRO_EDITION="enterprise"
4344
AC_SUBST(PGPRO_PACKAGE_NAME)
45+
AC_SUBST(PGPRO_EDITION)
4446
AC_DEFINE_UNQUOTED(PG_VERSION, "$PG_VERSION", [PostgreSQL version as a string])
4547
AC_DEFINE_UNQUOTED(PGPRO_PACKAGE_NAME, "$PGPRO_PACKAGE_NAME", [PostgresPro name as a string])
48+
AC_DEFINE_UNQUOTED(PGPRO_EDITION,"$PGPRO_EDITION",[PostgresPro edition])
4649
AC_DEFINE_UNQUOTED(PGPRO_VERSION, "$PGPRO_VERSION", [PostgresPro version as a string])
4750

4851
AC_CANONICAL_HOST
@@ -1129,12 +1132,22 @@ if test "$with_openssl" = yes ; then
11291132
dnl Order matters!
11301133
if test "$PORTNAME" != "win32"; then
11311134
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])])
1135+
AC_CHECK_LIB(ssl,SSL_new, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])])
11331136
else
11341137
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])])
1138+
AC_SEARCH_LIBS(SSL_new, ssleay32 ssl, [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])])
11361139
fi
11371140
AC_CHECK_FUNCS([SSL_get_current_compression])
1141+
# Functions introduced in OpenSSL 1.1.0. We used to check for
1142+
# OPENSSL_VERSION_NUMBER, but that didn't work with 1.1.0, because LibreSSL
1143+
# defines OPENSSL_VERSION_NUMBER to claim version 2.0.0, even though it
1144+
# doesn't have these OpenSSL 1.1.0 functions. So check for individual
1145+
# functions.
1146+
AC_CHECK_FUNCS([OPENSSL_init_ssl BIO_get_data BIO_meth_new ASN1_STRING_get0_data RAND_OpenSSL])
1147+
# OpenSSL versions before 1.1.0 required setting callback functions, for
1148+
# thread-safety. In 1.1.0, it's no longer required, and CRYPTO_lock()
1149+
# function was removed.
1150+
AC_CHECK_FUNCS([CRYPTO_lock])
11381151
fi
11391152

11401153
if test "$with_icu" = yes ; then

‎contrib/Makefile

Lines changed: 4 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\
@@ -40,6 +41,7 @@ SUBDIRS = \
4041
pgstattuple\
4142
pg_visibility\
4243
postgres_fdw\
44+
rum\
4345
seg\
4446
spi\
4547
tablefunc\
@@ -58,6 +60,8 @@ SUBDIRS = \
5860
pg_variables\
5961
jsquery\
6062
sr_plan\
63+
pg_arman\
64+
pg_pathman\
6165
shared_ispell
6266

6367
ifeq ($(with_openssl),yes)

‎contrib/btree_gist/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ OBJS = btree_gist.o btree_utils_num.o btree_utils_var.o btree_int2.o \
99
btree_numeric.o$(WIN32RES)
1010

1111
EXTENSION = btree_gist
12-
DATA = btree_gist--1.2.sql btree_gist--1.1--1.2.sql btree_gist--1.0--1.1.sql\
12+
DATA = btree_gist--1.3.sql btree_gist--1.2--1.3.sql\
13+
btree_gist--1.1--1.2.sql btree_gist--1.0--1.1.sql\
1314
btree_gist--unpackaged--1.0.sql
1415
PGFILEDESC = "btree_gist - B-tree equivalent GiST operator classes"
1516

‎contrib/btree_gist/btree_cash.c

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -90,27 +90,6 @@ static const gbtree_ninfo tinfo =
9090
};
9191

9292

93-
PG_FUNCTION_INFO_V1(cash_dist);
94-
Datum
95-
cash_dist(PG_FUNCTION_ARGS)
96-
{
97-
Casha=PG_GETARG_CASH(0);
98-
Cashb=PG_GETARG_CASH(1);
99-
Cashr;
100-
Cashra;
101-
102-
r=a-b;
103-
ra=Abs(r);
104-
105-
/* Overflow check. */
106-
if (ra<0|| (!SAMESIGN(a,b)&& !SAMESIGN(r,a)))
107-
ereport(ERROR,
108-
(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
109-
errmsg("money out of range")));
110-
111-
PG_RETURN_CASH(ra);
112-
}
113-
11493
/**************************************************
11594
* Cash ops
11695
**************************************************/

‎contrib/btree_gist/btree_date.c

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -108,19 +108,6 @@ static const gbtree_ninfo tinfo =
108108
};
109109

110110

111-
PG_FUNCTION_INFO_V1(date_dist);
112-
Datum
113-
date_dist(PG_FUNCTION_ARGS)
114-
{
115-
/* we assume the difference can't overflow */
116-
Datumdiff=DirectFunctionCall2(date_mi,
117-
PG_GETARG_DATUM(0),
118-
PG_GETARG_DATUM(1));
119-
120-
PG_RETURN_INT32(Abs(DatumGetInt32(diff)));
121-
}
122-
123-
124111
/**************************************************
125112
* date ops
126113
**************************************************/

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp