Skip to content

Commit 2f82e00

Browse files
kelvichkelvich
committed
Merge branch 'pgmaster' into logical_twophase
2 parents 9003c9f + 90992e0 commit 2f82e00

File tree

1,720 files changed

+24500
-10268
lines changed

Some content is hidden

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

1,720 files changed

+24500
-10268
lines changed

‎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: 59 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# This configure script is free software; the Free Software Foundation
1212
# gives unlimited permission to copy, distribute and modify it.
1313
#
14-
# Copyright (c) 1996-2016, PostgreSQL Global Development Group
14+
# Copyright (c) 1996-2017, PostgreSQL Global Development Group
1515
## -------------------- ##
1616
## M4sh Initialization. ##
1717
## -------------------- ##
@@ -1624,7 +1624,7 @@ Copyright (C) 2012 Free Software Foundation, Inc.
16241624
This configure script is free software; the Free Software Foundation
16251625
gives unlimited permission to copy, distribute and modify it.
16261626
1627-
Copyright (c) 1996-2016, PostgreSQL Global Development Group
1627+
Copyright (c) 1996-2017, PostgreSQL Global Development Group
16281628
_ACEOF
16291629
exit
16301630
fi
@@ -9055,6 +9055,62 @@ if test "$ac_res" != no; then :
90559055

90569056
fi
90579057

9058+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5
9059+
$as_echo_n "checking for library containing clock_gettime... " >&6; }
9060+
if ${ac_cv_search_clock_gettime+:} false; then :
9061+
$as_echo_n "(cached) " >&6
9062+
else
9063+
ac_func_search_save_LIBS=$LIBS
9064+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9065+
/* end confdefs.h. */
9066+
9067+
/* Override any GCC internal prototype to avoid an error.
9068+
Use char because int might match the return type of a GCC
9069+
builtin and then its argument prototype would still apply. */
9070+
#ifdef __cplusplus
9071+
extern "C"
9072+
#endif
9073+
char clock_gettime ();
9074+
int
9075+
main ()
9076+
{
9077+
return clock_gettime ();
9078+
;
9079+
return 0;
9080+
}
9081+
_ACEOF
9082+
for ac_lib in '' rt posix4; do
9083+
if test -z "$ac_lib"; then
9084+
ac_res="none required"
9085+
else
9086+
ac_res=-l$ac_lib
9087+
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
9088+
fi
9089+
if ac_fn_c_try_link "$LINENO"; then :
9090+
ac_cv_search_clock_gettime=$ac_res
9091+
fi
9092+
rm -f core conftest.err conftest.$ac_objext \
9093+
conftest$ac_exeext
9094+
if ${ac_cv_search_clock_gettime+:} false; then :
9095+
break
9096+
fi
9097+
done
9098+
if ${ac_cv_search_clock_gettime+:} false; then :
9099+
9100+
else
9101+
ac_cv_search_clock_gettime=no
9102+
fi
9103+
rm conftest.$ac_ext
9104+
LIBS=$ac_func_search_save_LIBS
9105+
fi
9106+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5
9107+
$as_echo "$ac_cv_search_clock_gettime" >&6; }
9108+
ac_res=$ac_cv_search_clock_gettime
9109+
if test "$ac_res" != no; then :
9110+
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
9111+
9112+
fi
9113+
90589114
# Solaris:
90599115
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing fdatasync" >&5
90609116
$as_echo_n "checking for library containing fdatasync... " >&6; }
@@ -12520,7 +12576,7 @@ fi
1252012576
LIBS_including_readline="$LIBS"
1252112577
LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
1252212578

12523-
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
12579+
for ac_func in cbrt clock_gettime 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
1252412580
do :
1252512581
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
1252612582
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"

‎configure.in

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.6
2323
Untested combinations of 'autoconf' and PostgreSQL versions are not
2424
recommended. You can remove the check from 'configure.in' but it is then
2525
your responsibility whether the result works or not.])])
26-
AC_COPYRIGHT([Copyright (c) 1996-2016, PostgreSQL Global Development Group])
26+
AC_COPYRIGHT([Copyright (c) 1996-2017, PostgreSQL Global Development Group])
2727
AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
2828
AC_CONFIG_AUX_DIR(config)
2929
AC_PREFIX_DEFAULT(/usr/local/pgsql)
@@ -1016,6 +1016,7 @@ AC_SEARCH_LIBS(getopt_long, [getopt gnugetopt])
10161016
AC_SEARCH_LIBS(crypt, crypt)
10171017
AC_SEARCH_LIBS(shm_open, rt)
10181018
AC_SEARCH_LIBS(shm_unlink, rt)
1019+
AC_SEARCH_LIBS(clock_gettime, [rt posix4])
10191020
# Solaris:
10201021
AC_SEARCH_LIBS(fdatasync, [rt posix4])
10211022
# Required for thread_test.c on Solaris
@@ -1415,7 +1416,7 @@ PGAC_FUNC_WCSTOMBS_L
14151416
LIBS_including_readline="$LIBS"
14161417
LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
14171418

1418-
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])
1419+
AC_CHECK_FUNCS([cbrt clock_gettime 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])
14191420

14201421
AC_REPLACE_FUNCS(fseeko)
14211422
case $host_os in

‎contrib/adminpack/adminpack.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* adminpack.c
44
*
55
*
6-
* Copyright (c) 2002-2016, PostgreSQL Global Development Group
6+
* Copyright (c) 2002-2017, PostgreSQL Global Development Group
77
*
88
* Author: Andreas Pflug <pgadmin@pse-consulting.de>
99
*

‎contrib/auth_delay/auth_delay.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
*
33
* auth_delay.c
44
*
5-
* Copyright (c) 2010-2016, PostgreSQL Global Development Group
5+
* Copyright (c) 2010-2017, PostgreSQL Global Development Group
66
*
77
* IDENTIFICATION
88
* contrib/auth_delay/auth_delay.c

‎contrib/auto_explain/auto_explain.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* auto_explain.c
44
*
55
*
6-
* Copyright (c) 2008-2016, PostgreSQL Global Development Group
6+
* Copyright (c) 2008-2017, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
99
* contrib/auto_explain/auto_explain.c

‎contrib/bloom/blcost.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* blcost.c
44
* Cost estimate function for bloom indexes.
55
*
6-
* Copyright (c) 2016, PostgreSQL Global Development Group
6+
* Copyright (c) 2016-2017, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
99
* contrib/bloom/blcost.c

‎contrib/bloom/blinsert.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* blinsert.c
44
* Bloom index build and insert functions.
55
*
6-
* Copyright (c) 2016, PostgreSQL Global Development Group
6+
* Copyright (c) 2016-2017, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
99
* contrib/bloom/blinsert.c

‎contrib/bloom/bloom.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* bloom.h
44
* Header for bloom index.
55
*
6-
* Copyright (c) 2016, PostgreSQL Global Development Group
6+
* Copyright (c) 2016-2017, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
99
* contrib/bloom/bloom.h

‎contrib/bloom/blscan.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* blscan.c
44
* Bloom index scan functions.
55
*
6-
* Copyright (c) 2016, PostgreSQL Global Development Group
6+
* Copyright (c) 2016-2017, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
99
* contrib/bloom/blscan.c

‎contrib/bloom/blutils.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* blutils.c
44
* Bloom index utilities.
55
*
6-
* Portions Copyright (c) 2016, PostgreSQL Global Development Group
6+
* Portions Copyright (c) 2016-2017, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1990-1993, Regents of the University of California
88
*
99
* IDENTIFICATION

‎contrib/bloom/blvacuum.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* blvacuum.c
44
* Bloom VACUUM functions.
55
*
6-
* Copyright (c) 2016, PostgreSQL Global Development Group
6+
* Copyright (c) 2016-2017, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
99
* contrib/bloom/blvacuum.c

‎contrib/bloom/blvalidate.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* blvalidate.c
44
* Opclass validator for bloom.
55
*
6-
* Copyright (c) 2016, PostgreSQL Global Development Group
6+
* Copyright (c) 2016-2017, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
99
* contrib/bloom/blvalidate.c
@@ -21,6 +21,7 @@
2121
#include "catalog/pg_type.h"
2222
#include "utils/builtins.h"
2323
#include "utils/lsyscache.h"
24+
#include "utils/regproc.h"
2425
#include "utils/syscache.h"
2526

2627
#include "bloom.h"

‎contrib/btree_gist/btree_bit.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
#include "btree_gist.h"
77
#include "btree_utils_var.h"
8+
#include "utils/builtins.h"
89
#include "utils/bytea.h"
910
#include "utils/varbit.h"
1011

‎contrib/btree_gist/btree_bytea.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
#include "btree_gist.h"
77
#include "btree_utils_var.h"
8+
#include "utils/builtins.h"
89
#include "utils/bytea.h"
910

1011

‎contrib/btree_gist/btree_date.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
#include "btree_gist.h"
77
#include "btree_utils_num.h"
8+
#include "utils/builtins.h"
89
#include "utils/date.h"
910

1011
typedef struct

‎contrib/btree_gist/btree_interval.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
#include "btree_gist.h"
77
#include "btree_utils_num.h"
8+
#include "utils/builtins.h"
89
#include "utils/timestamp.h"
910

1011
typedef struct

‎contrib/btree_gist/btree_time.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
#include "btree_gist.h"
77
#include "btree_utils_num.h"
8+
#include "utils/builtins.h"
89
#include "utils/date.h"
910
#include "utils/timestamp.h"
1011

‎contrib/citext/citext.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include "catalog/pg_collation.h"
88
#include "utils/builtins.h"
99
#include "utils/formatting.h"
10+
#include "utils/varlena.h"
1011

1112
#ifdef PG_MODULE_MAGIC
1213
PG_MODULE_MAGIC;

‎contrib/dblink/dblink.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Shridhar Daithankar <shridhar_daithankar@persistent.co.in>
1010
*
1111
* contrib/dblink/dblink.c
12-
* Copyright (c) 2001-2016, PostgreSQL Global Development Group
12+
* Copyright (c) 2001-2017, PostgreSQL Global Development Group
1313
* ALL RIGHTS RESERVED;
1414
*
1515
* Permission to use, copy, modify, and distribute this software and its
@@ -59,6 +59,7 @@
5959
#include "utils/memutils.h"
6060
#include "utils/rel.h"
6161
#include "utils/tqual.h"
62+
#include "utils/varlena.h"
6263

6364
#include "dblink.h"
6465

‎contrib/dblink/dblink.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Shridhar Daithankar <shridhar_daithankar@persistent.co.in>
1010
*
1111
* contrib/dblink/dblink.h
12-
* Copyright (c) 2001-2016, PostgreSQL Global Development Group
12+
* Copyright (c) 2001-2017, PostgreSQL Global Development Group
1313
* ALL RIGHTS RESERVED;
1414
*
1515
* Permission to use, copy, modify, and distribute this software and its

‎contrib/dict_int/dict_int.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* dict_int.c
44
* Text search dictionary for integers
55
*
6-
* Copyright (c) 2007-2016, PostgreSQL Global Development Group
6+
* Copyright (c) 2007-2017, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
99
* contrib/dict_int/dict_int.c

‎contrib/dict_xsyn/dict_xsyn.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* dict_xsyn.c
44
* Extended synonym dictionary
55
*
6-
* Copyright (c) 2007-2016, PostgreSQL Global Development Group
6+
* Copyright (c) 2007-2017, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
99
* contrib/dict_xsyn/dict_xsyn.c

‎contrib/file_fdw/file_fdw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* file_fdw.c
44
* foreign-data wrapper for server-side flat files (or programs).
55
*
6-
* Copyright (c) 2010-2016, PostgreSQL Global Development Group
6+
* Copyright (c) 2010-2017, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
99
* contrib/file_fdw/file_fdw.c

‎contrib/fuzzystrmatch/fuzzystrmatch.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Joe Conway <mail@joeconway.com>
77
*
88
* contrib/fuzzystrmatch/fuzzystrmatch.c
9-
* Copyright (c) 2001-2016, PostgreSQL Global Development Group
9+
* Copyright (c) 2001-2017, PostgreSQL Global Development Group
1010
* ALL RIGHTS RESERVED;
1111
*
1212
* metaphone()
@@ -42,6 +42,7 @@
4242

4343
#include "mb/pg_wchar.h"
4444
#include "utils/builtins.h"
45+
#include "utils/varlena.h"
4546

4647
PG_MODULE_MAGIC;
4748

‎contrib/hstore_plperl/expected/create_transform.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ ERROR: type "foo" does not exist
1818
CREATE TRANSFORM FOR hstore LANGUAGE foo (FROM SQL WITH FUNCTION hstore_to_plperl(internal), TO SQL WITH FUNCTION plperl_to_hstore(internal)); -- fail
1919
ERROR: language "foo" does not exist
2020
CREATE TRANSFORM FOR hstore LANGUAGE plperl (FROM SQL WITH FUNCTION hstore_out(hstore), TO SQL WITH FUNCTION plperl_to_hstore(internal)); -- fail
21-
ERROR: return data type of FROM SQL function must be "internal"
21+
ERROR: return data type of FROM SQL function must be internal
2222
CREATE TRANSFORM FOR hstore LANGUAGE plperl (FROM SQL WITH FUNCTION internal_in(cstring), TO SQL WITH FUNCTION plperl_to_hstore(internal)); -- fail
23-
ERROR: first argument of transform function must be type "internal"
23+
ERROR: first argument of transform function must be type internal
2424
CREATE TRANSFORM FOR hstore LANGUAGE plperl (FROM SQL WITH FUNCTION hstore_to_plperl(internal), TO SQL WITH FUNCTION plperl_to_hstore(internal)); -- ok
2525
CREATE TRANSFORM FOR hstore LANGUAGE plperl (FROM SQL WITH FUNCTION hstore_to_plperl(internal), TO SQL WITH FUNCTION plperl_to_hstore(internal)); -- fail
2626
ERROR: transform for type hstore language "plperl" already exists

‎contrib/intarray/_int_selfuncs.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* _int_selfuncs.c
44
* Functions for selectivity estimation of intarray operators
55
*
6-
* Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
6+
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
99
*
@@ -19,6 +19,7 @@
1919
#include "catalog/pg_operator.h"
2020
#include "catalog/pg_statistic.h"
2121
#include "catalog/pg_type.h"
22+
#include "utils/builtins.h"
2223
#include "utils/selfuncs.h"
2324
#include "utils/syscache.h"
2425
#include "utils/lsyscache.h"
@@ -32,14 +33,6 @@ PG_FUNCTION_INFO_V1(_int_contains_joinsel);
3233
PG_FUNCTION_INFO_V1(_int_contained_joinsel);
3334
PG_FUNCTION_INFO_V1(_int_matchsel);
3435

35-
Datum _int_overlap_sel(PG_FUNCTION_ARGS);
36-
Datum _int_contains_sel(PG_FUNCTION_ARGS);
37-
Datum _int_contained_sel(PG_FUNCTION_ARGS);
38-
Datum _int_overlap_joinsel(PG_FUNCTION_ARGS);
39-
Datum _int_contains_joinsel(PG_FUNCTION_ARGS);
40-
Datum _int_contained_joinsel(PG_FUNCTION_ARGS);
41-
Datum _int_matchsel(PG_FUNCTION_ARGS);
42-
4336

4437
static Selectivity int_query_opr_selec(ITEM *item, Datum *values, float4 *freqs,
4538
int nmncelems, float4 minfreq);

‎contrib/isn/isn.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* PostgreSQL type definitions for ISNs (ISBN, ISMN, ISSN, EAN13, UPC)
55
*
66
* Author: German Mendez Bravo (Kronuz)
7-
* Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
7+
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
88
*
99
* IDENTIFICATION
1010
* contrib/isn/isn.c

0 commit comments

Comments
 (0)