remove useless includes, remove PathmanRange & PathmanHash impl

funbringer · funbringer · commit f6cd9d5c7996 · 2016-08-29T00:03:38.000+03:00
diff --git a/src/hooks.c b/src/hooks.c
@@ -10,9 +10,9 @@
 
 #include "hooks.h"
 #include "init.h"
+#include "partition_filter.h"
 #include "runtimeappend.h"
 #include "runtime_merge_append.h"
-#include "partition_filter.h"
 #include "utils.h"
 
 #include "miscadmin.h"
@@ -447,13 +447,10 @@ pathman_planner_hook(Query *parse, int cursorOptions, ParamListInfo boundParams)
 void
 pathman_post_parse_analysis_hook(ParseState *pstate, Query *query)
 {
-	elog(DEBUG2, "Called parse hook [%u]", MyProcPid);
-
 	/* Invoke original hook if needed */
 	if (post_parse_analyze_hook_next)
 		post_parse_analyze_hook_next(pstate, query);
 
-
 	/* Finish delayed invalidation jobs */
 	if (IsPathmanReady())
 		finish_delayed_invalidation();
diff --git a/src/init.c b/src/init.c
@@ -25,18 +25,17 @@
 #include "catalog/pg_inherits.h"
 #include "catalog/pg_inherits_fn.h"
 #include "catalog/pg_type.h"
-#include "executor/spi.h"
 #include "miscadmin.h"
 #include "optimizer/clauses.h"
 #include "utils/datum.h"
 #include "utils/inval.h"
-#include "utils/fmgroids.h"
-#include "utils/syscache.h"
 #include "utils/builtins.h"
-#include "utils/typcache.h"
+#include "utils/fmgroids.h"
 #include "utils/memutils.h"
 #include "utils/lsyscache.h"
 #include "utils/snapmgr.h"
+#include "utils/syscache.h"
+#include "utils/typcache.h"
 
 
 /* Help user in case of emergency */
diff --git a/src/pathman.h b/src/pathman.h
@@ -51,8 +51,6 @@
 /* type modifier (typmod) for 'range_interval' */
 #define PATHMAN_CONFIG_interval_typmod		-1
 
-#define PATHMAN_CONFIG_ID_SEQ				"pathman_config_id_seq"
-
 /*
  * Definitions for the "pathman_config_params" table
  */
diff --git a/src/pl_funcs.c b/src/pl_funcs.c
@@ -8,10 +8,10 @@
  * ------------------------------------------------------------------------
  */
 
-#include "pathman.h"
 #include "init.h"
-#include "utils.h"
+#include "pathman.h"
 #include "relation_info.h"
+#include "utils.h"
 #include "xact_handling.h"
 
 #include "access/htup_details.h"
@@ -20,13 +20,13 @@
 #include "catalog/indexing.h"
 #include "commands/sequence.h"
 #include "miscadmin.h"
+#include "utils/array.h"
 #include "utils/builtins.h"
+#include <utils/inval.h>
+#include "utils/memutils.h"
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
 #include "utils/typcache.h"
-#include "utils/array.h"
-#include "utils/memutils.h"
-#include <utils/inval.h>
 
 
 /* declarations */
@@ -56,33 +56,6 @@ PG_FUNCTION_INFO_V1( lock_partitioned_relation );
 PG_FUNCTION_INFO_V1( debug_capture );
 
 
-/* pathman_range type */
-typedef struct PathmanRange
-{
-	Oid			type_oid;
-	bool		by_val;
-	RangeEntry	range;
-} PathmanRange;
-
-typedef struct PathmanHash
-{
-	Oid			child_oid;
-	uint32		hash;
-} PathmanHash;
-
-typedef struct PathmanRangeListCtxt
-{
-	Oid			type_oid;
-	bool		by_val;
-	RangeEntry *ranges;
-	int			nranges;
-	int			pos;
-} PathmanRangeListCtxt;
-
-PG_FUNCTION_INFO_V1( pathman_range_in );
-PG_FUNCTION_INFO_V1( pathman_range_out );
-
-
 static void on_partitions_created_internal(Oid partitioned_table, bool add_callbacks);
 static void on_partitions_updated_internal(Oid partitioned_table, bool add_callbacks);
 static void on_partitions_removed_internal(Oid partitioned_table, bool add_callbacks);
@@ -729,41 +702,6 @@ lock_partitioned_relation(PG_FUNCTION_ARGS)
 }
 
 
-Datum
-pathman_range_in(PG_FUNCTION_ARGS)
-{
-	elog(ERROR, "Not implemented");
-}
-
-Datum
-pathman_range_out(PG_FUNCTION_ARGS)
-{
-	PathmanRange *rng = (PathmanRange *) PG_GETARG_POINTER(0);
-	char	   *result;
-	char	   *left,
-			   *right;
-	Oid			outputfunc;
-	bool		typisvarlena;
-
-	getTypeOutputInfo(rng->type_oid, &outputfunc, &typisvarlena);
-
-	left = OidOutputFunctionCall(
-		outputfunc,
-		rng->by_val ?
-			(Datum) rng->range.min :
-			PointerGetDatum(&rng->range.min));
-
-	right = OidOutputFunctionCall(
-		outputfunc,
-		rng->by_val ?
-			(Datum) rng->range.max :
-			PointerGetDatum(&rng->range.max));
-
-	result = psprintf("[%s: %s)", left, right);
-	PG_RETURN_CSTRING(result);
-}
-
-
 /*
  * NOTE: used for DEBUG, set breakpoint here.
  */
