Commitace45b9

committed

Merge branch 'master' into picky_nodes

2 parents4efb205 +1f6ccf7 commitace45b9Copy full SHA for ace45b9

File tree

-6

lines changed

-6

lines changed

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -133,12 +133,12 @@ unpack_runtimemergeappend_private(RuntimeMergeAppendState *scan_state,`
`133`	`133`	`#defineFillStateField(name,type,method) \`
`134`	`134`	`do \`
`135`	`135`	`{ \`
`136`		`-ListCell *lc; \`
`137`		`-inti = 0; \`
	`136`	`+ListCell*lc; \`
	`137`	`+inti = 0; \`
`138`	`138`	`Assert(scan_state->numCols == list_length(name)); \`
`139`		`-scan_state->name =palloc(scan_state->numCols * sizeof(type)); \`
	`139`	`+scan_state->name =palloc0(scan_state->numCols * sizeof(type)); \`
`140`	`140`	`foreach (lc, name) \`
`141`		`-scan_state->name[i] =lfirst_int(lc); \`
	`141`	`+scan_state->name[i++] =method(lc); \`
`142`	`142`	`} \`
`143`	`143`	`while (0)`
`144`	`144`
`@@ -225,8 +225,8 @@ create_runtimemergeappend_path(PlannerInfo *root,`
`225`	`225`
`226`	`226`	`Plan*`
`227`	`227`	`create_runtimemergeappend_plan(PlannerInforoot,RelOptInforel,`
`228`		`-CustomPathbest_path,Listtlist,`
`229`		`-Listclauses,Listcustom_plans)`
	`228`	`+CustomPathbest_path,Listtlist,`
	`229`	`+Listclauses,Listcustom_plans)`
`230`	`230`	`{`
`231`	`231`	`CustomScan*node;`
`232`	`232`	`Plan*plan;`

Comments

(0)