Enable compilation of declarative syntax only for pg10+

ildus · ildus · commit e426c7194747 · 2018-10-04T18:23:04.000+03:00
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ OBJS = src/init.o src/relation_info.o src/utils.o src/partition_filter.o \
 	src/hooks.o src/nodes_common.o src/xact_handling.o src/utility_stmt_hooking.o \
 	src/planner_tree_modification.o src/debug_print.o src/partition_creation.o \
 	src/compat/pg_compat.o src/compat/rowmarks_fix.o src/partition_router.o \
-	src/partition_overseer.o src/declarative.o $(WIN32RES)
+	src/partition_overseer.o $(WIN32RES)
 
 ifdef USE_PGXS
 override PG_CPPFLAGS += -I$(CURDIR)/src/include
@@ -67,14 +67,15 @@ EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/conf.add
 
 EXTRA_CLEAN = pg_pathman--$(EXTVERSION).sql ./isolation_output
 
-DECL_CHECK_VERSIONS = 10beta1
+DECL_CHECK_VERSIONS = 10 11
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 VNUM := $(shell $(PG_CONFIG) --version | awk '{print $$2}')
 ifeq ($(VNUM),$(filter $(VNUM), $(DECL_CHECK_VERSIONS)))
 	REGRESS += pathman_declarative
+	OBJS += src/declarative.o
 endif
 include $(PGXS)
 else
diff --git a/src/hooks.c b/src/hooks.c
@@ -818,7 +818,13 @@ pathman_post_parse_analyze_hook(ParseState *pstate, Query *query)
 		return;
 	}
 
+#if PG_VERSION_NUM >= 100000
+	/*
+	 * for now this call works only for declarative partitioning so
+	 * we disabled it
+	 */
 	pathman_post_analyze_query(query);
+#endif
 }
 
 /*
@@ -956,6 +962,7 @@ pathman_process_utility_hook(Node *first_arg,
 								get_attname_compat(relation_oid, attr_number),
 								get_rel_name(relation_oid))));
 		}
+#if PG_VERSION_NUM >= 100000
 		else if (is_pathman_related_partitioning_cmd(parsetree))
 		{
 			/* we can handle all the partitioning commands */
@@ -981,6 +988,7 @@ pathman_process_utility_hook(Node *first_arg,
 				}
 			}
 		}
+#endif
 	}
 
 	/* Finally call process_utility_hook_next or standard_ProcessUtility */
diff --git a/src/include/declarative.h b/src/include/declarative.h
@@ -5,11 +5,6 @@
 #include "nodes/nodes.h"
 #include "nodes/parsenodes.h"
 
-typedef enum DeclarativeCommandType {
-	DP_ATTACH,	/* ALTER TABLE .. ATTACH PARTITION */
-	DP_DETACH	/* ALTER TABLE .. DETACH PARTITION */
-} DeclarativeCommandType;
-
 void modify_declative_partitioning_query(Query *query);
 bool is_pathman_related_partitioning_cmd(Node *parsetree);
 
diff --git a/src/planner_tree_modification.c b/src/planner_tree_modification.c
@@ -429,7 +429,9 @@ pathman_post_analyze_query_walker(Node *node, void *context)
 		Query *query = (Query *) node;
 
 		/* Make changes for declarative syntax */
+#if PG_VERSION_NUM >= 100000
 		modify_declative_partitioning_query(query);
+#endif
 
 		/* Handle Query node */
 		return query_tree_walker(query,

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`	`+#if PG_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`	`+#if PG_VERSION_NUM >= 100000`
`959`	`966`	`else if (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 */`