This is an automated email from the ASF dual-hosted git repository.
rafsun42 pushed a commit to branch PG11
in repository https://gitbox.apache.org/repos/asf/age.git
The following commit(s) were added to refs/heads/PG11 by this push:
new dbeb16a9 Clean up #included files in nodes, executor, & optimizer
directories (#1509) (#1534)
dbeb16a9 is described below
commit dbeb16a955653382fd4782d0de8dd826b636cbc6
Author: John Gemignani <[email protected]>
AuthorDate: Thu Feb 1 13:15:58 2024 -0800
Clean up #included files in nodes, executor, & optimizer directories
(#1509) (#1534)
Cleaned up #included files in the .c files in the nodes, executor,
and optimizer directories.
modified: src/backend/executor/cypher_create.c
modified: src/backend/executor/cypher_delete.c
modified: src/backend/executor/cypher_merge.c
modified: src/backend/executor/cypher_set.c
modified: src/backend/executor/cypher_utils.c
modified: src/backend/nodes/ag_nodes.c
modified: src/backend/nodes/cypher_copyfuncs.c
modified: src/backend/nodes/cypher_outfuncs.c
modified: src/backend/optimizer/cypher_createplan.c
modified: src/backend/optimizer/cypher_pathnode.c
modified: src/backend/optimizer/cypher_paths.c
Resolved -
Conflicts:
src/backend/executor/cypher_create.c
src/backend/executor/cypher_delete.c
src/backend/executor/cypher_merge.c
src/backend/executor/cypher_set.c
src/backend/executor/cypher_utils.c
src/backend/optimizer/cypher_createplan.c
src/backend/optimizer/cypher_pathnode.c
src/backend/optimizer/cypher_paths.c
---
src/backend/executor/cypher_create.c | 13 -------------
src/backend/executor/cypher_delete.c | 18 +-----------------
src/backend/executor/cypher_merge.c | 13 -------------
src/backend/executor/cypher_set.c | 18 +-----------------
src/backend/executor/cypher_utils.c | 14 +-------------
src/backend/nodes/ag_nodes.c | 2 --
src/backend/nodes/cypher_copyfuncs.c | 3 ---
src/backend/nodes/cypher_outfuncs.c | 4 ----
src/backend/optimizer/cypher_createplan.c | 8 --------
src/backend/optimizer/cypher_pathnode.c | 3 ---
src/backend/optimizer/cypher_paths.c | 5 -----
11 files changed, 3 insertions(+), 98 deletions(-)
diff --git a/src/backend/executor/cypher_create.c
b/src/backend/executor/cypher_create.c
index bf349e8a..82eec4c6 100644
--- a/src/backend/executor/cypher_create.c
+++ b/src/backend/executor/cypher_create.c
@@ -19,25 +19,12 @@
#include "postgres.h"
-#include "access/htup_details.h"
#include "access/xact.h"
-#include "executor/tuptable.h"
-#include "nodes/execnodes.h"
-#include "nodes/extensible.h"
-#include "nodes/nodes.h"
-#include "nodes/plannodes.h"
-#include "parser/parse_relation.h"
-#include "rewrite/rewriteHandler.h"
#include "utils/rel.h"
-#include "utils/tqual.h"
#include "catalog/ag_label.h"
#include "executor/cypher_executor.h"
#include "executor/cypher_utils.h"
-#include "nodes/cypher_nodes.h"
-#include "utils/agtype.h"
-#include "utils/ag_cache.h"
-#include "utils/graphid.h"
static void begin_cypher_create(CustomScanState *node, EState *estate,
int eflags);
diff --git a/src/backend/executor/cypher_delete.c
b/src/backend/executor/cypher_delete.c
index dd7860c1..dfe68c42 100644
--- a/src/backend/executor/cypher_delete.c
+++ b/src/backend/executor/cypher_delete.c
@@ -19,30 +19,14 @@
#include "postgres.h"
-#include "access/sysattr.h"
-#include "access/htup_details.h"
-#include "access/multixact.h"
#include "access/xact.h"
-#include "storage/bufmgr.h"
-#include "executor/tuptable.h"
-#include "nodes/execnodes.h"
-#include "nodes/extensible.h"
-#include "nodes/nodes.h"
-#include "nodes/plannodes.h"
-#include "parser/parsetree.h"
-#include "parser/parse_relation.h"
-#include "rewrite/rewriteHandler.h"
#include "utils/rel.h"
-#include "utils/tqual.h"
+#include "storage/bufmgr.h"
#include "catalog/ag_label.h"
#include "commands/label_commands.h"
#include "executor/cypher_executor.h"
#include "executor/cypher_utils.h"
-#include "parser/cypher_parse_node.h"
-#include "nodes/cypher_nodes.h"
-#include "utils/agtype.h"
-#include "utils/graphid.h"
static void begin_cypher_delete(CustomScanState *node, EState *estate,
int eflags);
diff --git a/src/backend/executor/cypher_merge.c
b/src/backend/executor/cypher_merge.c
index 0ac49761..861c52fd 100644
--- a/src/backend/executor/cypher_merge.c
+++ b/src/backend/executor/cypher_merge.c
@@ -19,25 +19,12 @@
#include "postgres.h"
-#include "access/htup_details.h"
#include "access/xact.h"
-#include "executor/tuptable.h"
-#include "nodes/execnodes.h"
-#include "nodes/extensible.h"
-#include "nodes/nodes.h"
-#include "nodes/plannodes.h"
-#include "parser/parse_relation.h"
-#include "rewrite/rewriteHandler.h"
#include "utils/rel.h"
-#include "utils/tqual.h"
#include "catalog/ag_label.h"
#include "executor/cypher_executor.h"
#include "executor/cypher_utils.h"
-#include "nodes/cypher_nodes.h"
-#include "utils/agtype.h"
-#include "utils/ag_cache.h"
-#include "utils/graphid.h"
static void begin_cypher_merge(CustomScanState *node, EState *estate,
int eflags);
diff --git a/src/backend/executor/cypher_set.c
b/src/backend/executor/cypher_set.c
index 6afa2c8a..552395c9 100644
--- a/src/backend/executor/cypher_set.c
+++ b/src/backend/executor/cypher_set.c
@@ -19,28 +19,12 @@
#include "postgres.h"
-#include "access/sysattr.h"
-#include "access/htup_details.h"
#include "access/xact.h"
-#include "storage/bufmgr.h"
-#include "executor/tuptable.h"
-#include "nodes/execnodes.h"
-#include "nodes/extensible.h"
-#include "nodes/nodes.h"
-#include "nodes/plannodes.h"
-#include "parser/parsetree.h"
-#include "parser/parse_relation.h"
-#include "rewrite/rewriteHandler.h"
#include "utils/rel.h"
+#include "storage/bufmgr.h"
-#include "catalog/ag_label.h"
-#include "commands/label_commands.h"
#include "executor/cypher_executor.h"
#include "executor/cypher_utils.h"
-#include "parser/cypher_parse_node.h"
-#include "nodes/cypher_nodes.h"
-#include "utils/agtype.h"
-#include "utils/graphid.h"
static void begin_cypher_set(CustomScanState *node, EState *estate,
int eflags);
diff --git a/src/backend/executor/cypher_utils.c
b/src/backend/executor/cypher_utils.c
index 3558fe69..be175f13 100644
--- a/src/backend/executor/cypher_utils.c
+++ b/src/backend/executor/cypher_utils.c
@@ -24,27 +24,15 @@
#include "postgres.h"
-#include "access/htup_details.h"
-#include "access/sysattr.h"
#include "access/xact.h"
-#include "access/multixact.h"
-#include "nodes/extensible.h"
+#include "utils/rel.h"
#include "nodes/makefuncs.h"
-#include "nodes/nodes.h"
-#include "nodes/nodeFuncs.h"
-#include "nodes/plannodes.h"
-#include "parser/parsetree.h"
#include "parser/parse_relation.h"
-#include "storage/procarray.h"
-#include "utils/rel.h"
#include "catalog/ag_label.h"
#include "commands/label_commands.h"
-#include "executor/cypher_executor.h"
#include "executor/cypher_utils.h"
-#include "utils/agtype.h"
#include "utils/ag_cache.h"
-#include "utils/graphid.h"
/*
* Given the graph name and the label name, create a ResultRelInfo for the
table
diff --git a/src/backend/nodes/ag_nodes.c b/src/backend/nodes/ag_nodes.c
index dee460b3..73f6154a 100644
--- a/src/backend/nodes/ag_nodes.c
+++ b/src/backend/nodes/ag_nodes.c
@@ -19,8 +19,6 @@
#include "postgres.h"
-#include "nodes/extensible.h"
-
#include "nodes/ag_nodes.h"
#include "nodes/cypher_copyfuncs.h"
#include "nodes/cypher_outfuncs.h"
diff --git a/src/backend/nodes/cypher_copyfuncs.c
b/src/backend/nodes/cypher_copyfuncs.c
index 6c832f89..9453bb52 100644
--- a/src/backend/nodes/cypher_copyfuncs.c
+++ b/src/backend/nodes/cypher_copyfuncs.c
@@ -19,10 +19,7 @@
#include "postgres.h"
-#include "nodes/bitmapset.h"
#include "nodes/extensible.h"
-#include "nodes/nodes.h"
-#include "utils/palloc.h"
#include "nodes/cypher_copyfuncs.h"
#include "nodes/cypher_nodes.h"
diff --git a/src/backend/nodes/cypher_outfuncs.c
b/src/backend/nodes/cypher_outfuncs.c
index ca9baafd..dbc9f664 100644
--- a/src/backend/nodes/cypher_outfuncs.c
+++ b/src/backend/nodes/cypher_outfuncs.c
@@ -19,10 +19,6 @@
#include "postgres.h"
-#include "lib/stringinfo.h"
-#include "nodes/extensible.h"
-#include "nodes/nodes.h"
-
#include "nodes/cypher_nodes.h"
#include "nodes/cypher_outfuncs.h"
diff --git a/src/backend/optimizer/cypher_createplan.c
b/src/backend/optimizer/cypher_createplan.c
index 41446985..fdbcb10b 100644
--- a/src/backend/optimizer/cypher_createplan.c
+++ b/src/backend/optimizer/cypher_createplan.c
@@ -19,14 +19,6 @@
#include "postgres.h"
-#include "access/sysattr.h"
-#include "catalog/pg_type_d.h"
-#include "nodes/extensible.h"
-#include "nodes/nodes.h"
-#include "nodes/pg_list.h"
-#include "nodes/plannodes.h"
-#include "nodes/relation.h"
-
#include "executor/cypher_executor.h"
#include "optimizer/cypher_createplan.h"
diff --git a/src/backend/optimizer/cypher_pathnode.c
b/src/backend/optimizer/cypher_pathnode.c
index 50fb9370..60ce5366 100644
--- a/src/backend/optimizer/cypher_pathnode.c
+++ b/src/backend/optimizer/cypher_pathnode.c
@@ -20,9 +20,6 @@
#include "postgres.h"
#include "nodes/extensible.h"
-#include "nodes/nodes.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
#include "optimizer/cypher_createplan.h"
#include "optimizer/cypher_pathnode.h"
diff --git a/src/backend/optimizer/cypher_paths.c
b/src/backend/optimizer/cypher_paths.c
index 0cb537ae..519501ba 100644
--- a/src/backend/optimizer/cypher_paths.c
+++ b/src/backend/optimizer/cypher_paths.c
@@ -19,11 +19,6 @@
#include "postgres.h"
-#include "access/sysattr.h"
-#include "catalog/pg_type_d.h"
-#include "nodes/parsenodes.h"
-#include "nodes/primnodes.h"
-#include "nodes/relation.h"
#include "optimizer/pathnode.h"
#include "optimizer/paths.h"
