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

Commitcffe577

Browse files
committed
Update contrib/pg_probackup to version 2.0 (git.postgrespro.ru stable65245aa)
1 parent1eed472 commitcffe577

File tree

65 files changed

+10744
-7007
lines changed

Some content is hidden

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

65 files changed

+10744
-7007
lines changed

‎contrib/pg_probackup/.gitignore‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,15 @@
2828
/env
2929
/tests/__pycache__/
3030
/tests/tmp_dirs/
31+
/tests/*pyc
32+
/tests/helpers/*pyc
3133

3234
# Extra files
33-
/datapagemap.c
34-
/datapagemap.h
35-
/logging.h
36-
/receivelog.c
37-
/receivelog.h
38-
/streamutil.c
39-
/streamutil.h
40-
/xlogreader.c
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: 46 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,67 @@
11
PROGRAM = pg_probackup
2-
OBJS = backup.o\
3-
catalog.o\
4-
data.o\
5-
delete.o\
6-
dir.o\
7-
fetch.o\
8-
init.o\
9-
parray.o\
10-
pg_probackup.o\
11-
restore.o\
12-
show.o\
13-
status.o\
14-
util.o\
15-
validate.o\
16-
datapagemap.o\
17-
parsexlog.o\
18-
xlogreader.o\
19-
streamutil.o\
20-
receivelog.o\
21-
pgut/pgut.o\
22-
pgut/pgut-port.o\
23-
pgut/getopt_long.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+
# Those files are symlinked from the PostgreSQL sources.
47+
src/xlogreader.c:% :$(top_srcdir)/src/backend/access/transam/xlogreader.c
48+
rm -f$@&&$(LN_S) ../$< ./src/xlogreader.c
49+
src/datapagemap.c:% :$(top_srcdir)/src/bin/pg_rewind/datapagemap.c
50+
rm -f$@&&$(LN_S) ../$< ./src/datapagemap.c
51+
src/datapagemap.h:% :$(top_srcdir)/src/bin/pg_rewind/datapagemap.h
52+
rm -f$@&&$(LN_S) ../$< src/datapagemap.h
53+
src/logging.h:% :$(top_srcdir)/src/bin/pg_rewind/logging.h
54+
rm -f$@&&$(LN_S) ../$< ./src
55+
src/receivelog.c:% :$(top_srcdir)/src/bin/pg_basebackup/receivelog.c
56+
rm -f$@&&$(LN_S) ../$< ./src
57+
src/receivelog.h:% :$(top_srcdir)/src/bin/pg_basebackup/receivelog.h
58+
rm -f$@&&$(LN_S) ../$< ./src
59+
src/streamutil.c:% :$(top_srcdir)/src/bin/pg_basebackup/streamutil.c
60+
rm -f$@&&$(LN_S) ../$< ./src
61+
src/streamutil.h:% :$(top_srcdir)/src/bin/pg_basebackup/streamutil.h
62+
rm -f$@&&$(LN_S) ../$< ./src
5163
endif
64+
5265
PG_CPPFLAGS = -I$(libpq_srcdir) ${PTHREAD_CFLAGS}
5366
overrideCPPFLAGS := -DFRONTEND$(CPPFLAGS)$(PG_CPPFLAGS)
5467
PG_LIBS =$(libpq_pgport) ${PTHREAD_CFLAGS}
@@ -58,7 +71,7 @@ ifeq ($(PORTNAME), aix)
5871
endif
5972

6073
envtest:
61-
: top_srcdir=$(top_srcdir)
74+
: top_srcdir=$()
6275
: libpq_srcdir =$(libpq_srcdir)
6376

6477
# This rule's only purpose is to give the user instructions on how to pass
@@ -71,23 +84,3 @@ ifndef top_srcdir
7184
@echo "variable: \"make top_srcdir=<path to PostgreSQL source tree>\""
7285
@exit 1
7386
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