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

Commit3af19b7

Browse files
committed
Merge branch 'PGPROEE9_6' into PGPROEE9_6_RDMA
2 parents9018a8d +02cf3b3 commit3af19b7

File tree

75 files changed

+6300
-3400
lines changed

Some content is hidden

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

75 files changed

+6300
-3400
lines changed

‎contrib/pg_probackup/.gitignore

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,14 @@
2929
/tests/__pycache__/
3030
/tests/tmp_dirs/
3131
/tests/*pyc
32+
/tests/helpers/*pyc
3233

3334
# Extra files
34-
/datapagemap.c
35-
/datapagemap.h
36-
/logging.h
37-
/receivelog.c
38-
/receivelog.h
39-
/streamutil.c
40-
/streamutil.h
41-
/xlogreader.c
42-
/logging.h
43-
/receivelog.c
44-
/receivelog.h
45-
/streamutil.c
46-
/streamutil.h
47-
35+
/src/datapagemap.c
36+
/src/datapagemap.h
37+
/src/logging.h
38+
/src/receivelog.c
39+
/src/receivelog.h
40+
/src/streamutil.c
41+
/src/streamutil.h
42+
/src/xlogreader.c

‎contrib/pg_probackup/COPYRIGHT

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
Copyright (c) 2009-2013, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
1+
Copyright (c) 2015-2017, Postgres Professional
2+
Portions Copyright (c) 2009-2013, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
23

34
Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
45
Portions Copyright (c) 1994, The Regents of the University of California

‎contrib/pg_probackup/Makefile

Lines changed: 52 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,73 @@
11
PROGRAM = pg_probackup
2-
OBJS = backup.o\
3-
catalog.o\
4-
configure.o\
5-
data.o\
6-
delete.o\
7-
dir.o\
8-
fetch.o\
9-
help.o\
10-
init.o\
11-
parray.o\
12-
pg_probackup.o\
13-
restore.o\
14-
show.o\
15-
status.o\
16-
util.o\
17-
validate.o\
18-
datapagemap.o\
19-
parsexlog.o\
20-
xlogreader.o\
21-
streamutil.o\
22-
receivelog.o\
23-
pgut/pgut.o
2+
OBJS = src/backup.o src/catalog.o src/configure.o src/data.o\
3+
src/delete.o src/dir.o src/fetch.o src/help.o src/init.o\
4+
src/pg_probackup.o src/restore.o src/show.o src/status.o\
5+
src/util.o src/validate.o src/datapagemap.o src/parsexlog.o\
6+
src/xlogreader.o src/streamutil.o src/receivelog.o\
7+
src/archive.o src/utils/parray.o src/utils/pgut.o src/utils/logger.o
248

25-
EXTRA_CLEAN = datapagemap.c datapagemap.h xlogreader.c receivelog.c receivelog.h streamutil.c streamutil.h logging.h
9+
EXTRA_CLEAN = src/datapagemap.c src/datapagemap.h src/xlogreader.c\
10+
src/receivelog.c src/receivelog.h src/streamutil.c src/streamutil.h src/logging.h
2611

27-
all: checksrcdir datapagemap.h logging.h receivelog.h streamutil.h pg_probackup
12+
all: checksrcdirsrc/datapagemap.hsrc/logging.hsrc/receivelog.hsrc/streamutil.h pg_probackup
2813

29-
MAKE_GLOBAL="../../src/Makefile.global"
30-
TEST_GLOBAL:=$(shell test -e ../../src/Makefile.global)
31-
ifeq ($(.SHELLSTATUS),1)
14+
ifdefUSE_PGXS
3215
PG_CONFIG = pg_config
3316
PGXS :=$(shell$(PG_CONFIG) --pgxs)
3417
include$(PGXS)
35-
36-
.PHONY: checksrcdir
37-
checksrcdir:
3818
ifndeftop_srcdir
3919
@echo "You must have PostgreSQL source tree available to compile."
4020
@echo "Pass the path to the PostgreSQL source tree to make, in the top_srcdir"
4121
@echo "variable: \"make top_srcdir=<path to PostgreSQL source tree>\""
4222
@exit 1
4323
endif
24+
# Those files are symlinked from the PostgreSQL sources.
25+
src/xlogreader.c:% :$(top_srcdir)/src/backend/access/transam/xlogreader.c
26+
rm -f$@&&$(LN_S)$< ./src/xlogreader.c
27+
src/datapagemap.c:% :$(top_srcdir)/src/bin/pg_rewind/datapagemap.c
28+
rm -f$@&&$(LN_S)$< ./src/datapagemap.c
29+
src/datapagemap.h:% :$(top_srcdir)/src/bin/pg_rewind/datapagemap.h
30+
rm -f$@&&$(LN_S)$< src/datapagemap.h
31+
src/logging.h:% :$(top_srcdir)/src/bin/pg_rewind/logging.h
32+
rm -f$@&&$(LN_S)$< ./src
33+
src/receivelog.c:% :$(top_srcdir)/src/bin/pg_basebackup/receivelog.c
34+
rm -f$@&&$(LN_S)$< ./src
35+
src/receivelog.h:% :$(top_srcdir)/src/bin/pg_basebackup/receivelog.h
36+
rm -f$@&&$(LN_S)$< ./src
37+
src/streamutil.c:% :$(top_srcdir)/src/bin/pg_basebackup/streamutil.c
38+
rm -f$@&&$(LN_S)$< ./src
39+
src/streamutil.h:% :$(top_srcdir)/src/bin/pg_basebackup/streamutil.h
40+
rm -f$@&&$(LN_S)$< ./src
4441
else
45-
#TODO: fix me
46-
REGRESS =
4742
subdir=contrib/pg_probackup
4843
top_builddir=../..
4944
include$(top_builddir)/src/Makefile.global
5045
include$(top_srcdir)/contrib/contrib-global.mk
46+
ifeq ("$(top_srcdir)","../..")
47+
srchome="$(top_srcdir)/.."
48+
else
49+
srchome="$(top_srcdir)"
5150
endif
52-
PG_CPPFLAGS = -I$(libpq_srcdir) ${PTHREAD_CFLAGS}
51+
# Those files are symlinked from the PostgreSQL sources.
52+
src/xlogreader.c:$(top_srcdir)/src/backend/access/transam/xlogreader.c
53+
rm -f$@&&$(LN_S)$(srchome)/src/backend/access/transam/xlogreader.c$@
54+
src/datapagemap.c:$(top_srcdir)/src/bin/pg_rewind/datapagemap.c
55+
rm -f$@&&$(LN_S)$(srchome)/src/bin/pg_rewind/datapagemap.c$@
56+
src/datapagemap.h:$(top_srcdir)/src/bin/pg_rewind/datapagemap.h
57+
rm -f$@&&$(LN_S)$(srchome)/src/bin/pg_rewind/datapagemap.h$@
58+
src/logging.h:$(top_srcdir)/src/bin/pg_rewind/logging.h
59+
rm -f$@&&$(LN_S)$(srchome)/src/bin/pg_rewind/logging.h$@
60+
src/receivelog.c:$(top_srcdir)/src/bin/pg_basebackup/receivelog.c
61+
rm -f$@&&$(LN_S)$(srchome)/src/bin/pg_basebackup/receivelog.c$@
62+
src/receivelog.h:$(top_srcdir)/src/bin/pg_basebackup/receivelog.h
63+
rm -f$@&&$(LN_S)$(srchome)/src/bin/pg_basebackup/receivelog.h$@
64+
src/streamutil.c:$(top_srcdir)/src/bin/pg_basebackup/streamutil.c
65+
rm -f$@&&$(LN_S)$(srchome)/src/bin/pg_basebackup/streamutil.c$@
66+
src/streamutil.h:$(top_srcdir)/src/bin/pg_basebackup/streamutil.h
67+
rm -f$@&&$(LN_S)$(srchome)/src/bin/pg_basebackup/streamutil.h$@
68+
endif
69+
70+
PG_CPPFLAGS = -I$(libpq_srcdir) ${PTHREAD_CFLAGS} -Isrc
5371
overrideCPPFLAGS := -DFRONTEND$(CPPFLAGS)$(PG_CPPFLAGS)
5472
PG_LIBS =$(libpq_pgport) ${PTHREAD_CFLAGS}
5573

@@ -58,7 +76,7 @@ ifeq ($(PORTNAME), aix)
5876
endif
5977

6078
envtest:
61-
: top_srcdir=$(top_srcdir)
79+
: top_srcdir=$()
6280
: libpq_srcdir =$(libpq_srcdir)
6381

6482
# This rule's only purpose is to give the user instructions on how to pass
@@ -71,23 +89,3 @@ ifndef top_srcdir
7189
@echo "variable: \"make top_srcdir=<path to PostgreSQL source tree>\""
7290
@exit 1
7391
endif
74-
75-
# Those files are symlinked from the PostgreSQL sources.
76-
xlogreader.c:% :$(top_srcdir)/src/backend/access/transam/%
77-
rm -f$@&&$(LN_S)$<.
78-
datapagemap.c:% :$(top_srcdir)/src/bin/pg_rewind/%
79-
rm -f$@&&$(LN_S)$<.
80-
datapagemap.h:% :$(top_srcdir)/src/bin/pg_rewind/%
81-
rm -f&&$(LN_S)$<.
82-
#logging.c: % : $(top_srcdir)/src/bin/pg_rewind/%
83-
#rm -f && $(LN_S) $< .
84-
logging.h:% :$(top_srcdir)/src/bin/pg_rewind/%
85-
rm -f&&$(LN_S)$<.
86-
receivelog.c:% :$(top_srcdir)/src/bin/pg_basebackup/%
87-
rm -f&&$(LN_S)$<.
88-
receivelog.h:% :$(top_srcdir)/src/bin/pg_basebackup/%
89-
rm -f&&$(LN_S)$<.
90-
streamutil.c:% :$(top_srcdir)/src/bin/pg_basebackup/%
91-
rm -f&&$(LN_S)$<.
92-
streamutil.h:% :$(top_srcdir)/src/bin/pg_basebackup/%
93-
rm -f&&$(LN_S)$<.

‎contrib/pg_probackup/README.md

Lines changed: 0 additions & 184 deletions
This file was deleted.

0 commit comments

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