Skip to content

Commit 49a636b

Browse files
knizhnikknizhnik
committed
Merge branch 'master' into xtm
2 parents 3f778c1 + a1b2888 commit 49a636b

File tree

191 files changed

+2866
-2046
lines changed

Some content is hidden

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

191 files changed

+2866
-2046
lines changed

‎config/c-library.m4

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -170,33 +170,6 @@ AC_DEFUN([PGAC_STRUCT_ADDRINFO],
170170
])])# PGAC_STRUCT_ADDRINFO
171171

172172

173-
# PGAC_FUNC_POSIX_SIGNALS
174-
# -----------------------
175-
# Check to see if the machine has the POSIX signal interface. Define
176-
# HAVE_POSIX_SIGNALS if so. Also set the output variable HAVE_POSIX_SIGNALS
177-
# to yes or no.
178-
#
179-
# Note that this test only compiles a test program, it doesn't check
180-
# whether the routines actually work. If that becomes a problem, make
181-
# a fancier check.
182-
AC_DEFUN([PGAC_FUNC_POSIX_SIGNALS],
183-
[AC_CACHE_CHECK(for POSIX signal interface, pgac_cv_func_posix_signals,
184-
[AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <signal.h>
185-
],
186-
[struct sigaction act, oact;
187-
sigemptyset(&act.sa_mask);
188-
act.sa_flags = SA_RESTART;
189-
sigaction(0, &act, &oact);])],
190-
[pgac_cv_func_posix_signals=yes],
191-
[pgac_cv_func_posix_signals=no])])
192-
if test x"$pgac_cv_func_posix_signals" = xyes ; then
193-
AC_DEFINE(HAVE_POSIX_SIGNALS, 1,
194-
[Define to 1 if you have the POSIX signal interface.])
195-
fi
196-
HAVE_POSIX_SIGNALS=$pgac_cv_func_posix_signals
197-
AC_SUBST(HAVE_POSIX_SIGNALS)])# PGAC_FUNC_POSIX_SIGNALS
198-
199-
200173
# PGAC_FUNC_SNPRINTF_LONG_LONG_INT_MODIFIER
201174
# ---------------------------------------
202175
# Determine which length modifier snprintf uses for long long int. We

‎configure

Lines changed: 1 addition & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,6 @@ XGETTEXT
649649
MSGMERGE
650650
MSGFMT_FLAGS
651651
MSGFMT
652-
HAVE_POSIX_SIGNALS
653652
PG_CRC32C_OBJS
654653
CFLAGS_SSE42
655654
have_win32_dbghelp
@@ -12289,7 +12288,7 @@ fi
1228912288
LIBS_including_readline="$LIBS"
1229012289
LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
1229112290

12292-
for ac_func in cbrt dlopen fdatasync getifaddrs getpeerucred getrlimit mbstowcs_l memmove poll pstat pthread_is_threaded_np readlink setproctitle setsid shm_open sigprocmask symlink sync_file_range towlower utime utimes wcstombs wcstombs_l
12291+
for ac_func in cbrt dlopen fdatasync getifaddrs getpeerucred getrlimit mbstowcs_l memmove poll pstat pthread_is_threaded_np readlink setproctitle setsid shm_open symlink sync_file_range towlower utime utimes wcstombs wcstombs_l
1229312292
do :
1229412293
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
1229512294
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -13048,38 +13047,6 @@ esac
1304813047

1304913048
fi
1305013049

13051-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigsetjmp" >&5
13052-
$as_echo_n "checking for sigsetjmp... " >&6; }
13053-
if ${pgac_cv_func_sigsetjmp+:} false; then :
13054-
$as_echo_n "(cached) " >&6
13055-
else
13056-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13057-
/* end confdefs.h. */
13058-
#include <setjmp.h>
13059-
int
13060-
main ()
13061-
{
13062-
sigjmp_buf x; sigsetjmp(x, 1);
13063-
;
13064-
return 0;
13065-
}
13066-
_ACEOF
13067-
if ac_fn_c_try_link "$LINENO"; then :
13068-
pgac_cv_func_sigsetjmp=yes
13069-
else
13070-
pgac_cv_func_sigsetjmp=no
13071-
fi
13072-
rm -f core conftest.err conftest.$ac_objext \
13073-
conftest$ac_exeext conftest.$ac_ext
13074-
fi
13075-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_func_sigsetjmp" >&5
13076-
$as_echo "$pgac_cv_func_sigsetjmp" >&6; }
13077-
if test x"$pgac_cv_func_sigsetjmp" = x"yes"; then
13078-
13079-
$as_echo "#define HAVE_SIGSETJMP 1" >>confdefs.h
13080-
13081-
fi
13082-
1308313050
ac_fn_c_check_decl "$LINENO" "sys_siglist" "ac_cv_have_decl_sys_siglist" "#include <signal.h>
1308413051
/* NetBSD declares sys_siglist in unistd.h. */
1308513052
#ifdef HAVE_UNISTD_H
@@ -14151,20 +14118,6 @@ _ACEOF
1415114118
fi
1415214119

1415314120

14154-
# We also check for sig_atomic_t, which *should* be defined per ANSI
14155-
# C, but is missing on some old platforms.
14156-
ac_fn_c_check_type "$LINENO" "sig_atomic_t" "ac_cv_type_sig_atomic_t" "#include <signal.h>
14157-
"
14158-
if test "x$ac_cv_type_sig_atomic_t" = xyes; then :
14159-
14160-
cat >>confdefs.h <<_ACEOF
14161-
#define HAVE_SIG_ATOMIC_T 1
14162-
_ACEOF
14163-
14164-
14165-
fi
14166-
14167-
1416814121
# Check for extensions offering the integer scalar type __int128.
1416914122
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __int128" >&5
1417014123
$as_echo_n "checking for __int128... " >&6; }
@@ -14649,54 +14602,6 @@ fi
1464914602

1465014603

1465114604

14652-
# Check that POSIX signals are available if thread safety is enabled.
14653-
if test "$PORTNAME" != "win32"
14654-
then
14655-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POSIX signal interface" >&5
14656-
$as_echo_n "checking for POSIX signal interface... " >&6; }
14657-
if ${pgac_cv_func_posix_signals+:} false; then :
14658-
$as_echo_n "(cached) " >&6
14659-
else
14660-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14661-
/* end confdefs.h. */
14662-
#include <signal.h>
14663-
14664-
int
14665-
main ()
14666-
{
14667-
struct sigaction act, oact;
14668-
sigemptyset(&act.sa_mask);
14669-
act.sa_flags = SA_RESTART;
14670-
sigaction(0, &act, &oact);
14671-
;
14672-
return 0;
14673-
}
14674-
_ACEOF
14675-
if ac_fn_c_try_link "$LINENO"; then :
14676-
pgac_cv_func_posix_signals=yes
14677-
else
14678-
pgac_cv_func_posix_signals=no
14679-
fi
14680-
rm -f core conftest.err conftest.$ac_objext \
14681-
conftest$ac_exeext conftest.$ac_ext
14682-
fi
14683-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_func_posix_signals" >&5
14684-
$as_echo "$pgac_cv_func_posix_signals" >&6; }
14685-
if test x"$pgac_cv_func_posix_signals" = xyes ; then
14686-
14687-
$as_echo "#define HAVE_POSIX_SIGNALS 1" >>confdefs.h
14688-
14689-
fi
14690-
HAVE_POSIX_SIGNALS=$pgac_cv_func_posix_signals
14691-
14692-
if test "$pgac_cv_func_posix_signals" != yes -a "$enable_thread_safety" = yes; then
14693-
as_fn_error $? "
14694-
Thread-safety requires POSIX signals, which are not supported by this
14695-
operating system; use --disable-thread-safety to disable thread safety." "$LINENO" 5
14696-
fi
14697-
fi
14698-
14699-
1470014605
# Select semaphore implementation type.
1470114606
if test "$PORTNAME" != "win32"; then
1470214607
if test x"$USE_NAMED_POSIX_SEMAPHORES" = x"1" ; then

‎configure.in

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1406,7 +1406,7 @@ PGAC_FUNC_GETTIMEOFDAY_1ARG
14061406
LIBS_including_readline="$LIBS"
14071407
LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
14081408

1409-
AC_CHECK_FUNCS([cbrt dlopen fdatasync getifaddrs getpeerucred getrlimit mbstowcs_l memmove poll pstat pthread_is_threaded_np readlink setproctitle setsid shm_open sigprocmask symlink sync_file_range towlower utime utimes wcstombs wcstombs_l])
1409+
AC_CHECK_FUNCS([cbrt dlopen fdatasync getifaddrs getpeerucred getrlimit mbstowcs_l memmove poll pstat pthread_is_threaded_np readlink setproctitle setsid shm_open symlink sync_file_range towlower utime utimes wcstombs wcstombs_l])
14101410

14111411
AC_REPLACE_FUNCS(fseeko)
14121412
case $host_os in
@@ -1596,18 +1596,6 @@ if test "$PORTNAME" = "cygwin"; then
15961596
AC_LIBOBJ(dirmod)
15971597
fi
15981598

1599-
dnl Cannot use AC_CHECK_FUNC because sigsetjmp may be a macro
1600-
dnl (especially on GNU libc)
1601-
dnl See also comments in c.h.
1602-
AC_CACHE_CHECK([for sigsetjmp], pgac_cv_func_sigsetjmp,
1603-
[AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <setjmp.h>],
1604-
[sigjmp_buf x; sigsetjmp(x, 1);])],
1605-
[pgac_cv_func_sigsetjmp=yes],
1606-
[pgac_cv_func_sigsetjmp=no])])
1607-
if test x"$pgac_cv_func_sigsetjmp" = x"yes"; then
1608-
AC_DEFINE(HAVE_SIGSETJMP, 1, [Define to 1 if you have sigsetjmp().])
1609-
fi
1610-
16111599
AC_CHECK_DECLS([sys_siglist], [], [],
16121600
[#include <signal.h>
16131601
/* NetBSD declares sys_siglist in unistd.h. */
@@ -1831,10 +1819,6 @@ AC_DEFINE_UNQUOTED(MAXIMUM_ALIGNOF, $MAX_ALIGNOF, [Define as the maximum alignme
18311819
AC_CHECK_TYPES([int8, uint8, int64, uint64], [], [],
18321820
[#include <stdio.h>])
18331821

1834-
# We also check for sig_atomic_t, which *should* be defined per ANSI
1835-
# C, but is missing on some old platforms.
1836-
AC_CHECK_TYPES(sig_atomic_t, [], [], [#include <signal.h>])
1837-
18381822
# Check for extensions offering the integer scalar type __int128.
18391823
PGAC_TYPE_128BIT_INT
18401824

@@ -1936,18 +1920,6 @@ fi
19361920
AC_SUBST(PG_CRC32C_OBJS)
19371921

19381922

1939-
# Check that POSIX signals are available if thread safety is enabled.
1940-
if test "$PORTNAME" != "win32"
1941-
then
1942-
PGAC_FUNC_POSIX_SIGNALS
1943-
if test "$pgac_cv_func_posix_signals" != yes -a "$enable_thread_safety" = yes; then
1944-
AC_MSG_ERROR([
1945-
Thread-safety requires POSIX signals, which are not supported by this
1946-
operating system; use --disable-thread-safety to disable thread safety.])
1947-
fi
1948-
fi
1949-
1950-
19511923
# Select semaphore implementation type.
19521924
if test "$PORTNAME" != "win32"; then
19531925
if test x"$USE_NAMED_POSIX_SEMAPHORES" = x"1" ; then

‎contrib/btree_gist/btree_ts.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ gbt_ts_penalty(PG_FUNCTION_ARGS)
369369
newdbl[2];
370370

371371
/*
372-
* We are allways using "double" timestamps here. Precision should be good
372+
* We are always using "double" timestamps here. Precision should be good
373373
* enough.
374374
*/
375375
orgdbl[0] = ((double) origentry->lower);

‎contrib/btree_gist/btree_utils_var.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ gbt_var_decompress(PG_FUNCTION_ARGS)
5252
PG_RETURN_POINTER(entry);
5353
}
5454

55-
/* Returns a better readable representaion of variable key ( sets pointer ) */
55+
/* Returns a better readable representation of variable key ( sets pointer ) */
5656
GBT_VARKEY_R
5757
gbt_var_key_readable(const GBT_VARKEY *k)
5858
{

‎contrib/cube/cube.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ cube_inter(PG_FUNCTION_ARGS)
814814
Max(LL_COORD(b, i), UR_COORD(b, i))
815815
);
816816
}
817-
/* continue on the higher dimemsions only present in 'a' */
817+
/* continue on the higher dimensions only present in 'a' */
818818
for (; i < DIM(a); i++)
819819
{
820820
result->x[i] = Max(0,

‎contrib/dblink/expected/dblink.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
CREATE EXTENSION dblink;
2+
-- want context for notices
3+
\set SHOW_CONTEXT always
24
CREATE TABLE foo(f1 int, f2 text, f3 text[], primary key (f1,f2));
35
INSERT INTO foo VALUES (0,'a','{"a0","b0","c0"}');
46
INSERT INTO foo VALUES (1,'b','{"a1","b1","c1"}');

‎contrib/dblink/sql/dblink.sql

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
CREATE EXTENSION dblink;
22

3+
-- want context for notices
4+
\set SHOW_CONTEXT always
5+
36
CREATE TABLE foo(f1 int, f2 text, f3 text[], primary key (f1,f2));
47
INSERT INTO foo VALUES (0,'a','{"a0","b0","c0"}');
58
INSERT INTO foo VALUES (1,'b','{"a1","b1","c1"}');

‎contrib/hstore_plperl/expected/hstore_plperlu.out

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ INFO: $VAR1 = {
2929
'cc' => undef
3030
};
3131

32-
CONTEXT: PL/Perl function "test1"
3332
test1
3433
-------
3534
2
@@ -46,7 +45,6 @@ $$;
4645
SELECT test1none('aa=>bb, cc=>NULL'::hstore);
4746
INFO: $VAR1 = '"aa"=>"bb", "cc"=>NULL';
4847

49-
CONTEXT: PL/Perl function "test1none"
5048
test1none
5149
-----------
5250
0
@@ -67,7 +65,6 @@ INFO: $VAR1 = {
6765
'cc' => undef
6866
};
6967

70-
CONTEXT: PL/Perl function "test1list"
7168
test1list
7269
-----------
7370
2
@@ -92,7 +89,6 @@ $VAR2 = {
9289
'dd' => 'ee'
9390
};
9491

95-
CONTEXT: PL/Perl function "test1arr"
9692
test1arr
9793
----------
9894
2
@@ -120,10 +116,8 @@ INFO: $VAR1 = {
120116
'cc' => undef
121117
};
122118

123-
CONTEXT: PL/Perl function "test3"
124119
INFO: $VAR1 = '"a"=>"1", "b"=>"boo", "c"=>NULL';
125120

126-
CONTEXT: PL/Perl function "test3"
127121
test3
128122
-------
129123

@@ -161,7 +155,6 @@ INFO: $VAR1 = {
161155
}
162156
};
163157

164-
CONTEXT: PL/Perl function "test4"
165158
SELECT * FROM test1;
166159
a | b
167160
---+---------------------------------

‎contrib/hstore_plpython/expected/hstore_plpython.out

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ return len(val)
1313
$$;
1414
SELECT test1('aa=>bb, cc=>NULL'::hstore);
1515
INFO: [('aa', 'bb'), ('cc', None)]
16-
CONTEXT: PL/Python function "test1"
1716
test1
1817
-------
1918
2
@@ -32,7 +31,6 @@ return len(val)
3231
$$;
3332
SELECT test1n('aa=>bb, cc=>NULL'::hstore);
3433
INFO: [('aa', 'bb'), ('cc', None)]
35-
CONTEXT: PL/Python function "test1n"
3634
test1n
3735
--------
3836
2

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy