Disable Query Idenfifier calculation in tests

When queryId is not 0 and verbose is true, the query identifier is
emitted to the explain output. This is breaking Postgres outputs.
We disable de query identifier calculation in the tests.
Commit on PG that introduced the query identifier in the explain output:
4f0b0966c866ae9f0e15d7cc73ccf7ce4e1af84b
pull/5209/head
Sait Talha Nisanci 2021-08-21 23:03:54 +03:00
parent 7c0389a7a1
commit d1c0403055
3 changed files with 8 additions and 3 deletions

View File

@ -11,6 +11,8 @@
#include "libpq-fe.h"
#include "miscadmin.h"
#include "distributed/pg_version_constants.h"
#include "access/htup_details.h"
#include "access/xact.h"
#include "catalog/namespace.h"
@ -1251,10 +1253,8 @@ CitusExplainOneQuery(Query *query, int cursorOptions, IntoClause *into,
/* plan the query */
PlannedStmt *plan = pg_plan_query_compat(query, NULL, cursorOptions, params);
INSTR_TIME_SET_CURRENT(planduration);
INSTR_TIME_SUBTRACT(planduration, planstart);
#if PG_VERSION_NUM >= PG_VERSION_13
/* calc differences of buffer counters. */

View File

@ -235,7 +235,6 @@ s/ERROR: parallel workers for vacuum must be between/ERROR: parallel vacuum de
s/ERROR: fake_fetch_row_version not implemented/ERROR: fake_tuple_update not implemented/g
s/ERROR: COMMIT is not allowed in an SQL function/ERROR: COMMIT is not allowed in a SQL function/g
s/ERROR: ROLLBACK is not allowed in an SQL function/ERROR: ROLLBACK is not allowed in a SQL function/g
/.*Query Identifier.*/d
/.*Async-Capable.*/d
/.*Async Capable.*/d
/Parent Relationship/d

View File

@ -438,6 +438,12 @@ push(@pgOptions, "wal_receiver_status_interval=1");
# src/backend/replication/logical/launcher.c.
push(@pgOptions, "wal_retrieve_retry_interval=1000");
# disable compute_query_id so that we don't get Query Identifiers
# in explain outputs
if ($majorversion >= "14") {
push(@pgOptions, "compute_query_id=off");
}
# Citus options set for the tests
push(@pgOptions, "citus.shard_count=4");
push(@pgOptions, "citus.max_adaptive_executor_pool_size=4");