Merge branch 'rel_future_expressions' into rel_future_beta

Author: ildus

src/compat/pg_compat.c

@@ -13,14 +13,16 @@
 
 #include "compat/pg_compat.h"
 
+#include "utils.h"
+
 #include "access/htup_details.h"
+#include "catalog/pg_class.h"
 #include "catalog/pg_proc.h"
 #include "foreign/fdwapi.h"
 #include "optimizer/clauses.h"
 #include "optimizer/pathnode.h"
 #include "optimizer/prep.h"
 #include "port.h"
-#include "utils.h"
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
 

src/include/utils.h

@@ -16,10 +16,6 @@
 
 #include "postgres.h"
 #include "parser/parse_oper.h"
-#include "utils/rel.h"
-#include "nodes/relation.h"
-#include "nodes/memnodes.h"
-#include "nodes/nodeFuncs.h"
 
 
 /*

src/init.c

@@ -29,7 +29,6 @@
 #include "catalog/pg_type.h"
 #include "miscadmin.h"
 #include "optimizer/clauses.h"
-#include "utils/datum.h"
 #include "utils/inval.h"
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"

src/nodes_common.c

@@ -13,9 +13,8 @@
 #include "runtimeappend.h"
 #include "utils.h"
 
-#include "access/sysattr.h"
+#include "nodes/nodeFuncs.h"
 #include "optimizer/clauses.h"
-#include "optimizer/restrictinfo.h"
 #include "optimizer/tlist.h"
 #include "optimizer/var.h"
 #include "rewrite/rewriteManip.h"

src/partition_creation.c

@@ -14,7 +14,6 @@
 #include "pathman.h"
 #include "pathman_workers.h"
 #include "xact_handling.h"
-#include "compat/pg_compat.h"
 
 #include "access/htup_details.h"
 #include "access/reloptions.h"
@@ -32,21 +31,16 @@
 #include "commands/tablespace.h"
 #include "commands/trigger.h"
 #include "miscadmin.h"
-#include "nodes/plannodes.h"
-#include "optimizer/clauses.h"
-#include "parser/parser.h"
+#include "nodes/nodeFuncs.h"
 #include "parser/parse_func.h"
-#include "parser/parse_relation.h"
 #include "parser/parse_utilcmd.h"
-#include "parser/analyze.h"
 #include "tcop/utility.h"
 #include "utils/builtins.h"
 #include "utils/datum.h"
 #include "utils/fmgroids.h"
 #include "utils/jsonb.h"
 #include "utils/snapmgr.h"
 #include "utils/lsyscache.h"
-#include "utils/memutils.h"
 #include "utils/syscache.h"
 #include "utils/typcache.h"
 

src/partition_filter.c

@@ -13,18 +13,15 @@
 #include "pathman.h"
 #include "partition_creation.h"
 #include "partition_filter.h"
-#include "planner_tree_modification.h"
 #include "utils.h"
 
-#include "access/htup_details.h"
 #include "catalog/pg_type.h"
 #include "foreign/fdwapi.h"
 #include "foreign/foreign.h"
 #include "nodes/nodeFuncs.h"
 #include "rewrite/rewriteManip.h"
 #include "utils/guc.h"
 #include "utils/memutils.h"
-#include "utils/lsyscache.h"
 #include "utils/syscache.h"
 
 

src/pathman_workers.c

@@ -34,7 +34,6 @@
 #include "storage/proc.h"
 #include "utils/builtins.h"
 #include "utils/datum.h"
-#include "utils/memutils.h"
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
 #include "utils/typcache.h"

src/pg_pathman.c

@@ -16,7 +16,6 @@
 #include "hooks.h"
 #include "pathman.h"
 #include "partition_filter.h"
-#include "planner_tree_modification.h"
 #include "runtimeappend.h"
 #include "runtime_merge_append.h"
 

src/pl_funcs.c

@@ -19,20 +19,18 @@
 #include "utils.h"
 
 #include "access/tupconvert.h"
-#include "access/nbtree.h"
 #include "access/htup_details.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_inherits_fn.h"
-#include "catalog/pg_trigger.h"
 #include "catalog/pg_type.h"
 #include "commands/tablespace.h"
 #include "commands/trigger.h"
 #include "executor/executor.h"
 #include "executor/spi.h"
 #include "funcapi.h"
 #include "miscadmin.h"
+#include "nodes/nodeFuncs.h"
 #include "utils/builtins.h"
-#include "utils/fmgroids.h"
 #include "utils/inval.h"
 #include "utils/snapmgr.h"
 #include "utils/lsyscache.h"

src/pl_hash_funcs.c

@@ -13,12 +13,9 @@
 #include "relation_info.h"
 #include "utils.h"
 
-#include "catalog/pg_type.h"
 #include "utils/builtins.h"
 #include "utils/typcache.h"
 #include "utils/lsyscache.h"
-#include "utils/builtins.h"
-#include "utils/array.h"
 
 
 /* Function declarations */

src/planner_tree_modification.c

@@ -12,7 +12,6 @@
 #include "compat/relation_tags.h"
 #include "compat/rowmarks_fix.h"
 
-#include "nodes_common.h"
 #include "partition_filter.h"
 #include "planner_tree_modification.h"
 #include "rewrite/rewriteManip.h"
@@ -21,7 +20,6 @@
 #include "miscadmin.h"
 #include "optimizer/clauses.h"
 #include "storage/lmgr.h"
-#include "utils/lsyscache.h"
 #include "utils/syscache.h"
 
 

src/relation_info.c

@@ -11,7 +11,6 @@
 #include "compat/pg_compat.h"
 
 #include "relation_info.h"
-#include "partition_creation.h"
 #include "init.h"
 #include "utils.h"
 #include "xact_handling.h"
@@ -24,6 +23,7 @@
 #include "catalog/pg_inherits.h"
 #include "catalog/pg_type.h"
 #include "miscadmin.h"
+#include "nodes/nodeFuncs.h"
 #include "optimizer/clauses.h"
 #include "optimizer/var.h"
 #include "parser/parser.h"
@@ -33,7 +33,6 @@
 #include "utils/fmgroids.h"
 #include "utils/hsearch.h"
 #include "utils/memutils.h"
-#include "utils/snapmgr.h"
 #include "utils/syscache.h"
 #include "utils/lsyscache.h"
 #include "utils/typcache.h"

src/runtime_merge_append.c

@@ -13,14 +13,12 @@
 #include "compat/pg_compat.h"
 
 #include "runtime_merge_append.h"
-#include "pathman.h"
 
 #include "postgres.h"
 #include "catalog/pg_collation.h"
 #include "miscadmin.h"
 #include "nodes/nodeFuncs.h"
 #include "nodes/plannodes.h"
-#include "optimizer/clauses.h"
 #include "optimizer/cost.h"
 #include "optimizer/planmain.h"
 #include "optimizer/tlist.h"
@@ -29,7 +27,6 @@
 #include "utils/guc.h"
 #include "utils/lsyscache.h"
 #include "utils/typcache.h"
-#include "utils/memutils.h"
 #include "utils/ruleutils.h"
 
 #include "lib/binaryheap.h"

src/runtimeappend.c

@@ -10,8 +10,6 @@
 
 #include "runtimeappend.h"
 
-#include "postgres.h"
-#include "utils/memutils.h"
 #include "utils/guc.h"
 
 

src/utils.c

@@ -16,14 +16,15 @@
 #include "access/nbtree.h"
 #include "access/sysattr.h"
 #include "access/xact.h"
-#include "catalog/heap.h"
+#include "catalog/indexing.h"
 #include "catalog/namespace.h"
-#include "catalog/pg_type.h"
+#include "catalog/pg_class.h"
 #include "catalog/pg_extension.h"
 #include "catalog/pg_operator.h"
+#include "catalog/pg_type.h"
 #include "commands/extension.h"
 #include "miscadmin.h"
-#include "optimizer/var.h"
+#include "nodes/nodeFuncs.h"
 #include "parser/parse_coerce.h"
 #include "parser/parse_oper.h"
 #include "utils/builtins.h"