mirror of
https://github.com/postgres/postgres.git
synced 2025-08-24 09:27:52 +03:00
Disable force_parallel_mode in libpq_pipeline
Some buildfarm animals with force_parallel_mode=regress were failing this test because the error is reported in a parallel worker quicker than the rows that succeed. Take the opportunity to move the SET of lc_messages out of the traced section, 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
This commit is contained in:
@@ -438,6 +438,7 @@ test_pipeline_abort(PGconn *conn)
|
||||
if (PQresultStatus(res) != PGRES_PIPELINE_SYNC)
|
||||
pg_fatal("Unexpected result code %s from pipeline sync",
|
||||
PQresStatus(PQresultStatus(res)));
|
||||
fprintf(stderr, "ok\n");
|
||||
|
||||
/* Test single-row mode with an error partways */
|
||||
if (PQsendQuery(conn, "SELECT 1.0/g FROM generate_series(3, -1, -1) g") != 1)
|
||||
@@ -1308,6 +1309,13 @@ main(int argc, char **argv)
|
||||
exit_nicely(conn);
|
||||
}
|
||||
|
||||
res = PQexec(conn, "SET lc_messages TO \"C\"");
|
||||
if (PQresultStatus(res) != PGRES_COMMAND_OK)
|
||||
pg_fatal("failed to set lc_messages: %s", PQerrorMessage(conn));
|
||||
res = PQexec(conn, "SET force_parallel_mode = off");
|
||||
if (PQresultStatus(res) != PGRES_COMMAND_OK)
|
||||
pg_fatal("failed to set force_parallel_mode: %s", PQerrorMessage(conn));
|
||||
|
||||
/* Set the trace file, if requested */
|
||||
if (tracefile != NULL)
|
||||
{
|
||||
@@ -1320,10 +1328,6 @@ main(int argc, char **argv)
|
||||
PQTRACE_SUPPRESS_TIMESTAMPS | PQTRACE_REGRESS_MODE);
|
||||
}
|
||||
|
||||
res = PQexec(conn, "SET lc_messages TO \"C\"");
|
||||
if (PQresultStatus(res) != PGRES_COMMAND_OK)
|
||||
pg_fatal("failed to set lc_messages: %s", PQerrorMessage(conn));
|
||||
|
||||
if (strcmp(testname, "disallowed_in_pipeline") == 0)
|
||||
test_disallowed_in_pipeline(conn);
|
||||
else if (strcmp(testname, "multi_pipelines") == 0)
|
||||
|
Reference in New Issue
Block a user