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

Commit2865e31

Browse files
committed
Merge branch 'PGPROEE9_6' into PGPROEE9_6_CFS_385
2 parents56d399c +372de65 commit2865e31

File tree

671 files changed

+79930
-40459
lines changed

Some content is hidden

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

671 files changed

+79930
-40459
lines changed

‎.ci/build_and_test_world

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
if [-z"$TCLCONFIG" ];then
33
[-x /usr/lib/tcl8.5/tclConfig.sh ]&& TCLCONFIG=/usr/lib/tcl8.5
44
[-x /usr/lib/tcl8.6/tclConfig.sh ]&& TCLCONFIG=/usr/lib/tcl8.6
5+
[-f /usr/lib64/tclConfig.sh ]&& TCLCONFIG=/usr/lib64
56
fi
67
[-n"$TCLCONFIG" ]&&export TCLCONFIG
78
echo TCLCONFIG=${TCLCONFIG}
@@ -34,7 +35,8 @@ set -e
3435
stage configure
3536
./configure --enable-tap-tests --enable-debug --enable-cassert --enable-nls \
3637
--with-openssl --with-perl --with-tcl --with-python \
37-
--with-gssapi --with-libxml --with-libxslt --with-ldap \
38+
--with-gssapi --with-includes=/usr/include/gssglue \
39+
--with-libxml --with-libxslt --with-ldap \
3840
--with-icu --with-zstd${TCLCONFIG:+--with-tclconfig=${TCLCONFIG}}
3941
stage make
4042
make

‎.ci/make_test_base

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,22 @@ put into postgresql conf.
77
88
On success, starts database
99
"""
10-
importos,sys,subprocess,glob,re,os.path,time
10+
importos,sys,subprocess,glob,re,os.path,time,re
1111

1212
iflen(sys.argv)!=2:
1313
print>>sys.stderr,"Usage %s data-directory"%sys.argv[0]
1414
sys.exit(1)
15+
16+
defprepare_extlist(value):
17+
v=re.sub("[']",'',value)
18+
l=re.split("\s*,\s*",v)
19+
if"pg_pathman"inl:
20+
# remove duplicates and reorder extension list to move pg_pathman to tail
21+
nl=sorted(list(set(l)),cmp=lambdaa,b:1ifa=="pg_pathman"else-1)
22+
new_value="'{0}'".format(",".join(nl))
23+
returnnew_value
24+
else:
25+
returnvalue
1526

1627
datadir=sys.argv[1]
1728

@@ -56,10 +67,10 @@ for module in glob.glob("contrib/*"):
5667
else:
5768
addopts[opt]=value
5869

59-
ifaddopts:
70+
ifaddopts:
6071
withopen(datadir+"/postgresql.conf","a")asf:
6172
foropt,valueinaddopts.items():
62-
print>>f,"%s=%s"%(opt,value)
73+
print>>f,"%s=%s"%(opt,prepare_extlist(value))
6374
withopen("initdb.log","a")asf:
6475
exitcode=subprocess.call(["pg_ctl","start","-D",datadir,"-l",datadir+"/postmaster.log"],env=env,stdout=f,stderr=subprocess.STDOUT)
6576
ifexitcode:
@@ -73,5 +84,3 @@ while time.time() < failtime:
7384
sys.exit(0)
7485
print>>sys.stderr,"Database havent't started in 60 seconds"
7586
sys.exit(1)
76-
77-

‎.ci/run

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#!/bin/sh
2+
#
3+
# Universal CI hook
4+
#
5+
6+
set -e
7+
8+
if ["`id -un`"="root" ];then
9+
if [-d".ci" ];then
10+
if ["`uname`"="Darwin" ];then
11+
if! [-e /Users/ci ];then
12+
echo"Error: User ci not found."
13+
exit 1
14+
fi
15+
chown -R ci.
16+
[-e~/.ci.env ]&&source~/.ci.env
17+
else
18+
groupadd ci
19+
useradd -g ci ci
20+
# chown -R ci:ci .
21+
find. -type d -exec chown ci:ci {} +
22+
fi
23+
su ci -c ./.ci/build_and_test_world
24+
else
25+
echo"Error: .ci not found"
26+
exit 1
27+
fi
28+
else
29+
./.ci/build_and_test_world
30+
fi

‎.ci/run.cmd

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
@echooff
2+
PATH=C:\Windows\system32;C:\Perl64\bin;C:\Program Files\Git\cmd;C:\msys64\usr\bin
3+
4+
REM Copy source-repo to CI temporary catalog
5+
cp -r postgrespro/* .
6+
7+
IF"%ARCH%"==""SETARCH=X86
8+
IF"%ARCH%"=="x86"SETARCH=X86
9+
IF"%ARCH%"=="x64"SETARCH=X64
10+
IF"%ARCH%"=="amd64"SETARCH=X64
11+
IF"%ARCH%"=="AMD64"SETARCH=X64
12+
IF"%SDK%"==""SETSDK=SDK71
13+
14+
echo BUILD_ID=%BUILD_ID%
15+
echo BUILD_NAME=%BUILD_NAME%
16+
echo ARCH=%ARCH%
17+
echo SDK=%SDK%
18+
19+
IF%SDK%== SDK71SETDEPENDENCIES_BIN_DIR=C:\pgfarm\deps_%ARCH%_%SDK%
20+
IF%SDK%== MSVC2013SETDEPENDENCIES_BIN_DIR=C:\pgfarm\deps_%ARCH%
21+
22+
SETPERL32_PATH=C:\Perl
23+
SETPERL64_PATH=C:\Perl64
24+
SETPYTHON32_PATH=C:\Python27x86
25+
SETPYTHON64_PATH=C:\Python27x64
26+
27+
IF%SDK%== SDK71 (
28+
CALL"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv" /%ARCH%||GOTO :ERROR
29+
ECHOON
30+
)
31+
32+
IF%SDK%== MSVC2013 (
33+
IF%ARCH%== X86CALL"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall" x86||GOTO :ERROR
34+
ECHOON
35+
IF%ARCH%== X64CALL"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall" amd64||GOTO :ERROR
36+
ECHOON
37+
)
38+
39+
>src\tools\msvc\config.plECHO use strict;
40+
>>src\tools\msvc\config.plECHO use warnings;
41+
>>src\tools\msvc\config.plECHO our $config = {
42+
>>src\tools\msvc\config.plECHO asserts^=^> 0^,^# --enable-cassert
43+
>>src\tools\msvc\config.plECHO^# integer_datetimes^=^>1,
44+
>>src\tools\msvc\config.plECHO^# float4byval^=^>1,
45+
>>src\tools\msvc\config.plECHO^# float8byval^=^>0,
46+
>>src\tools\msvc\config.plECHO^# blocksize^=^> 8,
47+
>>src\tools\msvc\config.plECHO^# wal_blocksize^=^> 8,
48+
>>src\tools\msvc\config.plECHO^# wal_segsize^=^> 16,
49+
>>src\tools\msvc\config.plECHO ldap^=^> 1,
50+
>>src\tools\msvc\config.plECHO nls^=^> '%DEPENDENCIES_BIN_DIR%\libintl',
51+
>>src\tools\msvc\config.plECHO tcl^=^> undef,
52+
IF%ARCH%== X64 (>>src\tools\msvc\config.plECHO perl^=^> '%PERL64_PATH%', )
53+
IF%ARCH%== X86 (>>src\tools\msvc\config.plECHO perl^=^> '%PERL32_PATH%', )
54+
IF%ARCH%== X64 (>>src\tools\msvc\config.plECHO python^=^> '%PYTHON64_PATH%', )
55+
IF%ARCH%== X86 (>>src\tools\msvc\config.plECHO python^=^> '%PYTHON32_PATH%', )
56+
>>src\tools\msvc\config.plECHO openssl^=^> '%DEPENDENCIES_BIN_DIR%\openssl',
57+
>>src\tools\msvc\config.plECHO uuid^=^> '%DEPENDENCIES_BIN_DIR%\uuid',
58+
>>src\tools\msvc\config.plECHO xml^=^> '%DEPENDENCIES_BIN_DIR%\libxml2',
59+
>>src\tools\msvc\config.plECHO xslt^=^> '%DEPENDENCIES_BIN_DIR%\libxslt',
60+
>>src\tools\msvc\config.plECHO iconv^=^> '%DEPENDENCIES_BIN_DIR%\iconv',
61+
>>src\tools\msvc\config.plECHO zlib^=^> '%DEPENDENCIES_BIN_DIR%\zlib',
62+
>>src\tools\msvc\config.plECHO icu^=^> '%DEPENDENCIES_BIN_DIR%\icu'
63+
>>src\tools\msvc\config.plECHO^};
64+
>>src\tools\msvc\config.plECHO 1^;
65+
66+
type .\src\tools\msvc\config.pl
67+
68+
perl src\tools\msvc\build.pl||GOTO :ERROR
69+
70+
GOTO :DONE
71+
:ERROR
72+
ECHO Failed with error #%errorlevel%.
73+
EXIT /b%errorlevel%
74+
:DONE
75+
ECHO Done.

‎.ci/run_install_check

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ make install prefix=`pwd`/tmp_install -C contrib
2222

2323
# Setup an environment
2424
LD_LIBRARY_PATH=$(pwd)/tmp_install/lib
25+
DYLD_LIBRARY_PATH=$(pwd)/tmp_install/lib
2526
PATH=$(pwd)/tmp_install/bin:${PATH}
2627
PGDATA=$(pwd)/tmp_base
27-
export LD_LIBRARY_PATH PATH PG_DATA
28+
exportDYLD_LIBRARY_PATHLD_LIBRARY_PATH PATH PG_DATA
2829

2930
# create installation
3031
PGPORT=`./.ci/find_free_port 5432`

‎.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

‎Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ all check install installdirs installcheck installcheck-parallel uninstall clean
2929
\
3030
if [ x"$${GMAKE+set}"= xset ];then \
3131
echo"Using GNU make found at$${GMAKE}";\
32+
unset MAKEFLAGS;unset MAKELEVEL;\
3233
$${GMAKE}$@;\
3334
else\
3435
echo"You must use GNU make to build PostgreSQL.";\

‎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: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,33 @@ 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. An exception is that we need to let through
63+
# -D_USE_32BIT_TIME_T if it's present. (We probably could restrict that to
64+
# only get through on Windows, but for the moment we let it through always.)
65+
# For debugging purposes, let's have the configure output report the raw
66+
# ccflags value as well as the set of flags we chose to adopt.
67+
AC_DEFUN([PGAC_CHECK_PERL_EMBED_CCFLAGS],
68+
[AC_REQUIRE([PGAC_PATH_PERL])
69+
AC_MSG_CHECKING([for CFLAGS recommended by Perl])
70+
perl_ccflags=`$PERL -MConfig -e['print $Config{ccflags}']`
71+
AC_MSG_RESULT([$perl_ccflags])
72+
AC_MSG_CHECKING([for CFLAGS to compile embedded Perl])
73+
perl_embed_ccflags=`$PERL -MConfig -e['foreach $f (split(" ",$Config{ccflags})) {print $f, " " if ($f =~ /^-D[^_]/ || $f =~ /^-D_USE_32BIT_TIME_T/)}']`
74+
AC_SUBST(perl_embed_ccflags)dnl
75+
AC_MSG_RESULT([$perl_embed_ccflags])
76+
])# PGAC_CHECK_PERL_EMBED_CCFLAGS
77+
78+
5279
# PGAC_CHECK_PERL_EMBED_LDFLAGS
5380
# -----------------------------
5481
# We are after Embed's ldopts, but without the subset mentioned in

0 commit comments

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