Commit74769d8

committed

Issue#48: PostgreSQL 10.6 release didn't get rbtree renames

Handle it differently for PostgreSQL 10.6 and 10.7.

1 parent7f025c9 commit74769d8Copy full SHA for 74769d8

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -773,7 +773,7 @@ extern IndexBulkDeleteResult rumvacuumcleanup(IndexVacuumInfo info,`
`773`	`773`	`externboolrumvalidate(Oidopclassoid);`
`774`	`774`
`775`	`775`	`/* rumbulk.c */`
`776`		`-#ifPG_VERSION_NUM<100000`
	`776`	`+#ifPG_VERSION_NUM <=100006`
`777`	`777`	`#defineRBTNode RBNode`
`778`	`778`	`#endif`
`779`	`779`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`#defineDEF_NPTR5/* ItemPointer initial allocation quantum */`
`23`	`23`
`24`	`24`	`/* PostgreSQL pre 10 has different names for this functions */`
`25`		`-#ifPG_VERSION_NUM<100000`
	`25`	`+#ifPG_VERSION_NUM <=100006`
`26`	`26`	`#definerbt_create(node_size,comparator,combiner,allocfunc,freefunc,arg) \`
`27`	`27`	`(rb_create(node_size, comparator, combiner, allocfunc, freefunc, arg))`
`28`	`28`	`#definerbt_insert(rbt,data,isNew) \`
`@@ -280,8 +280,10 @@ qsortCompareRumItem(const void a, const void b, void *arg)`
`280`	`280`	`void`
`281`	`281`	`rumBeginBAScan(BuildAccumulator*accum)`
`282`	`282`	`{`
`283`		`-#ifPG_VERSION_NUM >=100000`
	`283`	`+#ifPG_VERSION_NUM>100006`
`284`	`284`	`rbt_begin_iterate(accum->tree,LeftRightWalk,&accum->tree_walk);`
	`285`	`+#elifPG_VERSION_NUM >=100000`
	`286`	`+rb_begin_iterate(accum->tree,LeftRightWalk,&accum->tree_walk);`
`285`	`287`	`#else`
`286`	`288`	`rb_begin_iterate(accum->tree,LeftRightWalk);`
`287`	`289`	`#endif`
`@@ -300,8 +302,10 @@ rumGetBAEntry(BuildAccumulator *accum,`
`300`	`302`	`RumEntryAccumulator*entry;`
`301`	`303`	`RumItem*list;`
`302`	`304`
`303`		`-#ifPG_VERSION_NUM >=100000`
	`305`	`+#ifPG_VERSION_NUM>100006`
`304`	`306`	`entry= (RumEntryAccumulator*)rbt_iterate(&accum->tree_walk);`
	`307`	`+#elifPG_VERSION_NUM >=100000`
	`308`	`+entry= (RumEntryAccumulator*)rb_iterate(&accum->tree_walk);`
`305`	`309`	`#else`
`306`	`310`	`entry= (RumEntryAccumulator*)rb_iterate(accum->tree);`
`307`	`311`	`#endif`

Comments

(0)