Commitcc6b1e8

committed

Add compat version of build_simple_rel routine

1 parent981e769 commitcc6b1e8Copy full SHA for cc6b1e8

File tree

+14

-5

lines changed

+14

-5

lines changed

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,19 @@`
`75`	`75`	`#endif`
`76`	`76`
`77`	`77`
	`78`	`+/*`
	`79`	`+ * build_simple_rel()`
	`80`	`+ */`
	`81`	`+#ifPG_VERSION_NUM >=100000`
	`82`	`+#definebuild_simple_rel_compat(root,childRTindex,parent_rel) \`
	`83`	`+build_simple_rel((root), (childRTindex), (parent_rel))`
	`84`	`+#elifPG_VERSION_NUM >=90500`
	`85`	`+#definebuild_simple_rel_compat(root,childRTindex,parent_rel) \`
	`86`	`+build_simple_rel((root), (childRTindex), \`
	`87`	`+(parent_rel) ? RELOPT_OTHER_MEMBER_REL : RELOPT_BASEREL)`
	`88`	`+#endif`
	`89`	`+`
	`90`	`+`
`78`	`91`	`/*`
`79`	`92`	`* Define ALLOCSET_DEFAULT_SIZES for our precious MemoryContexts`
`80`	`93`	`*/`

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -338,11 +338,7 @@ append_child_relation(PlannerInfo *root, Relation parent_relation,`
`338`	`338`	`root->simple_rte_array[childRTindex]=child_rte;`
`339`	`339`
`340`	`340`	`/* Create RelOptInfo for this child (and make some estimates as well) */`
`341`		`-#ifPG_VERSION_NUM >=100000`
`342`		`-child_rel=build_simple_rel(root,childRTindex,parent_rel);`
`343`		`-#else`
`344`		`-child_rel=build_simple_rel(root,childRTindex,RELOPT_OTHER_MEMBER_REL);`
`345`		`-#endif`
	`341`	`+child_rel=build_simple_rel_compat(root,childRTindex,parent_rel);`
`346`	`342`
`347`	`343`	`/* Increase total_table_pages using the 'child_rel' */`
`348`	`344`	`root->total_table_pages+= (double)child_rel->pages;`

Comments

(0)