8000 Merge remote-tracking branch 'upstream/master' · postgres/postgres@0c619a6 · GitHub
[go: up one dir, main page]
Skip to content

Commit 0c619a6

Browse files
danielcodedanielcode
committed
Merge remote-tracking branch 'upstream/master'
2 parents f9a0494 + 230e92c commit 0c619a6

File tree

324 files changed

+239704
-120170
lines changed

Some content is hidden

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

324 files changed

+239704
-120170
lines changed

‎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.63 for PostgreSQL 9.3devel.
3+
# Generated by GNU Autoconf 2.63 for PostgreSQL 9.3beta1.
44
#
55
# Report bugs to <pgsql-bugs@postgresql.org>.
66
#
@@ -598,8 +598,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
598598
# Identity of this package.
599599
PACKAGE_NAME='PostgreSQL'
600600
PACKAGE_TARNAME='postgresql'
601-
PACKAGE_VERSION='9.3devel'
602-
PACKAGE_STRING='PostgreSQL 9.3devel'
601+
PACKAGE_VERSION='9.3beta1'
602+
PACKAGE_STRING='PostgreSQL 9.3beta1'
603603
PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
604604

605605
ac_unique_file="src/backend/access/common/heaptuple.c"
@@ -1412,7 +1412,7 @@ if test "$ac_init_help" = "long"; then
14121412
# Omit some internal or obsolete options to make the list less imposing.
14131413
# This message is too long to be a string in the A/UX 3.1 sh.
14141414
cat <<_ACEOF
1415-
\`configure' configures PostgreSQL 9.3devel to adapt to many kinds of systems.
1415+
\`configure' configures PostgreSQL 9.3beta1 to adapt to many kinds of systems.
14161416

14171417
Usage: $0 [OPTION]... [VAR=VALUE]...
14181418

@@ -1477,7 +1477,7 @@ fi
14771477

14781478
if test -n "$ac_init_help"; then
14791479
case $ac_init_help in
1480-
short | recursive ) echo "Configuration of PostgreSQL 9.3devel:";;
1480+
short | recursive ) echo "Configuration of PostgreSQL 9.3beta1:";;
14811481
esac
14821482
cat <<\_ACEOF
14831483

@@ -1623,7 +1623,7 @@ fi
16231623
test -n "$ac_init_help" && exit $ac_status
16241624
if $ac_init_version; then
16251625
cat <<\_ACEOF
1626-
PostgreSQL configure 9.3devel
1626+
PostgreSQL configure 9.3beta1
16271627
generated by GNU Autoconf 2.63
16281628

16291629
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1639,7 +1639,7 @@ cat >config.log <<_ACEOF
16391639
This file contains any messages produced by compilers while
16401640
running configure, to aid debugging if configure makes a mistake.
16411641

1642-
It was created by PostgreSQL $as_me 9.3devel, which was
1642+
It was created by PostgreSQL $as_me 9.3beta1, which was
16431643
generated by GNU Autoconf 2.63. Invocation command line was
16441644

16451645
$ $0 $@
@@ -30815,7 +30815,7 @@ exec 6>&1
3081530815
# report actual input values of CONFIG_FILES etc. instead of their
3081630816
# values after options handling.
3081730817
ac_log="
30818-
This file was extended by PostgreSQL $as_me 9.3devel, which was
30818+
This file was extended by PostgreSQL $as_me 9.3beta1, which was
3081930819
generated by GNU Autoconf 2.63. Invocation command line was
3082030820

3082130821
CONFIG_FILES = $CONFIG_FILES
@@ -30882,7 +30882,7 @@ Report bugs to <bug-autoconf@gnu.org>."
3088230882
_ACEOF
3088330883
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3088430884
ac_cs_version="\\
30885-
PostgreSQL config.status 9.3devel
30885+
PostgreSQL config.status 9.3beta1
3088630886
configured by $0, generated by GNU Autoconf 2.63,
3088730887
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
3088830888

‎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.3devel], [pgsql-bugs@postgresql.org])
20+
AC_INIT([PostgreSQL], [9.3beta1], [pgsql-bugs@postgresql.org])
2121

2222
m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required.
2323
Untested combinations of 'autoconf' and PostgreSQL versions are not

‎contrib/pageinspect/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ MODULE_big = pageinspect
44
OBJS = rawpage.o heapfuncs.o btreefuncs.o fsmfuncs.o
55

66
EXTENSION = pageinspect
7-
DATA = pageinspect--1.0.sql pageinspect--unpackaged--1.0.sql \
8-
pageinspect--1.1.sql pageinspect--1.0--1.1.sql
7+
DATA = pageinspect--1.1.sql pageinspect--1.0--1.1.sql \
8+
pageinspect--unpackaged--1.0.sql
99

1010
ifdef USE_PGXS
1111
PG_CONFIG = pg_config

‎contrib/pageinspect/pageinspect--1.0.sql

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

‎contrib/pg_upgrade/dump.c

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,34 +22,38 @@ generate_old_dump(void)
2222

2323
/* run new pg_dumpall binary for globals */
2424
exec_prog(UTILITY_LOG_FILE, NULL, true,
25-
"\"%s/pg_dumpall\" %s --schema-only --globals-only --binary-upgrade %s -f %s",
25+
"\"%s/pg_dumpall\" %s --schema-only --globals-only "
26+
"--quote-all-identifiers --binary-upgrade %s -f %s",
2627
new_cluster.bindir, cluster_conn_opts(&old_cluster),
2728
log_opts.verbose ? "--verbose" : "",
2829
GLOBALS_DUMP_FILE);
2930
check_ok();
3031

3132
prep_status("Creating dump of database schemas\n");
3233

33-
/* create per-db dump files */
34+
/* create per-db dump files */
3435
for (dbnum = 0; dbnum < old_cluster.dbarr.ndbs; dbnum++)
3536
{
36-
char sql_file_name[MAXPGPATH], log_file_name[MAXPGPATH];
37-
DbInfo *old_db = &old_cluster.dbarr.dbs[dbnum];
37+
char sql_file_name[MAXPGPATH],
38+
log_file_name[MAXPGPATH];
39+
DbInfo *old_db = &old_cluster.dbarr.dbs[dbnum];
3840

3941
pg_log(PG_STATUS, "%s", old_db->db_name);
4042
snprintf(sql_file_name, sizeof(sql_file_name), DB_DUMP_FILE_MASK, old_db->db_oid);
4143
snprintf(log_file_name, sizeof(log_file_name), DB_DUMP_LOG_FILE_MASK, old_db->db_oid);
4244

4345
parallel_exec_prog(log_file_name, NULL,
44-
"\"%s/pg_dump\" %s --schema-only --binary-upgrade --format=custom %s --file=\"%s\" \"%s\"",
45-
new_cluster.bindir, cluster_conn_opts(&old_cluster),
46-
log_opts.verbose ? "--verbose" : "", sql_file_name, old_db->db_name);
46+
"\"%s/pg_dump\" %s --schema-only --quote-all-identifiers "
47+
"--binary-upgrade --format=custom %s --file=\"%s\" \"%s\"",
48+
new_cluster.bindir, cluster_conn_opts(&old_cluster),
49+
log_opts.verbose ? "--verbose" : "",
50+
sql_file_name, old_db->db_name);
4751
}
4852

4953
/* reap all children */
5054
while (reap_child(true) == true)
5155
;
52-
56+
5357
end_progress_output();
5458
check_ok();
5559
}

‎contrib/pg_upgrade/function.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,20 +193,20 @@ get_loadable_libraries(void)
193193
"in the \"pg_catalog\" schema. You can confirm this by executing\n"
194194
"in psql:\n"
195195
"\n"
196-
" \\df *.plpython_call_handler\n"
196+
" \\df *.plpython_call_handler\n"
197197
"\n"
198198
"The \"public\" schema version of this function was created by a\n"
199199
"pre-8.1 install of plpython, and must be removed for pg_upgrade\n"
200200
"to complete because it references a now-obsolete \"plpython\"\n"
201201
"shared object file. You can remove the \"public\" schema version\n"
202202
"of this function by running the following command:\n"
203203
"\n"
204-
" DROP FUNCTION public.plpython_call_handler()\n"
204+
" DROP FUNCTION public.plpython_call_handler()\n"
205205
"\n"
206206
"in each affected database:\n"
207207
"\n");
208208
}
209-
pg_log(PG_WARNING, " %s\n", active_db->db_name);
209+
pg_log(PG_WARNING, " %s\n", active_db->db_name);
210210
found_public_plpython_handler = true;
211211
}
212212
PQclear(res);

‎contrib/pg_upgrade/test.sh

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ set -e
1313

1414
: ${MAKE=make}
1515

16+
# Guard against parallel make issues (see comments in pg_regress.c)
17+
unset MAKEFLAGS
18+
unset MAKELEVEL
19+
20+
# Set listen_addresses desirably
1621
testhost=`uname -s`
1722

1823
case $testhost in
@@ -65,6 +70,12 @@ PGDATA="$BASE_PGDATA.old"
6570
export PGDATA
6671
rm -rf "$BASE_PGDATA" "$PGDATA"
6772

73+
logdir=$PWD/log
74+
rm -rf "$logdir"
75+
mkdir "$logdir"
76+
77+
# Clear out any environment vars that might cause libpq to connect to
78+
# the wrong postmaster (cf pg_regress.c)
6879
unset PGDATABASE
6980
unset PGUSER
7081
unset PGSERVICE
@@ -74,9 +85,27 @@ unset PGCONNECT_TIMEOUT
7485
unset PGHOST
7586
unset PGHOSTADDR
7687

77-
logdir=$PWD/log
78-
rm -rf "$logdir"
79-
mkdir "$logdir"
88+
# Select a non-conflicting port number, similarly to pg_regress.c
89+
PG_VERSION_NUM=`grep '#define PG_VERSION_NUM' $newsrc/src/include/pg_config.h | awk '{print $3}'`
90+
PGPORT=`expr $PG_VERSION_NUM % 16384 + 49152`
91+
export PGPORT
92+
93+
i=0
94+
while psql -X postgres </dev/null 2>/dev/null
95+
do
96+
i=`expr $i + 1`
97+
if [ $i -eq 16 ]
98+
then
99+
echo port $PGPORT apparently in use
100+
exit 1
101+
fi
102+
PGPORT=`expr $PGPORT + 1`
103+
export PGPORT
104+
done
105+
106+
# buildfarm may try to override port via EXTRA_REGRESS_OPTS ...
107+
EXTRA_REGRESS_OPTS="$EXTRA_REGRESS_OPTS --port=$PGPORT"
108+
export EXTRA_REGRESS_OPTS
80109

81110
# enable echo so the user can see what is being executed
82111
set -x
@@ -123,7 +152,7 @@ PGDATA=$BASE_PGDATA
123152

124153
initdb -N
125154

126-
pg_upgrade -d "${PGDATA}.old" -D "${PGDATA}" -b "$oldbindir" -B "$bindir"
155+
pg_upgrade -d "${PGDATA}.old" -D "${PGDATA}" -b "$oldbindir" -B "$bindir" -p "$PGPORT" -P "$PGPORT"
127156

128157
pg_ctl start -l "$logdir/postmaster2.log" -o "$POSTMASTER_OPTS" -w
129158

‎contrib/pg_xlogdump/pg_xlogdump.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -381,11 +381,8 @@ usage(void)
381381
printf("%s decodes and displays PostgreSQL transaction logs for debugging.\n\n",
382382
progname);
383383
printf("Usage:\n");
384-
printf(" %s [OPTION] [STARTSEG [ENDSEG]] \n", progname);
385-
printf("\nGeneral options:\n");
386-
printf(" -V, --version output version information, then exit\n");
387-
printf(" -?, --help show this help, then exit\n");
388-
printf("\nContent options:\n");
384+
printf(" %s [OPTION]... [STARTSEG [ENDSEG]] \n", progname);
385+
printf("\nOptions:\n");
389386
printf(" -b, --bkp-details output detailed information about backup blocks\n");
390387
printf(" -e, --end=RECPTR stop reading at log position RECPTR\n");
391388
printf(" -n, --limit=N number of records to display\n");
@@ -396,7 +393,9 @@ usage(void)
396393
printf(" -s, --start=RECPTR start reading at log position RECPTR\n");
397394
printf(" -t, --timeline=TLI timeline from which to read log records\n");
398395
printf(" (default: 1 or the value used in STARTSEG)\n");
396+
printf(" -V, --version output version information, then exit\n");
399397
printf(" -x, --xid=XID only show records with TransactionId XID\n");
398+
printf(" -?, --help show this help, then exit\n");
400399
}
401400

402401
int

‎contrib/pgbench/pgbench.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -328,10 +328,10 @@ usage(void)
328328
" %s [OPTION]... [DBNAME]\n"
329329
"\nInitialization options:\n"
330330
" -i invokes initialization mode\n"
331-
" -n do not run VACUUM after initialization\n"
332331
" -F NUM fill factor\n"
333-
" -s NUM scaling factor\n"
332+
" -n do not run VACUUM after initialization\n"
334333
" -q quiet logging (one message each 5 seconds)\n"
334+
" -s NUM scaling factor\n"
335335
" --foreign-keys\n"
336336
" create foreign key constraints between tables\n"
337337
" --index-tablespace=TABLESPACE\n"
@@ -348,10 +348,6 @@ usage(void)
348348
" -f FILENAME read transaction script from FILENAME\n"
349349
" -j NUM number of threads (default: 1)\n"
350350
" -l write transaction times to log file\n"
351-
" --sampling-rate NUM\n"
352-
" fraction of transactions to log (e.g. 0.01 for 1%% sample)\n"
353-
" --aggregate-interval NUM\n"
354-
" aggregate data over NUM seconds\n"
355351
" -M simple|extended|prepared\n"
356352
" protocol for submitting queries to server (default: simple)\n"
357353
" -n do not run VACUUM before tests\n"
@@ -362,6 +358,10 @@ usage(void)
362358
" -t NUM number of transactions each client runs (default: 10)\n"
363359
" -T NUM duration of benchmark test in seconds\n"
364360
" -v vacuum all four standard tables before tests\n"
361+
" --aggregate-interval=NUM\n"
362+
" aggregate data over NUM seconds\n"
363+
" --sampling-rate=NUM\n"
364+
" fraction of transactions to log (e.g. 0.01 for 1%% sample)\n"
365365
"\nCommon options:\n"
366366
" -d print debugging output\n"
367367
" -h HOSTNAME database server host or socket directory\n"

0 commit comments

Comments
 (0)
0