Skip to content

Commit e3aa8d0

Browse files
kelvichkelvich
committed
Merge branch 'pgmaster' into replica_twophase_II
2 parents 053d560 + 90992e0 commit e3aa8d0

File tree

502 files changed

+20061
-7822
lines changed

Some content is hidden

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

502 files changed

+20061
-7822
lines changed

‎contrib/bloom/blvalidate.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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/fuzzystrmatch/fuzzystrmatch.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -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/lo/lo.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include "commands/trigger.h"
1111
#include "executor/spi.h"
12-
#include "libpq/be-fsstubs.h"
12+
#include "utils/builtins.h"
1313
#include "utils/rel.h"
1414

1515
PG_MODULE_MAGIC;
@@ -82,7 +82,7 @@ lo_manage(PG_FUNCTION_ARGS)
8282
char *newv = SPI_getvalue(newtuple, tupdesc, attnum);
8383

8484
if (orig != NULL && (newv == NULL || strcmp(orig, newv) != 0))
85-
DirectFunctionCall1(lo_unlink,
85+
DirectFunctionCall1(be_lo_unlink,
8686
ObjectIdGetDatum(atooid(orig)));
8787

8888
if (newv)
@@ -102,7 +102,7 @@ lo_manage(PG_FUNCTION_ARGS)
102102

103103
if (orig != NULL)
104104
{
105-
DirectFunctionCall1(lo_unlink,
105+
DirectFunctionCall1(be_lo_unlink,
106106
ObjectIdGetDatum(atooid(orig)));
107107

108108
pfree(orig);

‎contrib/pageinspect/btreefuncs.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include "miscadmin.h"
3535
#include "utils/builtins.h"
3636
#include "utils/rel.h"
37+
#include "utils/varlena.h"
3738

3839

3940
PG_FUNCTION_INFO_V1(bt_metap);

‎contrib/pageinspect/rawpage.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "utils/builtins.h"
2626
#include "utils/pg_lsn.h"
2727
#include "utils/rel.h"
28+
#include "utils/varlena.h"
2829

2930
PG_MODULE_MAGIC;
3031

0 commit comments

Comments
 (0)