From 2879fc2643e0916431def8a281ac9eb3c58794ee Mon Sep 17 00:00:00 2001 From: Kyotaro Horiguchi Date: Wed, 12 Oct 2016 14:03:53 +0900 Subject: [PATCH 2/4] Fix some bugs. --- contrib/postgres_fdw/expected/postgres_fdw.out | 142 ++++++++++++------------- contrib/postgres_fdw/postgres_fdw.c | 3 +- src/backend/executor/execAsync.c | 4 +- src/backend/postmaster/pgstat.c | 3 + src/include/pgstat.h | 3 +- 5 files changed, 81 insertions(+), 74 deletions(-) diff --git a/contrib/postgres_fdw/expected/postgres_fdw.out b/contrib/postgres_fdw/expected/postgres_fdw.out index d97e694..6677bc4 100644 --- a/contrib/postgres_fdw/expected/postgres_fdw.out +++ b/contrib/postgres_fdw/expected/postgres_fdw.out @@ -5082,12 +5082,12 @@ INSERT INTO b(aa) VALUES('bbbbb'); SELECT tableoid::regclass, * FROM a; tableoid | aa ----------+------- - a | aaa - a | aaaa - a | aaaaa b | bbb b | bbbb b | bbbbb + a | aaa + a | aaaa + a | aaaaa (6 rows) SELECT tableoid::regclass, * FROM b; @@ -5110,12 +5110,12 @@ UPDATE a SET aa = 'zzzzzz' WHERE aa LIKE 'aaaa%'; SELECT tableoid::regclass, * FROM a; tableoid | aa ----------+-------- - a | aaa - a | zzzzzz - a | zzzzzz b | bbb b | bbbb b | bbbbb + a | aaa + a | zzzzzz + a | zzzzzz (6 rows) SELECT tableoid::regclass, * FROM b; @@ -5138,12 +5138,12 @@ UPDATE b SET aa = 'new'; SELECT tableoid::regclass, * FROM a; tableoid | aa ----------+-------- - a | aaa - a | zzzzzz - a | zzzzzz b | new b | new b | new + a | aaa + a | zzzzzz + a | zzzzzz (6 rows) SELECT tableoid::regclass, * FROM b; @@ -5166,12 +5166,12 @@ UPDATE a SET aa = 'newtoo'; SELECT tableoid::regclass, * FROM a; tableoid | aa ----------+-------- - a | newtoo - a | newtoo - a | newtoo b | newtoo b | newtoo b | newtoo + a | newtoo + a | newtoo + a | newtoo (6 rows) SELECT tableoid::regclass, * FROM b; @@ -5230,120 +5230,120 @@ insert into bar2 values(4,44,44); insert into bar2 values(7,77,77); explain (verbose, costs off) select * from bar where f1 in (select f1 from foo) for update; - QUERY PLAN ----------------------------------------------------------------------------------------------- + QUERY PLAN +------------------------------------------------------------------------------------------------------------------------ LockRows - Output: bar.f1, bar.f2, bar.ctid, bar.*, bar.tableoid, foo.ctid, foo.*, foo.tableoid + Output: bar2.f1, bar2.f2, bar2.ctid, ((bar2.*)::bar), bar2.tableoid, foo2.ctid, ((foo2.*)::foo), foo2.tableoid -> Hash Join - Output: bar.f1, bar.f2, bar.ctid, bar.*, bar.tableoid, foo.ctid, foo.*, foo.tableoid - Hash Cond: (bar.f1 = foo.f1) + Output: bar2.f1, bar2.f2, bar2.ctid, ((bar2.*)::bar), bar2.tableoid, foo2.ctid, ((foo2.*)::foo), foo2.tableoid + Hash Cond: (bar2.f1 = foo2.f1) -> Append - -> Seq Scan on public.bar - Output: bar.f1, bar.f2, bar.ctid, bar.*, bar.tableoid -> Foreign Scan on public.bar2 Output: bar2.f1, bar2.f2, bar2.ctid, bar2.*, bar2.tableoid Remote SQL: SELECT f1, f2, f3, ctid FROM public.loct2 FOR UPDATE + -> Seq Scan on public.bar + Output: bar.f1, bar.f2, bar.ctid, bar.*, bar.tableoid -> Hash - Output: foo.ctid, foo.*, foo.tableoid, foo.f1 + Output: foo2.ctid, ((foo2.*)::foo), foo2.tableoid, foo2.f1 -> HashAggregate - Output: foo.ctid, foo.*, foo.tableoid, foo.f1 - Group Key: foo.f1 + Output: foo2.ctid, ((foo2.*)::foo), foo2.tableoid, foo2.f1 + Group Key: foo2.f1 -> Append - -> Seq Scan on public.foo - Output: foo.ctid, foo.*, foo.tableoid, foo.f1 -> Foreign Scan on public.foo2 Output: foo2.ctid, foo2.*, foo2.tableoid, foo2.f1 Remote SQL: SELECT f1, f2, f3, ctid FROM public.loct1 + -> Seq Scan on public.foo + Output: foo.ctid, foo.*, foo.tableoid, foo.f1 (22 rows) select * from bar where f1 in (select f1 from foo) for update; f1 | f2 ----+---- - 1 | 11 - 2 | 22 3 | 33 4 | 44 + 1 | 11 + 2 | 22 (4 rows) explain (verbose, costs off) select * from bar where f1 in (select f1 from foo) for share; - QUERY PLAN ----------------------------------------------------------------------------------------------- + QUERY PLAN +------------------------------------------------------------------------------------------------------------------------ LockRows - Output: bar.f1, bar.f2, bar.ctid, bar.*, bar.tableoid, foo.ctid, foo.*, foo.tableoid + Output: bar2.f1, bar2.f2, bar2.ctid, ((bar2.*)::bar), bar2.tableoid, foo2.ctid, ((foo2.*)::foo), foo2.tableoid -> Hash Join - Output: bar.f1, bar.f2, bar.ctid, bar.*, bar.tableoid, foo.ctid, foo.*, foo.tableoid - Hash Cond: (bar.f1 = foo.f1) + Output: bar2.f1, bar2.f2, bar2.ctid, ((bar2.*)::bar), bar2.tableoid, foo2.ctid, ((foo2.*)::foo), foo2.tableoid + Hash Cond: (bar2.f1 = foo2.f1) -> Append - -> Seq Scan on public.bar - Output: bar.f1, bar.f2, bar.ctid, bar.*, bar.tableoid -> Foreign Scan on public.bar2 Output: bar2.f1, bar2.f2, bar2.ctid, bar2.*, bar2.tableoid Remote SQL: SELECT f1, f2, f3, ctid FROM public.loct2 FOR SHARE + -> Seq Scan on public.bar + Output: bar.f1, bar.f2, bar.ctid, bar.*, bar.tableoid -> Hash - Output: foo.ctid, foo.*, foo.tableoid, foo.f1 + Output: foo2.ctid, ((foo2.*)::foo), foo2.tableoid, foo2.f1 -> HashAggregate - Output: foo.ctid, foo.*, foo.tableoid, foo.f1 - Group Key: foo.f1 + Output: foo2.ctid, ((foo2.*)::foo), foo2.tableoid, foo2.f1 + Group Key: foo2.f1 -> Append - -> Seq Scan on public.foo - Output: foo.ctid, foo.*, foo.tableoid, foo.f1 -> Foreign Scan on public.foo2 Output: foo2.ctid, foo2.*, foo2.tableoid, foo2.f1 Remote SQL: SELECT f1, f2, f3, ctid FROM public.loct1 + -> Seq Scan on public.foo + Output: foo.ctid, foo.*, foo.tableoid, foo.f1 (22 rows) select * from bar where f1 in (select f1 from foo) for share; f1 | f2 ----+---- - 1 | 11 - 2 | 22 3 | 33 4 | 44 + 1 | 11 + 2 | 22 (4 rows) -- Check UPDATE with inherited target and an inherited source table explain (verbose, costs off) update bar set f2 = f2 + 100 where f1 in (select f1 from foo); - QUERY PLAN ---------------------------------------------------------------------------------------------- + QUERY PLAN +--------------------------------------------------------------------------------------------------------- Update on public.bar Update on public.bar Foreign Update on public.bar2 Remote SQL: UPDATE public.loct2 SET f2 = $2 WHERE ctid = $1 -> Hash Join - Output: bar.f1, (bar.f2 + 100), bar.ctid, foo.ctid, foo.*, foo.tableoid - Hash Cond: (bar.f1 = foo.f1) + Output: bar.f1, (bar.f2 + 100), bar.ctid, foo2.ctid, ((foo2.*)::foo), foo2.tableoid + Hash Cond: (bar.f1 = foo2.f1) -> Seq Scan on public.bar Output: bar.f1, bar.f2, bar.ctid -> Hash - Output: foo.ctid, foo.*, foo.tableoid, foo.f1 + Output: foo2.ctid, ((foo2.*)::foo), foo2.tableoid, foo2.f1 -> HashAggregate - Output: foo.ctid, foo.*, foo.tableoid, foo.f1 - Group Key: foo.f1 + Output: foo2.ctid, ((foo2.*)::foo), foo2.tableoid, foo2.f1 + Group Key: foo2.f1 -> Append - -> Seq Scan on public.foo - Output: foo.ctid, foo.*, foo.tableoid, foo.f1 -> Foreign Scan on public.foo2 Output: foo2.ctid, foo2.*, foo2.tableoid, foo2.f1 Remote SQL: SELECT f1, f2, f3, ctid FROM public.loct1 + -> Seq Scan on public.foo + Output: foo.ctid, foo.*, foo.tableoid, foo.f1 -> Hash Join - Output: bar2.f1, (bar2.f2 + 100), bar2.f3, bar2.ctid, foo.ctid, foo.*, foo.tableoid - Hash Cond: (bar2.f1 = foo.f1) + Output: bar2.f1, (bar2.f2 + 100), bar2.f3, bar2.ctid, foo2.ctid, ((foo2.*)::foo), foo2.tableoid + Hash Cond: (bar2.f1 = foo2.f1) -> Foreign Scan on public.bar2 Output: bar2.f1, bar2.f2, bar2.f3, bar2.ctid Remote SQL: SELECT f1, f2, f3, ctid FROM public.loct2 FOR UPDATE -> Hash - Output: foo.ctid, foo.*, foo.tableoid, foo.f1 + Output: foo2.ctid, ((foo2.*)::foo), foo2.tableoid, foo2.f1 -> HashAggregate - Output: foo.ctid, foo.*, foo.tableoid, foo.f1 - Group Key: foo.f1 + Output: foo2.ctid, ((foo2.*)::foo), foo2.tableoid, foo2.f1 + Group Key: foo2.f1 -> Append - -> Seq Scan on public.foo - Output: foo.ctid, foo.*, foo.tableoid, foo.f1 -> Foreign Scan on public.foo2 Output: foo2.ctid, foo2.*, foo2.tableoid, foo2.f1 Remote SQL: SELECT f1, f2, f3, ctid FROM public.loct1 + -> Seq Scan on public.foo + Output: foo.ctid, foo.*, foo.tableoid, foo.f1 (37 rows) update bar set f2 = f2 + 100 where f1 in (select f1 from foo); @@ -5371,26 +5371,26 @@ where bar.f1 = ss.f1; Foreign Update on public.bar2 Remote SQL: UPDATE public.loct2 SET f2 = $2 WHERE ctid = $1 -> Hash Join - Output: bar.f1, (bar.f2 + 100), bar.ctid, (ROW(foo.f1)) - Hash Cond: (foo.f1 = bar.f1) + Output: bar.f1, (bar.f2 + 100), bar.ctid, (ROW(foo2.f1)) + Hash Cond: (foo2.f1 = bar.f1) -> Append - -> Seq Scan on public.foo - Output: ROW(foo.f1), foo.f1 -> Foreign Scan on public.foo2 Output: ROW(foo2.f1), foo2.f1 Remote SQL: SELECT f1 FROM public.loct1 - -> Seq Scan on public.foo foo_1 - Output: ROW((foo_1.f1 + 3)), (foo_1.f1 + 3) -> Foreign Scan on public.foo2 foo2_1 Output: ROW((foo2_1.f1 + 3)), (foo2_1.f1 + 3) Remote SQL: SELECT f1 FROM public.loct1 + -> Seq Scan on public.foo + Output: ROW(foo.f1), foo.f1 + -> Seq Scan on public.foo foo_1 + Output: ROW((foo_1.f1 + 3)), (foo_1.f1 + 3) -> Hash Output: bar.f1, bar.f2, bar.ctid -> Seq Scan on public.bar Output: bar.f1, bar.f2, bar.ctid -> Merge Join - Output: bar2.f1, (bar2.f2 + 100), bar2.f3, bar2.ctid, (ROW(foo.f1)) - Merge Cond: (bar2.f1 = foo.f1) + Output: bar2.f1, (bar2.f2 + 100), bar2.f3, bar2.ctid, (ROW(foo2.f1)) + Merge Cond: (bar2.f1 = foo2.f1) -> Sort Output: bar2.f1, bar2.f2, bar2.f3, bar2.ctid Sort Key: bar2.f1 @@ -5398,19 +5398,19 @@ where bar.f1 = ss.f1; Output: bar2.f1, bar2.f2, bar2.f3, bar2.ctid Remote SQL: SELECT f1, f2, f3, ctid FROM public.loct2 FOR UPDATE -> Sort - Output: (ROW(foo.f1)), foo.f1 - Sort Key: foo.f1 + Output: (ROW(foo2.f1)), foo2.f1 + Sort Key: foo2.f1 -> Append - -> Seq Scan on public.foo - Output: ROW(foo.f1), foo.f1 -> Foreign Scan on public.foo2 Output: ROW(foo2.f1), foo2.f1 Remote SQL: SELECT f1 FROM public.loct1 - -> Seq Scan on public.foo foo_1 - Output: ROW((foo_1.f1 + 3)), (foo_1.f1 + 3) -> Foreign Scan on public.foo2 foo2_1 Output: ROW((foo2_1.f1 + 3)), (foo2_1.f1 + 3) Remote SQL: SELECT f1 FROM public.loct1 + -> Seq Scan on public.foo + Output: ROW(foo.f1), foo.f1 + -> Seq Scan on public.foo foo_1 + Output: ROW((foo_1.f1 + 3)), (foo_1.f1 + 3) (45 rows) update bar set f2 = f2 + 100 @@ -5577,8 +5577,8 @@ update bar set f2 = f2 + 100 returning *; update bar set f2 = f2 + 100 returning *; f1 | f2 ----+----- - 1 | 311 2 | 322 + 1 | 311 6 | 266 3 | 333 4 | 344 diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c index ab69aa3..6da5843 100644 --- a/contrib/postgres_fdw/postgres_fdw.c +++ b/contrib/postgres_fdw/postgres_fdw.c @@ -20,6 +20,7 @@ #include "commands/explain.h" #include "commands/vacuum.h" #include "executor/execAsync.h" +#include "executor/nodeForeignscan.h" #include "foreign/fdwapi.h" #include "funcapi.h" #include "miscadmin.h" @@ -4374,7 +4375,7 @@ postgresForeignAsyncRequest(EState *estate, PendingAsyncRequest *areq) TupleTableSlot *slot; Assert(IsA(node, ForeignScanState)); - slot = postgresIterateForeignScan(node); + slot = ExecForeignScan(node); ExecAsyncRequestDone(estate, areq, (Node *) slot); } diff --git a/src/backend/executor/execAsync.c b/src/backend/executor/execAsync.c index 5858bb5..e070c26 100644 --- a/src/backend/executor/execAsync.c +++ b/src/backend/executor/execAsync.c @@ -18,6 +18,7 @@ #include "executor/nodeAppend.h" #include "executor/nodeForeignscan.h" #include "miscadmin.h" +#include "pgstat.h" #include "storage/latch.h" static bool ExecAsyncEventWait(EState *estate, long timeout); @@ -286,7 +287,8 @@ ExecAsyncEventWait(EState *estate, long timeout) /* Wait for at least one event to occur. */ noccurred = WaitEventSetWait(estate->es_wait_event_set, timeout, - occurred_event, EVENT_BUFFER_SIZE); + occurred_event, EVENT_BUFFER_SIZE, + WAIT_EVENT_ASYNC_WAIT); if (noccurred == 0) return false; diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c index 5112d6d..558bb8f 100644 --- a/src/backend/postmaster/pgstat.c +++ b/src/backend/postmaster/pgstat.c @@ -3393,6 +3393,9 @@ pgstat_get_wait_ipc(WaitEventIPC w) case WAIT_EVENT_SYNC_REP: event_name = "SyncRep"; break; + case WAIT_EVENT_ASYNC_WAIT: + event_name = "AsyncExecWait"; + break; /* no default case, so that compiler will warn */ } diff --git a/src/include/pgstat.h b/src/include/pgstat.h index 1c9bf13..40c6d08 100644 --- a/src/include/pgstat.h +++ b/src/include/pgstat.h @@ -785,7 +785,8 @@ typedef enum WAIT_EVENT_MQ_SEND, WAIT_EVENT_PARALLEL_FINISH, WAIT_EVENT_SAFE_SNAPSHOT, - WAIT_EVENT_SYNC_REP + WAIT_EVENT_SYNC_REP, + WAIT_EVENT_ASYNC_WAIT } WaitEventIPC; /* ---------- -- 2.9.2