NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit639f014

Maksim Milyutin

committed

Refactor pathman_process_utility_callback

1 parent6187a4e commit639f014Copy full SHA for 639f014

File tree

2 files changed

+33

-28

lines changed

src
- hooks.c
- include/compat
  - pg_compat.h

2 files changed

+33

-28

lines changed

`‎src/hooks.c`

Lines changed: 11 additions & 28 deletions

Original file line number	Diff line number	Diff line change
`@@ -755,24 +755,25 @@ pathman_relcache_hook(Datum arg, Oid relid)`
`755`	`755`	`*/`
`756`	`756`	`void`
`757`	`757`	`#ifPG_VERSION_NUM >=100000`
`758`		`-pathman_process_utility_hook(PlannedStmt*pstmt,`
	`758`	`+pathman_process_utility_hook(PlannedStmt*first_arg,`
`759`	`759`	`constchar*queryString,`
`760`	`760`	`ProcessUtilityContextcontext,`
`761`	`761`	`ParamListInfoparams,`
`762`	`762`	`QueryEnvironment*queryEnv,`
`763`	`763`	`DestReceiverdest,charcompletionTag)`
`764`	`764`	`{`
`765`		`-Node*parsetree=pstmt->utilityStmt;`
`766`		`-intstmt_location=pstmt->stmt_location,`
`767`		`-stmt_len=pstmt->stmt_len;`
	`765`	`+Node*parsetree=first_arg->utilityStmt;`
	`766`	`+intstmt_location=first_arg->stmt_location,`
	`767`	`+stmt_len=first_arg->stmt_len;`
`768`	`768`	`#else`
`769`		`-pathman_process_utility_hook(Node*parsetree,`
	`769`	`+pathman_process_utility_hook(Node*first_arg,`
`770`	`770`	`constchar*queryString,`
`771`	`771`	`ProcessUtilityContextcontext,`
`772`	`772`	`ParamListInfoparams,`
`773`	`773`	`DestReceiver*dest,`
`774`	`774`	`char*completionTag)`
`775`	`775`	`{`
	`776`	`+Node*parsetree=first_arg;`
`776`	`777`	`intstmt_location=-1,`
`777`	`778`	`stmt_len=0;`
`778`	`779`	`#endif`
`@@ -825,27 +826,9 @@ pathman_process_utility_hook(Node *parsetree,`
`825`	`826`	`}`
`826`	`827`	`}`
`827`	`828`
`828`		`-#ifPG_VERSION_NUM >=100000`
`829`		`-/* Call hooks set by other extensions if needed */`
`830`		`-if (process_utility_hook_next)`
`831`		`-process_utility_hook_next(pstmt,queryString,`
`832`		`-context,params,queryEnv,`
`833`		`-dest,completionTag);`
`834`		`-/* Else call internal implementation */`
`835`		`-else`
`836`		`-standard_ProcessUtility(pstmt,queryString,`
`837`		`-context,params,queryEnv,`
`838`		`-dest,completionTag);`
`839`		`-#else`
`840`		`-/* Call hooks set by other extensions if needed */`
`841`		`-if (process_utility_hook_next)`
`842`		`-process_utility_hook_next(parsetree,queryString,`
`843`		`-context,params,`
`844`		`-dest,completionTag);`
`845`		`-/* Else call internal implementation */`
`846`		`-else`
`847`		`-standard_ProcessUtility(parsetree,queryString,`
`848`		`-context,params,`
`849`		`-dest,completionTag);`
`850`		`-#endif`
	`829`	`+/* 'first_arg' is PlannedStmt in pg10 or Node parsetree in pg9.6 and lower */`
	`830`	`+call_process_utility_compat(`
	`831`	`+(process_utility_hook_next) ?process_utility_hook_next :`
	`832`	`+standard_ProcessUtility,`
	`833`	`+first_arg,queryString,context,params,queryEnv,dest,completionTag);`
`851`	`834`	`}`

`‎src/include/compat/pg_compat.h`

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,28 @@`
`97`	`97`	`#endif`
`98`	`98`
`99`	`99`
	`100`	`+/*`
	`101`	`+ * call_process_utility_compat()`
	`102`	`+ *`
	`103`	`+ * the parameter 'first_arg' is:`
	`104`	`+ * - in pg 10 PlannedStmt object`
	`105`	`+ * - in pg 9.6 and lower Node parsetree`
	`106`	`+ */`
	`107`	`+#ifPG_VERSION_NUM >=100000`
	`108`	`+#definecall_process_utility_compat(process_utility,first_arg,query_string, \`
	`109`	`+context,params,query_env,dest, \`
	`110`	`+completion_tag) \`
	`111`	`+(process_utility)((first_arg), (query_string), (context), (params), \`
	`112`	`+ (query_env), (dest), (completion_tag))`
	`113`	`+#elifPG_VERSION_NUM >=90500`
	`114`	`+#definecall_process_utility_compat(process_utility,first_arg,query_string, \`
	`115`	`+context,params,query_env,dest, \`
	`116`	`+completion_tag) \`
	`117`	`+(process_utility)((first_arg), (query_string), (context), (params), \`
	`118`	`+ (dest), (completion_tag))`
	`119`	`+#endif`
	`120`	`+`
	`121`	`+`
`100`	`122`	`/*`
`101`	`123`	`* CatalogIndexInsert()`
`102`	`124`	`*/`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit639f014

File tree

2 files changed

2 files changed

`‎src/hooks.c`

`‎src/include/compat/pg_compat.h`

0 commit comments