Commit96bf14f

committed

Fix compile conflicts related with calling routines from postgres core

1 parentaaf4f80 commit96bf14fCopy full SHA for 96bf14f

File tree

-6

lines changed

-6

lines changed

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -159,9 +159,9 @@ pg_qs_shmem_startup(void)`
`159`	`159`	`{`
`160`	`160`	`toc=shm_toc_attach(PG_QS_MODULE_KEY,shmem);`
`161`	`161`
`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);`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`if (prev_shmem_startup_hook)`
`@@ -872,7 +872,7 @@ GetRemoteBackendWorkers(PGPROC *proc)`
`872`	`872`	`result=lcons(proc,result);`
`873`	`873`	`}`
`874`	`874`
`875`		`-shm_mq_detach(mq);`
	`875`	`+shm_mq_detach(mqh);`
`876`	`876`
`877`	`877`	`returnresult;`
`878`	`878`
`@@ -962,7 +962,7 @@ GetRemoteBackendQueryStates(PGPROC *leader,`
`962`	`962`	`gotomq_error;`
`963`	`963`	`Assert(len==msg->length);`
`964`	`964`	`result=lappend(result,copy_msg(msg));`
`965`		`-shm_mq_detach(mq);`
	`965`	`+shm_mq_detach(mqh);`
`966`	`966`
`967`	`967`	`/*`
`968`	`968`	`* collect results from all alived parallel workers`
`@@ -993,7 +993,7 @@ GetRemoteBackendQueryStates(PGPROC *leader,`
`993`	`993`	`/* aggregate result data */`
`994`	`994`	`result=lappend(result,copy_msg(msg));`
`995`	`995`
`996`		`-shm_mq_detach(mq);`
	`996`	`+shm_mq_detach(mqh);`
`997`	`997`	`}`
`998`	`998`
`999`	`999`	`returnresult;`

Comments

(0)