diff options
Diffstat (limited to 'src/test/isolation')
| -rw-r--r-- | src/test/isolation/.gitignore | 1 | ||||
| -rw-r--r-- | src/test/isolation/isolationtester.c | 12 |
2 files changed, 3 insertions, 10 deletions
diff --git a/src/test/isolation/.gitignore b/src/test/isolation/.gitignore index 44bcf95854..870dac4d28 100644 --- a/src/test/isolation/.gitignore +++ b/src/test/isolation/.gitignore @@ -7,5 +7,6 @@ /specscanner.c # Generated subdirectories +/results/ /output_iso/ /tmp_check_iso/ diff --git a/src/test/isolation/isolationtester.c b/src/test/isolation/isolationtester.c index 4d18710bdf..3af5a706ce 100644 --- a/src/test/isolation/isolationtester.c +++ b/src/test/isolation/isolationtester.c @@ -224,20 +224,12 @@ main(int argc, char **argv) */ initPQExpBuffer(&wait_query); appendPQExpBufferStr(&wait_query, - "SELECT pg_catalog.pg_blocking_pids($1) && '{"); + "SELECT pg_catalog.pg_isolation_test_session_is_blocked($1, '{"); /* The spec syntax requires at least one session; assume that here. */ appendPQExpBufferStr(&wait_query, backend_pids[1]); for (i = 2; i < nconns; i++) appendPQExpBuffer(&wait_query, ",%s", backend_pids[i]); - appendPQExpBufferStr(&wait_query, "}'::integer[]"); - - /* Also detect certain wait events. */ - appendPQExpBufferStr(&wait_query, - " OR EXISTS (" - " SELECT * " - " FROM pg_catalog.pg_stat_activity " - " WHERE pid = $1 " - " AND wait_event IN ('SafeSnapshot'))"); + appendPQExpBufferStr(&wait_query, "}')"); res = PQprepare(conns[0], PREP_WAITING, wait_query.data, 0, NULL); if (PQresultStatus(res) != PGRES_COMMAND_OK) |