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

Commita6d3dea

Browse files
committed
Disable force_parallel_mode in libpq_pipeline
Some buildfarm animals with force_parallel_mode=regress were failingthis test because the error is reported in a parallel worker quickerthan the rows that succeed.Take the opportunity to move the SET of lc_messages out of the tracedsection, because it's not very interesting.Diagnosed-by: Tom Lane <tgl@sss.pgh.pa.us>Discussion:https://postgr.es/m/3304521.1617221724@sss.pgh.pa.us
1 parent9e20406 commita6d3dea

File tree

8 files changed

+8
-25
lines changed

8 files changed

+8
-25
lines changed

‎src/test/modules/libpq_pipeline/libpq_pipeline.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,7 @@ test_pipeline_abort(PGconn *conn)
438438
if (PQresultStatus(res)!=PGRES_PIPELINE_SYNC)
439439
pg_fatal("Unexpected result code %s from pipeline sync",
440440
PQresStatus(PQresultStatus(res)));
441+
fprintf(stderr,"ok\n");
441442

442443
/* Test single-row mode with an error partways */
443444
if (PQsendQuery(conn,"SELECT 1.0/g FROM generate_series(3, -1, -1) g")!=1)
@@ -1308,6 +1309,13 @@ main(int argc, char **argv)
13081309
exit_nicely(conn);
13091310
}
13101311

1312+
res=PQexec(conn,"SET lc_messages TO \"C\"");
1313+
if (PQresultStatus(res)!=PGRES_COMMAND_OK)
1314+
pg_fatal("failed to set lc_messages: %s",PQerrorMessage(conn));
1315+
res=PQexec(conn,"SET force_parallel_mode = off");
1316+
if (PQresultStatus(res)!=PGRES_COMMAND_OK)
1317+
pg_fatal("failed to set force_parallel_mode: %s",PQerrorMessage(conn));
1318+
13111319
/* Set the trace file, if requested */
13121320
if (tracefile!=NULL)
13131321
{
@@ -1320,10 +1328,6 @@ main(int argc, char **argv)
13201328
PQTRACE_SUPPRESS_TIMESTAMPS |PQTRACE_REGRESS_MODE);
13211329
}
13221330

1323-
res=PQexec(conn,"SET lc_messages TO \"C\"");
1324-
if (PQresultStatus(res)!=PGRES_COMMAND_OK)
1325-
pg_fatal("failed to set lc_messages: %s",PQerrorMessage(conn));
1326-
13271331
if (strcmp(testname,"disallowed_in_pipeline")==0)
13281332
test_disallowed_in_pipeline(conn);
13291333
elseif (strcmp(testname,"multi_pipelines")==0)

‎src/test/modules/libpq_pipeline/traces/disallowed_in_pipeline.trace

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
F27Query "SET lc_messages TO "C""
2-
B8CommandComplete "SET"
3-
B5ReadyForQuery I
41
F13Query "SELECT 1"
52
B33RowDescription 1 "?column?" NNNN 0 NNNN 4 -1 0
63
B11DataRow 1 1 '1'

‎src/test/modules/libpq_pipeline/traces/multi_pipelines.trace

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
F27Query "SET lc_messages TO "C""
2-
B8CommandComplete "SET"
3-
B5ReadyForQuery I
41
F21Parse "" "SELECT $1" 1 NNNN
52
F19Bind "" "" 0 1 1 '1' 1 0
63
F6Describe P ""

‎src/test/modules/libpq_pipeline/traces/pipeline_abort.trace

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
F27Query "SET lc_messages TO "C""
2-
B8CommandComplete "SET"
3-
B5ReadyForQuery I
41
F42Query "DROP TABLE IF EXISTS pq_pipeline_demo"
52
B123NoticeResponse S "NOTICE" V "NOTICE" C "00000" M "table "pq_pipeline_demo" does not exist, skipping" F "SSSS" L "SSSS" R "SSSS" \x00
63
B15CommandComplete "DROP TABLE"

‎src/test/modules/libpq_pipeline/traces/prepared.trace

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
F27Query "SET lc_messages TO "C""
2-
B8CommandComplete "SET"
3-
B5ReadyForQuery I
41
F68Parse "select_one" "SELECT $1, '42', $1::numeric, interval '1 sec'" 1 NNNN
52
F16Describe S "select_one"
63
F4Sync

‎src/test/modules/libpq_pipeline/traces/simple_pipeline.trace

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
F27Query "SET lc_messages TO "C""
2-
B8CommandComplete "SET"
3-
B5ReadyForQuery I
41
F21Parse "" "SELECT $1" 1 NNNN
52
F19Bind "" "" 0 1 1 '1' 1 0
63
F6Describe P ""

‎src/test/modules/libpq_pipeline/traces/singlerow.trace

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
F27Query "SET lc_messages TO "C""
2-
B8CommandComplete "SET"
3-
B5ReadyForQuery I
41
F38Parse "" "SELECT generate_series(42, $1)" 0
52
F20Bind "" "" 0 1 2 '44' 1 0
63
F6Describe P ""

‎src/test/modules/libpq_pipeline/traces/transaction.trace

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
F27Query "SET lc_messages TO "C""
2-
B8CommandComplete "SET"
3-
B5ReadyForQuery I
41
F79Query "DROP TABLE IF EXISTS pq_pipeline_tst;CREATE TABLE pq_pipeline_tst (id int)"
52
B122NoticeResponse S "NOTICE" V "NOTICE" C "00000" M "table "pq_pipeline_tst" does not exist, skipping" F "SSSS" L "SSSS" R "SSSS" \x00
63
B15CommandComplete "DROP TABLE"

0 commit comments

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