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

Commitc0980d0

Browse files
committed
Merge branch 'master' into logical_twophase
2 parentse3ef202 +37289ff commitc0980d0

File tree

950 files changed

+175965
-383462
lines changed

Some content is hidden

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

950 files changed

+175965
-383462
lines changed

‎.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ README.*conflict-marker-size=32
1313

1414
# Certain data files that contain special whitespace, and other special cases
1515
*.data-whitespace
16-
contrib/tsearch2/sql/tsearch2.sqlwhitespace=space-before-tab,blank-at-eof,-blank-at-eol
1716
contrib/pgcrypto/sql/pgp-armor.sqlwhitespace=-blank-at-eol
1817
doc/bug.templatewhitespace=space-before-tab,-blank-at-eof,blank-at-eol
1918
src/backend/catalog/sql_features.txtwhitespace=space-before-tab,blank-at-eof,-blank-at-eol

‎config/ac_func_accept_argtypes.m4

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ dnl #define ACCEPT_TYPE_ARG1 int
1414
dnl #define ACCEPT_TYPE_ARG2 struct sockaddr *
1515
dnl #define ACCEPT_TYPE_ARG3 socklen_t
1616
dnl
17-
dnl This macro requires AC_CHECK_HEADERS to have already verified the
18-
dnl presence or absence of sys/types.h and sys/socket.h.
19-
dnl
2017
dnl NOTE: This is just a modified version of the AC_FUNC_SELECT_ARGTYPES
2118
dnl macro. Credit for that one goes to David MacKenzie et. al.
2219
dnl
@@ -51,12 +48,8 @@ AC_DEFUN([AC_FUNC_ACCEPT_ARGTYPES],
5148
for ac_cv_func_accept_arg2 in 'struct sockaddr *' 'const struct sockaddr *' 'void *'; do
5249
for ac_cv_func_accept_arg3 in 'int' 'size_t' 'socklen_t' 'unsigned int' 'void'; do
5350
AC_COMPILE_IFELSE([AC_LANG_SOURCE(
54-
[#ifdef HAVE_SYS_TYPES_H
55-
#include <sys/types.h>
56-
#endif
57-
#ifdef HAVE_SYS_SOCKET_H
51+
[#include <sys/types.h>
5852
#include <sys/socket.h>
59-
#endif
6053
extern $ac_cv_func_accept_return accept ($ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2, $ac_cv_func_accept_arg3 *);])],
6154
[ac_not_found=no; break 4],[ac_not_found=yes])
6255
done

‎config/c-library.m4

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,12 @@ fi
111111
AC_DEFUN([PGAC_UNION_SEMUN],
112112
[AC_CHECK_TYPES([union semun],[],[],
113113
[#include <sys/types.h>
114+
#ifdef HAVE_SYS_IPC_H
114115
#include <sys/ipc.h>
115-
#include <sys/sem.h>])])# PGAC_UNION_SEMUN
116+
#endif
117+
#ifdef HAVE_SYS_SEM_H
118+
#include <sys/sem.h>
119+
#endif])])# PGAC_UNION_SEMUN
116120

117121

118122
# PGAC_STRUCT_SOCKADDR_UN
@@ -135,9 +139,7 @@ AC_DEFUN([PGAC_STRUCT_SOCKADDR_UN],
135139
AC_DEFUN([PGAC_STRUCT_SOCKADDR_STORAGE],
136140
[AC_CHECK_TYPES([struct sockaddr_storage],[],[],
137141
[#include <sys/types.h>
138-
#ifdef HAVE_SYS_SOCKET_H
139142
#include <sys/socket.h>
140-
#endif
141143
])])# PGAC_STRUCT_SOCKADDR_STORAGE
142144

143145
# PGAC_STRUCT_SOCKADDR_STORAGE_MEMBERS
@@ -154,9 +156,7 @@ AC_DEFUN([PGAC_STRUCT_SOCKADDR_STORAGE_MEMBERS],
154156
struct sockaddr_storage.__ss_len,
155157
struct sockaddr.sa_len],[],[],
156158
[#include <sys/types.h>
157-
#ifdef HAVE_SYS_SOCKET_H
158159
#include <sys/socket.h>
159-
#endif
160160
])])# PGAC_STRUCT_SOCKADDR_STORAGE_MEMBERS
161161

162162

‎config/python.m4

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ fi
1818

1919
# _PGAC_CHECK_PYTHON_DIRS
2020
# -----------------------
21-
# Determine the name of various directories of a given Python installation.
21+
# Determine the name of various directories of a given Python installation,
22+
# as well as the Python version.
2223
AC_DEFUN([_PGAC_CHECK_PYTHON_DIRS],
2324
[AC_REQUIRE([PGAC_PATH_PYTHON])
2425
AC_MSG_CHECKING([for Python distutils module])
@@ -31,10 +32,16 @@ else
3132
fi
3233
AC_MSG_CHECKING([Python configuration directory])
3334
python_majorversion=`${PYTHON} -c "import sys; print(sys.version[[0]])"`
35+
python_minorversion=`${PYTHON} -c "import sys; print(sys.version[[2]])"`
3436
python_version=`${PYTHON} -c "import sys; print(sys.version[[:3]])"`
3537
python_configdir=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBPL'))))"`
3638
AC_MSG_RESULT([$python_configdir])
3739
40+
# Reject unsupported Python versions as soon as practical.
41+
if test "$python_majorversion" -lt 3 -a "$python_minorversion" -lt 4; then
42+
AC_MSG_ERROR([Python version $python_version is too old (version 2.4 or later is required)])
43+
fi
44+
3845
AC_MSG_CHECKING([Python include directories])
3946
python_includespec=`${PYTHON} -c "
4047
import distutils.sysconfig

‎configure

Lines changed: 17 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1473,7 +1473,7 @@ Optional Features:
14731473
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
14741474
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
14751475
--disable-integer-datetimes
1476-
disable 64-bit integer date/time support
1476+
obsolete option, no longer supported
14771477
--enable-nls[=LANGUAGES]
14781478
enable Native Language Support
14791479
--disable-rpath do not embed shared library search path in
@@ -2984,23 +2984,21 @@ fi
29842984

29852985

29862986
#
2987-
# 64-bit integer date/time storage: enabled by default.
2987+
# 64-bit integer date/time storage is now the only option, but to avoid
2988+
# unnecessary breakage of build scripts, continue to accept an explicit
2989+
# "--enable-integer-datetimes" switch.
29882990
#
2989-
{$as_echo"$as_me:${as_lineno-$LINENO}: checking whether to build with 64-bit integer date/time support">&5
2990-
$as_echo_n"checking whether to build with 64-bit integer date/time support...">&6; }
29912991

29922992

29932993
# Check whether --enable-integer-datetimes was given.
29942994
iftest"${enable_integer_datetimes+set}" =set;then:
29952995
enableval=$enable_integer_datetimes;
29962996
case$enablevalin
29972997
yes)
2998-
2999-
$as_echo"#define USE_INTEGER_DATETIMES 1">>confdefs.h
3000-
2998+
:
30012999
;;
30023000
no)
3003-
:
3001+
as_fn_error$?"--disable-integer-datetimes is no longer supported""$LINENO" 5
30043002
;;
30053003
*)
30063004
as_fn_error$?"no argument expected for --enable-integer-datetimes option""$LINENO" 5
@@ -3010,13 +3008,9 @@ $as_echo "#define USE_INTEGER_DATETIMES 1" >>confdefs.h
30103008
else
30113009
enable_integer_datetimes=yes
30123010

3013-
$as_echo"#define USE_INTEGER_DATETIMES 1">>confdefs.h
3014-
30153011
fi
30163012

30173013

3018-
{$as_echo"$as_me:${as_lineno-$LINENO}: result:$enable_integer_datetimes">&5
3019-
$as_echo"$enable_integer_datetimes">&6; }
30203014

30213015

30223016
#
@@ -7588,11 +7582,17 @@ fi
75887582
{$as_echo"$as_me:${as_lineno-$LINENO}: checking Python configuration directory">&5
75897583
$as_echo_n"checking Python configuration directory...">&6; }
75907584
python_majorversion=`${PYTHON} -c"import sys; print(sys.version[0])"`
7585+
python_minorversion=`${PYTHON} -c"import sys; print(sys.version[2])"`
75917586
python_version=`${PYTHON} -c"import sys; print(sys.version[:3])"`
75927587
python_configdir=`${PYTHON} -c"import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBPL'))))"`
75937588
{$as_echo"$as_me:${as_lineno-$LINENO}: result:$python_configdir">&5
75947589
$as_echo"$python_configdir">&6; }
75957590

7591+
# Reject unsupported Python versions as soon as practical.
7592+
iftest"$python_majorversion" -lt 3 -a"$python_minorversion" -lt 4;then
7593+
as_fn_error$?"Python version$python_version is too old (version 2.4 or later is required)""$LINENO" 5
7594+
fi
7595+
75967596
{$as_echo"$as_me:${as_lineno-$LINENO}: checking Python include directories">&5
75977597
$as_echo_n"checking Python include directories...">&6; }
75987598
python_includespec=`${PYTHON} -c"
@@ -10332,7 +10332,7 @@ fi
1033210332
## Header files
1033310333
##
1033410334

10335-
forac_headerin atomic.h crypt.h dld.h fp_class.h getopt.h ieeefp.h ifaddrs.h langinfo.h mbarrier.h poll.hpwd.hsys/epoll.h sys/ioctl.h sys/ipc.h sys/poll.h sys/pstat.h sys/resource.h sys/select.h sys/sem.h sys/shm.h sys/socket.h sys/sockio.h sys/tas.h sys/time.h sys/un.h termios.h ucred.h utime.h wchar.h wctype.h
10335+
forac_headerin atomic.h crypt.h dld.h fp_class.h getopt.h ieeefp.h ifaddrs.h langinfo.h mbarrier.h poll.h sys/epoll.h sys/ipc.h sys/poll.h sys/pstat.h sys/resource.h sys/select.h sys/sem.h sys/shm.h sys/sockio.h sys/tas.h sys/un.h termios.h ucred.h utime.h wchar.h wctype.h
1033610336
do:
1033710337
as_ac_Header=`$as_echo"ac_cv_header_$ac_header"|$as_tr_sh`
1033810338
ac_fn_c_check_header_mongrel"$LINENO""$ac_header""$as_ac_Header""$ac_includes_default"
@@ -10351,9 +10351,7 @@ done
1035110351
forac_headerin net/if.h
1035210352
do:
1035310353
ac_fn_c_check_header_compile"$LINENO""net/if.h""ac_cv_header_net_if_h""$ac_includes_default
10354-
#ifdef HAVE_SYS_SOCKET_H
1035510354
#include <sys/socket.h>
10356-
#endif
1035710355
1035810356
"
1035910357
iftest"x$ac_cv_header_net_if_h" = xyes;then:
@@ -10386,24 +10384,10 @@ done
1038610384

1038710385
# At least on IRIX, test for netinet/tcp.h will fail unless
1038810386
# netinet/in.h is included first.
10389-
forac_headerin netinet/in.h
10390-
do:
10391-
ac_fn_c_check_header_mongrel"$LINENO""netinet/in.h""ac_cv_header_netinet_in_h""$ac_includes_default"
10392-
iftest"x$ac_cv_header_netinet_in_h" = xyes;then:
10393-
cat>>confdefs.h<<_ACEOF
10394-
#define HAVE_NETINET_IN_H 1
10395-
_ACEOF
10396-
10397-
fi
10398-
10399-
done
10400-
1040110387
forac_headerin netinet/tcp.h
1040210388
do:
1040310389
ac_fn_c_check_header_compile"$LINENO""netinet/tcp.h""ac_cv_header_netinet_tcp_h""$ac_includes_default
10404-
#ifdef HAVE_NETINET_IN_H
1040510390
#include <netinet/in.h>
10406-
#endif
1040710391
1040810392
"
1040910393
iftest"x$ac_cv_header_netinet_tcp_h" = xyes;then:
@@ -11671,8 +11655,12 @@ $as_echo "#define HAVE_TZNAME 1" >>confdefs.h
1167111655
fi
1167211656

1167311657
ac_fn_c_check_type"$LINENO""union semun""ac_cv_type_union_semun""#include <sys/types.h>
11658+
#ifdef HAVE_SYS_IPC_H
1167411659
#include <sys/ipc.h>
11660+
#endif
11661+
#ifdef HAVE_SYS_SEM_H
1167511662
#include <sys/sem.h>
11663+
#endif
1167611664
"
1167711665
iftest"x$ac_cv_type_union_semun" = xyes;then:
1167811666

@@ -11696,9 +11684,7 @@ $as_echo "#define HAVE_UNIX_SOCKETS 1" >>confdefs.h
1169611684
fi
1169711685

1169811686
ac_fn_c_check_type"$LINENO""struct sockaddr_storage""ac_cv_type_struct_sockaddr_storage""#include <sys/types.h>
11699-
#ifdef HAVE_SYS_SOCKET_H
1170011687
#include <sys/socket.h>
11701-
#endif
1170211688
1170311689
"
1170411690
iftest"x$ac_cv_type_struct_sockaddr_storage" = xyes;then:
@@ -11711,9 +11697,7 @@ _ACEOF
1171111697
fi
1171211698

1171311699
ac_fn_c_check_member"$LINENO""struct sockaddr_storage""ss_family""ac_cv_member_struct_sockaddr_storage_ss_family""#include <sys/types.h>
11714-
#ifdef HAVE_SYS_SOCKET_H
1171511700
#include <sys/socket.h>
11716-
#endif
1171711701
1171811702
"
1171911703
iftest"x$ac_cv_member_struct_sockaddr_storage_ss_family" = xyes;then:
@@ -11725,9 +11709,7 @@ _ACEOF
1172511709

1172611710
fi
1172711711
ac_fn_c_check_member"$LINENO""struct sockaddr_storage""__ss_family""ac_cv_member_struct_sockaddr_storage___ss_family""#include <sys/types.h>
11728-
#ifdef HAVE_SYS_SOCKET_H
1172911712
#include <sys/socket.h>
11730-
#endif
1173111713
1173211714
"
1173311715
iftest"x$ac_cv_member_struct_sockaddr_storage___ss_family" = xyes;then:
@@ -11739,9 +11721,7 @@ _ACEOF
1173911721

1174011722
fi
1174111723
ac_fn_c_check_member"$LINENO""struct sockaddr_storage""ss_len""ac_cv_member_struct_sockaddr_storage_ss_len""#include <sys/types.h>
11742-
#ifdef HAVE_SYS_SOCKET_H
1174311724
#include <sys/socket.h>
11744-
#endif
1174511725
1174611726
"
1174711727
iftest"x$ac_cv_member_struct_sockaddr_storage_ss_len" = xyes;then:
@@ -11753,9 +11733,7 @@ _ACEOF
1175311733

1175411734
fi
1175511735
ac_fn_c_check_member"$LINENO""struct sockaddr_storage""__ss_len""ac_cv_member_struct_sockaddr_storage___ss_len""#include <sys/types.h>
11756-
#ifdef HAVE_SYS_SOCKET_H
1175711736
#include <sys/socket.h>
11758-
#endif
1175911737
1176011738
"
1176111739
iftest"x$ac_cv_member_struct_sockaddr_storage___ss_len" = xyes;then:
@@ -11767,9 +11745,7 @@ _ACEOF
1176711745

1176811746
fi
1176911747
ac_fn_c_check_member"$LINENO""struct sockaddr""sa_len""ac_cv_member_struct_sockaddr_sa_len""#include <sys/types.h>
11770-
#ifdef HAVE_SYS_SOCKET_H
1177111748
#include <sys/socket.h>
11772-
#endif
1177311749
1177411750
"
1177511751
iftest"x$ac_cv_member_struct_sockaddr_sa_len" = xyes;then:
@@ -12427,12 +12403,8 @@ else
1242712403
forac_cv_func_accept_arg3in'int''size_t''socklen_t''unsigned int''void';do
1242812404
cat confdefs.h -<<_ACEOF >conftest.$ac_ext
1242912405
/* end confdefs.h. */
12430-
#ifdef HAVE_SYS_TYPES_H
1243112406
#include <sys/types.h>
12432-
#endif
12433-
#ifdef HAVE_SYS_SOCKET_H
1243412407
#include <sys/socket.h>
12435-
#endif
1243612408
extern$ac_cv_func_accept_return accept ($ac_cv_func_accept_arg1,$ac_cv_func_accept_arg2,$ac_cv_func_accept_arg3 *);
1243712409
_ACEOF
1243812410
if ac_fn_c_try_compile"$LINENO";then:

‎configure.in

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,13 @@ PGAC_ARG_REQ(with, libs, [DIRS], [alternative spelling of --with-libraries]
122122

123123

124124
#
125-
# 64-bit integer date/time storage: enabled by default.
125+
# 64-bit integer date/time storage is now the only option, but to avoid
126+
# unnecessary breakage of build scripts, continue to accept an explicit
127+
# "--enable-integer-datetimes" switch.
126128
#
127-
AC_MSG_CHECKING([whether to build with 64-bit integer date/time support])
128-
PGAC_ARG_BOOL(enable, integer-datetimes, yes, [disable 64-bit integer date/time support],
129-
[AC_DEFINE([USE_INTEGER_DATETIMES], 1,
130-
[Define to 1 if you want 64-bit integer timestamp and interval support. (--enable-integer-datetimes)])])
131-
AC_MSG_RESULT([$enable_integer_datetimes])
129+
PGAC_ARG_BOOL(enable, integer-datetimes, yes, [obsolete option, no longer supported],
130+
[],
131+
[AC_MSG_ERROR([--disable-integer-datetimes is no longer supported])])
132132

133133

134134
#
@@ -1162,16 +1162,13 @@ AC_SUBST(UUID_LIBS)
11621162
## Header files
11631163
##
11641164

1165-
dnl sys/socket.h is required by AC_FUNC_ACCEPT_ARGTYPES
1166-
AC_CHECK_HEADERS([atomic.h crypt.h dld.h fp_class.h getopt.h ieeefp.h ifaddrs.h langinfo.h mbarrier.h poll.h pwd.h sys/epoll.h sys/ioctl.h sys/ipc.h sys/poll.h sys/pstat.h sys/resource.h sys/select.h sys/sem.h sys/shm.h sys/socket.h sys/sockio.h sys/tas.h sys/time.h sys/un.h termios.h ucred.h utime.h wchar.h wctype.h])
1165+
AC_CHECK_HEADERS([atomic.h crypt.h dld.h fp_class.h getopt.h ieeefp.h ifaddrs.h langinfo.h mbarrier.h poll.h sys/epoll.h sys/ipc.h sys/poll.h sys/pstat.h sys/resource.h sys/select.h sys/sem.h sys/shm.h sys/sockio.h sys/tas.h sys/un.h termios.h ucred.h utime.h wchar.h wctype.h])
11671166

11681167
# On BSD, test for net/if.h will fail unless sys/socket.h
11691168
# is included first.
11701169
AC_CHECK_HEADERS(net/if.h, [], [],
11711170
[AC_INCLUDES_DEFAULT
1172-
#ifdef HAVE_SYS_SOCKET_H
11731171
#include <sys/socket.h>
1174-
#endif
11751172
])
11761173

11771174
# On OpenBSD, test for sys/ucred.h will fail unless sys/param.h
@@ -1183,12 +1180,9 @@ AC_CHECK_HEADERS(sys/ucred.h, [], [],
11831180

11841181
# At least on IRIX, test for netinet/tcp.h will fail unless
11851182
# netinet/in.h is included first.
1186-
AC_CHECK_HEADERS(netinet/in.h)
11871183
AC_CHECK_HEADERS(netinet/tcp.h, [], [],
11881184
[AC_INCLUDES_DEFAULT
1189-
#ifdef HAVE_NETINET_IN_H
11901185
#include <netinet/in.h>
1191-
#endif
11921186
])
11931187

11941188
if expr x"$pgac_cv_check_readline" : 'x-lreadline' >/dev/null ; then

‎contrib/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ include $(top_builddir)/src/Makefile.global
66

77
SUBDIRS =\
88
adminpack\
9+
amcheck\
910
auth_delay\
1011
auto_explain\
1112
bloom\
@@ -47,7 +48,6 @@ SUBDIRS = \
4748
test_decoding\
4849
tsm_system_rows\
4950
tsm_system_time\
50-
tsearch2\
5151
unaccent\
5252
vacuumlo
5353

0 commit comments

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