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

Commit524f915

Browse files
author
Mikhail Rutman
committed
fix multimaster tests
The perl2host() function was removed in the upstream commit, but000_regress.pl is used it. This commit fixes this issue.
1 parent8345b3a commit524f915

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

‎expected/regression_ee.diff‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ diff ../../../src/test/regress/expected/create_table.out ../tmp_check/regress_ou
2929
diff ../../../src/test/regress/expected/create_index.out ../tmp_check/regress_outdir/results/create_index.out
3030
--- ../../../src/test/regress/expected/create_index.outCENSORED
3131
+++ ../tmp_check/regress_outdir/results/create_index.outCENSORED
32-
@@ -1367,31 +1367,33 @@
32+
@@ -1394,31 +1394,33 @@
3333
CREATE TABLE concur_heap (f1 text, f2 text);
3434
-- empty table
3535
CREATE INDEX CONCURRENTLY concur_index1 ON concur_heap(f2,f1);
@@ -70,7 +70,7 @@ diff ../../../src/test/regress/expected/create_index.out ../tmp_check/regress_ou
7070
COMMIT;
7171
-- test where predicate is able to do a transactional update during
7272
-- a concurrent build before switching pg_index state flags.
73-
@@ -1403,7 +1405,9 @@
73+
@@ -1430,7 +1432,9 @@
7474
END; $$;
7575
CREATE INDEX CONCURRENTLY concur_index8 ON concur_heap (f1)
7676
WHERE predicate_stable();
@@ -80,7 +80,7 @@ diff ../../../src/test/regress/expected/create_index.out ../tmp_check/regress_ou
8080
DROP FUNCTION predicate_stable();
8181
-- But you can do a regular index build in a transaction
8282
BEGIN;
83-
@@ -1412,8 +1416,6 @@
83+
@@ -1439,8 +1443,6 @@
8484
-- Failed builds are left invalid by VACUUM FULL, fixed by REINDEX
8585
VACUUM FULL concur_heap;
8686
REINDEX TABLE concur_heap;
@@ -89,7 +89,7 @@ diff ../../../src/test/regress/expected/create_index.out ../tmp_check/regress_ou
8989
DELETE FROM concur_heap WHERE f1 = 'b';
9090
VACUUM FULL concur_heap;
9191
\d concur_heap
92-
@@ -1423,12 +1425,6 @@
92+
@@ -1450,12 +1452,6 @@
9393
f1 | text | | |
9494
f2 | text | | |
9595
Indexes:
@@ -102,7 +102,7 @@ diff ../../../src/test/regress/expected/create_index.out ../tmp_check/regress_ou
102102
"std_index" btree (f2)
103103

104104
REINDEX TABLE concur_heap;
105-
@@ -1439,12 +1435,6 @@
105+
@@ -1466,12 +1462,6 @@
106106
f1 | text | | |
107107
f2 | text | | |
108108
Indexes:
@@ -115,7 +115,7 @@ diff ../../../src/test/regress/expected/create_index.out ../tmp_check/regress_ou
115115
"std_index" btree (f2)
116116

117117
-- Temporary tables with concurrent builds and on-commit actions
118-
@@ -1454,7 +1444,9 @@
118+
@@ -1481,7 +1471,9 @@
119119
ON COMMIT PRESERVE ROWS;
120120
INSERT INTO concur_temp VALUES (1, 'foo'), (2, 'bar');
121121
CREATE INDEX CONCURRENTLY concur_temp_ind ON concur_temp(f1);
@@ -125,7 +125,7 @@ diff ../../../src/test/regress/expected/create_index.out ../tmp_check/regress_ou
125125
DROP TABLE concur_temp;
126126
-- ON COMMIT DROP
127127
BEGIN;
128-
@@ -1463,34 +1455,42 @@
128+
@@ -1490,34 +1482,42 @@
129129
INSERT INTO concur_temp VALUES (1, 'foo'), (2, 'bar');
130130
-- Fails when running in a transaction.
131131
CREATE INDEX CONCURRENTLY concur_temp_ind ON concur_temp(f1);
@@ -172,7 +172,7 @@ diff ../../../src/test/regress/expected/create_index.out ../tmp_check/regress_ou
172172
\d concur_heap
173173
Table "public.concur_heap"
174174
Column | Type | Collation | Nullable | Default
175-
@@ -2447,46 +2447,38 @@
175+
@@ -2474,46 +2474,38 @@
176176
INSERT INTO concur_reindex_tab4 VALUES (1), (1), (2);
177177
-- This trick creates an invalid index.
178178
CREATE UNIQUE INDEX CONCURRENTLY concur_reindex_ind5 ON concur_reindex_tab4 (c1);

‎t/001_regress.pl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
unlink('parallel_schedule');
9393
TestLib::append_to_file('parallel_schedule',$schedule);
9494

95-
my$regress_shlib =TestLib::perl2host($ENV{REGRESS_SHLIB});
95+
my$regress_shlib =$ENV{REGRESS_SHLIB};
9696
my$regress_libdir = dirname($regress_shlib);
9797
my$regress_outdir ="$ENV{TESTDIR}/tmp_check/regress_outdir";
9898
mkdir($regress_outdir);

0 commit comments

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