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

Commite119258

Browse files
committed
Merge branch 'PGPRO9_6' into PGPROEE9_6
Merge PGPRO9_6 as of 9.6.3.3 into EEConflicts:.gitignoreconfigureconfigure.indoc/src/sgml/pgprobackup.sgmldoc/src/sgml/sourcerepo.sgmlsrc/backend/access/nbtree/nbtvalidate.csrc/backend/access/spgist/spgvalidate.csrc/backend/replication/logical/reorderbuffer.csrc/backend/replication/logical/snapbuild.csrc/backend/replication/walsender.csrc/backend/storage/file/copydir.csrc/backend/utils/init/globals.csrc/bin/pg_dump/pg_backup_archiver.csrc/bin/pg_xlogdump/pg_xlogdump.csrc/include/miscadmin.hsrc/include/pg_config.h.win32src/include/replication/snapbuild.hsrc/interfaces/libpq/fe-connect.csrc/test/regress/expected/join.outsrc/test/regress/parallel_schedulesrc/test/regress/serial_schedulesrc/tools/msvc/Mkvcbuild.pm
2 parents338c303 +e49fa4e commite119258

File tree

223 files changed

+5385
-3531
lines changed

Some content is hidden

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

223 files changed

+5385
-3531
lines changed

‎.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,3 @@ lib*.pc
4646
/contrib/pg_query_state/isolation_output/
4747
/contrib/pg_hint_plan/expected/ut-fdw.out
4848
/contrib/pg_hint_plan/sql/ut-fdw.sql
49-

‎COPYRIGHT

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
PostgreSQL Database Management System
22
(formerly known as Postgres, then as Postgres95)
33

4+
Portions Copyright (c) 2015-2017, Postgres Professional company
5+
46
Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
57

68
Portions Copyright (c) 1994, The Regents of the University of California
79

810
Permission to use, copy, modify, and distribute this software and its
9-
documentation for any purpose, without fee, and without a written agreement
11+
documentation for the purposes of testing and studying its features and performance,
12+
as well as educational purposes, without fee, and without a written agreement
1013
is hereby granted, provided that the above copyright notice and this
11-
paragraph and the following two paragraphs appear in all copies.
14+
paragraph and the following two paragraphs appear in all copies. Using this
15+
software and its documentation for other purposes, including its packaging with
16+
other software, copying, modification and redistribution, requires
17+
a special license from Postgres Professional.
1218

1319
IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
1420
DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING

‎HISTORY

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
Release notes for all versions of PostgreSQL can be found on-line at
2-
http://www.postgresql.org/docs/current/static/release.html
3-
4-
Distribution file sets include release notes for their version and preceding
5-
versions. Visit the file doc/src/sgml/html/release.html in an HTML browser.
1+
Release notes for all versions of Postgres Pro Standard can be found on-line at
2+
https://postgrespro.com/docs/postgrespro/9.6/release.html

‎README

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,19 @@
1-
PostgreSQL Database Management System
2-
=====================================
1+
Postgres Pro Standard Database Management System
2+
================================================
33

4-
This directory contains the source code distribution of thePostgreSQL
5-
database management system.
4+
This directory contains the source code distribution of the
5+
Postgres Pro Standarddatabase management system.
66

7-
PostgreSQL is an advanced object-relational database management system
8-
that supports an extended subset of the SQL standard, including
9-
transactions, foreign keys, subqueries, triggers, user-defined types
10-
and functions. This distribution also contains C language bindings.
7+
Postgres Pro Standard is an advanced object-relational database
8+
management system that supports an extended subset of the SQL standard,
9+
including transactions, foreign keys, subqueries, triggers,
10+
user-defined types and functions. This distribution also
11+
contains C language bindings.
1112

12-
PostgreSQL has many language interfaces, many of which are listed here:
13-
14-
http://www.postgresql.org/download
15-
16-
See the file INSTALL for instructions on how to build and install
17-
PostgreSQL. That file also lists supported operating systems and
18-
hardware platforms and contains information regarding any other
19-
software packages that are required to build or run the PostgreSQL
20-
system. Copyright and license information can be found in the
21-
file COPYRIGHT. A comprehensive documentation set is included in this
22-
distribution; it can be read as described in the installation
23-
instructions.
13+
Copyright and license information can be found in the
14+
file COPYRIGHT. A comprehensive documentation set is included in this
15+
distribution.
2416

2517
The latest version of this software may be obtained at
26-
http://www.postgresql.org/download/. For more information look at our
27-
web site located at http://www.postgresql.org/.
18+
https://postgrespro.com/products/download. For more information look at our
19+
web site located at http://postgrespro.com/.

‎README.git

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ git and so will not be present if you are using a git checkout.
66

77
If you are using a git checkout, you can view the most recent installation
88
instructions at:
9-
http://www.postgresql.org/docs/devel/static/installation.html
9+
https://www.postgresql.org/docs/devel/static/installation.html
1010

1111
Users compiling from git will also need compatible versions of Bison, Flex,
1212
and Perl, as discussed in the install documentation. These programs are not

‎config/perl.m4

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,31 @@ AC_DEFUN([PGAC_CHECK_PERL_CONFIGS],
4949
[m4_foreach([pgac_item],[$1],[PGAC_CHECK_PERL_CONFIG(pgac_item)])])
5050

5151

52+
# PGAC_CHECK_PERL_EMBED_CCFLAGS
53+
# -----------------------------
54+
# We selectively extract stuff from $Config{ccflags}. We don't really need
55+
# anything except -D switches, and other sorts of compiler switches can
56+
# actively break things if Perl was compiled with a different compiler.
57+
# Moreover, although Perl likes to put stuff like -D_LARGEFILE_SOURCE and
58+
# -D_FILE_OFFSET_BITS=64 here, it would be fatal to try to compile PL/Perl
59+
# to a different libc ABI than core Postgres uses. The available information
60+
# says that all the symbols that affect Perl's own ABI begin with letters,
61+
# so it should be sufficient to adopt -D switches for symbols not beginning
62+
# with underscore.
63+
# For debugging purposes, let's have the configure output report the raw
64+
# ccflags value as well as the set of flags we chose to adopt.
65+
AC_DEFUN([PGAC_CHECK_PERL_EMBED_CCFLAGS],
66+
[AC_REQUIRE([PGAC_PATH_PERL])
67+
AC_MSG_CHECKING([for CFLAGS recommended by Perl])
68+
perl_ccflags=`$PERL -MConfig -e['print $Config{ccflags}']`
69+
AC_MSG_RESULT([$perl_ccflags])
70+
AC_MSG_CHECKING([for CFLAGS to compile embedded Perl])
71+
perl_embed_ccflags=`$PERL -MConfig -e['foreach $f (split(" ",$Config{ccflags})) {print $f, " " if ($f =~ /^-D[^_]/)}']`
72+
AC_SUBST(perl_embed_ccflags)dnl
73+
AC_MSG_RESULT([$perl_embed_ccflags])
74+
])# PGAC_CHECK_PERL_EMBED_CCFLAGS
75+
76+
5277
# PGAC_CHECK_PERL_EMBED_LDFLAGS
5378
# -----------------------------
5479
# We are after Embed's ldopts, but without the subset mentioned in

‎configure

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -672,6 +672,7 @@ python_version
672672
python_majorversion
673673
PYTHON
674674
perl_embed_ldflags
675+
perl_embed_ccflags
675676
perl_useshrplib
676677
perl_privlibexp
677678
perl_archlibexp
@@ -2754,7 +2755,7 @@ else
27542755
fi
27552756

27562757

2757-
PGPRO_VERSION="$PACKAGE_VERSION.2"
2758+
PGPRO_VERSION="$PACKAGE_VERSION.3"
27582759
PGPRO_PACKAGE_NAME="PostgresPro"
27592760
PGPRO_EDITION="enterprise"
27602761

@@ -7661,6 +7662,18 @@ documentation for details. Use --without-perl to disable building
76617662
PL/Perl." "$LINENO" 5
76627663
fi
76637664

7665+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLAGS recommended by Perl" >&5
7666+
$as_echo_n "checking for CFLAGS recommended by Perl... " >&6; }
7667+
perl_ccflags=`$PERL -MConfig -e 'print $Config{ccflags}'`
7668+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $perl_ccflags" >&5
7669+
$as_echo "$perl_ccflags" >&6; }
7670+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLAGS to compile embedded Perl" >&5
7671+
$as_echo_n "checking for CFLAGS to compile embedded Perl... " >&6; }
7672+
perl_embed_ccflags=`$PERL -MConfig -e 'foreach $f (split(" ",$Config{ccflags})) {print $f, " " if ($f =~ /^-D[^_]/)}'`
7673+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $perl_embed_ccflags" >&5
7674+
$as_echo "$perl_embed_ccflags" >&6; }
7675+
7676+
76647677
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for flags to link embedded Perl" >&5
76657678
$as_echo_n "checking for flags to link embedded Perl... " >&6; }
76667679
if test "$PORTNAME" = "win32" ; then

‎configure.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ 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.2"
41+
PGPRO_VERSION="$PACKAGE_VERSION.3"
4242
PGPRO_PACKAGE_NAME="PostgresPro"
4343
PGPRO_EDITION="enterprise"
4444
AC_SUBST(PGPRO_PACKAGE_NAME)
@@ -959,6 +959,7 @@ You might have to rebuild your Perl installation. Refer to the
959959
documentation for details. Use --without-perl to disable building
960960
PL/Perl.])
961961
fi
962+
PGAC_CHECK_PERL_EMBED_CCFLAGS
962963
PGAC_CHECK_PERL_EMBED_LDFLAGS
963964
fi
964965

‎contrib/hstore_plperl/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ endif
4343
# last, probably because it sometimes contains some header files with names
4444
# that clash with some of ours, or with some that we include, notably on
4545
# Windows.
46-
overrideCPPFLAGS :=$(CPPFLAGS) -I$(perl_archlibexp)/CORE
46+
overrideCPPFLAGS :=$(CPPFLAGS)$(perl_embed_ccflags)-I$(perl_archlibexp)/CORE

‎contrib/hstore_plperl/expected/hstore_plperlu.out

Lines changed: 11 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,12 @@ TRANSFORM FOR TYPE hstore
2020
AS $$
2121
use Data::Dumper;
2222
$Data::Dumper::Sortkeys = 1;
23+
$Data::Dumper::Indent = 0;
2324
elog(INFO, Dumper($_[0]));
2425
return scalar(keys %{$_[0]});
2526
$$;
2627
SELECT test1('aa=>bb, cc=>NULL'::hstore);
27-
INFO: $VAR1 = {
28-
'aa' => 'bb',
29-
'cc' => undef
30-
};
31-
28+
INFO: $VAR1 = {'aa' => 'bb','cc' => undef};
3229
test1
3330
-------
3431
2
@@ -39,12 +36,12 @@ LANGUAGE plperlu
3936
AS $$
4037
use Data::Dumper;
4138
$Data::Dumper::Sortkeys = 1;
39+
$Data::Dumper::Indent = 0;
4240
elog(INFO, Dumper($_[0]));
4341
return scalar(keys %{$_[0]});
4442
$$;
4543
SELECT test1none('aa=>bb, cc=>NULL'::hstore);
4644
INFO: $VAR1 = '"aa"=>"bb", "cc"=>NULL';
47-
4845
test1none
4946
-----------
5047
0
@@ -56,15 +53,12 @@ TRANSFORM FOR TYPE hstore
5653
AS $$
5754
use Data::Dumper;
5855
$Data::Dumper::Sortkeys = 1;
56+
$Data::Dumper::Indent = 0;
5957
elog(INFO, Dumper($_[0]));
6058
return scalar(keys %{$_[0]});
6159
$$;
6260
SELECT test1list('aa=>bb, cc=>NULL'::hstore);
63-
INFO: $VAR1 = {
64-
'aa' => 'bb',
65-
'cc' => undef
66-
};
67-
61+
INFO: $VAR1 = {'aa' => 'bb','cc' => undef};
6862
test1list
6963
-----------
7064
2
@@ -77,18 +71,12 @@ TRANSFORM FOR TYPE hstore
7771
AS $$
7872
use Data::Dumper;
7973
$Data::Dumper::Sortkeys = 1;
74+
$Data::Dumper::Indent = 0;
8075
elog(INFO, Dumper($_[0]->[0], $_[0]->[1]));
8176
return scalar(keys %{$_[0]});
8277
$$;
8378
SELECT test1arr(array['aa=>bb, cc=>NULL'::hstore, 'dd=>ee']);
84-
INFO: $VAR1 = {
85-
'aa' => 'bb',
86-
'cc' => undef
87-
};
88-
$VAR2 = {
89-
'dd' => 'ee'
90-
};
91-
79+
INFO: $VAR1 = {'aa' => 'bb','cc' => undef};$VAR2 = {'dd' => 'ee'};
9280
test1arr
9381
----------
9482
2
@@ -101,6 +89,7 @@ TRANSFORM FOR TYPE hstore
10189
AS $$
10290
use Data::Dumper;
10391
$Data::Dumper::Sortkeys = 1;
92+
$Data::Dumper::Indent = 0;
10493

10594
$rv = spi_exec_query(q{SELECT 'aa=>bb, cc=>NULL'::hstore AS col1});
10695
elog(INFO, Dumper($rv->{rows}[0]->{col1}));
@@ -111,13 +100,8 @@ $rv = spi_exec_prepared($plan, {}, $val);
111100
elog(INFO, Dumper($rv->{rows}[0]->{col1}));
112101
$$;
113102
SELECT test3();
114-
INFO: $VAR1 = {
115-
'aa' => 'bb',
116-
'cc' => undef
117-
};
118-
103+
INFO: $VAR1 = {'aa' => 'bb','cc' => undef};
119104
INFO: $VAR1 = '"a"=>"1", "b"=>"boo", "c"=>NULL';
120-
121105
test3
122106
-------
123107

@@ -138,6 +122,7 @@ TRANSFORM FOR TYPE hstore
138122
AS $$
139123
use Data::Dumper;
140124
$Data::Dumper::Sortkeys = 1;
125+
$Data::Dumper::Indent = 0;
141126
elog(INFO, Dumper($_TD->{new}));
142127
if ($_TD->{new}{a} == 1) {
143128
$_TD->{new}{b} = {a => 1, b => 'boo', c => undef};
@@ -147,14 +132,7 @@ return "MODIFY";
147132
$$;
148133
CREATE TRIGGER test4 BEFORE UPDATE ON test1 FOR EACH ROW EXECUTE PROCEDURE test4();
149134
UPDATE test1 SET a = a;
150-
INFO: $VAR1 = {
151-
'a' => '1',
152-
'b' => {
153-
'aa' => 'bb',
154-
'cc' => undef
155-
}
156-
};
157-
135+
INFO: $VAR1 = {'a' => '1','b' => {'aa' => 'bb','cc' => undef}};
158136
SELECT * FROM test1;
159137
a | b
160138
---+---------------------------------

‎contrib/hstore_plperl/hstore_plperl.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ PG_FUNCTION_INFO_V1(hstore_to_plperl);
1313
Datum
1414
hstore_to_plperl(PG_FUNCTION_ARGS)
1515
{
16+
dTHX;
1617
HStore*in=PG_GETARG_HS(0);
1718
inti;
1819
intcount=HS_COUNT(in);
@@ -45,16 +46,15 @@ PG_FUNCTION_INFO_V1(plperl_to_hstore);
4546
Datum
4647
plperl_to_hstore(PG_FUNCTION_ARGS)
4748
{
48-
HV*hv;
49+
dTHX;
50+
HV*hv= (HV*)SvRV((SV*)PG_GETARG_POINTER(0));
4951
HE*he;
5052
int32buflen;
5153
int32i;
5254
int32pcount;
5355
HStore*out;
5456
Pairs*pairs;
5557

56-
hv= (HV*)SvRV((SV*)PG_GETARG_POINTER(0));
57-
5858
pcount=hv_iterinit(hv);
5959

6060
pairs=palloc(pcount*sizeof(Pairs));

‎contrib/hstore_plperl/sql/hstore_plperlu.sql

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ TRANSFORM FOR TYPE hstore
1515
AS $$
1616
use Data::Dumper;
1717
$Data::Dumper::Sortkeys=1;
18+
$Data::Dumper::Indent=0;
1819
elog(INFO, Dumper($_[0]));
1920
return scalar(keys%{$_[0]});
2021
$$;
@@ -26,6 +27,7 @@ LANGUAGE plperlu
2627
AS $$
2728
use Data::Dumper;
2829
$Data::Dumper::Sortkeys=1;
30+
$Data::Dumper::Indent=0;
2931
elog(INFO, Dumper($_[0]));
3032
return scalar(keys%{$_[0]});
3133
$$;
@@ -38,6 +40,7 @@ TRANSFORM FOR TYPE hstore
3840
AS $$
3941
use Data::Dumper;
4042
$Data::Dumper::Sortkeys=1;
43+
$Data::Dumper::Indent=0;
4144
elog(INFO, Dumper($_[0]));
4245
return scalar(keys%{$_[0]});
4346
$$;
@@ -52,6 +55,7 @@ TRANSFORM FOR TYPE hstore
5255
AS $$
5356
use Data::Dumper;
5457
$Data::Dumper::Sortkeys=1;
58+
$Data::Dumper::Indent=0;
5559
elog(INFO, Dumper($_[0]->[0], $_[0]->[1]));
5660
return scalar(keys%{$_[0]});
5761
$$;
@@ -66,6 +70,7 @@ TRANSFORM FOR TYPE hstore
6670
AS $$
6771
use Data::Dumper;
6872
$Data::Dumper::Sortkeys=1;
73+
$Data::Dumper::Indent=0;
6974

7075
$rv= spi_exec_query(q{SELECT'aa=>bb, cc=>NULL'::hstoreAS col1});
7176
elog(INFO, Dumper($rv->{rows}[0]->{col1}));
@@ -90,6 +95,7 @@ TRANSFORM FOR TYPE hstore
9095
AS $$
9196
use Data::Dumper;
9297
$Data::Dumper::Sortkeys=1;
98+
$Data::Dumper::Indent=0;
9399
elog(INFO, Dumper($_TD->{new}));
94100
if ($_TD->{new}{a}==1) {
95101
$_TD->{new}{b}= {a=>1, b=>'boo', c=> undef};

‎contrib/pg_standby/pg_standby.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ char *xlogFilePath;/* where we are going to restore to */
5757
char*nextWALFileName;/* the file we need to get from archive */
5858
char*restartWALFileName;/* the file from which we can restart restore */
5959
char*priorWALFileName;/* the file we need to get from archive */
60-
charWALFilePath[MAXPGPATH];/* the file path including archive */
60+
charWALFilePath[MAXPGPATH*2];/* the file path including archive */
6161
charrestoreCommand[MAXPGPATH];/* run this to restore */
6262
charexclusiveCleanupFileName[MAXFNAMELEN];/* the file we need to
6363
* get from archive */
@@ -259,9 +259,9 @@ CustomizableCleanupPriorWALFiles(void)
259259
strcmp(xlde->d_name+8,exclusiveCleanupFileName+8)<0)
260260
{
261261
#ifdefWIN32
262-
snprintf(WALFilePath,MAXPGPATH,"%s\\%s",archiveLocation,xlde->d_name);
262+
snprintf(WALFilePath,sizeof(WALFilePath),"%s\\%s",archiveLocation,xlde->d_name);
263263
#else
264-
snprintf(WALFilePath,MAXPGPATH,"%s/%s",archiveLocation,xlde->d_name);
264+
snprintf(WALFilePath,sizeof(WALFilePath),"%s/%s",archiveLocation,xlde->d_name);
265265
#endif
266266

267267
if (debug)

0 commit comments

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