8000 Fix compile conflicts related with calling routines from postgres core · postgrespro/pg_query_state@96bf14f · GitHub
[go: up one dir, main page]
Skip to content

Commit 96bf14f

Browse files
maksm90maksm90
committed
Fix compile conflicts related with calling routines from postgres core
1 parent aaf4f80 commit 96bf14f

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

‎pg_query_state.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,9 @@ pg_qs_shmem_startup(void)
159159
{
160160
toc = shm_toc_attach(PG_QS_MODULE_KEY, shmem);
161161

162-
counterpart_userid = shm_toc_lookup(toc, num_toc++);
163-
params = shm_toc_lookup(toc, num_toc++);
164-
mq = shm_toc_lookup(toc, num_toc++);
162+
counterpart_userid = shm_toc_lookup(toc, num_toc++, false);
163+
params = shm_toc_lookup(toc, num_toc++, false);
164+
mq = shm_toc_lookup(toc, num_toc++, false);
165165
}
166166

167167
if (prev_shmem_startup_hook)
@@ -872,7 +872,7 @@ GetRemoteBackendWorkers(PGPROC *proc)
872872
result = lcons(proc, result);
873873
}
874874

875-
shm_mq_detach(mq);
875+
shm_mq_detach(mqh);
876876

877877
return result;
878878

@@ -962,7 +962,7 @@ GetRemoteBackendQueryStates(PGPROC *leader,
962962
goto mq_error;
963963
Assert(len == msg->length);
964964
result = lappend(result, copy_msg(msg));
965-
shm_mq_detach(mq);
965+
shm_mq_detach(mqh);
966966

967967
/*
968968
* collect results from all alived parallel workers
@@ -993,7 +993,7 @@ GetRemoteBackendQueryStates(PGPROC *leader,
993993
/* aggregate result data */
994994
result = lappend(result, copy_msg(msg));
995995

996-
shm_mq_detach(mq);
996+
shm_mq_detach(mqh);
997997
}
998998

999999
return result;

0 commit comments

Comments
 (0)
0