Commit af38d16

author

Arseny Kositsyn

committed

[PGPRO-11599] Fixed the build on version 18 of PostgreSQL.

Tags: rum

1 parent 49347aa commit af38d16Copy full SHA for af38d16

File tree

+1653

-2

lines changed

+1653

-2

lines changed

Lines changed: 19 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,9 @@`
`19`	`19`	`* you need to transfer the src/backend/nodes/tidbitmap.c of the`
`20`	`20`	`* required version to the RUM and include it here.`
`21`	`21`	`*/`
`22`		`-#if PG_VERSION_NUM >= 170000`
	`22`	`+#if PG_VERSION_NUM >= 180000`
	`23`	`+#include "tidbitmap/tidbitmap18.c"`
	`24`	`+#elif PG_VERSION_NUM >= 170000`
`23`	`25`	`#include "tidbitmap/tidbitmap17.c"`
`24`	`26`	`#elif PG_VERSION_NUM >= 160000`
`25`	`27`	`#include "tidbitmap/tidbitmap16.c"`
`@@ -76,17 +78,33 @@ rum_tbm_is_empty(const RumTIDBitmap *tbm)`
`76`	`78`	`return tbm_is_empty(tbm);`
`77`	`79`	`}`
`78`	`80`
	`81`	`+#if PG_VERSION_NUM >= 180000`
	`82`	`+RumTBMIterator`
	`83`	`+rum_tbm_begin_iterate(RumTIDBitmap tbm, dsa_area dsa, dsa_pointer dsp)`
	`84`	`+{`
	`85`	`+ return tbm_begin_iterate(tbm, dsa, dsp);`
	`86`	`+}`
	`87`	`+#else`
`79`	`88`	`RumTBMIterator *`
`80`	`89`	`rum_tbm_begin_iterate(RumTIDBitmap *tbm)`
`81`	`90`	`{`
`82`	`91`	`return tbm_begin_iterate(tbm);`
`83`	`92`	`}`
	`93`	`+#endif`
`84`	`94`
	`95`	`+#if PG_VERSION_NUM >= 180000`
	`96`	`+bool`
	`97`	`+rum_tbm_iterate(RumTBMIterator iterator, RumTBMIterateResult tbmres)`
	`98`	`+{`
	`99`	`+ return tbm_iterate(iterator, tbmres);`
	`100`	`+}`
	`101`	`+#else`
`85`	`102`	`RumTBMIterateResult *`
`86`	`103`	`rum_tbm_iterate(RumTBMIterator *iterator)`
`87`	`104`	`{`
`88`	`105`	`return tbm_iterate(iterator);`
`89`	`106`	`}`
	`107`	`+#endif`
`90`	`108`
`91`	`109`	`void`
`92`	`110`	`rum_tbm_end_iterate(RumTBMIterator *iterator)`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,15 @@ extern void rum_tbm_intersect(RumTIDBitmap a, const RumTIDBitmap b);`
`40`	`40`
`41`	`41`	`extern bool rum_tbm_is_empty(const RumTIDBitmap *tbm);`
`42`	`42`
`43`		`-extern RumTBMIterator rum_tbm_begin_iterate(RumTIDBitmap tbm);`
	`43`	`+#if PG_VERSION_NUM >= 180000`
	`44`	`+extern RumTBMIterator rum_tbm_begin_iterate(RumTIDBitmap *tbm,`
	`45`	`+ dsa_area *dsa, dsa_pointer dsp);`
	`46`	`+extern bool rum_tbm_iterate(RumTBMIterator iterator, RumTBMIterateResult tbmres);`
	`47`	`+#else`
`44`	`48`	`extern RumTBMIterateResult rum_tbm_iterate(RumTBMIterator iterator);`
	`49`	`+extern RumTBMIterator rum_tbm_begin_iterate(RumTIDBitmap tbm);`
	`50`	`+#endif`
	`51`	`+`
`45`	`52`	`extern void rum_tbm_end_iterate(RumTBMIterator *iterator);`
`46`	`53`
`47`	`54`	`extern long rum_tbm_calculate_entries(double maxbytes);`

Comments

(0)