external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disable queryId calculation in our test suite 

With pg_stat_statements queryId is calculated by default now but that
puts an extra line to explain outputs with Query Identifier. To avoid
that, we explicitly turn off this setting.

Commit on PG:
cafde58b337e007cb6a719f5ab4dd6459d932a39
pg14_support_after_rebase
Sait Talha Nisanci 2021-08-23 15:51:36 +03:00
parent 6ce3bd94b5
commit f46b7fe70e
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/distributed/planner/multi_explain.c
View File

@ -65,9 +65,6 @@
#include "utils/json.h" #include "utils/json.h"
#include "utils/lsyscache.h" #include "utils/lsyscache.h"
#include "utils/snapmgr.h" #include "utils/snapmgr.h"
#if PG_VERSION_NUM >= PG_VERSION_14
#include "utils/queryjumble.h"
#endif
/* Config variables that enable printing distributed query plans */ /* Config variables that enable printing distributed query plans */
@ -1256,15 +1253,6 @@ CitusExplainOneQuery(Query *query, int cursorOptions, IntoClause *into,
/* plan the query */ /* plan the query */
PlannedStmt *plan = pg_plan_query_compat(query, NULL, cursorOptions, params); PlannedStmt *plan = pg_plan_query_compat(query, NULL, cursorOptions, params);
#if PG_VERSION_NUM >= PG_VERSION_14
if (compute_query_id != COMPUTE_QUERY_ID_ON) {
/*
* We don't want to emit the query identifier in explain output.
* By default queryId is already 0.
*/
plan->queryId = 0;
}
#endif
INSTR_TIME_SET_CURRENT(planduration); INSTR_TIME_SET_CURRENT(planduration);
INSTR_TIME_SUBTRACT(planduration, planstart); INSTR_TIME_SUBTRACT(planduration, planstart);
#if PG_VERSION_NUM >= PG_VERSION_13 #if PG_VERSION_NUM >= PG_VERSION_13

1
src/test/regress/bin/normalize.sed
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: 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: 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 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
/.*Async Capable.*/d /.*Async Capable.*/d
/Parent Relationship/d /Parent Relationship/d

6
src/test/regress/pg_regress_multi.pl
View File

@ -438,6 +438,12 @@ push(@pgOptions, "wal_receiver_status_interval=1");
# src/backend/replication/logical/launcher.c. # src/backend/replication/logical/launcher.c.
push(@pgOptions, "wal_retrieve_retry_interval=1000"); 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 # Citus options set for the tests
push(@pgOptions, "citus.shard_count=4"); push(@pgOptions, "citus.shard_count=4");
push(@pgOptions, "citus.max_adaptive_executor_pool_size=4"); push(@pgOptions, "citus.max_adaptive_executor_pool_size=4");