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

Commit8790c8a

Browse files
committed
Merge branch 'REL9_6_STABLE' into PGPRO9_6
Conflicts:HISTORYREADMEdoc/src/sgml/advanced.sgmldoc/src/sgml/contacts.sgmldoc/src/sgml/info.sgmldoc/src/sgml/installation.sgmldoc/src/sgml/libpq.sgmldoc/src/sgml/problems.sgmlsrc/test/regress/expected/join.outsrc/test/regress/sql/join.sql
2 parentsf750095 +42f62e4 commit8790c8a

File tree

149 files changed

+3440
-2965
lines changed

Some content is hidden

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

149 files changed

+3440
-2965
lines changed

‎README.git

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ git and so will not be present if you are using a git checkout.
66

77
If you are using a git checkout, you can view the most recent installation
88
instructions at:
9-
http://www.postgresql.org/docs/devel/static/installation.html
9+
https://www.postgresql.org/docs/devel/static/installation.html
1010

1111
Users compiling from git will also need compatible versions of Bison, Flex,
1212
and Perl, as discussed in the install documentation. These programs are not

‎contrib/hstore_plperl/expected/hstore_plperlu.out

Lines changed: 11 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,12 @@ TRANSFORM FOR TYPE hstore
2020
AS $$
2121
use Data::Dumper;
2222
$Data::Dumper::Sortkeys = 1;
23+
$Data::Dumper::Indent = 0;
2324
elog(INFO, Dumper($_[0]));
2425
return scalar(keys %{$_[0]});
2526
$$;
2627
SELECT test1('aa=>bb, cc=>NULL'::hstore);
27-
INFO: $VAR1 = {
28-
'aa' => 'bb',
29-
'cc' => undef
30-
};
31-
28+
INFO: $VAR1 = {'aa' => 'bb','cc' => undef};
3229
test1
3330
-------
3431
2
@@ -39,12 +36,12 @@ LANGUAGE plperlu
3936
AS $$
4037
use Data::Dumper;
4138
$Data::Dumper::Sortkeys = 1;
39+
$Data::Dumper::Indent = 0;
4240
elog(INFO, Dumper($_[0]));
4341
return scalar(keys %{$_[0]});
4442
$$;
4543
SELECT test1none('aa=>bb, cc=>NULL'::hstore);
4644
INFO: $VAR1 = '"aa"=>"bb", "cc"=>NULL';
47-
4845
test1none
4946
-----------
5047
0
@@ -56,15 +53,12 @@ TRANSFORM FOR TYPE hstore
5653
AS $$
5754
use Data::Dumper;
5855
$Data::Dumper::Sortkeys = 1;
56+
$Data::Dumper::Indent = 0;
5957
elog(INFO, Dumper($_[0]));
6058
return scalar(keys %{$_[0]});
6159
$$;
6260
SELECT test1list('aa=>bb, cc=>NULL'::hstore);
63-
INFO: $VAR1 = {
64-
'aa' => 'bb',
65-
'cc' => undef
66-
};
67-
61+
INFO: $VAR1 = {'aa' => 'bb','cc' => undef};
6862
test1list
6963
-----------
7064
2
@@ -77,18 +71,12 @@ TRANSFORM FOR TYPE hstore
7771
AS $$
7872
use Data::Dumper;
7973
$Data::Dumper::Sortkeys = 1;
74+
$Data::Dumper::Indent = 0;
8075
elog(INFO, Dumper($_[0]->[0], $_[0]->[1]));
8176
return scalar(keys %{$_[0]});
8277
$$;
8378
SELECT test1arr(array['aa=>bb, cc=>NULL'::hstore, 'dd=>ee']);
84-
INFO: $VAR1 = {
85-
'aa' => 'bb',
86-
'cc' => undef
87-
};
88-
$VAR2 = {
89-
'dd' => 'ee'
90-
};
91-
79+
INFO: $VAR1 = {'aa' => 'bb','cc' => undef};$VAR2 = {'dd' => 'ee'};
9280
test1arr
9381
----------
9482
2
@@ -101,6 +89,7 @@ TRANSFORM FOR TYPE hstore
10189
AS $$
10290
use Data::Dumper;
10391
$Data::Dumper::Sortkeys = 1;
92+
$Data::Dumper::Indent = 0;
10493

10594
$rv = spi_exec_query(q{SELECT 'aa=>bb, cc=>NULL'::hstore AS col1});
10695
elog(INFO, Dumper($rv->{rows}[0]->{col1}));
@@ -111,13 +100,8 @@ $rv = spi_exec_prepared($plan, {}, $val);
111100
elog(INFO, Dumper($rv->{rows}[0]->{col1}));
112101
$$;
113102
SELECT test3();
114-
INFO: $VAR1 = {
115-
'aa' => 'bb',
116-
'cc' => undef
117-
};
118-
103+
INFO: $VAR1 = {'aa' => 'bb','cc' => undef};
119104
INFO: $VAR1 = '"a"=>"1", "b"=>"boo", "c"=>NULL';
120-
121105
test3
122106
-------
123107

@@ -138,6 +122,7 @@ TRANSFORM FOR TYPE hstore
138122
AS $$
139123
use Data::Dumper;
140124
$Data::Dumper::Sortkeys = 1;
125+
$Data::Dumper::Indent = 0;
141126
elog(INFO, Dumper($_TD->{new}));
142127
if ($_TD->{new}{a} == 1) {
143128
$_TD->{new}{b} = {a => 1, b => 'boo', c => undef};
@@ -147,14 +132,7 @@ return "MODIFY";
147132
$$;
148133
CREATE TRIGGER test4 BEFORE UPDATE ON test1 FOR EACH ROW EXECUTE PROCEDURE test4();
149134
UPDATE test1 SET a = a;
150-
INFO: $VAR1 = {
151-
'a' => '1',
152-
'b' => {
153-
'aa' => 'bb',
154-
'cc' => undef
155-
}
156-
};
157-
135+
INFO: $VAR1 = {'a' => '1','b' => {'aa' => 'bb','cc' => undef}};
158136
SELECT * FROM test1;
159137
a | b
160138
---+---------------------------------

‎contrib/hstore_plperl/sql/hstore_plperlu.sql

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ TRANSFORM FOR TYPE hstore
1515
AS $$
1616
use Data::Dumper;
1717
$Data::Dumper::Sortkeys=1;
18+
$Data::Dumper::Indent=0;
1819
elog(INFO, Dumper($_[0]));
1920
return scalar(keys%{$_[0]});
2021
$$;
@@ -26,6 +27,7 @@ LANGUAGE plperlu
2627
AS $$
2728
use Data::Dumper;
2829
$Data::Dumper::Sortkeys=1;
30+
$Data::Dumper::Indent=0;
2931
elog(INFO, Dumper($_[0]));
3032
return scalar(keys%{$_[0]});
3133
$$;
@@ -38,6 +40,7 @@ TRANSFORM FOR TYPE hstore
3840
AS $$
3941
use Data::Dumper;
4042
$Data::Dumper::Sortkeys=1;
43+
$Data::Dumper::Indent=0;
4144
elog(INFO, Dumper($_[0]));
4245
return scalar(keys%{$_[0]});
4346
$$;
@@ -52,6 +55,7 @@ TRANSFORM FOR TYPE hstore
5255
AS $$
5356
use Data::Dumper;
5457
$Data::Dumper::Sortkeys=1;
58+
$Data::Dumper::Indent=0;
5559
elog(INFO, Dumper($_[0]->[0], $_[0]->[1]));
5660
return scalar(keys%{$_[0]});
5761
$$;
@@ -66,6 +70,7 @@ TRANSFORM FOR TYPE hstore
6670
AS $$
6771
use Data::Dumper;
6872
$Data::Dumper::Sortkeys=1;
73+
$Data::Dumper::Indent=0;
6974

7075
$rv= spi_exec_query(q{SELECT'aa=>bb, cc=>NULL'::hstoreAS col1});
7176
elog(INFO, Dumper($rv->{rows}[0]->{col1}));
@@ -90,6 +95,7 @@ TRANSFORM FOR TYPE hstore
9095
AS $$
9196
use Data::Dumper;
9297
$Data::Dumper::Sortkeys=1;
98+
$Data::Dumper::Indent=0;
9399
elog(INFO, Dumper($_TD->{new}));
94100
if ($_TD->{new}{a}==1) {
95101
$_TD->{new}{b}= {a=>1, b=>'boo', c=> undef};

‎contrib/pg_standby/pg_standby.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ char *xlogFilePath;/* where we are going to restore to */
5757
char*nextWALFileName;/* the file we need to get from archive */
5858
char*restartWALFileName;/* the file from which we can restart restore */
5959
char*priorWALFileName;/* the file we need to get from archive */
60-
charWALFilePath[MAXPGPATH];/* the file path including archive */
60+
charWALFilePath[MAXPGPATH*2];/* the file path including archive */
6161
charrestoreCommand[MAXPGPATH];/* run this to restore */
6262
charexclusiveCleanupFileName[MAXFNAMELEN];/* the file we need to
6363
* get from archive */
@@ -259,9 +259,9 @@ CustomizableCleanupPriorWALFiles(void)
259259
strcmp(xlde->d_name+8,exclusiveCleanupFileName+8)<0)
260260
{
261261
#ifdefWIN32
262-
snprintf(WALFilePath,MAXPGPATH,"%s\\%s",archiveLocation,xlde->d_name);
262+
snprintf(WALFilePath,sizeof(WALFilePath),"%s\\%s",archiveLocation,xlde->d_name);
263263
#else
264-
snprintf(WALFilePath,MAXPGPATH,"%s/%s",archiveLocation,xlde->d_name);
264+
snprintf(WALFilePath,sizeof(WALFilePath),"%s/%s",archiveLocation,xlde->d_name);
265265
#endif
266266

267267
if (debug)

0 commit comments

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