Commit83efce7

committed

Revert "Cope with NULL query string in ExecInitParallelPlan()."

This reverts commitb3ee4c5.We don't need it in the wake of the preceding commit, whichadded an upstream check that the querystring isn't null.Discussion:https://postgr.es/m/2197698.1617984583@sss.pgh.pa.us

1 parent1111b26 commit83efce7Copy full SHA for 83efce7

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -647,7 +647,7 @@ ExecInitParallelPlan(PlanState planstate, EState estate,`
`647`	`647`	`shm_toc_estimate_keys(&pcxt->estimator,1);`
`648`	`648`
`649`	`649`	`/* Estimate space for query text. */`
`650`		`-query_len=estate->es_sourceText ?strlen(estate->es_sourceText) :0;`
	`650`	`+query_len=strlen(estate->es_sourceText);`
`651`	`651`	`shm_toc_estimate_chunk(&pcxt->estimator,query_len+1);`
`652`	`652`	`shm_toc_estimate_keys(&pcxt->estimator,1);`
`653`	`653`
`@@ -742,10 +742,7 @@ ExecInitParallelPlan(PlanState planstate, EState estate,`
`742`	`742`
`743`	`743`	`/* Store query string */`
`744`	`744`	`query_string=shm_toc_allocate(pcxt->toc,query_len+1);`
`745`		`-if (query_len==0)`
`746`		`-query_string[0]=0;`
`747`		`-else`
`748`		`-memcpy(query_string,estate->es_sourceText,query_len+1);`
	`745`	`+memcpy(query_string,estate->es_sourceText,query_len+1);`
`749`	`746`	`shm_toc_insert(pcxt->toc,PARALLEL_KEY_QUERY_TEXT,query_string);`
`750`	`747`
`751`	`748`	`/* Store serialized PlannedStmt. */`

Comments

(0)