From 9057c8778b9b514c211ad309e78e0bbef13c38bc Mon Sep 17 00:00:00 2001 From: Mehmet Yilmaz Date: Thu, 12 Jun 2025 11:39:11 +0000 Subject: [PATCH] Remove unused includes and obsolete type alias for OpBtreeInterpretation in planner files --- citus-tools | 1 - src/backend/columnar/columnar_customscan.c | 1 - src/backend/distributed/planner/multi_explain.c | 5 ----- src/backend/distributed/planner/multi_logical_planner.c | 8 -------- src/backend/distributed/planner/shard_pruning.c | 8 -------- 5 files changed, 23 deletions(-) delete mode 160000 citus-tools diff --git a/citus-tools b/citus-tools deleted file mode 160000 index 3376bd684..000000000 --- a/citus-tools +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3376bd6845f0614908ed304f5033bd644c82d3bf diff --git a/src/backend/columnar/columnar_customscan.c b/src/backend/columnar/columnar_customscan.c index baf569464..e6f866078 100644 --- a/src/backend/columnar/columnar_customscan.c +++ b/src/backend/columnar/columnar_customscan.c @@ -18,7 +18,6 @@ #include "nodes/execnodes.h" /* for ExprState, ExprContext, etc. */ #include "executor/executor.h" /* for ExecInitExprWithParams(), ExecEvalExpr() */ -#include "commands/explain_format.h" /* for ExplainPropertyInteger() */ #include "access/amapi.h" #include "access/skey.h" #include "catalog/pg_am.h" diff --git a/src/backend/distributed/planner/multi_explain.c b/src/backend/distributed/planner/multi_explain.c index 023dc4718..9972adfee 100644 --- a/src/backend/distributed/planner/multi_explain.c +++ b/src/backend/distributed/planner/multi_explain.c @@ -23,7 +23,6 @@ #include "commands/createas.h" #include "commands/dbcommands.h" #include "commands/explain.h" -#include "commands/explain_format.h" #include "commands/tablecmds.h" #include "executor/tstoreReceiver.h" #include "lib/stringinfo.h" @@ -43,10 +42,6 @@ #include "utils/json.h" #include "utils/lsyscache.h" #include "utils/snapmgr.h" -#if PG_VERSION_NUM >= PG_VERSION_18 -# include "commands/explain_dr.h" /* CreateExplainSerializeDestReceiver() */ -#endif - #include "pg_version_constants.h" #if PG_VERSION_NUM >= PG_VERSION_18 diff --git a/src/backend/distributed/planner/multi_logical_planner.c b/src/backend/distributed/planner/multi_logical_planner.c index a42da71e9..d1e2e6bca 100644 --- a/src/backend/distributed/planner/multi_logical_planner.c +++ b/src/backend/distributed/planner/multi_logical_planner.c @@ -34,14 +34,6 @@ #include "utils/relcache.h" #include "utils/syscache.h" -/* - * PG 18 renamed OpBtreeInterpretation to the more generic OpIndexInterpretation, - * so make the old name an alias. - */ -#if PG_VERSION_NUM >= PG_VERSION_18 -typedef OpIndexInterpretation OpBtreeInterpretation; -#endif - #include "pg_version_constants.h" #if PG_VERSION_NUM >= PG_VERSION_18 typedef OpIndexInterpretation OpBtreeInterpretation; diff --git a/src/backend/distributed/planner/shard_pruning.c b/src/backend/distributed/planner/shard_pruning.c index 1ed8a3e57..7e58d1154 100644 --- a/src/backend/distributed/planner/shard_pruning.c +++ b/src/backend/distributed/planner/shard_pruning.c @@ -84,14 +84,6 @@ #include "utils/memutils.h" #include "utils/ruleutils.h" -/* - * PG 18 renamed OpBtreeInterpretation to the more generic OpIndexInterpretation, - * so make the old name an alias. - */ -#if PG_VERSION_NUM >= PG_VERSION_18 -typedef OpIndexInterpretation OpBtreeInterpretation; -#endif - #include "pg_version_constants.h" #if PG_VERSION_NUM >= PG_VERSION_18 typedef OpIndexInterpretation OpBtreeInterpretation;