Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit65ea14c

Browse files
committed
Merge branch 'PGPRO9_5' into pathman_pgpro9_5
2 parents174bbc5 +9ad3ab9 commit65ea14c

File tree

217 files changed

+14778
-736
lines changed

Some content is hidden

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

217 files changed

+14778
-736
lines changed

‎config/c-library.m4‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,4 +343,34 @@ fi
343343
if test "$pgac_cv_type_locale_t" = 'yes (in xlocale.h)'; then
344344
AC_DEFINE(LOCALE_T_IN_XLOCALE,1,
345345
[Define to 1 if `locale_t' requires <xlocale.h>.])
346-
fi])])# PGAC_HEADER_XLOCALE
346+
fi])# PGAC_TYPE_LOCALE_T
347+
348+
349+
# PGAC_FUNC_WCSTOMBS_L
350+
# --------------------
351+
# Try to find a declaration for wcstombs_l(). It might be in stdlib.h
352+
# (following the POSIX requirement for wcstombs()), or in locale.h, or in
353+
# xlocale.h. If it's in the latter, define WCSTOMBS_L_IN_XLOCALE.
354+
#
355+
AC_DEFUN([PGAC_FUNC_WCSTOMBS_L],
356+
[AC_CACHE_CHECK([for wcstombs_l declaration],pgac_cv_func_wcstombs_l,
357+
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
358+
[#include <stdlib.h>
359+
#include <locale.h>],
360+
[#ifndef wcstombs_l
361+
(void) wcstombs_l;
362+
#endif])],
363+
[pgac_cv_func_wcstombs_l='yes'],
364+
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
365+
[#include <stdlib.h>
366+
#include <locale.h>
367+
#include <xlocale.h>],
368+
[#ifndef wcstombs_l
369+
(void) wcstombs_l;
370+
#endif])],
371+
[pgac_cv_func_wcstombs_l='yes (in xlocale.h)'],
372+
[pgac_cv_func_wcstombs_l='no'])])])
373+
if test "$pgac_cv_func_wcstombs_l" = 'yes (in xlocale.h)'; then
374+
AC_DEFINE(WCSTOMBS_L_IN_XLOCALE,1,
375+
[Define to 1 if `wcstombs_l' requires <xlocale.h>.])
376+
fi])# PGAC_FUNC_WCSTOMBS_L

‎configure‎

Lines changed: 64 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 PostgresPro 9.5.1.1.
3+
# Generated by GNU Autoconf 2.69 for PostgresPro 9.5.1.3.
44
#
55
# Report bugs to <pgsql-bugs@postgrespro.com>.
66
#
@@ -12,6 +12,7 @@
1212
# gives unlimited permission to copy, distribute and modify it.
1313
#
1414
# Copyright (c) 1996-2015, PostgreSQL Global Development Group
15+
# Copyright (c) 2015-2016, Postgres Professional
1516
## -------------------- ##
1617
## M4sh Initialization. ##
1718
## -------------------- ##
@@ -582,8 +583,8 @@ MAKEFLAGS=
582583
# Identity of this package.
583584
PACKAGE_NAME='PostgresPro'
584585
PACKAGE_TARNAME='postgrespro'
585-
PACKAGE_VERSION='9.5.1.1'
586-
PACKAGE_STRING='PostgresPro 9.5.1.1'
586+
PACKAGE_VERSION='9.5.1.3'
587+
PACKAGE_STRING='PostgresPro 9.5.1.3'
587588
PACKAGE_BUGREPORT='pgsql-bugs@postgrespro.com'
588589
PACKAGE_URL=''
589590

@@ -1397,7 +1398,7 @@ if test "$ac_init_help" = "long"; then
13971398
# Omit some internal or obsolete options to make the list less imposing.
13981399
# This message is too long to be a string in the A/UX 3.1 sh.
13991400
cat<<_ACEOF
1400-
\`configure' configures PostgresPro 9.5.1.1 to adapt to many kinds of systems.
1401+
\`configure' configures PostgresPro 9.5.1.3 to adapt to many kinds of systems.
14011402
14021403
Usage:$0 [OPTION]... [VAR=VALUE]...
14031404
@@ -1462,7 +1463,7 @@ fi
14621463

14631464
iftest -n"$ac_init_help";then
14641465
case$ac_init_helpin
1465-
short | recursive )echo"Configuration of PostgresPro 9.5.1.1:";;
1466+
short | recursive )echo"Configuration of PostgresPro 9.5.1.3:";;
14661467
esac
14671468
cat<<\_ACEOF
14681469
@@ -1613,14 +1614,15 @@ fi
16131614
test -n "$ac_init_help" && exit $ac_status
16141615
if $ac_init_version; then
16151616
cat <<\_ACEOF
1616-
PostgresPro configure 9.5.1.1
1617+
PostgresPro configure 9.5.1.3
16171618
generated by GNU Autoconf 2.69
16181619
16191620
Copyright (C) 2012 Free Software Foundation, Inc.
16201621
This configure script is free software; the Free Software Foundation
16211622
gives unlimited permission to copy, distribute and modify it.
16221623
16231624
Copyright (c) 1996-2015, PostgreSQL Global Development Group
1625+
Copyright (c) 2015-2016, Postgres Professional
16241626
_ACEOF
16251627
exit
16261628
fi
@@ -2324,7 +2326,7 @@ cat >config.log <<_ACEOF
23242326
This file contains any messages produced by compilers while
23252327
running configure, to aid debugging if configure makes a mistake.
23262328
2327-
It was created by PostgresPro$as_me 9.5.1.1, which was
2329+
It was created by PostgresPro$as_me 9.5.1.3, which was
23282330
generated by GNU Autoconf 2.69. Invocation command line was
23292331
23302332
$$0$@
@@ -13427,6 +13429,59 @@ $as_echo "#define GETTIMEOFDAY_1ARG 1" >>confdefs.h
1342713429

1342813430
fi
1342913431

13432+
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for wcstombs_l declaration">&5
13433+
$as_echo_n"checking for wcstombs_l declaration...">&6; }
13434+
if${pgac_cv_func_wcstombs_l+:}false;then:
13435+
$as_echo_n"(cached)">&6
13436+
else
13437+
cat confdefs.h -<<_ACEOF >conftest.$ac_ext
13438+
/* end confdefs.h. */
13439+
#include <stdlib.h>
13440+
#include <locale.h>
13441+
int
13442+
main ()
13443+
{
13444+
#ifndef wcstombs_l
13445+
(void) wcstombs_l;
13446+
#endif
13447+
;
13448+
return 0;
13449+
}
13450+
_ACEOF
13451+
if ac_fn_c_try_compile"$LINENO";then:
13452+
pgac_cv_func_wcstombs_l='yes'
13453+
else
13454+
cat confdefs.h -<<_ACEOF >conftest.$ac_ext
13455+
/* end confdefs.h. */
13456+
#include <stdlib.h>
13457+
#include <locale.h>
13458+
#include <xlocale.h>
13459+
int
13460+
main ()
13461+
{
13462+
#ifndef wcstombs_l
13463+
(void) wcstombs_l;
13464+
#endif
13465+
;
13466+
return 0;
13467+
}
13468+
_ACEOF
13469+
if ac_fn_c_try_compile"$LINENO";then:
13470+
pgac_cv_func_wcstombs_l='yes (in xlocale.h)'
13471+
else
13472+
pgac_cv_func_wcstombs_l='no'
13473+
fi
13474+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13475+
fi
13476+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13477+
fi
13478+
{$as_echo"$as_me:${as_lineno-$LINENO}: result:$pgac_cv_func_wcstombs_l">&5
13479+
$as_echo"$pgac_cv_func_wcstombs_l">&6; }
13480+
iftest"$pgac_cv_func_wcstombs_l" ='yes (in xlocale.h)';then
13481+
13482+
$as_echo"#define WCSTOMBS_L_IN_XLOCALE 1">>confdefs.h
13483+
13484+
fi
1343013485

1343113486
# Some versions of libedit contain strlcpy(), setproctitle(), and other
1343213487
# symbols that that library has no business exposing to the world. Pending
@@ -18012,7 +18067,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1801218067
# report actual input values of CONFIG_FILES etc. instead of their
1801318068
# values after options handling.
1801418069
ac_log="
18015-
This file was extended by PostgresPro $as_me 9.5.1.1, which was
18070+
This file was extended by PostgresPro $as_me 9.5.1.3, which was
1801618071
generated by GNU Autoconf 2.69. Invocation command line was
1801718072
1801818073
CONFIG_FILES = $CONFIG_FILES
@@ -18082,7 +18137,7 @@ _ACEOF
1808218137
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1808318138
ac_cs_config="`$as_echo"$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1808418139
ac_cs_version="\\
18085-
PostgresPro config.status 9.5.1.1
18140+
PostgresPro config.status 9.5.1.3
1808618141
configured by$0, generated by GNU Autoconf 2.69,
1808718142
with options\\"\$ac_cs_config\\"
1808818143

‎configure.in‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@ dnl Read the Autoconf manual for details.
1717
dnl
1818
m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
1919

20-
AC_INIT([PostgresPro], [9.5.1.1], [pgsql-bugs@postgrespro.com])
20+
AC_INIT([PostgresPro], [9.5.1.3], [pgsql-bugs@postgrespro.com])
2121

2222
m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
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-2015, PostgreSQL Global Development Group
27+
Copyright (c) 2015-2016, Postgres Professional])
2728
AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
2829
AC_CONFIG_AUX_DIR(config)
2930
AC_PREFIX_DEFAULT(/usr/local/pgsql)
@@ -1400,6 +1401,7 @@ fi
14001401
PGAC_VAR_INT_TIMEZONE
14011402
AC_FUNC_ACCEPT_ARGTYPES
14021403
PGAC_FUNC_GETTIMEOFDAY_1ARG
1404+
PGAC_FUNC_WCSTOMBS_L
14031405

14041406
# Some versions of libedit contain strlcpy(), setproctitle(), and other
14051407
# symbols that that library has no business exposing to the world. Pending

‎contrib/Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ SUBDIRS = \
2828
intagg\
2929
intarray\
3030
isn\
31+
jsquery\
3132
lo\
3233
ltree\
3334
oid2name\
@@ -44,6 +45,7 @@ SUBDIRS = \
4445
pgstattuple\
4546
postgres_fdw\
4647
seg\
48+
shared_ispell\
4749
spi\
4850
sr_plan\
4951
tablefunc\

‎contrib/dblink/dblink.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*
1111
* contrib/dblink/dblink.c
1212
* Copyright (c) 2001-2015, PostgreSQL Global Development Group
13+
* Copyright (c) 2015-2016, Postgres Professional
1314
* ALL RIGHTS RESERVED;
1415
*
1516
* Permission to use, copy, modify, and distribute this software and its

‎contrib/jsquery/.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
*.so
2+
*.o
3+
jsquery_gram.c
4+
jsquery_scan.c
5+
jsquery_gram.h
6+
regression.diffs
7+
regression.out
8+
results

‎contrib/jsquery/META.json‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
{
2+
"name":"JsQuery",
3+
"abstract":"JSON Query Language with GIN indexing support",
4+
"description":"JsQuery provides additional functionality for JSONB, such as a simple and effective way to search in nested objects and arrays, and more comparison operators with index support. It does this by implementing a specialized search syntax, the @@ operator, and the jsquery type for search strings.",
5+
"version":"1.0.0",
6+
"maintainer": [
7+
"Teodor Sigaev <teodor@sigaev.ru>",
8+
"Alexander Korotkov <aekorotkov@gmail.com>",
9+
"Oleg Bartunov <oleg@sai.msu.su>"
10+
],
11+
"license": {
12+
"PostgreSQL":"http://www.postgresql.org/about/licence"
13+
},
14+
"prereqs": {
15+
"runtime": {
16+
"requires": {
17+
"PostgreSQL":"9.4.0"
18+
},
19+
"recommends": {
20+
"PostgreSQL":"9.4.0"
21+
}
22+
}
23+
},
24+
"provides": {
25+
"jsquery": {
26+
"file":"sql/jsquery.sql",
27+
"docfile":"README.md",
28+
"version":"1.0.0",
29+
"abstract":"JSON query language with GIN indexing support"
30+
}
31+
},
32+
"resources": {
33+
"homepage":"https://github.com/postgrespro/jsquery",
34+
"bugtracker": {
35+
"web":"https://github.com/postgrespro/jsquery/issues"
36+
},
37+
"repository": {
38+
"url":"https://github.com/postgrespro/jsquery.git",
39+
"web":"https://github.com/postgrespro/jsquery",
40+
"type":"git"
41+
}
42+
},
43+
"generated_by":"Josh Berkus",
44+
"meta-spec": {
45+
"version":"1.0.0",
46+
"url":"http://pgxn.org/meta/spec.txt"
47+
},
48+
"tags": [
49+
"JSON",
50+
"index",
51+
"search"
52+
]
53+
}

‎contrib/jsquery/Makefile‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# contrib/jsquery/Makefile
2+
3+
MODULE_big = jsquery
4+
OBJS = jsonb_gin_ops.o jsquery_constr.o jsquery_extract.o\
5+
jsquery_gram.o jsquery_io.o jsquery_op.o jsquery_support.o
6+
7+
EXTENSION = jsquery
8+
DATA = jsquery--1.0.sql
9+
10+
REGRESS = jsquery
11+
# We need a UTF8 database
12+
ENCODING = UTF8
13+
14+
EXTRA_CLEAN = y.tab.c y.tab.h\
15+
jsquery_gram.c jsquery_scan.c jsquery_gram.h
16+
17+
ifdefUSE_PGXS
18+
PG_CONFIG ?= pg_config
19+
PGXS :=$(shell$(PG_CONFIG) --pgxs)
20+
include$(PGXS)
21+
else
22+
subdir = contrib/jsquery
23+
top_builddir = ../..
24+
include$(top_builddir)/src/Makefile.global
25+
include$(top_srcdir)/contrib/contrib-global.mk
26+
endif
27+
28+
jsquery_gram.o: jsquery_scan.c
29+
30+
jsquery_gram.c: BISONFLAGS += -d
31+
32+
distprep: jsquery_gram.c jsquery_scan.c
33+
34+
maintainer-clean:
35+
rm -f jsquery_gram.c jsquery_scan.c jsquery_gram.h
36+

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp