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

Commit931d3bd

Browse files
committed
Merge branch 'PGPRO9_6' into PGPRO-291_updates
2 parents3498505 +ddb67da commit931d3bd

File tree

649 files changed

+59113
-14789
lines changed

Some content is hidden

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

649 files changed

+59113
-14789
lines changed

‎.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,9 @@ lib*.pc
3838
/Debug/
3939
/Release/
4040
/tmp_install/
41+
42+
# Contrib
43+
/contrib/*/log/
44+
/contrib/*/results/
45+
/contrib/*/tmp_check/
46+
/contrib/pg_query_state/isolation_output/

‎COPYRIGHT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PostgreSQL Database Management System
22
(formerly known as Postgres, then as Postgres95)
33

4-
Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
4+
Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
55

66
Portions Copyright (c) 1994, The Regents of the University of California
77

‎configure

Lines changed: 125 additions & 10 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.6.0.
3+
# Generated by GNU Autoconf 2.69 for PostgreSQL 9.6.1.
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.6.0'
587-
PACKAGE_STRING='PostgreSQL 9.6.0'
586+
PACKAGE_VERSION='9.6.1'
587+
PACKAGE_STRING='PostgreSQL 9.6.1'
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.6.0 to adapt to many kinds of systems.
1407+
\`configure' configures PostgreSQL 9.6.1 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.6.0:";;
1472+
short | recursive ) echo "Configuration of PostgreSQL 9.6.1:";;
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.6.0
1625+
PostgreSQL configure 9.6.1
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.6.0, which was
2337+
It was created by PostgreSQL $as_me 9.6.1, which was
23372338
generated by GNU Autoconf 2.69. Invocation command line was
23382339

23392340
$ $0 $@
@@ -2750,8 +2751,10 @@ else
27502751
fi
27512752

27522753

2753-
PGPRO_VERSION="$PACKAGE_VERSION.1"
2754+
PGPRO_VERSION="$PACKAGE_VERSION.3"
27542755
PGPRO_PACKAGE_NAME="PostgresPro"
2756+
PGPRO_EDITION="standard"
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
@@ -9805,6 +9813,62 @@ done
98059813
fi
98069814

98079815
if test "$with_icu" = yes ; then
9816+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open" >&5
9817+
$as_echo_n "checking for library containing ucol_open... " >&6; }
9818+
if ${ac_cv_search_ucol_open+:} false; then :
9819+
$as_echo_n "(cached) " >&6
9820+
else
9821+
ac_func_search_save_LIBS=$LIBS
9822+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9823+
/* end confdefs.h. */
9824+
9825+
/* Override any GCC internal prototype to avoid an error.
9826+
Use char because int might match the return type of a GCC
9827+
builtin and then its argument prototype would still apply. */
9828+
#ifdef __cplusplus
9829+
extern "C"
9830+
#endif
9831+
char ucol_open ();
9832+
int
9833+
main ()
9834+
{
9835+
return ucol_open ();
9836+
;
9837+
return 0;
9838+
}
9839+
_ACEOF
9840+
for ac_lib in '' icui18n icuin; do
9841+
if test -z "$ac_lib"; then
9842+
ac_res="none required"
9843+
else
9844+
ac_res=-l$ac_lib
9845+
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
9846+
fi
9847+
if ac_fn_c_try_link "$LINENO"; then :
9848+
ac_cv_search_ucol_open=$ac_res
9849+
fi
9850+
rm -f core conftest.err conftest.$ac_objext \
9851+
conftest$ac_exeext
9852+
if ${ac_cv_search_ucol_open+:} false; then :
9853+
break
9854+
fi
9855+
done
9856+
if ${ac_cv_search_ucol_open+:} false; then :
9857+
9858+
else
9859+
ac_cv_search_ucol_open=no
9860+
fi
9861+
rm conftest.$ac_ext
9862+
LIBS=$ac_func_search_save_LIBS
9863+
fi
9864+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucol_open" >&5
9865+
$as_echo "$ac_cv_search_ucol_open" >&6; }
9866+
ac_res=$ac_cv_search_ucol_open
9867+
if test "$ac_res" != no; then :
9868+
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
9869+
9870+
else
9871+
98089872
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_57" >&5
98099873
$as_echo_n "checking for library containing ucol_open_57... " >&6; }
98109874
if ${ac_cv_search_ucol_open_57+:} false; then :
@@ -10807,6 +10871,54 @@ fi
1080710871

1080810872
fi
1080910873

10874+
10875+
fi
10876+
10877+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars in -licuuc" >&5
10878+
$as_echo_n "checking for ucnv_fromUChars in -licuuc... " >&6; }
10879+
if ${ac_cv_lib_icuuc_ucnv_fromUChars+:} false; then :
10880+
$as_echo_n "(cached) " >&6
10881+
else
10882+
ac_check_lib_save_LIBS=$LIBS
10883+
LIBS="-licuuc $LIBS"
10884+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10885+
/* end confdefs.h. */
10886+
10887+
/* Override any GCC internal prototype to avoid an error.
10888+
Use char because int might match the return type of a GCC
10889+
builtin and then its argument prototype would still apply. */
10890+
#ifdef __cplusplus
10891+
extern "C"
10892+
#endif
10893+
char ucnv_fromUChars ();
10894+
int
10895+
main ()
10896+
{
10897+
return ucnv_fromUChars ();
10898+
;
10899+
return 0;
10900+
}
10901+
_ACEOF
10902+
if ac_fn_c_try_link "$LINENO"; then :
10903+
ac_cv_lib_icuuc_ucnv_fromUChars=yes
10904+
else
10905+
ac_cv_lib_icuuc_ucnv_fromUChars=no
10906+
fi
10907+
rm -f core conftest.err conftest.$ac_objext \
10908+
conftest$ac_exeext conftest.$ac_ext
10909+
LIBS=$ac_check_lib_save_LIBS
10910+
fi
10911+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_icuuc_ucnv_fromUChars" >&5
10912+
$as_echo "$ac_cv_lib_icuuc_ucnv_fromUChars" >&6; }
10913+
if test "x$ac_cv_lib_icuuc_ucnv_fromUChars" = xyes; then :
10914+
cat >>confdefs.h <<_ACEOF
10915+
#define HAVE_LIBICUUC 1
10916+
_ACEOF
10917+
10918+
LIBS="-licuuc $LIBS"
10919+
10920+
else
10921+
1081010922
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_57 in -licuuc" >&5
1081110923
$as_echo_n "checking for ucnv_fromUChars_57 in -licuuc... " >&6; }
1081210924
if ${ac_cv_lib_icuuc_ucnv_fromUChars_57+:} false; then :
@@ -11620,6 +11732,9 @@ fi
1162011732
fi
1162111733

1162211734

11735+
fi
11736+
11737+
1162311738
fi
1162411739

1162511740
fi
@@ -18358,7 +18473,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1835818473
# report actual input values of CONFIG_FILES etc. instead of their
1835918474
# values after options handling.
1836018475
ac_log="
18361-
This file was extended by PostgreSQL $as_me 9.6.0, which was
18476+
This file was extended by PostgreSQL $as_me 9.6.1, which was
1836218477
generated by GNU Autoconf 2.69. Invocation command line was
1836318478

1836418479
CONFIG_FILES = $CONFIG_FILES
@@ -18428,7 +18543,7 @@ _ACEOF
1842818543
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1842918544
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1843018545
ac_cs_version="\\
18431-
PostgreSQL config.status 9.6.0
18546+
PostgreSQL config.status 9.6.1
1843218547
configured by $0, generated by GNU Autoconf 2.69,
1843318548
with options \\"\$ac_cs_config\\"
1843418549

‎configure.in

Lines changed: 9 additions & 2 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.6.0], [bugs@postgrespro.ru],[postgrespro])
20+
AC_INIT([PostgreSQL], [9.6.1], [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.
@@ -38,11 +38,14 @@ AC_DEFINE_UNQUOTED(PG_MAJORVERSION, "$PG_MAJORVERSION", [PostgreSQL major versio
3838
PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version],
3939
[PG_VERSION="$PACKAGE_VERSION$withval"],
4040
[PG_VERSION="$PACKAGE_VERSION"])
41-
PGPRO_VERSION="$PACKAGE_VERSION.1"
41+
PGPRO_VERSION="$PACKAGE_VERSION.3"
4242
PGPRO_PACKAGE_NAME="PostgresPro"
43+
PGPRO_EDITION="standard"
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
@@ -1148,6 +1151,7 @@ if test "$with_openssl" = yes ; then
11481151
fi
11491152

11501153
if test "$with_icu" = yes ; then
1154+
AC_SEARCH_LIBS(ucol_open, [icui18n icuin], [], [
11511155
AC_SEARCH_LIBS(ucol_open_57, [icui18n icuin], [], [
11521156
AC_SEARCH_LIBS(ucol_open_56, [icui18n icuin], [], [
11531157
AC_SEARCH_LIBS(ucol_open_55, [icui18n icuin], [], [
@@ -1181,6 +1185,8 @@ if test "$with_icu" = yes ; then
11811185
])
11821186
])
11831187
])
1188+
])
1189+
AC_CHECK_LIB(icuuc, ucnv_fromUChars, [], [
11841190
AC_CHECK_LIB(icuuc, ucnv_fromUChars_57, [], [
11851191
AC_CHECK_LIB(icuuc, ucnv_fromUChars_56, [], [
11861192
AC_CHECK_LIB(icuuc, ucnv_fromUChars_55, [], [
@@ -1214,6 +1220,7 @@ if test "$with_icu" = yes ; then
12141220
])
12151221
])
12161222
])
1223+
])
12171224
fi
12181225

12191226
if test "$with_pam" = yes ; then

‎contrib/Makefile

Lines changed: 14 additions & 2 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,9 +59,14 @@ SUBDIRS = \
5859
pg_variables\
5960
jsquery\
6061
sr_plan\
61-
pg_arman\
62+
pg_probackup\
6263
pg_pathman\
63-
shared_ispell
64+
shared_ispell\
65+
fulleq\
66+
fasttrun\
67+
online_analyze\
68+
plantuner
69+
6470

6571
ifeq ($(with_openssl),yes)
6672
SUBDIRS += sslinfo
@@ -98,6 +104,12 @@ else
98104
ALWAYS_SUBDIRS += hstore_plpython ltree_plpython
99105
endif
100106

107+
ifeq ($(with_icu),yes)
108+
SUBDIRS += mchar
109+
else
110+
ALWAYS_SUBDIRS += mchar
111+
endif
112+
101113
# Missing:
102114
#start-scripts\ (does not have a makefile)
103115

‎contrib/bloom/blinsert.c

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,13 +164,18 @@ blbuildempty(Relation index)
164164
metapage= (Page)palloc(BLCKSZ);
165165
BloomFillMetapage(index,metapage);
166166

167-
/* Write the page. If archiving/streaming, XLOG it. */
167+
/*
168+
* Write the page and log it. It might seem that an immediate sync
169+
* would be sufficient to guarantee that the file exists on disk, but
170+
* recovery itself might remove it while replaying, for example, an
171+
* XLOG_DBASE_CREATE or XLOG_TBLSPC_CREATE record. Therefore, we
172+
* need this even when wal_level=minimal.
173+
*/
168174
PageSetChecksumInplace(metapage,BLOOM_METAPAGE_BLKNO);
169175
smgrwrite(index->rd_smgr,INIT_FORKNUM,BLOOM_METAPAGE_BLKNO,
170176
(char*)metapage, true);
171-
if (XLogIsNeeded())
172-
log_newpage(&index->rd_smgr->smgr_rnode.node,INIT_FORKNUM,
173-
BLOOM_METAPAGE_BLKNO,metapage, false);
177+
log_newpage(&index->rd_smgr->smgr_rnode.node,INIT_FORKNUM,
178+
BLOOM_METAPAGE_BLKNO,metapage, false);
174179

175180
/*
176181
* An immediate sync is required even if we xlog'd the page, because the

0 commit comments

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