Skip to content

Use correct way to detect SPI inner query #1972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Stolb27 merged 2 commits into from
Sep 17, 2025
Merged

Use correct way to detect SPI inner query #1972

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6596ac3
Revert "Fix incorrect SPI_INNER_QUERY tagging for top-level SPI calls."
Sep 17, 2025
3692e03
Use correct way to detect SPI inner query. (#1648)
dkovalev1 Jun 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions src/backend/executor/spi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1538,14 +1538,13 @@ SPI_cursor_open_internal(const char *name, SPIPlanPtr plan,
* GPDB: Mark all queries as SPI inner queries for extension usage. But
* make sure that SPI is not top level itself.
*/
if (already_under_executor_run())
if (!IsBackgroundWorker || _SPI_connected > 0)
{
foreach(lc, stmt_list)
{
Node *stmt = (Node *) lfirst(lc);

Node *stmt = (Node *) lfirst(lc);
if (IsA(stmt, PlannedStmt))
((PlannedStmt *) stmt)->metricsQueryType = SPI_INNER_QUERY;
((PlannedStmt*)stmt)->metricsQueryType = SPI_INNER_QUERY;
}
}

Expand Down Expand Up @@ -2493,10 +2492,10 @@ _SPI_execute_plan(SPIPlanPtr plan, ParamListInfo paramLI,
_SPI_current->tuptable = NULL;

/*
* GPDB: Mark all queries as SPI inner query for extension usage
* But make sure that SPI is not top level itself.
* GPDB: Mark all queries as SPI inner queries for extension
* usage. But make sure that SPI is not top level itself.
*/
if (already_under_executor_run())
if (!IsBackgroundWorker || _SPI_connected > 0)
stmt->metricsQueryType = SPI_INNER_QUERY;

/* Check for unsupported cases. */
Expand Down