Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 884a5d3

Browse files
dmpgprodmpgpro
committed
Merge branch 'PGPROEE9_6_ALPHA' into PGPROEE9_6_CFS
Conflicts: src/include/catalog/pg_proc.h
2 parents 879707f + 10b23c1 commit 884a5d3

File tree

607 files changed

+78876
-20307
lines changed

Some content is hidden

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

607 files changed

+78876
-20307
lines changed

‎GNUmakefile.in

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,11 @@ GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
7676

7777
##########################################################################
7878

79-
distdir = postgrespro-ee-$(VERSION)
79+
ifeq ($PGPRO_VERSION,)
80+
distdir = postgrespro-enterprise-$(VERSION)
81+
else
82+
distdir = postgrespro-enterprise-$(PGPRO_VERSION)
83+
endif
8084
dummy = =install=
8185
garbage = =* "#"* ."#"* *~* *.orig *.rej core postgrespro-ee-*
8286

‎configure

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.69 for PostgreSQL 9.6rc1.
3+
# Generated by GNU Autoconf 2.69 for PostgreSQL 9.6.0.
44
#
55
# Report bugs to <bugs@postgrespro.ru>.
66
#
@@ -583,8 +583,8 @@ MAKEFLAGS=
583583
# Identity of this package.
584584
PACKAGE_NAME='PostgreSQL'
585585
PACKAGE_TARNAME='postgrespro'
586-
PACKAGE_VERSION='9.6rc1'
587-
PACKAGE_STRING='PostgreSQL 9.6rc1'
586+
PACKAGE_VERSION='9.6.0'
587+
PACKAGE_STRING='PostgreSQL 9.6.0'
588588
PACKAGE_BUGREPORT='bugs@postgrespro.ru'
589589
PACKAGE_URL=''
590590

@@ -1403,7 +1403,7 @@ if test "$ac_init_help" = "long"; then
14031403
# Omit some internal or obsolete options to make the list less imposing.
14041404
# This message is too long to be a string in the A/UX 3.1 sh.
14051405
cat <<_ACEOF
1406-
\`configure' configures PostgreSQL 9.6rc1 to adapt to many kinds of systems.
1406+
\`configure' configures PostgreSQL 9.6.0 to adapt to many kinds of systems.
14071407

14081408
Usage: $0 [OPTION]... [VAR=VALUE]...
14091409

@@ -1468,7 +1468,7 @@ fi
14681468

14691469
if test -n "$ac_init_help"; then
14701470
case $ac_init_help in
1471-
short | recursive ) echo "Configuration of PostgreSQL 9.6rc1:";;
1471+
short | recursive ) echo "Configuration of PostgreSQL 9.6.0:";;
14721472
esac
14731473
cat <<\_ACEOF
14741474

@@ -1621,7 +1621,7 @@ fi
16211621
test -n "$ac_init_help" && exit $ac_status
16221622
if $ac_init_version; then
16231623
cat <<\_ACEOF
1624-
PostgreSQL configure 9.6rc1
1624+
PostgreSQL configure 9.6.0
16251625
generated by GNU Autoconf 2.69
16261626

16271627
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2333,7 +2333,7 @@ cat >config.log <<_ACEOF
23332333
This file contains any messages produced by compilers while
23342334
running configure, to aid debugging if configure makes a mistake.
23352335

2336-
It was created by PostgreSQL $as_me 9.6rc1, which was
2336+
It was created by PostgreSQL $as_me 9.6.0, which was
23372337
generated by GNU Autoconf 2.69. Invocation command line was
23382338

23392339
$ $0 $@
@@ -18358,7 +18358,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1835818358
# report actual input values of CONFIG_FILES etc. instead of their
1835918359
# values after options handling.
1836018360
ac_log="
18361-
This file was extended by PostgreSQL $as_me 9.6rc1, which was
18361+
This file was extended by PostgreSQL $as_me 9.6.0, which was
1836218362
generated by GNU Autoconf 2.69. Invocation command line was
1836318363

1836418364
CONFIG_FILES = $CONFIG_FILES
@@ -18428,7 +18428,7 @@ _ACEOF
1842818428
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1842918429
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1843018430
ac_cs_version="\\
18431-
PostgreSQL config.status 9.6rc1
18431+
PostgreSQL config.status 9.6.0
1843218432
configured by $0, generated by GNU Autoconf 2.69,
1843318433
with options \\"\$ac_cs_config\\"
1843418434

‎configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dnl Read the Autoconf manual for details.
1717
dnl
1818
m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
1919

20-
AC_INIT([PostgreSQL], [9.6rc1], [bugs@postgrespro.ru],[postgrespro])
20+
AC_INIT([PostgreSQL], [9.6.0], [bugs@postgrespro.ru],[postgrespro])
2121
PACKAGE_TARNAME=postgrespro
2222

2323
m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.

‎contrib/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ SUBDIRS = \
3232
pg_buffercache \
3333
pg_freespacemap \
3434
pg_prewarm \
35+
pg_query_state \
3536
pg_standby \
3637
pg_stat_statements \
3738
pg_trgm \
@@ -40,6 +41,7 @@ SUBDIRS = \
4041
pgstattuple \
4142
pg_visibility \
4243
postgres_fdw \
44+
rum \
4345
seg \
4446
spi \
4547
tablefunc \
@@ -58,6 +60,8 @@ SUBDIRS = \
5860
pg_variables \
5961
jsquery \
6062
sr_plan \
63+
pg_arman \
64+
pg_pathman \
6165
shared_ispell
6266

6367
ifeq ($(with_openssl),yes)

‎contrib/btree_gist/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ OBJS = btree_gist.o btree_utils_num.o btree_utils_var.o btree_int2.o \
99
btree_numeric.o $(WIN32RES)
1010

1111
EXTENSION = btree_gist
12-
DATA = btree_gist--1.2.sql btree_gist--1.1--1.2.sql btree_gist--1.0--1.1.sql \
12+
DATA = btree_gist--1.3.sql btree_gist--1.2--1.3.sql \
13+
btree_gist--1.1--1.2.sql btree_gist--1.0--1.1.sql \
1314
btree_gist--unpackaged--1.0.sql
1415
PGFILEDESC = "btree_gist - B-tree equivalent GiST operator classes"
1516

‎contrib/btree_gist/btree_cash.c

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -90,27 +90,6 @@ static const gbtree_ninfo tinfo =
9090
};
9191

9292

93-
PG_FUNCTION_INFO_V1(cash_dist);
94-
Datum
95-
cash_dist(PG_FUNCTION_ARGS)
96-
{
97-
Cash a = PG_GETARG_CASH(0);
98-
Cash b = PG_GETARG_CASH(1);
99-
Cash r;
100-
Cash ra;
101-
102-
r = a - b;
103-
ra = Abs(r);
104-
105-
/* Overflow check. */
106-
if (ra < 0 || (!SAMESIGN(a, b) && !SAMESIGN(r, a)))
107-
ereport(ERROR,
108-
(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
109-
errmsg("money out of range")));
110-
111-
PG_RETURN_CASH(ra);
112-
}
113-
11493
/**************************************************
11594
* Cash ops
11695
**************************************************/

‎contrib/btree_gist/btree_date.c

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -108,19 +108,6 @@ static const gbtree_ninfo tinfo =
108108
};
109109

110110

111-
PG_FUNCTION_INFO_V1(date_dist);
112-
Datum
113-
date_dist(PG_FUNCTION_ARGS)
114-
{
115-
/* we assume the difference can't overflow */
116-
Datum diff = DirectFunctionCall2(date_mi,
117-
PG_GETARG_DATUM(0),
118-
PG_GETARG_DATUM(1));
119-
120-
PG_RETURN_INT32(Abs(DatumGetInt32(diff)));
121-
}
122-
123-
124111
/**************************************************
125112
* date ops
126113
**************************************************/

‎contrib/btree_gist/btree_float4.c

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -89,21 +89,6 @@ static const gbtree_ninfo tinfo =
8989
};
9090

9191

92-
PG_FUNCTION_INFO_V1(float4_dist);
93-
Datum
94-
float4_dist(PG_FUNCTION_ARGS)
95-
{
96-
float4 a = PG_GETARG_FLOAT4(0);
97-
float4 b = PG_GETARG_FLOAT4(1);
98-
float4 r;
99-
100-
r = a - b;
101-
CHECKFLOATVAL(r, isinf(a) || isinf(b), true);
102-
103-
PG_RETURN_FLOAT4(Abs(r));
104-
}
105-
106-
10792
/**************************************************
10893
* float4 ops
10994
**************************************************/

‎contrib/btree_gist/btree_float8.c

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -96,21 +96,6 @@ static const gbtree_ninfo tinfo =
9696
gbt_float8_dist
9797
};
9898

99-
100-
PG_FUNCTION_INFO_V1(float8_dist);
101-
Datum
102-
float8_dist(PG_FUNCTION_ARGS)
103-
{
104-
float8 a = PG_GETARG_FLOAT8(0);
105-
float8 b = PG_GETARG_FLOAT8(1);
106-
float8 r;
107-
108-
r = a - b;
109-
CHECKFLOATVAL(r, isinf(a) || isinf(b), true);
110-
111-
PG_RETURN_FLOAT8(Abs(r));
112-
}
113-
11499
/**************************************************
115100
* float8 ops
116101
**************************************************/

‎contrib/btree_gist/btree_gist--1.2--1.3.sql

Lines changed: 150 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,150 @@
1+
/* contrib/btree_gist/btree_gist--1.2--1.3.sql */
2+
3+
-- complain if script is sourced in psql, rather than via ALTER EXTENSION
4+
\echo Use "ALTER EXTENSION btree_gist UPDATE TO '1.3'" to load this file. \quit
5+
6+
-- update references to distance operators in pg_amop and pg_depend
7+
8+
WITH
9+
btree_ops AS (
10+
SELECT
11+
amoplefttype, amoprighttype, amopopr
12+
FROM
13+
pg_amop
14+
JOIN pg_am ON pg_am.oid = amopmethod
15+
JOIN pg_opfamily ON pg_opfamily.oid = amopfamily
16+
JOIN pg_namespace ON pg_namespace.oid = opfnamespace
17+
WHERE
18+
nspname = 'pg_catalog'
19+
AND opfname IN (
20+
'integer_ops',
21+
'oid_ops',
22+
'money_ops',
23+
'float_ops',
24+
'datetime_ops',
25+
'time_ops',
26+
'interval_ops'
27+
)
28+
AND amname = 'btree'
29+
AND amoppurpose = 'o'
30+
AND amopstrategy = 6
31+
),
32+
gist_ops AS (
33+
SELECT
34+
pg_amop.oid AS oid, amoplefttype, amoprighttype, amopopr
35+
FROM
36+
pg_amop
37+
JOIN pg_am ON amopmethod = pg_am.oid
38+
JOIN pg_opfamily ON amopfamily = pg_opfamily.oid
39+
JOIN pg_namespace ON pg_namespace.oid = opfnamespace
40+
WHERE
41+
nspname = current_schema()
42+
AND opfname IN (
43+
'gist_oid_ops',
44+
'gist_int2_ops',
45+
'gist_int4_ops',
46+
'gist_int8_ops',
47+
'gist_float4_ops',
48+
'gist_float8_ops',
49+
'gist_timestamp_ops',
50+
'gist_timestamptz_ops',
51+
'gist_time_ops',
52+
'gist_date_ops',
53+
'gist_interval_ops',
54+
'gist_cash_ops'
55+
)
56+
AND amname = 'gist'
57+
AND amoppurpose = 'o'
58+
AND amopstrategy = 15
59+
),
60+
depend_update_data(gist_amop, gist_amopopr, btree_amopopr) AS (
61+
SELECT
62+
gist_ops.oid, gist_ops.amopopr, btree_ops.amopopr
63+
FROM
64+
btree_ops JOIN gist_ops USING (amoplefttype, amoprighttype)
65+
),
66+
amop_update_data AS (
67+
UPDATE
68+
pg_depend
69+
SET
70+
refobjid = btree_amopopr
71+
FROM
72+
depend_update_data
73+
WHERE
74+
objid = gist_amop AND refobjid = gist_amopopr
75+
RETURNING
76+
depend_update_data.*
77+
)
78+
UPDATE
79+
pg_amop
80+
SET
81+
amopopr = btree_amopopr
82+
FROM
83+
amop_update_data
84+
WHERE
85+
pg_amop.oid = gist_amop;
86+
87+
-- disable implicit pg_catalog search
88+
89+
DO
90+
$$
91+
BEGIN
92+
EXECUTE 'SET LOCAL search_path TO ' || current_schema() || ', pg_catalog';
93+
END
94+
$$;
95+
96+
-- drop distance operators
97+
98+
ALTER EXTENSION btree_gist DROP OPERATOR <-> (int2, int2);
99+
ALTER EXTENSION btree_gist DROP OPERATOR <-> (int4, int4);
100+
ALTER EXTENSION btree_gist DROP OPERATOR <-> (int8, int8);
101+
ALTER EXTENSION btree_gist DROP OPERATOR <-> (float4, float4);
102+
ALTER EXTENSION btree_gist DROP OPERATOR <-> (float8, float8);
103+
ALTER EXTENSION btree_gist DROP OPERATOR <-> (oid, oid);
104+
ALTER EXTENSION btree_gist DROP OPERATOR <-> (money, money);
105+
ALTER EXTENSION btree_gist DROP OPERATOR <-> (date, date);
106+
ALTER EXTENSION btree_gist DROP OPERATOR <-> (time, time);
107+
ALTER EXTENSION btree_gist DROP OPERATOR <-> (timestamp, timestamp);
108+
ALTER EXTENSION btree_gist DROP OPERATOR <-> (timestamptz, timestamptz);
109+
ALTER EXTENSION btree_gist DROP OPERATOR <-> (interval, interval);
110+
111+
DROP OPERATOR <-> (int2, int2);
112+
DROP OPERATOR <-> (int4, int4);
113+
DROP OPERATOR <-> (int8, int8);
114+
DROP OPERATOR <-> (float4, float4);
115+
DROP OPERATOR <-> (float8, float8);
116+
DROP OPERATOR <-> (oid, oid);
117+
DROP OPERATOR <-> (money, money);
118+
DROP OPERATOR <-> (date, date);
119+
DROP OPERATOR <-> (time, time);
120+
DROP OPERATOR <-> (timestamp, timestamp);
121+
DROP OPERATOR <-> (timestamptz, timestamptz);
122+
DROP OPERATOR <-> (interval, interval);
123+
124+
-- drop distance functions
125+
126+
ALTER EXTENSION btree_gist DROP FUNCTION int2_dist(int2, int2);
127+
ALTER EXTENSION btree_gist DROP FUNCTION int4_dist(int4, int4);
128+
ALTER EXTENSION btree_gist DROP FUNCTION int8_dist(int8, int8);
129+
ALTER EXTENSION btree_gist DROP FUNCTION float4_dist(float4, float4);
130+
ALTER EXTENSION btree_gist DROP FUNCTION float8_dist(float8, float8);
131+
ALTER EXTENSION btree_gist DROP FUNCTION oid_dist(oid, oid);
132+
ALTER EXTENSION btree_gist DROP FUNCTION cash_dist(money, money);
133+
ALTER EXTENSION btree_gist DROP FUNCTION date_dist(date, date);
134+
ALTER EXTENSION btree_gist DROP FUNCTION time_dist(time, time);
135+
ALTER EXTENSION btree_gist DROP FUNCTION ts_dist(timestamp, timestamp);
136+
ALTER EXTENSION btree_gist DROP FUNCTION tstz_dist(timestamptz, timestamptz);
137+
ALTER EXTENSION btree_gist DROP FUNCTION interval_dist(interval, interval);
138+
139+
DROP FUNCTION int2_dist(int2, int2);
140+
DROP FUNCTION int4_dist(int4, int4);
141+
DROP FUNCTION int8_dist(int8, int8);
142+
DROP FUNCTION float4_dist(float4, float4);
143+
DROP FUNCTION float8_dist(float8, float8);
144+
DROP FUNCTION oid_dist(oid, oid);
145+
DROP FUNCTION cash_dist(money, money);
146+
DROP FUNCTION date_dist(date, date);
147+
DROP FUNCTION time_dist(time, time);
148+
DROP FUNCTION ts_dist(timestamp, timestamp);
149+
DROP FUNCTION tstz_dist(timestamptz, timestamptz);
150+
DROP FUNCTION interval_dist(interval, interval);

0 commit comments

Comments
 (0)