Commite426c71

committed

Enable compilation of declarative syntax only for pg10+

1 parentca9f9eb commite426c71Copy full SHA for e426c71

File tree

+13

-7

lines changed

+13

-7

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ OBJS = src/init.o src/relation_info.o src/utils.o src/partition_filter.o \`
`8`	`8`	`src/hooks.o src/nodes_common.o src/xact_handling.o src/utility_stmt_hooking.o\`
`9`	`9`	`src/planner_tree_modification.o src/debug_print.o src/partition_creation.o\`
`10`	`10`	`src/compat/pg_compat.o src/compat/rowmarks_fix.o src/partition_router.o\`
`11`		`-src/partition_overseer.osrc/declarative.o$(WIN32RES)`
	`11`	`+src/partition_overseer.o$(WIN32RES)`
`12`	`12`
`13`	`13`	`ifdefUSE_PGXS`
`14`	`14`	`overridePG_CPPFLAGS += -I$(CURDIR)/src/include`
`@@ -67,14 +67,15 @@ EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/conf.add`
`67`	`67`
`68`	`68`	`EXTRA_CLEAN = pg_pathman--$(EXTVERSION).sql ./isolation_output`
`69`	`69`
`70`		`-DECL_CHECK_VERSIONS =10beta1`
	`70`	`+DECL_CHECK_VERSIONS =10 11`
`71`	`71`
`72`	`72`	`ifdefUSE_PGXS`
`73`	`73`	`PG_CONFIG = pg_config`
`74`	`74`	`PGXS :=$(shell$(PG_CONFIG) --pgxs)`
`75`	`75`	`VNUM :=$(shell$(PG_CONFIG) --version \| awk '{print $$2}')`
`76`	`76`	`ifeq ($(VNUM),$(filter$(VNUM),$(DECL_CHECK_VERSIONS)))`
`77`	`77`	`REGRESS += pathman_declarative`
	`78`	`+OBJS += src/declarative.o`
`78`	`79`	`endif`
`79`	`80`	`include$(PGXS)`
`80`	`81`	`else`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -818,7 +818,13 @@ pathman_post_parse_analyze_hook(ParseState pstate, Query query)`
`818`	`818`	`return;`
`819`	`819`	`}`
`820`	`820`
	`821`	`+#ifPG_VERSION_NUM >=100000`
	`822`	`+/*`
	`823`	`+ * for now this call works only for declarative partitioning so`
	`824`	`+ * we disabled it`
	`825`	`+ */`
`821`	`826`	`pathman_post_analyze_query(query);`
	`827`	`+#endif`
`822`	`828`	`}`
`823`	`829`
`824`	`830`	`/*`
`@@ -956,6 +962,7 @@ pathman_process_utility_hook(Node *first_arg,`
`956`	`962`	`get_attname_compat(relation_oid,attr_number),`
`957`	`963`	`get_rel_name(relation_oid))));`
`958`	`964`	`}`
	`965`	`+#ifPG_VERSION_NUM >=100000`
`959`	`966`	`elseif (is_pathman_related_partitioning_cmd(parsetree))`
`960`	`967`	`{`
`961`	`968`	`/* we can handle all the partitioning commands */`
`@@ -981,6 +988,7 @@ pathman_process_utility_hook(Node *first_arg,`
`981`	`988`	`}`
`982`	`989`	`}`
`983`	`990`	`}`
	`991`	`+#endif`
`984`	`992`	`}`
`985`	`993`
`986`	`994`	`/* Finally call process_utility_hook_next or standard_ProcessUtility */`

Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,6 @@`
`5`	`5`	`#include"nodes/nodes.h"`
`6`	`6`	`#include"nodes/parsenodes.h"`
`7`	`7`
`8`		`-typedefenumDeclarativeCommandType {`
`9`		`-DP_ATTACH,/* ALTER TABLE .. ATTACH PARTITION */`
`10`		`-DP_DETACH/* ALTER TABLE .. DETACH PARTITION */`
`11`		`-}DeclarativeCommandType;`
`12`		`-`
`13`	`8`	`voidmodify_declative_partitioning_query(Query*query);`
`14`	`9`	`boolis_pathman_related_partitioning_cmd(Node*parsetree);`
`15`	`10`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -429,7 +429,9 @@ pathman_post_analyze_query_walker(Node node, void context)`
`429`	`429`	`Queryquery= (Query)node;`
`430`	`430`
`431`	`431`	`/* Make changes for declarative syntax */`
	`432`	`+#ifPG_VERSION_NUM >=100000`
`432`	`433`	`modify_declative_partitioning_query(query);`
	`434`	`+#endif`
`433`	`435`
`434`	`436`	`/* Handle Query node */`
`435`	`437`	`returnquery_tree_walker(query,`

Comments

(0)