Skip to content

Commit 8f97f25

Browse files
author
Alexander Korotkov
committed
Merge branch 'PGPROEE9_6' into PGPROEE9_6-15-64-xid
2 parents 29809bd + 01563e6 commit 8f97f25

File tree

517 files changed

+100679
-9959
lines changed

Some content is hidden

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

517 files changed

+100679
-9959
lines changed

‎.gitlab-ci.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
image: debian
2+
3+
stages:
4+
- test
5+
6+
before_script:
7+
- export DEBIAN_FRONTEND=noninteractive
8+
- export CORES=$(grep -c ^processor /proc/cpuinfo)
9+
- uname -a
10+
- df -h
11+
12+
test:ubuntu-16.04:
13+
stage: test
14+
image: ubuntu:16.04
15+
only:
16+
- PGPROEE9_6
17+
before_script:
18+
- apt-get update && apt-get install -y sudo gcc make flex bison libreadline-dev zlib1g-dev openjade libzstd0 libzstd-dev opensp
19+
script:
20+
- ./configure --prefix=/opt/pgproee
21+
- make -j $CORES world
22+
- sudo make install-world
23+
- make check
24+
- cd contrib
25+
- make check
26+
when: always

‎configure

Lines changed: 17 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.6.0.
3+
# Generated by GNU Autoconf 2.69 for PostgreSQL 9.6.1.
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.6.0'
587-
PACKAGE_STRING='PostgreSQL 9.6.0'
586+
PACKAGE_VERSION='9.6.1'
587+
PACKAGE_STRING='PostgreSQL 9.6.1'
588588
PACKAGE_BUGREPORT='bugs@postgrespro.ru'
589589
PACKAGE_URL=''
590590

@@ -756,6 +756,7 @@ build_os
756756
build_vendor
757757
build_cpu
758758
build
759+
PGPRO_EDITION
759760
PGPRO_PACKAGE_NAME
760761
PG_MAJORVERSION
761762
configure_args
@@ -1403,7 +1404,7 @@ if test "$ac_init_help" = "long"; then
14031404
# Omit some internal or obsolete options to make the list less imposing.
14041405
# This message is too long to be a string in the A/UX 3.1 sh.
14051406
cat <<_ACEOF
1406-
\`configure' configures PostgreSQL 9.6.0 to adapt to many kinds of systems.
1407+
\`configure' configures PostgreSQL 9.6.1 to adapt to many kinds of systems.
14071408

14081409
Usage: $0 [OPTION]... [VAR=VALUE]...
14091410

@@ -1468,7 +1469,7 @@ fi
14681469

14691470
if test -n "$ac_init_help"; then
14701471
case $ac_init_help in
1471-
short | recursive ) echo "Configuration of PostgreSQL 9.6.0:";;
1472+
short | recursive ) echo "Configuration of PostgreSQL 9.6.1:";;
14721473
esac
14731474
cat <<\_ACEOF
14741475

@@ -1621,7 +1622,7 @@ fi
16211622
test -n "$ac_init_help" && exit $ac_status
16221623
if $ac_init_version; then
16231624
cat <<\_ACEOF
1624-
PostgreSQL configure 9.6.0
1625+
PostgreSQL configure 9.6.1
16251626
generated by GNU Autoconf 2.69
16261627

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

2336-
It was created by PostgreSQL $as_me 9.6.0, which was
2337+
It was created by PostgreSQL $as_me 9.6.1, which was
23372338
generated by GNU Autoconf 2.69. Invocation command line was
23382339

23392340
$ $0 $@
@@ -2752,6 +2753,8 @@ fi
27522753

27532754
PGPRO_VERSION="$PACKAGE_VERSION.1"
27542755
PGPRO_PACKAGE_NAME="PostgresPro"
2756+
PGPRO_EDITION="enterprise"
2757+
27552758

27562759

27572760
cat >>confdefs.h <<_ACEOF
@@ -2764,6 +2767,11 @@ cat >>confdefs.h <<_ACEOF
27642767
_ACEOF
27652768

27662769

2770+
cat >>confdefs.h <<_ACEOF
2771+
#define PGPRO_EDITION "$PGPRO_EDITION"
2772+
_ACEOF
2773+
2774+
27672775
cat >>confdefs.h <<_ACEOF
27682776
#define PGPRO_VERSION "$PGPRO_VERSION"
27692777
_ACEOF
@@ -18358,7 +18366,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1835818366
# report actual input values of CONFIG_FILES etc. instead of their
1835918367
# values after options handling.
1836018368
ac_log="
18361-
This file was extended by PostgreSQL $as_me 9.6.0, which was
18369+
This file was extended by PostgreSQL $as_me 9.6.1, which was
1836218370
generated by GNU Autoconf 2.69. Invocation command line was
1836318371

1836418372
CONFIG_FILES = $CONFIG_FILES
@@ -18428,7 +18436,7 @@ _ACEOF
1842818436
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1842918437
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1843018438
ac_cs_version="\\
18431-
PostgreSQL config.status 9.6.0
18439+
PostgreSQL config.status 9.6.1
1843218440
configured by $0, generated by GNU Autoconf 2.69,
1843318441
with options \\"\$ac_cs_config\\"
1843418442

‎configure.in

Lines changed: 4 additions & 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.6.0], [bugs@postgrespro.ru],[postgrespro])
20+
AC_INIT([PostgreSQL], [9.6.1], [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.
@@ -40,9 +40,12 @@ PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version],
4040
[PG_VERSION="$PACKAGE_VERSION"])
4141
PGPRO_VERSION="$PACKAGE_VERSION.1"
4242
PGPRO_PACKAGE_NAME="PostgresPro"
43+
PGPRO_EDITION="enterprise"
4344
AC_SUBST(PGPRO_PACKAGE_NAME)
45+
AC_SUBST(PGPRO_EDITION)
4446
AC_DEFINE_UNQUOTED(PG_VERSION, "$PG_VERSION", [PostgreSQL version as a string])
4547
AC_DEFINE_UNQUOTED(PGPRO_PACKAGE_NAME, "$PGPRO_PACKAGE_NAME", [PostgresPro name as a string])
48+
AC_DEFINE_UNQUOTED(PGPRO_EDITION,"$PGPRO_EDITION",[PostgresPro edition])
4649
AC_DEFINE_UNQUOTED(PGPRO_VERSION, "$PGPRO_VERSION", [PostgresPro version as a string])
4750

4851
AC_CANONICAL_HOST

‎contrib/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ SUBDIRS = \
4141
pgstattuple \
4242
pg_visibility \
4343
postgres_fdw \
44+
rum \
4445
seg \
4546
spi \
4647
tablefunc \
@@ -61,7 +62,8 @@ SUBDIRS = \
6162
sr_plan \
6263
pg_arman \
6364
pg_pathman \
64-
shared_ispell
65+
shared_ispell \
66+
pg_hint_plan
6567

6668
ifeq ($(with_openssl),yes)
6769
SUBDIRS += sslinfo

‎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
**************************************************/

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy