Commitce86d27

Maxim Orlov

committed

Issue#27: Improve compatibility check.

Use pg_compatibility_check_no_error function to precheck compatibility in order to free memory.

1 parent6d7aa7a commitce86d27Copy full SHA for ce86d27

File tree

-11

lines changed

-11

lines changed

Lines changed: 2 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -2484,21 +2484,12 @@ compatibility_check(void)`
`2484`	`2484`	`*/`
`2485`	`2485`	`#ifdefPGPRO_EE`
`2486`	`2486`
`2487`		`-/* All the ee have ATX. */`
`2488`		`-#defineATX_CHECK(getNestLevelATX() != 0)`
`2489`		`-/* ee10 and less does not have connpool. */`
`2490`		`-#if (PG_VERSION_NUM >=110000)`
`2491`		`-#defineCONNPOOL_CHECK(!IsDedicatedBackend)`
`2492`		`-#else`
`2493`		`-#defineCONNPOOL_CHECK(false)`
`2494`		`-#endif`
`2495`		`-`
`2496`	`2487`	`#if (PG_VERSION_NUM<100000)`
`2497`	`2488`	`/*`
`2498`	`2489`	`* This versions does not have dedicated macro to check compatibility.`
`2499`	`2490`	`* So, use simple check here for ATX.`
`2500`	`2491`	`*/`
`2501`		`-if (ATX_CHECK)`
	`2492`	`+if (getNestLevelATX()!=0)`
`2502`	`2493`	`{`
`2503`	`2494`	`freeStatsLists();`
`2504`	`2495`	`elog(ERROR,"pg_variables extension is not compatible with "`
`@@ -2513,7 +2504,7 @@ compatibility_check(void)`
`2513`	`2504`	`*/`
`2514`	`2505`	`#ifdefPG_COMPATIBILITY_CHECK`
`2515`	`2506`	`{`
`2516`		`-if (ATX_CHECK\|\|CONNPOOL_CHECK)`
	`2507`	`+if (!pg_compatibility_check_no_error())`
`2517`	`2508`	`freeStatsLists();`
`2518`	`2509`
`2519`	`2510`	`PG_COMPATIBILITY_CHECK("pg_variables");`

Comments

(0)