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

Commitf43f84c

Browse files
committed
Merge branch 'PGPROEE9_6_ALPHA' into PGPROEE9_6-9-idle-timeout
2 parentsaa84428 +bbe42b7 commitf43f84c

File tree

487 files changed

+48877
-19087
lines changed

Some content is hidden

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

487 files changed

+48877
-19087
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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ SUBDIRS = \
5858
pg_variables\
5959
jsquery\
6060
sr_plan\
61+
pg_arman\
62+
pg_pathman\
6163
shared_ispell
6264

6365
ifeq ($(with_openssl),yes)

‎contrib/pg_pathman/.gitignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
.deps
2+
isolation_output
3+
results/*
4+
regression.diffs
5+
regression.out
6+
*.o
7+
*.so
8+
*.pyc
9+
pg_pathman--*.sql

‎contrib/pg_pathman/.travis.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
os:
2+
-linux
3+
4+
sudo:required
5+
dist:trusty
6+
7+
language:c
8+
9+
compiler:
10+
-clang
11+
-gcc
12+
13+
before_install:
14+
-sudo sh ./travis/apt.postgresql.org.sh
15+
16+
env:
17+
-PGVERSION=9.6 CHECK_CODE=true
18+
-PGVERSION=9.6 CHECK_CODE=false
19+
-PGVERSION=9.5 CHECK_CODE=true
20+
-PGVERSION=9.5 CHECK_CODE=false
21+
22+
script:bash ./travis/pg-travis-test.sh

‎contrib/pg_pathman/Makefile

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# contrib/pg_pathman/Makefile
2+
3+
MODULE_big = pg_pathman
4+
OBJS = src/init.o src/relation_info.o src/utils.o src/partition_filter.o\
5+
src/runtimeappend.o src/runtime_merge_append.o src/pg_pathman.o src/rangeset.o\
6+
src/pl_funcs.o src/pl_range_funcs.o src/pl_hash_funcs.o src/pathman_workers.o\
7+
src/hooks.o src/nodes_common.o src/xact_handling.o src/copy_stmt_hooking.o\
8+
src/pg_compat.o$(WIN32RES)
9+
10+
EXTENSION = pg_pathman
11+
EXTVERSION = 1.0
12+
DATA_built =$(EXTENSION)--$(EXTVERSION).sql
13+
PGFILEDESC = "pg_pathman - partitioning tool"
14+
15+
REGRESS = pathman_basic\
16+
pathman_runtime_nodes\
17+
pathman_callbacks\
18+
pathman_domains\
19+
pathman_foreign_keys
20+
EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/conf.add
21+
EXTRA_CLEAN =$(EXTENSION)--$(EXTVERSION).sql ./isolation_output
22+
23+
ifdefUSE_PGXS
24+
PG_CONFIG = pg_config
25+
PGXS :=$(shell$(PG_CONFIG) --pgxs)
26+
include$(PGXS)
27+
else
28+
subdir = contrib/pg_pathman
29+
top_builddir = ../..
30+
include$(top_builddir)/src/Makefile.global
31+
include$(top_srcdir)/contrib/contrib-global.mk
32+
endif
33+
34+
$(EXTENSION)--$(EXTVERSION).sql: init.sql hash.sql range.sql
35+
cat$^>$@
36+
37+
ISOLATIONCHECKS=insert_nodes for_update rollback_on_create_partitions
38+
39+
submake-isolation:
40+
$(MAKE) -C$(top_builddir)/src/test/isolation all
41+
42+
isolationcheck: | submake-isolation
43+
$(MKDIR_P) isolation_output
44+
$(pg_isolation_regress_check)\
45+
--temp-config=$(top_srcdir)/$(subdir)/conf.add\
46+
--outputdir=./isolation_output\
47+
$(ISOLATIONCHECKS)

0 commit comments

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