Skip to content

Commit 2972a66

Browse files
kelvichkelvich
committed
Merge branch 'pgmaster' into logical_twophase
2 parents 2f82e00 + 64ee636 commit 2972a66

File tree

440 files changed

+12357
-4120
lines changed

Some content is hidden

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

440 files changed

+12357
-4120
lines changed

‎configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7088,7 +7088,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
70887088
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
70897089

70907090
# When Autoconf chooses install-sh as install program it tries to generate
7091-
# a relative path to it in each makefile where it subsitutes it. This clashes
7091+
# a relative path to it in each makefile where it substitutes it. This clashes
70927092
# with our Makefile.global concept. This workaround helps.
70937093
case $INSTALL in
70947094
*install-sh*) install_bin='';;
@@ -7232,7 +7232,7 @@ fi
72327232
$as_echo "$MKDIR_P" >&6; }
72337233

72347234
# When Autoconf chooses install-sh as mkdir -p program it tries to generate
7235-
# a relative path to it in each makefile where it subsitutes it. This clashes
7235+
# a relative path to it in each makefile where it substitutes it. This clashes
72367236
# with our Makefile.global concept. This workaround helps.
72377237
case $MKDIR_P in
72387238
*install-sh*) MKDIR_P='\${SHELL} \${top_srcdir}/config/install-sh -c -d';;

‎configure.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,7 @@ fi
887887

888888
AC_PROG_INSTALL
889889
# When Autoconf chooses install-sh as install program it tries to generate
890-
# a relative path to it in each makefile where it subsitutes it. This clashes
890+
# a relative path to it in each makefile where it substitutes it. This clashes
891891
# with our Makefile.global concept. This workaround helps.
892892
case $INSTALL in
893893
*install-sh*) install_bin='';;
@@ -900,7 +900,7 @@ AC_PROG_LN_S
900900
AC_PROG_AWK
901901
AC_PROG_MKDIR_P
902902
# When Autoconf chooses install-sh as mkdir -p program it tries to generate
903-
# a relative path to it in each makefile where it subsitutes it. This clashes
903+
# a relative path to it in each makefile where it substitutes it. This clashes
904904
# with our Makefile.global concept. This workaround helps.
905905
case $MKDIR_P in
906906
*install-sh*) MKDIR_P='\${SHELL} \${top_srcdir}/config/install-sh -c -d';;

‎contrib/bloom/blutils.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,9 @@ blhandler(PG_FUNCTION_ARGS)
138138
amroutine->amendscan = blendscan;
139139
amroutine->ammarkpos = NULL;
140140
amroutine->amrestrpos = NULL;
141+
amroutine->amestimateparallelscan = NULL;
142+
amroutine->aminitparallelscan = NULL;
143+
amroutine->amparallelrescan = NULL;
141144

142145
PG_RETURN_POINTER(amroutine);
143146
}

‎contrib/bloom/blvacuum.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ blbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats,
5151
initBloomState(&state, index);
5252

5353
/*
54-
* Interate over the pages. We don't care about concurrently added pages,
54+
* Iterate over the pages. We don't care about concurrently added pages,
5555
* they can't contain tuples to delete.
5656
*/
5757
npages = RelationGetNumberOfBlocks(index);

‎contrib/cube/expected/cube.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1056,7 +1056,7 @@ SELECT cube_dim('(4,8,15,16,23),(4,8,15,16,23)'::cube);
10561056
5
10571057
(1 row)
10581058

1059-
-- Test of cube_ll_coord function (retrieves LL coodinate values)
1059+
-- Test of cube_ll_coord function (retrieves LL coordinate values)
10601060
--
10611061
SELECT cube_ll_coord('(-1,1),(2,-2)'::cube, 1);
10621062
cube_ll_coord
@@ -1112,7 +1112,7 @@ SELECT cube_ll_coord('(42,137)'::cube, 3);
11121112
0
11131113
(1 row)
11141114

1115-
-- Test of cube_ur_coord function (retrieves UR coodinate values)
1115+
-- Test of cube_ur_coord function (retrieves UR coordinate values)
11161116
--
11171117
SELECT cube_ur_coord('(-1,1),(2,-2)'::cube, 1);
11181118
cube_ur_coord

‎contrib/cube/expected/cube_2.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1056,7 +1056,7 @@ SELECT cube_dim('(4,8,15,16,23),(4,8,15,16,23)'::cube);
10561056
5
10571057
(1 row)
10581058

1059-
-- Test of cube_ll_coord function (retrieves LL coodinate values)
1059+
-- Test of cube_ll_coord function (retrieves LL coordinate values)
10601060
--
10611061
SELECT cube_ll_coord('(-1,1),(2,-2)'::cube, 1);
10621062
cube_ll_coord
@@ -1112,7 +1112,7 @@ SELECT cube_ll_coord('(42,137)'::cube, 3);
11121112
0
11131113
(1 row)
11141114

1115-
-- Test of cube_ur_coord function (retrieves UR coodinate values)
1115+
-- Test of cube_ur_coord function (retrieves UR coordinate values)
11161116
--
11171117
SELECT cube_ur_coord('(-1,1),(2,-2)'::cube, 1);
11181118
cube_ur_coord

‎contrib/cube/sql/cube.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ SELECT cube_dim('(0,0,0)'::cube);
256256
SELECT cube_dim('(42,42,42),(42,42,42)'::cube);
257257
SELECT cube_dim('(4,8,15,16,23),(4,8,15,16,23)'::cube);
258258

259-
-- Test of cube_ll_coord function (retrieves LL coodinate values)
259+
-- Test of cube_ll_coord function (retrieves LL coordinate values)
260260
--
261261
SELECT cube_ll_coord('(-1,1),(2,-2)'::cube, 1);
262262
SELECT cube_ll_coord('(-1,1),(2,-2)'::cube, 2);
@@ -268,7 +268,7 @@ SELECT cube_ll_coord('(42,137)'::cube, 1);
268268
SELECT cube_ll_coord('(42,137)'::cube, 2);
269269
SELECT cube_ll_coord('(42,137)'::cube, 3);
270270

271-
-- Test of cube_ur_coord function (retrieves UR coodinate values)
271+
-- Test of cube_ur_coord function (retrieves UR coordinate values)
272272
--
273273
SELECT cube_ur_coord('(-1,1),(2,-2)'::cube, 1);
274274
SELECT cube_ur_coord('(-1,1),(2,-2)'::cube, 2);

‎contrib/earthdistance/earthdistance--1.1.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ CREATE FUNCTION earth() RETURNS float8
1111
LANGUAGE SQL IMMUTABLE PARALLEL SAFE
1212
AS 'SELECT ''6378168''::float8';
1313

14-
-- Astromers may want to change the earth function so that distances will be
14+
-- Astronomers may want to change the earth function so that distances will be
1515
-- returned in degrees. To do this comment out the above definition and
1616
-- uncomment the one below. Note that doing this will break the regression
1717
-- tests.

‎contrib/hstore_plperl/Makefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ include $(top_srcdir)/contrib/contrib-global.mk
2424
endif
2525

2626
# We must link libperl explicitly
27-
ifeq ($(PORTNAME), aix)
28-
rpathdir = $(pkglibdir):$(perl_archlibexp)/CORE
29-
SHLIB_LINK += $(perl_embed_ldflags)
30-
else
3127
ifeq ($(PORTNAME), win32)
3228
# these settings are the same as for plperl
3329
override CPPFLAGS += -DPLPERL_HAVE_UID_GID -Wno-comment
@@ -37,7 +33,6 @@ else
3733
rpathdir = $(perl_archlibexp)/CORE
3834
SHLIB_LINK += $(perl_embed_ldflags)
3935
endif
40-
endif
4136

4237
# As with plperl we need to make sure that the CORE directory is included
4338
# last, probably because it sometimes contains some header files with names

‎contrib/hstore_plpython/Makefile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,12 @@ include $(top_srcdir)/contrib/contrib-global.mk
2424
endif
2525

2626
# We must link libpython explicitly
27-
ifeq ($(PORTNAME), aix)
28-
rpathdir = $(pkglibdir):$(python_libdir)
29-
SHLIB_LINK += $(python_libspec) $(python_additional_libs)
30-
else
3127
ifeq ($(PORTNAME), win32)
3228
# ... see silliness in plpython Makefile ...
3329
SHLIB_LINK += $(sort $(wildcard ../../src/pl/plpython/libpython*.a))
3430
else
3531
rpathdir = $(python_libdir)
36-
SHLIB_LINK += $(python_libspec)
37-
endif
32+
SHLIB_LINK += $(python_libspec) $(python_additional_libs)
3833
endif
3934

4035
REGRESS_OPTS += --load-extension=hstore

‎contrib/isn/ISSN.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* Product 9 + 21 + 7 + 3 + 1 + 12 + 4 + 24 + 7 + 15 + 0 + 0 = 103
2424
* 103 / 10 = 10 remainder 3
2525
* Check digit 10 - 3 = 7
26-
* => 977-1144875-00-7 ?? <- suplemental number (number of the week, month, etc.)
26+
* => 977-1144875-00-7 ?? <- supplemental number (number of the week, month, etc.)
2727
* ^^ 00 for non-daily publications (01=Monday, 02=Tuesday, ...)
2828
*
2929
* The hyphenation is always in after the four digits of the ISSN code.

‎contrib/isn/isn.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ dehyphenate(char *bufO, char *bufI)
160160
* into bufO using the given hyphenation range TABLE.
161161
* Assumes the input string to be used is of only digits.
162162
*
163-
* Returns the number of characters acctually hyphenated.
163+
* Returns the number of characters actually hyphenated.
164164
*/
165165
static unsigned
166166
hyphenate(char *bufO, char *bufI, const char *(*TABLE)[2], const unsigned TABLE_index[10][2])
@@ -748,7 +748,7 @@ string2ean(const char *str, bool errorOK, ean13 *result,
748748
}
749749
else if (*aux2 == '!' && *(aux2 + 1) == '\0')
750750
{
751-
/* the invalid check digit sufix was found, set it */
751+
/* the invalid check digit suffix was found, set it */
752752
if (!magic)
753753
valid = false;
754754
magic = true;

‎contrib/ltree/expected/ltree.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1113,7 +1113,7 @@ SELECT '{a.b.c.d.e,B.df}'::ltree[] ? '{A.b.c.d.e,*.df}';
11131113
t
11141114
(1 row)
11151115

1116-
--exractors
1116+
--extractors
11171117
SELECT ('{3456,1.2.3.34}'::ltree[] ?@> '1.2.3.4') is null;
11181118
?column?
11191119
----------

‎contrib/ltree/ltxtquery_io.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ pushval_asis(QPRS_STATE *state, int type, char *strval, int lenval, uint16 flag)
197197

198198
#define STACKDEPTH 32
199199
/*
200-
* make polish notaion of query
200+
* make polish notation of query
201201
*/
202202
static int32
203203
makepol(QPRS_STATE *state)

‎contrib/ltree/sql/ltree.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ SELECT 'a.b.c.d.e'::ltree ? '{A.b.c.d.e, a.*}';
209209
SELECT '{a.b.c.d.e,B.df}'::ltree[] ? '{A.b.c.d.e}';
210210
SELECT '{a.b.c.d.e,B.df}'::ltree[] ? '{A.b.c.d.e,*.df}';
211211

212-
--exractors
212+
--extractors
213213
SELECT ('{3456,1.2.3.34}'::ltree[] ?@> '1.2.3.4') is null;
214214
SELECT '{3456,1.2.3}'::ltree[] ?@> '1.2.3.4';
215215
SELECT '{3456,1.2.3.4}'::ltree[] ?<@ '1.2.3';

‎contrib/ltree_plpython/Makefile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,12 @@ include $(top_srcdir)/contrib/contrib-global.mk
2424
endif
2525

2626
# We must link libpython explicitly
27-
ifeq ($(PORTNAME), aix)
28-
rpathdir = $(pkglibdir):$(python_libdir)
29-
SHLIB_LINK += $(python_libspec) $(python_additional_libs)
30-
else
3127
ifeq ($(PORTNAME), win32)
3228
# ... see silliness in plpython Makefile ...
3329
SHLIB_LINK += $(sort $(wildcard ../../src/pl/plpython/libpython*.a))
3430
else
3531
rpathdir = $(python_libdir)
36-
SHLIB_LINK += $(python_libspec)
37-
endif
32+
SHLIB_LINK += $(python_libspec) $(python_additional_libs)
3833
endif
3934

4035
REGRESS_OPTS += --load-extension=ltree

‎contrib/pageinspect/Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
MODULE_big = pageinspect
44
OBJS = rawpage.o heapfuncs.o btreefuncs.o fsmfuncs.o \
5-
brinfuncs.o ginfuncs.o $(WIN32RES)
5+
brinfuncs.o ginfuncs.o hashfuncs.o $(WIN32RES)
66

77
EXTENSION = pageinspect
8-
DATA = pageinspect--1.5.sql pageinspect--1.4--1.5.sql \
9-
pageinspect--1.3--1.4.sql pageinspect--1.2--1.3.sql \
10-
pageinspect--1.1--1.2.sql pageinspect--1.0--1.1.sql \
11-
pageinspect--unpackaged--1.0.sql
8+
DATA = pageinspect--1.5.sql pageinspect--1.5--1.6.sql \
9+
pageinspect--1.4--1.5.sql pageinspect--1.3--1.4.sql \
10+
pageinspect--1.2--1.3.sql pageinspect--1.1--1.2.sql \
11+
pageinspect--1.0--1.1.sql pageinspect--unpackaged--1.0.sql
1212
PGFILEDESC = "pageinspect - functions to inspect contents of database pages"
1313

14-
REGRESS = page btree brin gin
14+
REGRESS = page btree brin gin hash
1515

1616
ifdef USE_PGXS
1717
PG_CONFIG = pg_config

‎contrib/pageinspect/brinfuncs.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
*/
1010
#include "postgres.h"
1111

12+
#include "pageinspect.h"
13+
1214
#include "access/htup_details.h"
1315
#include "access/brin.h"
1416
#include "access/brin_internal.h"

‎contrib/pageinspect/btreefuncs.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727

2828
#include "postgres.h"
2929

30+
#include "pageinspect.h"
31+
3032
#include "access/nbtree.h"
3133
#include "catalog/namespace.h"
3234
#include "catalog/pg_am.h"

0 commit comments

Comments
 (0)