agora inbox for [email protected]help / color / mirror / Atom feed
[PATCH 09/13] Fix the resource owner to be used 19+ messages / 2 participants [nested] [flat]
* [PATCH 09/13] Fix the resource owner to be used @ 2017-02-22 00:12 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Kyotaro Horiguchi @ 2017-02-22 00:12 UTC (permalink / raw) Fixup of previous commit. --- src/backend/executor/execAsync.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/backend/executor/execAsync.c b/src/backend/executor/execAsync.c index 588ba18..a8e5f80 100644 --- a/src/backend/executor/execAsync.c +++ b/src/backend/executor/execAsync.c @@ -20,7 +20,7 @@ #include "miscadmin.h" #include "pgstat.h" #include "storage/latch.h" -#include "utils/resowner_private.h" +#include "utils/memutils.h" static bool ExecAsyncEventWait(EState *estate, long timeout); static bool ExecAsyncConfigureWait(EState *estate, PendingAsyncRequest *areq, @@ -297,8 +297,6 @@ ExecAsyncEventWait(EState *estate, long timeout) if (estate->es_wait_event_set == NULL) { - ResourceOwner savedOwner; - /* * Allow for a few extra events without reinitializing. It * doesn't seem worth the complexity of doing anything very @@ -308,26 +306,14 @@ ExecAsyncEventWait(EState *estate, long timeout) estate->es_allocated_fd_events = estate->es_total_fd_events + 16; /* - * The wait event set created here should be released in case of - * error. + * The wait event set created here should be live beyond ExecutorState + * context but released in case of error. */ - savedOwner = CurrentResourceOwner; - CurrentResourceOwner = TopTransactionResourceOwner; - - PG_TRY(); - { - estate->es_wait_event_set = - CreateWaitEventSet(estate->es_query_cxt, - estate->es_allocated_fd_events + 1); - } - PG_CATCH(); - { - CurrentResourceOwner = savedOwner; - PG_RE_THROW(); - } - PG_END_TRY(); + estate->es_wait_event_set = + CreateWaitEventSet(TopTransactionContext, + TopTransactionResourceOwner, + estate->es_allocated_fd_events + 1); - CurrentResourceOwner = savedOwner; AddWaitEventToSet(estate->es_wait_event_set, WL_LATCH_SET, PGINVALID_SOCKET, MyLatch, NULL); reinit = true; -- 2.9.2 ----Next_Part(Wed_Feb_22_17_39_45_2017_090)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0008-Allow-wait-event-set-to-be-registered-to-resource-ow.patch" ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH 09/13] Fix the resource owner to be used @ 2017-02-22 00:12 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Kyotaro Horiguchi @ 2017-02-22 00:12 UTC (permalink / raw) Fixup of previous commit. --- src/backend/executor/execAsync.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/backend/executor/execAsync.c b/src/backend/executor/execAsync.c index 588ba18..a8e5f80 100644 --- a/src/backend/executor/execAsync.c +++ b/src/backend/executor/execAsync.c @@ -20,7 +20,7 @@ #include "miscadmin.h" #include "pgstat.h" #include "storage/latch.h" -#include "utils/resowner_private.h" +#include "utils/memutils.h" static bool ExecAsyncEventWait(EState *estate, long timeout); static bool ExecAsyncConfigureWait(EState *estate, PendingAsyncRequest *areq, @@ -297,8 +297,6 @@ ExecAsyncEventWait(EState *estate, long timeout) if (estate->es_wait_event_set == NULL) { - ResourceOwner savedOwner; - /* * Allow for a few extra events without reinitializing. It * doesn't seem worth the complexity of doing anything very @@ -308,26 +306,14 @@ ExecAsyncEventWait(EState *estate, long timeout) estate->es_allocated_fd_events = estate->es_total_fd_events + 16; /* - * The wait event set created here should be released in case of - * error. + * The wait event set created here should be live beyond ExecutorState + * context but released in case of error. */ - savedOwner = CurrentResourceOwner; - CurrentResourceOwner = TopTransactionResourceOwner; - - PG_TRY(); - { - estate->es_wait_event_set = - CreateWaitEventSet(estate->es_query_cxt, - estate->es_allocated_fd_events + 1); - } - PG_CATCH(); - { - CurrentResourceOwner = savedOwner; - PG_RE_THROW(); - } - PG_END_TRY(); + estate->es_wait_event_set = + CreateWaitEventSet(TopTransactionContext, + TopTransactionResourceOwner, + estate->es_allocated_fd_events + 1); - CurrentResourceOwner = savedOwner; AddWaitEventToSet(estate->es_wait_event_set, WL_LATCH_SET, PGINVALID_SOCKET, MyLatch, NULL); reinit = true; -- 2.9.2 ----Next_Part(Wed_Feb_22_17_39_45_2017_090)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0008-Allow-wait-event-set-to-be-registered-to-resource-ow.patch" ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH 09/13] Fix the resource owner to be used @ 2017-02-22 00:12 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Kyotaro Horiguchi @ 2017-02-22 00:12 UTC (permalink / raw) Fixup of previous commit. --- src/backend/executor/execAsync.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/backend/executor/execAsync.c b/src/backend/executor/execAsync.c index 588ba18..a8e5f80 100644 --- a/src/backend/executor/execAsync.c +++ b/src/backend/executor/execAsync.c @@ -20,7 +20,7 @@ #include "miscadmin.h" #include "pgstat.h" #include "storage/latch.h" -#include "utils/resowner_private.h" +#include "utils/memutils.h" static bool ExecAsyncEventWait(EState *estate, long timeout); static bool ExecAsyncConfigureWait(EState *estate, PendingAsyncRequest *areq, @@ -297,8 +297,6 @@ ExecAsyncEventWait(EState *estate, long timeout) if (estate->es_wait_event_set == NULL) { - ResourceOwner savedOwner; - /* * Allow for a few extra events without reinitializing. It * doesn't seem worth the complexity of doing anything very @@ -308,26 +306,14 @@ ExecAsyncEventWait(EState *estate, long timeout) estate->es_allocated_fd_events = estate->es_total_fd_events + 16; /* - * The wait event set created here should be released in case of - * error. + * The wait event set created here should be live beyond ExecutorState + * context but released in case of error. */ - savedOwner = CurrentResourceOwner; - CurrentResourceOwner = TopTransactionResourceOwner; - - PG_TRY(); - { - estate->es_wait_event_set = - CreateWaitEventSet(estate->es_query_cxt, - estate->es_allocated_fd_events + 1); - } - PG_CATCH(); - { - CurrentResourceOwner = savedOwner; - PG_RE_THROW(); - } - PG_END_TRY(); + estate->es_wait_event_set = + CreateWaitEventSet(TopTransactionContext, + TopTransactionResourceOwner, + estate->es_allocated_fd_events + 1); - CurrentResourceOwner = savedOwner; AddWaitEventToSet(estate->es_wait_event_set, WL_LATCH_SET, PGINVALID_SOCKET, MyLatch, NULL); reinit = true; -- 2.9.2 ----Next_Part(Wed_Feb_22_17_39_45_2017_090)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0008-Allow-wait-event-set-to-be-registered-to-resource-ow.patch" ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH 09/13] Fix the resource owner to be used @ 2017-02-22 00:12 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Kyotaro Horiguchi @ 2017-02-22 00:12 UTC (permalink / raw) Fixup of previous commit. --- src/backend/executor/execAsync.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/backend/executor/execAsync.c b/src/backend/executor/execAsync.c index 588ba18..a8e5f80 100644 --- a/src/backend/executor/execAsync.c +++ b/src/backend/executor/execAsync.c @@ -20,7 +20,7 @@ #include "miscadmin.h" #include "pgstat.h" #include "storage/latch.h" -#include "utils/resowner_private.h" +#include "utils/memutils.h" static bool ExecAsyncEventWait(EState *estate, long timeout); static bool ExecAsyncConfigureWait(EState *estate, PendingAsyncRequest *areq, @@ -297,8 +297,6 @@ ExecAsyncEventWait(EState *estate, long timeout) if (estate->es_wait_event_set == NULL) { - ResourceOwner savedOwner; - /* * Allow for a few extra events without reinitializing. It * doesn't seem worth the complexity of doing anything very @@ -308,26 +306,14 @@ ExecAsyncEventWait(EState *estate, long timeout) estate->es_allocated_fd_events = estate->es_total_fd_events + 16; /* - * The wait event set created here should be released in case of - * error. + * The wait event set created here should be live beyond ExecutorState + * context but released in case of error. */ - savedOwner = CurrentResourceOwner; - CurrentResourceOwner = TopTransactionResourceOwner; - - PG_TRY(); - { - estate->es_wait_event_set = - CreateWaitEventSet(estate->es_query_cxt, - estate->es_allocated_fd_events + 1); - } - PG_CATCH(); - { - CurrentResourceOwner = savedOwner; - PG_RE_THROW(); - } - PG_END_TRY(); + estate->es_wait_event_set = + CreateWaitEventSet(TopTransactionContext, + TopTransactionResourceOwner, + estate->es_allocated_fd_events + 1); - CurrentResourceOwner = savedOwner; AddWaitEventToSet(estate->es_wait_event_set, WL_LATCH_SET, PGINVALID_SOCKET, MyLatch, NULL); reinit = true; -- 2.9.2 ----Next_Part(Wed_Feb_22_17_39_45_2017_090)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0008-Allow-wait-event-set-to-be-registered-to-resource-ow.patch" ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH 09/13] Fix the resource owner to be used @ 2017-02-22 00:12 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Kyotaro Horiguchi @ 2017-02-22 00:12 UTC (permalink / raw) Fixup of previous commit. --- src/backend/executor/execAsync.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/backend/executor/execAsync.c b/src/backend/executor/execAsync.c index 588ba18..a8e5f80 100644 --- a/src/backend/executor/execAsync.c +++ b/src/backend/executor/execAsync.c @@ -20,7 +20,7 @@ #include "miscadmin.h" #include "pgstat.h" #include "storage/latch.h" -#include "utils/resowner_private.h" +#include "utils/memutils.h" static bool ExecAsyncEventWait(EState *estate, long timeout); static bool ExecAsyncConfigureWait(EState *estate, PendingAsyncRequest *areq, @@ -297,8 +297,6 @@ ExecAsyncEventWait(EState *estate, long timeout) if (estate->es_wait_event_set == NULL) { - ResourceOwner savedOwner; - /* * Allow for a few extra events without reinitializing. It * doesn't seem worth the complexity of doing anything very @@ -308,26 +306,14 @@ ExecAsyncEventWait(EState *estate, long timeout) estate->es_allocated_fd_events = estate->es_total_fd_events + 16; /* - * The wait event set created here should be released in case of - * error. + * The wait event set created here should be live beyond ExecutorState + * context but released in case of error. */ - savedOwner = CurrentResourceOwner; - CurrentResourceOwner = TopTransactionResourceOwner; - - PG_TRY(); - { - estate->es_wait_event_set = - CreateWaitEventSet(estate->es_query_cxt, - estate->es_allocated_fd_events + 1); - } - PG_CATCH(); - { - CurrentResourceOwner = savedOwner; - PG_RE_THROW(); - } - PG_END_TRY(); + estate->es_wait_event_set = + CreateWaitEventSet(TopTransactionContext, + TopTransactionResourceOwner, + estate->es_allocated_fd_events + 1); - CurrentResourceOwner = savedOwner; AddWaitEventToSet(estate->es_wait_event_set, WL_LATCH_SET, PGINVALID_SOCKET, MyLatch, NULL); reinit = true; -- 2.9.2 ----Next_Part(Wed_Feb_22_17_39_45_2017_090)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0008-Allow-wait-event-set-to-be-registered-to-resource-ow.patch" ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH 09/13] Fix the resource owner to be used @ 2017-02-22 00:12 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Kyotaro Horiguchi @ 2017-02-22 00:12 UTC (permalink / raw) Fixup of previous commit. --- src/backend/executor/execAsync.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/backend/executor/execAsync.c b/src/backend/executor/execAsync.c index 588ba18..a8e5f80 100644 --- a/src/backend/executor/execAsync.c +++ b/src/backend/executor/execAsync.c @@ -20,7 +20,7 @@ #include "miscadmin.h" #include "pgstat.h" #include "storage/latch.h" -#include "utils/resowner_private.h" +#include "utils/memutils.h" static bool ExecAsyncEventWait(EState *estate, long timeout); static bool ExecAsyncConfigureWait(EState *estate, PendingAsyncRequest *areq, @@ -297,8 +297,6 @@ ExecAsyncEventWait(EState *estate, long timeout) if (estate->es_wait_event_set == NULL) { - ResourceOwner savedOwner; - /* * Allow for a few extra events without reinitializing. It * doesn't seem worth the complexity of doing anything very @@ -308,26 +306,14 @@ ExecAsyncEventWait(EState *estate, long timeout) estate->es_allocated_fd_events = estate->es_total_fd_events + 16; /* - * The wait event set created here should be released in case of - * error. + * The wait event set created here should be live beyond ExecutorState + * context but released in case of error. */ - savedOwner = CurrentResourceOwner; - CurrentResourceOwner = TopTransactionResourceOwner; - - PG_TRY(); - { - estate->es_wait_event_set = - CreateWaitEventSet(estate->es_query_cxt, - estate->es_allocated_fd_events + 1); - } - PG_CATCH(); - { - CurrentResourceOwner = savedOwner; - PG_RE_THROW(); - } - PG_END_TRY(); + estate->es_wait_event_set = + CreateWaitEventSet(TopTransactionContext, + TopTransactionResourceOwner, + estate->es_allocated_fd_events + 1); - CurrentResourceOwner = savedOwner; AddWaitEventToSet(estate->es_wait_event_set, WL_LATCH_SET, PGINVALID_SOCKET, MyLatch, NULL); reinit = true; -- 2.9.2 ----Next_Part(Wed_Feb_22_17_39_45_2017_090)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0008-Allow-wait-event-set-to-be-registered-to-resource-ow.patch" ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH 09/13] Fix the resource owner to be used @ 2017-02-22 00:12 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Kyotaro Horiguchi @ 2017-02-22 00:12 UTC (permalink / raw) Fixup of previous commit. --- src/backend/executor/execAsync.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/backend/executor/execAsync.c b/src/backend/executor/execAsync.c index 588ba18..a8e5f80 100644 --- a/src/backend/executor/execAsync.c +++ b/src/backend/executor/execAsync.c @@ -20,7 +20,7 @@ #include "miscadmin.h" #include "pgstat.h" #include "storage/latch.h" -#include "utils/resowner_private.h" +#include "utils/memutils.h" static bool ExecAsyncEventWait(EState *estate, long timeout); static bool ExecAsyncConfigureWait(EState *estate, PendingAsyncRequest *areq, @@ -297,8 +297,6 @@ ExecAsyncEventWait(EState *estate, long timeout) if (estate->es_wait_event_set == NULL) { - ResourceOwner savedOwner; - /* * Allow for a few extra events without reinitializing. It * doesn't seem worth the complexity of doing anything very @@ -308,26 +306,14 @@ ExecAsyncEventWait(EState *estate, long timeout) estate->es_allocated_fd_events = estate->es_total_fd_events + 16; /* - * The wait event set created here should be released in case of - * error. + * The wait event set created here should be live beyond ExecutorState + * context but released in case of error. */ - savedOwner = CurrentResourceOwner; - CurrentResourceOwner = TopTransactionResourceOwner; - - PG_TRY(); - { - estate->es_wait_event_set = - CreateWaitEventSet(estate->es_query_cxt, - estate->es_allocated_fd_events + 1); - } - PG_CATCH(); - { - CurrentResourceOwner = savedOwner; - PG_RE_THROW(); - } - PG_END_TRY(); + estate->es_wait_event_set = + CreateWaitEventSet(TopTransactionContext, + TopTransactionResourceOwner, + estate->es_allocated_fd_events + 1); - CurrentResourceOwner = savedOwner; AddWaitEventToSet(estate->es_wait_event_set, WL_LATCH_SET, PGINVALID_SOCKET, MyLatch, NULL); reinit = true; -- 2.9.2 ----Next_Part(Wed_Feb_22_17_39_45_2017_090)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0008-Allow-wait-event-set-to-be-registered-to-resource-ow.patch" ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH 09/13] Fix the resource owner to be used @ 2017-02-22 00:12 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Kyotaro Horiguchi @ 2017-02-22 00:12 UTC (permalink / raw) Fixup of previous commit. --- src/backend/executor/execAsync.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/backend/executor/execAsync.c b/src/backend/executor/execAsync.c index 588ba18..a8e5f80 100644 --- a/src/backend/executor/execAsync.c +++ b/src/backend/executor/execAsync.c @@ -20,7 +20,7 @@ #include "miscadmin.h" #include "pgstat.h" #include "storage/latch.h" -#include "utils/resowner_private.h" +#include "utils/memutils.h" static bool ExecAsyncEventWait(EState *estate, long timeout); static bool ExecAsyncConfigureWait(EState *estate, PendingAsyncRequest *areq, @@ -297,8 +297,6 @@ ExecAsyncEventWait(EState *estate, long timeout) if (estate->es_wait_event_set == NULL) { - ResourceOwner savedOwner; - /* * Allow for a few extra events without reinitializing. It * doesn't seem worth the complexity of doing anything very @@ -308,26 +306,14 @@ ExecAsyncEventWait(EState *estate, long timeout) estate->es_allocated_fd_events = estate->es_total_fd_events + 16; /* - * The wait event set created here should be released in case of - * error. + * The wait event set created here should be live beyond ExecutorState + * context but released in case of error. */ - savedOwner = CurrentResourceOwner; - CurrentResourceOwner = TopTransactionResourceOwner; - - PG_TRY(); - { - estate->es_wait_event_set = - CreateWaitEventSet(estate->es_query_cxt, - estate->es_allocated_fd_events + 1); - } - PG_CATCH(); - { - CurrentResourceOwner = savedOwner; - PG_RE_THROW(); - } - PG_END_TRY(); + estate->es_wait_event_set = + CreateWaitEventSet(TopTransactionContext, + TopTransactionResourceOwner, + estate->es_allocated_fd_events + 1); - CurrentResourceOwner = savedOwner; AddWaitEventToSet(estate->es_wait_event_set, WL_LATCH_SET, PGINVALID_SOCKET, MyLatch, NULL); reinit = true; -- 2.9.2 ----Next_Part(Wed_Feb_22_17_39_45_2017_090)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0008-Allow-wait-event-set-to-be-registered-to-resource-ow.patch" ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH 09/13] Fix the resource owner to be used @ 2017-02-22 00:12 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Kyotaro Horiguchi @ 2017-02-22 00:12 UTC (permalink / raw) Fixup of previous commit. --- src/backend/executor/execAsync.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/backend/executor/execAsync.c b/src/backend/executor/execAsync.c index 588ba18..a8e5f80 100644 --- a/src/backend/executor/execAsync.c +++ b/src/backend/executor/execAsync.c @@ -20,7 +20,7 @@ #include "miscadmin.h" #include "pgstat.h" #include "storage/latch.h" -#include "utils/resowner_private.h" +#include "utils/memutils.h" static bool ExecAsyncEventWait(EState *estate, long timeout); static bool ExecAsyncConfigureWait(EState *estate, PendingAsyncRequest *areq, @@ -297,8 +297,6 @@ ExecAsyncEventWait(EState *estate, long timeout) if (estate->es_wait_event_set == NULL) { - ResourceOwner savedOwner; - /* * Allow for a few extra events without reinitializing. It * doesn't seem worth the complexity of doing anything very @@ -308,26 +306,14 @@ ExecAsyncEventWait(EState *estate, long timeout) estate->es_allocated_fd_events = estate->es_total_fd_events + 16; /* - * The wait event set created here should be released in case of - * error. + * The wait event set created here should be live beyond ExecutorState + * context but released in case of error. */ - savedOwner = CurrentResourceOwner; - CurrentResourceOwner = TopTransactionResourceOwner; - - PG_TRY(); - { - estate->es_wait_event_set = - CreateWaitEventSet(estate->es_query_cxt, - estate->es_allocated_fd_events + 1); - } - PG_CATCH(); - { - CurrentResourceOwner = savedOwner; - PG_RE_THROW(); - } - PG_END_TRY(); + estate->es_wait_event_set = + CreateWaitEventSet(TopTransactionContext, + TopTransactionResourceOwner, + estate->es_allocated_fd_events + 1); - CurrentResourceOwner = savedOwner; AddWaitEventToSet(estate->es_wait_event_set, WL_LATCH_SET, PGINVALID_SOCKET, MyLatch, NULL); reinit = true; -- 2.9.2 ----Next_Part(Wed_Feb_22_17_39_45_2017_090)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0008-Allow-wait-event-set-to-be-registered-to-resource-ow.patch" ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH 09/13] Fix the resource owner to be used @ 2017-02-22 00:12 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Kyotaro Horiguchi @ 2017-02-22 00:12 UTC (permalink / raw) Fixup of previous commit. --- src/backend/executor/execAsync.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/backend/executor/execAsync.c b/src/backend/executor/execAsync.c index 588ba18..a8e5f80 100644 --- a/src/backend/executor/execAsync.c +++ b/src/backend/executor/execAsync.c @@ -20,7 +20,7 @@ #include "miscadmin.h" #include "pgstat.h" #include "storage/latch.h" -#include "utils/resowner_private.h" +#include "utils/memutils.h" static bool ExecAsyncEventWait(EState *estate, long timeout); static bool ExecAsyncConfigureWait(EState *estate, PendingAsyncRequest *areq, @@ -297,8 +297,6 @@ ExecAsyncEventWait(EState *estate, long timeout) if (estate->es_wait_event_set == NULL) { - ResourceOwner savedOwner; - /* * Allow for a few extra events without reinitializing. It * doesn't seem worth the complexity of doing anything very @@ -308,26 +306,14 @@ ExecAsyncEventWait(EState *estate, long timeout) estate->es_allocated_fd_events = estate->es_total_fd_events + 16; /* - * The wait event set created here should be released in case of - * error. + * The wait event set created here should be live beyond ExecutorState + * context but released in case of error. */ - savedOwner = CurrentResourceOwner; - CurrentResourceOwner = TopTransactionResourceOwner; - - PG_TRY(); - { - estate->es_wait_event_set = - CreateWaitEventSet(estate->es_query_cxt, - estate->es_allocated_fd_events + 1); - } - PG_CATCH(); - { - CurrentResourceOwner = savedOwner; - PG_RE_THROW(); - } - PG_END_TRY(); + estate->es_wait_event_set = + CreateWaitEventSet(TopTransactionContext, + TopTransactionResourceOwner, + estate->es_allocated_fd_events + 1); - CurrentResourceOwner = savedOwner; AddWaitEventToSet(estate->es_wait_event_set, WL_LATCH_SET, PGINVALID_SOCKET, MyLatch, NULL); reinit = true; -- 2.9.2 ----Next_Part(Wed_Feb_22_17_39_45_2017_090)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0008-Allow-wait-event-set-to-be-registered-to-resource-ow.patch" ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH 09/13] Fix the resource owner to be used @ 2017-02-22 00:12 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Kyotaro Horiguchi @ 2017-02-22 00:12 UTC (permalink / raw) Fixup of previous commit. --- src/backend/executor/execAsync.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/backend/executor/execAsync.c b/src/backend/executor/execAsync.c index 588ba18..a8e5f80 100644 --- a/src/backend/executor/execAsync.c +++ b/src/backend/executor/execAsync.c @@ -20,7 +20,7 @@ #include "miscadmin.h" #include "pgstat.h" #include "storage/latch.h" -#include "utils/resowner_private.h" +#include "utils/memutils.h" static bool ExecAsyncEventWait(EState *estate, long timeout); static bool ExecAsyncConfigureWait(EState *estate, PendingAsyncRequest *areq, @@ -297,8 +297,6 @@ ExecAsyncEventWait(EState *estate, long timeout) if (estate->es_wait_event_set == NULL) { - ResourceOwner savedOwner; - /* * Allow for a few extra events without reinitializing. It * doesn't seem worth the complexity of doing anything very @@ -308,26 +306,14 @@ ExecAsyncEventWait(EState *estate, long timeout) estate->es_allocated_fd_events = estate->es_total_fd_events + 16; /* - * The wait event set created here should be released in case of - * error. + * The wait event set created here should be live beyond ExecutorState + * context but released in case of error. */ - savedOwner = CurrentResourceOwner; - CurrentResourceOwner = TopTransactionResourceOwner; - - PG_TRY(); - { - estate->es_wait_event_set = - CreateWaitEventSet(estate->es_query_cxt, - estate->es_allocated_fd_events + 1); - } - PG_CATCH(); - { - CurrentResourceOwner = savedOwner; - PG_RE_THROW(); - } - PG_END_TRY(); + estate->es_wait_event_set = + CreateWaitEventSet(TopTransactionContext, + TopTransactionResourceOwner, + estate->es_allocated_fd_events + 1); - CurrentResourceOwner = savedOwner; AddWaitEventToSet(estate->es_wait_event_set, WL_LATCH_SET, PGINVALID_SOCKET, MyLatch, NULL); reinit = true; -- 2.9.2 ----Next_Part(Wed_Feb_22_17_39_45_2017_090)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0008-Allow-wait-event-set-to-be-registered-to-resource-ow.patch" ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH 09/13] Fix the resource owner to be used @ 2017-02-22 00:12 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Kyotaro Horiguchi @ 2017-02-22 00:12 UTC (permalink / raw) Fixup of previous commit. --- src/backend/executor/execAsync.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/backend/executor/execAsync.c b/src/backend/executor/execAsync.c index 588ba18..a8e5f80 100644 --- a/src/backend/executor/execAsync.c +++ b/src/backend/executor/execAsync.c @@ -20,7 +20,7 @@ #include "miscadmin.h" #include "pgstat.h" #include "storage/latch.h" -#include "utils/resowner_private.h" +#include "utils/memutils.h" static bool ExecAsyncEventWait(EState *estate, long timeout); static bool ExecAsyncConfigureWait(EState *estate, PendingAsyncRequest *areq, @@ -297,8 +297,6 @@ ExecAsyncEventWait(EState *estate, long timeout) if (estate->es_wait_event_set == NULL) { - ResourceOwner savedOwner; - /* * Allow for a few extra events without reinitializing. It * doesn't seem worth the complexity of doing anything very @@ -308,26 +306,14 @@ ExecAsyncEventWait(EState *estate, long timeout) estate->es_allocated_fd_events = estate->es_total_fd_events + 16; /* - * The wait event set created here should be released in case of - * error. + * The wait event set created here should be live beyond ExecutorState + * context but released in case of error. */ - savedOwner = CurrentResourceOwner; - CurrentResourceOwner = TopTransactionResourceOwner; - - PG_TRY(); - { - estate->es_wait_event_set = - CreateWaitEventSet(estate->es_query_cxt, - estate->es_allocated_fd_events + 1); - } - PG_CATCH(); - { - CurrentResourceOwner = savedOwner; - PG_RE_THROW(); - } - PG_END_TRY(); + estate->es_wait_event_set = + CreateWaitEventSet(TopTransactionContext, + TopTransactionResourceOwner, + estate->es_allocated_fd_events + 1); - CurrentResourceOwner = savedOwner; AddWaitEventToSet(estate->es_wait_event_set, WL_LATCH_SET, PGINVALID_SOCKET, MyLatch, NULL); reinit = true; -- 2.9.2 ----Next_Part(Wed_Feb_22_17_39_45_2017_090)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0008-Allow-wait-event-set-to-be-registered-to-resource-ow.patch" ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH 09/13] Fix the resource owner to be used @ 2017-02-22 00:12 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Kyotaro Horiguchi @ 2017-02-22 00:12 UTC (permalink / raw) Fixup of previous commit. --- src/backend/executor/execAsync.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/backend/executor/execAsync.c b/src/backend/executor/execAsync.c index 588ba18..a8e5f80 100644 --- a/src/backend/executor/execAsync.c +++ b/src/backend/executor/execAsync.c @@ -20,7 +20,7 @@ #include "miscadmin.h" #include "pgstat.h" #include "storage/latch.h" -#include "utils/resowner_private.h" +#include "utils/memutils.h" static bool ExecAsyncEventWait(EState *estate, long timeout); static bool ExecAsyncConfigureWait(EState *estate, PendingAsyncRequest *areq, @@ -297,8 +297,6 @@ ExecAsyncEventWait(EState *estate, long timeout) if (estate->es_wait_event_set == NULL) { - ResourceOwner savedOwner; - /* * Allow for a few extra events without reinitializing. It * doesn't seem worth the complexity of doing anything very @@ -308,26 +306,14 @@ ExecAsyncEventWait(EState *estate, long timeout) estate->es_allocated_fd_events = estate->es_total_fd_events + 16; /* - * The wait event set created here should be released in case of - * error. + * The wait event set created here should be live beyond ExecutorState + * context but released in case of error. */ - savedOwner = CurrentResourceOwner; - CurrentResourceOwner = TopTransactionResourceOwner; - - PG_TRY(); - { - estate->es_wait_event_set = - CreateWaitEventSet(estate->es_query_cxt, - estate->es_allocated_fd_events + 1); - } - PG_CATCH(); - { - CurrentResourceOwner = savedOwner; - PG_RE_THROW(); - } - PG_END_TRY(); + estate->es_wait_event_set = + CreateWaitEventSet(TopTransactionContext, + TopTransactionResourceOwner, + estate->es_allocated_fd_events + 1); - CurrentResourceOwner = savedOwner; AddWaitEventToSet(estate->es_wait_event_set, WL_LATCH_SET, PGINVALID_SOCKET, MyLatch, NULL); reinit = true; -- 2.9.2 ----Next_Part(Wed_Feb_22_17_39_45_2017_090)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0008-Allow-wait-event-set-to-be-registered-to-resource-ow.patch" ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH 09/13] Fix the resource owner to be used @ 2017-02-22 00:12 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Kyotaro Horiguchi @ 2017-02-22 00:12 UTC (permalink / raw) Fixup of previous commit. --- src/backend/executor/execAsync.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/backend/executor/execAsync.c b/src/backend/executor/execAsync.c index 588ba18..a8e5f80 100644 --- a/src/backend/executor/execAsync.c +++ b/src/backend/executor/execAsync.c @@ -20,7 +20,7 @@ #include "miscadmin.h" #include "pgstat.h" #include "storage/latch.h" -#include "utils/resowner_private.h" +#include "utils/memutils.h" static bool ExecAsyncEventWait(EState *estate, long timeout); static bool ExecAsyncConfigureWait(EState *estate, PendingAsyncRequest *areq, @@ -297,8 +297,6 @@ ExecAsyncEventWait(EState *estate, long timeout) if (estate->es_wait_event_set == NULL) { - ResourceOwner savedOwner; - /* * Allow for a few extra events without reinitializing. It * doesn't seem worth the complexity of doing anything very @@ -308,26 +306,14 @@ ExecAsyncEventWait(EState *estate, long timeout) estate->es_allocated_fd_events = estate->es_total_fd_events + 16; /* - * The wait event set created here should be released in case of - * error. + * The wait event set created here should be live beyond ExecutorState + * context but released in case of error. */ - savedOwner = CurrentResourceOwner; - CurrentResourceOwner = TopTransactionResourceOwner; - - PG_TRY(); - { - estate->es_wait_event_set = - CreateWaitEventSet(estate->es_query_cxt, - estate->es_allocated_fd_events + 1); - } - PG_CATCH(); - { - CurrentResourceOwner = savedOwner; - PG_RE_THROW(); - } - PG_END_TRY(); + estate->es_wait_event_set = + CreateWaitEventSet(TopTransactionContext, + TopTransactionResourceOwner, + estate->es_allocated_fd_events + 1); - CurrentResourceOwner = savedOwner; AddWaitEventToSet(estate->es_wait_event_set, WL_LATCH_SET, PGINVALID_SOCKET, MyLatch, NULL); reinit = true; -- 2.9.2 ----Next_Part(Wed_Feb_22_17_39_45_2017_090)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0008-Allow-wait-event-set-to-be-registered-to-resource-ow.patch" ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH 09/13] Fix the resource owner to be used @ 2017-02-22 00:12 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Kyotaro Horiguchi @ 2017-02-22 00:12 UTC (permalink / raw) Fixup of previous commit. --- src/backend/executor/execAsync.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/backend/executor/execAsync.c b/src/backend/executor/execAsync.c index 588ba18..a8e5f80 100644 --- a/src/backend/executor/execAsync.c +++ b/src/backend/executor/execAsync.c @@ -20,7 +20,7 @@ #include "miscadmin.h" #include "pgstat.h" #include "storage/latch.h" -#include "utils/resowner_private.h" +#include "utils/memutils.h" static bool ExecAsyncEventWait(EState *estate, long timeout); static bool ExecAsyncConfigureWait(EState *estate, PendingAsyncRequest *areq, @@ -297,8 +297,6 @@ ExecAsyncEventWait(EState *estate, long timeout) if (estate->es_wait_event_set == NULL) { - ResourceOwner savedOwner; - /* * Allow for a few extra events without reinitializing. It * doesn't seem worth the complexity of doing anything very @@ -308,26 +306,14 @@ ExecAsyncEventWait(EState *estate, long timeout) estate->es_allocated_fd_events = estate->es_total_fd_events + 16; /* - * The wait event set created here should be released in case of - * error. + * The wait event set created here should be live beyond ExecutorState + * context but released in case of error. */ - savedOwner = CurrentResourceOwner; - CurrentResourceOwner = TopTransactionResourceOwner; - - PG_TRY(); - { - estate->es_wait_event_set = - CreateWaitEventSet(estate->es_query_cxt, - estate->es_allocated_fd_events + 1); - } - PG_CATCH(); - { - CurrentResourceOwner = savedOwner; - PG_RE_THROW(); - } - PG_END_TRY(); + estate->es_wait_event_set = + CreateWaitEventSet(TopTransactionContext, + TopTransactionResourceOwner, + estate->es_allocated_fd_events + 1); - CurrentResourceOwner = savedOwner; AddWaitEventToSet(estate->es_wait_event_set, WL_LATCH_SET, PGINVALID_SOCKET, MyLatch, NULL); reinit = true; -- 2.9.2 ----Next_Part(Wed_Feb_22_17_39_45_2017_090)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0008-Allow-wait-event-set-to-be-registered-to-resource-ow.patch" ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH 09/13] Fix the resource owner to be used @ 2017-02-22 00:12 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Kyotaro Horiguchi @ 2017-02-22 00:12 UTC (permalink / raw) Fixup of previous commit. --- src/backend/executor/execAsync.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/backend/executor/execAsync.c b/src/backend/executor/execAsync.c index 588ba18..a8e5f80 100644 --- a/src/backend/executor/execAsync.c +++ b/src/backend/executor/execAsync.c @@ -20,7 +20,7 @@ #include "miscadmin.h" #include "pgstat.h" #include "storage/latch.h" -#include "utils/resowner_private.h" +#include "utils/memutils.h" static bool ExecAsyncEventWait(EState *estate, long timeout); static bool ExecAsyncConfigureWait(EState *estate, PendingAsyncRequest *areq, @@ -297,8 +297,6 @@ ExecAsyncEventWait(EState *estate, long timeout) if (estate->es_wait_event_set == NULL) { - ResourceOwner savedOwner; - /* * Allow for a few extra events without reinitializing. It * doesn't seem worth the complexity of doing anything very @@ -308,26 +306,14 @@ ExecAsyncEventWait(EState *estate, long timeout) estate->es_allocated_fd_events = estate->es_total_fd_events + 16; /* - * The wait event set created here should be released in case of - * error. + * The wait event set created here should be live beyond ExecutorState + * context but released in case of error. */ - savedOwner = CurrentResourceOwner; - CurrentResourceOwner = TopTransactionResourceOwner; - - PG_TRY(); - { - estate->es_wait_event_set = - CreateWaitEventSet(estate->es_query_cxt, - estate->es_allocated_fd_events + 1); - } - PG_CATCH(); - { - CurrentResourceOwner = savedOwner; - PG_RE_THROW(); - } - PG_END_TRY(); + estate->es_wait_event_set = + CreateWaitEventSet(TopTransactionContext, + TopTransactionResourceOwner, + estate->es_allocated_fd_events + 1); - CurrentResourceOwner = savedOwner; AddWaitEventToSet(estate->es_wait_event_set, WL_LATCH_SET, PGINVALID_SOCKET, MyLatch, NULL); reinit = true; -- 2.9.2 ----Next_Part(Wed_Feb_22_17_39_45_2017_090)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0008-Allow-wait-event-set-to-be-registered-to-resource-ow.patch" ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH 09/13] Fix the resource owner to be used @ 2017-02-22 00:12 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Kyotaro Horiguchi @ 2017-02-22 00:12 UTC (permalink / raw) Fixup of previous commit. --- src/backend/executor/execAsync.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/backend/executor/execAsync.c b/src/backend/executor/execAsync.c index 588ba18..a8e5f80 100644 --- a/src/backend/executor/execAsync.c +++ b/src/backend/executor/execAsync.c @@ -20,7 +20,7 @@ #include "miscadmin.h" #include "pgstat.h" #include "storage/latch.h" -#include "utils/resowner_private.h" +#include "utils/memutils.h" static bool ExecAsyncEventWait(EState *estate, long timeout); static bool ExecAsyncConfigureWait(EState *estate, PendingAsyncRequest *areq, @@ -297,8 +297,6 @@ ExecAsyncEventWait(EState *estate, long timeout) if (estate->es_wait_event_set == NULL) { - ResourceOwner savedOwner; - /* * Allow for a few extra events without reinitializing. It * doesn't seem worth the complexity of doing anything very @@ -308,26 +306,14 @@ ExecAsyncEventWait(EState *estate, long timeout) estate->es_allocated_fd_events = estate->es_total_fd_events + 16; /* - * The wait event set created here should be released in case of - * error. + * The wait event set created here should be live beyond ExecutorState + * context but released in case of error. */ - savedOwner = CurrentResourceOwner; - CurrentResourceOwner = TopTransactionResourceOwner; - - PG_TRY(); - { - estate->es_wait_event_set = - CreateWaitEventSet(estate->es_query_cxt, - estate->es_allocated_fd_events + 1); - } - PG_CATCH(); - { - CurrentResourceOwner = savedOwner; - PG_RE_THROW(); - } - PG_END_TRY(); + estate->es_wait_event_set = + CreateWaitEventSet(TopTransactionContext, + TopTransactionResourceOwner, + estate->es_allocated_fd_events + 1); - CurrentResourceOwner = savedOwner; AddWaitEventToSet(estate->es_wait_event_set, WL_LATCH_SET, PGINVALID_SOCKET, MyLatch, NULL); reinit = true; -- 2.9.2 ----Next_Part(Wed_Feb_22_17_39_45_2017_090)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0008-Allow-wait-event-set-to-be-registered-to-resource-ow.patch" ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH 09/13] Fix the resource owner to be used @ 2017-02-22 00:12 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Kyotaro Horiguchi @ 2017-02-22 00:12 UTC (permalink / raw) Fixup of previous commit. --- src/backend/executor/execAsync.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/backend/executor/execAsync.c b/src/backend/executor/execAsync.c index 588ba18..a8e5f80 100644 --- a/src/backend/executor/execAsync.c +++ b/src/backend/executor/execAsync.c @@ -20,7 +20,7 @@ #include "miscadmin.h" #include "pgstat.h" #include "storage/latch.h" -#include "utils/resowner_private.h" +#include "utils/memutils.h" static bool ExecAsyncEventWait(EState *estate, long timeout); static bool ExecAsyncConfigureWait(EState *estate, PendingAsyncRequest *areq, @@ -297,8 +297,6 @@ ExecAsyncEventWait(EState *estate, long timeout) if (estate->es_wait_event_set == NULL) { - ResourceOwner savedOwner; - /* * Allow for a few extra events without reinitializing. It * doesn't seem worth the complexity of doing anything very @@ -308,26 +306,14 @@ ExecAsyncEventWait(EState *estate, long timeout) estate->es_allocated_fd_events = estate->es_total_fd_events + 16; /* - * The wait event set created here should be released in case of - * error. + * The wait event set created here should be live beyond ExecutorState + * context but released in case of error. */ - savedOwner = CurrentResourceOwner; - CurrentResourceOwner = TopTransactionResourceOwner; - - PG_TRY(); - { - estate->es_wait_event_set = - CreateWaitEventSet(estate->es_query_cxt, - estate->es_allocated_fd_events + 1); - } - PG_CATCH(); - { - CurrentResourceOwner = savedOwner; - PG_RE_THROW(); - } - PG_END_TRY(); + estate->es_wait_event_set = + CreateWaitEventSet(TopTransactionContext, + TopTransactionResourceOwner, + estate->es_allocated_fd_events + 1); - CurrentResourceOwner = savedOwner; AddWaitEventToSet(estate->es_wait_event_set, WL_LATCH_SET, PGINVALID_SOCKET, MyLatch, NULL); reinit = true; -- 2.9.2 ----Next_Part(Wed_Feb_22_17_39_45_2017_090)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0008-Allow-wait-event-set-to-be-registered-to-resource-ow.patch" ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH v13 4/8] Row pattern recognition patch (planner). @ 2024-01-22 09:45 Tatsuo Ishii <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Tatsuo Ishii @ 2024-01-22 09:45 UTC (permalink / raw) --- src/backend/optimizer/plan/createplan.c | 23 ++++++++++++++----- src/backend/optimizer/plan/planner.c | 3 +++ src/backend/optimizer/plan/setrefs.c | 27 ++++++++++++++++++++++- src/backend/optimizer/prep/prepjointree.c | 4 ++++ src/include/nodes/plannodes.h | 16 ++++++++++++++ 5 files changed, 67 insertions(+), 6 deletions(-) diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c index ca619eab94..3c7fd3867b 100644 --- a/src/backend/optimizer/plan/createplan.c +++ b/src/backend/optimizer/plan/createplan.c @@ -286,9 +286,10 @@ static WindowAgg *make_windowagg(List *tlist, Index winref, int ordNumCols, AttrNumber *ordColIdx, Oid *ordOperators, Oid *ordCollations, int frameOptions, Node *startOffset, Node *endOffset, Oid startInRangeFunc, Oid endInRangeFunc, - Oid inRangeColl, bool inRangeAsc, bool inRangeNullsFirst, - List *runCondition, List *qual, bool topWindow, - Plan *lefttree); + Oid inRangeColl, bool inRangeAsc, bool inRangeNullsFirst, List *runCondition, + RPSkipTo rpSkipTo, List *patternVariable, List *patternRegexp, List *defineClause, + List *defineInitial, + List *qual, bool topWindow, Plan *lefttree); static Group *make_group(List *tlist, List *qual, int numGroupCols, AttrNumber *grpColIdx, Oid *grpOperators, Oid *grpCollations, Plan *lefttree); @@ -2698,6 +2699,11 @@ create_windowagg_plan(PlannerInfo *root, WindowAggPath *best_path) wc->inRangeAsc, wc->inRangeNullsFirst, wc->runCondition, + wc->rpSkipTo, + wc->patternVariable, + wc->patternRegexp, + wc->defineClause, + wc->defineInitial, best_path->qual, best_path->topwindow, subplan); @@ -6601,8 +6607,10 @@ make_windowagg(List *tlist, Index winref, int ordNumCols, AttrNumber *ordColIdx, Oid *ordOperators, Oid *ordCollations, int frameOptions, Node *startOffset, Node *endOffset, Oid startInRangeFunc, Oid endInRangeFunc, - Oid inRangeColl, bool inRangeAsc, bool inRangeNullsFirst, - List *runCondition, List *qual, bool topWindow, Plan *lefttree) + Oid inRangeColl, bool inRangeAsc, bool inRangeNullsFirst, List *runCondition, + RPSkipTo rpSkipTo, List *patternVariable, List *patternRegexp, List *defineClause, + List *defineInitial, + List *qual, bool topWindow, Plan *lefttree) { WindowAgg *node = makeNode(WindowAgg); Plan *plan = &node->plan; @@ -6628,6 +6636,11 @@ make_windowagg(List *tlist, Index winref, node->inRangeAsc = inRangeAsc; node->inRangeNullsFirst = inRangeNullsFirst; node->topWindow = topWindow; + node->rpSkipTo = rpSkipTo, + node->patternVariable = patternVariable; + node->patternRegexp = patternRegexp; + node->defineClause = defineClause; + node->defineInitial = defineInitial; plan->targetlist = tlist; plan->lefttree = lefttree; diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index 2e2458b128..98fdfb06e3 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -868,6 +868,9 @@ subquery_planner(PlannerGlobal *glob, Query *parse, wc->runCondition = (List *) preprocess_expression(root, (Node *) wc->runCondition, EXPRKIND_TARGET); + wc->defineClause = (List *) preprocess_expression(root, + (Node *) wc->defineClause, + EXPRKIND_TARGET); } parse->limitOffset = preprocess_expression(root, parse->limitOffset, diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c index 22a1fa29f3..d96bf6d3a0 100644 --- a/src/backend/optimizer/plan/setrefs.c +++ b/src/backend/optimizer/plan/setrefs.c @@ -211,7 +211,6 @@ static List *set_windowagg_runcondition_references(PlannerInfo *root, List *runcondition, Plan *plan); - /***************************************************************************** * * SUBPLAN REFERENCES @@ -2456,6 +2455,32 @@ set_upper_references(PlannerInfo *root, Plan *plan, int rtoffset) NRM_EQUAL, NUM_EXEC_QUAL(plan)); + /* + * Modifies an expression tree in each DEFINE clause so that all Var + * nodes's varno refers to OUTER_VAR. + */ + if (IsA(plan, WindowAgg)) + { + WindowAgg *wplan = (WindowAgg *) plan; + + if (wplan->defineClause != NIL) + { + foreach(l, wplan->defineClause) + { + TargetEntry *tle = (TargetEntry *) lfirst(l); + + tle->expr = (Expr *) + fix_upper_expr(root, + (Node *) tle->expr, + subplan_itlist, + OUTER_VAR, + rtoffset, + NRM_EQUAL, + NUM_EXEC_QUAL(plan)); + } + } + } + pfree(subplan_itlist); } diff --git a/src/backend/optimizer/prep/prepjointree.c b/src/backend/optimizer/prep/prepjointree.c index aa83dd3636..95d7399ab4 100644 --- a/src/backend/optimizer/prep/prepjointree.c +++ b/src/backend/optimizer/prep/prepjointree.c @@ -2129,6 +2129,10 @@ perform_pullup_replace_vars(PlannerInfo *root, if (wc->runCondition != NIL) wc->runCondition = (List *) pullup_replace_vars((Node *) wc->runCondition, rvcontext); + + if (wc->defineClause != NIL) + wc->defineClause = (List *) + pullup_replace_vars((Node *) wc->defineClause, rvcontext); } if (parse->onConflict) { diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h index b4ef6bc44c..1b928e5a49 100644 --- a/src/include/nodes/plannodes.h +++ b/src/include/nodes/plannodes.h @@ -20,6 +20,7 @@ #include "lib/stringinfo.h" #include "nodes/bitmapset.h" #include "nodes/lockoptions.h" +#include "nodes/parsenodes.h" #include "nodes/primnodes.h" @@ -1096,6 +1097,21 @@ typedef struct WindowAgg /* nulls sort first for in_range tests? */ bool inRangeNullsFirst; + /* Row Pattern Recognition AFTER MACH SKIP clause */ + RPSkipTo rpSkipTo; /* Row Pattern Skip To type */ + + /* Row Pattern PATTERN variable name (list of String) */ + List *patternVariable; + + /* Row Pattern RPATTERN regular expression quantifier ('+' or ''. list of String) */ + List *patternRegexp; + + /* Row Pattern DEFINE clause (list of TargetEntry) */ + List *defineClause; + + /* Row Pattern DEFINE variable initial names (list of String) */ + List *defineInitial; + /* * false for all apart from the WindowAgg that's closest to the root of * the plan -- 2.25.1 ----Next_Part(Mon_Jan_22_19_26_18_2024_011)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="v13-0005-Row-pattern-recognition-patch-executor.patch" ^ permalink raw reply [nested|flat] 19+ messages in thread
end of thread, other threads:[~2024-01-22 09:45 UTC | newest] Thread overview: 19+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2017-02-22 00:12 [PATCH 09/13] Fix the resource owner to be used Kyotaro Horiguchi <[email protected]> 2017-02-22 00:12 [PATCH 09/13] Fix the resource owner to be used Kyotaro Horiguchi <[email protected]> 2017-02-22 00:12 [PATCH 09/13] Fix the resource owner to be used Kyotaro Horiguchi <[email protected]> 2017-02-22 00:12 [PATCH 09/13] Fix the resource owner to be used Kyotaro Horiguchi <[email protected]> 2017-02-22 00:12 [PATCH 09/13] Fix the resource owner to be used Kyotaro Horiguchi <[email protected]> 2017-02-22 00:12 [PATCH 09/13] Fix the resource owner to be used Kyotaro Horiguchi <[email protected]> 2017-02-22 00:12 [PATCH 09/13] Fix the resource owner to be used Kyotaro Horiguchi <[email protected]> 2017-02-22 00:12 [PATCH 09/13] Fix the resource owner to be used Kyotaro Horiguchi <[email protected]> 2017-02-22 00:12 [PATCH 09/13] Fix the resource owner to be used Kyotaro Horiguchi <[email protected]> 2017-02-22 00:12 [PATCH 09/13] Fix the resource owner to be used Kyotaro Horiguchi <[email protected]> 2017-02-22 00:12 [PATCH 09/13] Fix the resource owner to be used Kyotaro Horiguchi <[email protected]> 2017-02-22 00:12 [PATCH 09/13] Fix the resource owner to be used Kyotaro Horiguchi <[email protected]> 2017-02-22 00:12 [PATCH 09/13] Fix the resource owner to be used Kyotaro Horiguchi <[email protected]> 2017-02-22 00:12 [PATCH 09/13] Fix the resource owner to be used Kyotaro Horiguchi <[email protected]> 2017-02-22 00:12 [PATCH 09/13] Fix the resource owner to be used Kyotaro Horiguchi <[email protected]> 2017-02-22 00:12 [PATCH 09/13] Fix the resource owner to be used Kyotaro Horiguchi <[email protected]> 2017-02-22 00:12 [PATCH 09/13] Fix the resource owner to be used Kyotaro Horiguchi <[email protected]> 2017-02-22 00:12 [PATCH 09/13] Fix the resource owner to be used Kyotaro Horiguchi <[email protected]> 2024-01-22 09:45 [PATCH v13 4/8] Row pattern recognition patch (planner). Tatsuo Ishii <[email protected]>
This inbox is served by agora; see mirroring instructions for how to clone and mirror all data and code used for this inbox