Commite999b86

committed

Merge branch 'master' into pg_pathman_intro

2 parents9dd0807 +fbbbf4b commite999b86Copy full SHA for e999b86

File tree

+10

-1

lines changed

+10

-1

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -369,8 +369,16 @@ pathman_rel_pathlist_hook(PlannerInfo root, RelOptInfo rel, Index rti, RangeTb`
`369`	`369`	`ppi,paramsel);`
`370`	`370`	`elseif (IsA(cur_path,MergeAppendPath)&&`
`371`	`371`	`pg_pathman_enable_runtime_merge_append)`
	`372`	`+{`
	`373`	`+/* Check struct layout compatibility */`
	`374`	`+if (offsetof(AppendPath,subpaths)!=`
	`375`	`+offsetof(MergeAppendPath,subpaths))`
	`376`	`+elog(FATAL,"Struct layouts of AppendPath and "`
	`377`	`+"MergeAppendPath differ");`
	`378`	`+`
`372`	`379`	`inner_path=create_runtimemergeappend_path(root,cur_path,`
`373`	`380`	`ppi,paramsel);`
	`381`	`+}`
`374`	`382`
`375`	`383`	`if (inner_path)`
`376`	`384`	`add_path(rel,inner_path);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ get_partitioned_attr_clauses(List *restrictinfo_list,`
`259`	`259`	`Indexpartitioned_rel)`
`260`	`260`	`{`
`261`	`261`	`#defineAdjustAttno(attno) \`
`262`		`-( (AttrNumber) (part_attno + FirstLowInvalidHeapAttributeNumber) )`
	`262`	`+( (AttrNumber) (attno + FirstLowInvalidHeapAttributeNumber) )`
`263`	`263`
`264`	`264`	`List*result=NIL;`
`265`	`265`	`ListCell*l;`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -497,6 +497,7 @@ append_child_relation(PlannerInfo root, RelOptInfo rel, Index rti,`
`497`	`497`	`/* Recalc parent relation tuples count */`
`498`	`498`	`rel->tuples+=childrel->tuples;`
`499`	`499`
	`500`	`+/* Close child relations, but keep locks */`
`500`	`501`	`heap_close(newrelation,NoLock);`
`501`	`502`
`502`	`503`

Comments

(0)