Skip to content

Commit 61d0022

Browse files
Jim NasbyJim Nasby
Jim Nasby
authored and
Jim Nasby
committed
Merge branch 'master' into format_errors
2 parents ba51e6c + 7157fe8 commit 61d0022

File tree

1,538 files changed

+9793
-5836
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,538 files changed

+9793
-5836
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-2015, PostgreSQL Global Development Group
4+
Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
55

66
Portions Copyright (c) 1994, The Regents of the University of California
77

‎config/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ include $(top_builddir)/src/Makefile.global
77

88
install: all installdirs
99
$(INSTALL_SCRIPT) $(srcdir)/install-sh '$(DESTDIR)$(pgxsdir)/config/install-sh'
10+
$(INSTALL_SCRIPT) $(srcdir)/missing '$(DESTDIR)$(pgxsdir)/config/missing'
1011

1112
installdirs:
1213
$(MKDIR_P) '$(DESTDIR)$(pgxsdir)/config'
1314

1415
uninstall:
1516
rm -f '$(DESTDIR)$(pgxsdir)/config/install-sh'
17+
rm -f '$(DESTDIR)$(pgxsdir)/config/missing'

‎configure

Lines changed: 3 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-2015, PostgreSQL Global Development Group
14+
# Copyright (c) 1996-2016, PostgreSQL Global Development Group
1515
## -------------------- ##
1616
## M4sh Initialization. ##
1717
## -------------------- ##
@@ -1617,7 +1617,7 @@ Copyright (C) 2012 Free Software Foundation, Inc.
16171617
This configure script is free software; the Free Software Foundation
16181618
gives unlimited permission to copy, distribute and modify it.
16191619
1620-
Copyright (c) 1996-2015, PostgreSQL Global Development Group
1620+
Copyright (c) 1996-2016, PostgreSQL Global Development Group
16211621
_ACEOF
16221622
exit
16231623
fi
@@ -13232,7 +13232,7 @@ if test x"$pgac_cv_var_rl_completion_append_character" = x"yes"; then
1323213232
$as_echo "#define HAVE_RL_COMPLETION_APPEND_CHARACTER 1" >>confdefs.h
1323313233

1323413234
fi
13235-
for ac_func in rl_completion_matches rl_filename_completion_function
13235+
for ac_func in rl_completion_matches rl_filename_completion_function rl_reset_screen_size
1323613236
do :
1323713237
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
1323813238
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"

‎configure.in

Lines changed: 2 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-2015, PostgreSQL Global Development Group])
26+
AC_COPYRIGHT([Copyright (c) 1996-2016, 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)
@@ -1635,7 +1635,7 @@ LIBS="$LIBS_including_readline"
16351635

16361636
if test "$with_readline" = yes; then
16371637
PGAC_VAR_RL_COMPLETION_APPEND_CHARACTER
1638-
AC_CHECK_FUNCS([rl_completion_matches rl_filename_completion_function])
1638+
AC_CHECK_FUNCS([rl_completion_matches rl_filename_completion_function rl_reset_screen_size])
16391639
AC_CHECK_FUNCS([append_history history_truncate_file])
16401640
fi
16411641

‎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-2015, PostgreSQL Global Development Group
6+
* Copyright (c) 2002-2016, 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-2011, PostgreSQL Global Development Group
5+
* Copyright (c) 2010-2016, 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-2015, PostgreSQL Global Development Group
6+
* Copyright (c) 2008-2016, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
99
* contrib/auto_explain/auto_explain.c

‎contrib/cube/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ MODULE_big = cube
44
OBJS= cube.o cubeparse.o $(WIN32RES)
55

66
EXTENSION = cube
7-
DATA = cube--1.0.sql cube--unpackaged--1.0.sql
7+
DATA = cube--1.1.sql cube--1.0--1.1.sql cube--unpackaged--1.0.sql
88
PGFILEDESC = "cube - multidimensional cube data type"
99

1010
REGRESS = cube

‎contrib/cube/cube--1.0--1.1.sql

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/* contrib/cube/cube--1.0--1.1.sql */
2+
3+
-- complain if script is sourced in psql, rather than via ALTER EXTENSION
4+
\echo Use "ALTER EXTENSION cube UPDATE TO '1.1'" to load this file. \quit
5+
6+
CREATE FUNCTION distance_chebyshev(cube, cube)
7+
RETURNS float8
8+
AS 'MODULE_PATHNAME'
9+
LANGUAGE C IMMUTABLE STRICT;
10+
11+
CREATE FUNCTION distance_taxicab(cube, cube)
12+
RETURNS float8
13+
AS 'MODULE_PATHNAME'
14+
LANGUAGE C IMMUTABLE STRICT;
15+
16+
CREATE FUNCTION cube_coord(cube, int4)
17+
RETURNS float8
18+
AS 'MODULE_PATHNAME'
19+
LANGUAGE C IMMUTABLE STRICT;
20+
21+
CREATE FUNCTION cube_coord_llur(cube, int4)
22+
RETURNS float8
23+
AS 'MODULE_PATHNAME'
24+
LANGUAGE C IMMUTABLE STRICT;
25+
26+
CREATE OPERATOR -> (
27+
LEFTARG = cube, RIGHTARG = int, PROCEDURE = cube_coord
28+
);
29+
30+
CREATE OPERATOR ~> (
31+
LEFTARG = cube, RIGHTARG = int, PROCEDURE = cube_coord_llur
32+
);
33+
34+
CREATE OPERATOR <#> (
35+
LEFTARG = cube, RIGHTARG = cube, PROCEDURE = distance_taxicab,
36+
COMMUTATOR = '<#>'
37+
);
38+
39+
CREATE OPERATOR <-> (
40+
LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_distance,
41+
COMMUTATOR = '<->'
42+
);
43+
44+
CREATE OPERATOR <=> (
45+
LEFTARG = cube, RIGHTARG = cube, PROCEDURE = distance_chebyshev,
46+
COMMUTATOR = '<=>'
47+
);
48+
49+
CREATE FUNCTION g_cube_distance (internal, cube, smallint, oid)
50+
RETURNS internal
51+
AS 'MODULE_PATHNAME'
52+
LANGUAGE C IMMUTABLE STRICT;
53+
54+
ALTER OPERATOR FAMILY gist_cube_ops USING gist ADD
55+
OPERATOR 15 ~> (cube, int) FOR ORDER BY float_ops,
56+
OPERATOR 16 <#> (cube, cube) FOR ORDER BY float_ops,
57+
OPERATOR 17 <-> (cube, cube) FOR ORDER BY float_ops,
58+
OPERATOR 18 <=> (cube, cube) FOR ORDER BY float_ops,
59+
FUNCTION 8 (cube, cube) g_cube_distance (internal, cube, smallint, oid);

‎contrib/cube/cube--1.0.sql renamed to ‎contrib/cube/cube--1.1.sql

Lines changed: 55 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* contrib/cube/cube--1.0.sql */
1+
/* contrib/cube/cube--1.1.sql */
22

33
-- complain if script is sourced in psql, rather than via CREATE EXTENSION
44
\echo Use "CREATE EXTENSION cube" to load this file. \quit
@@ -140,6 +140,16 @@ RETURNS float8
140140
AS 'MODULE_PATHNAME'
141141
LANGUAGE C IMMUTABLE STRICT;
142142

143+
CREATE FUNCTION distance_chebyshev(cube, cube)
144+
RETURNS float8
145+
AS 'MODULE_PATHNAME'
146+
LANGUAGE C IMMUTABLE STRICT;
147+
148+
CREATE FUNCTION distance_taxicab(cube, cube)
149+
RETURNS float8
150+
AS 'MODULE_PATHNAME'
151+
LANGUAGE C IMMUTABLE STRICT;
152+
143153
-- Extracting elements functions
144154

145155
CREATE FUNCTION cube_dim(cube)
@@ -157,6 +167,16 @@ RETURNS float8
157167
AS 'MODULE_PATHNAME'
158168
LANGUAGE C IMMUTABLE STRICT;
159169

170+
CREATE FUNCTION cube_coord(cube, int4)
171+
RETURNS float8
172+
AS 'MODULE_PATHNAME'
173+
LANGUAGE C IMMUTABLE STRICT;
174+
175+
CREATE FUNCTION cube_coord_llur(cube, int4)
176+
RETURNS float8
177+
AS 'MODULE_PATHNAME'
178+
LANGUAGE C IMMUTABLE STRICT;
179+
160180
CREATE FUNCTION cube(float8) RETURNS cube
161181
AS 'MODULE_PATHNAME', 'cube_f8'
162182
LANGUAGE C IMMUTABLE STRICT;
@@ -246,6 +266,29 @@ CREATE OPERATOR <@ (
246266
RESTRICT = contsel, JOIN = contjoinsel
247267
);
248268

269+
CREATE OPERATOR -> (
270+
LEFTARG = cube, RIGHTARG = int, PROCEDURE = cube_coord
271+
);
272+
273+
CREATE OPERATOR ~> (
274+
LEFTARG = cube, RIGHTARG = int, PROCEDURE = cube_coord_llur
275+
);
276+
277+
CREATE OPERATOR <#> (
278+
LEFTARG = cube, RIGHTARG = cube, PROCEDURE = distance_taxicab,
279+
COMMUTATOR = '<#>'
280+
);
281+
282+
CREATE OPERATOR <-> (
283+
LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_distance,
284+
COMMUTATOR = '<->'
285+
);
286+
287+
CREATE OPERATOR <=> (
288+
LEFTARG = cube, RIGHTARG = cube, PROCEDURE = distance_chebyshev,
289+
COMMUTATOR = '<=>'
290+
);
291+
249292
-- these are obsolete/deprecated:
250293
CREATE OPERATOR @ (
251294
LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_contains,
@@ -296,6 +339,10 @@ RETURNS internal
296339
AS 'MODULE_PATHNAME'
297340
LANGUAGE C IMMUTABLE STRICT;
298341

342+
CREATE FUNCTION g_cube_distance (internal, cube, smallint, oid)
343+
RETURNS internal
344+
AS 'MODULE_PATHNAME'
345+
LANGUAGE C IMMUTABLE STRICT;
299346

300347
-- Create the operator classes for indexing
301348

@@ -316,10 +363,16 @@ CREATE OPERATOR CLASS gist_cube_ops
316363
OPERATOR 8 <@ ,
317364
OPERATOR 13 @ ,
318365
OPERATOR 14 ~ ,
366+
OPERATOR 15 ~> (cube, int) FOR ORDER BY float_ops,
367+
OPERATOR 16 <#> (cube, cube) FOR ORDER BY float_ops,
368+
OPERATOR 17 <-> (cube, cube) FOR ORDER BY float_ops,
369+
OPERATOR 18 <=> (cube, cube) FOR ORDER BY float_ops,
370+
319371
FUNCTION 1 g_cube_consistent (internal, cube, int, oid, internal),
320372
FUNCTION 2 g_cube_union (internal, internal),
321373
FUNCTION 3 g_cube_compress (internal),
322374
FUNCTION 4 g_cube_decompress (internal),
323375
FUNCTION 5 g_cube_penalty (internal, internal, internal),
324376
FUNCTION 6 g_cube_picksplit (internal, internal),
325-
FUNCTION 7 g_cube_same (cube, cube, internal);
377+
FUNCTION 7 g_cube_same (cube, cube, internal),
378+
FUNCTION 8 g_cube_distance (internal, cube, smallint, oid);

0 commit comments

Comments
 (0)