Refactor ChunkDispatch to remove ChunkDispatchInfo

src/CMakeLists.txt

@@ -7,7 +7,6 @@ set(SOURCES
   chunk_adaptive.c
   chunk_constraint.c
   chunk_dispatch.c
-  chunk_dispatch_info.c
   chunk_dispatch_plan.c
   chunk_dispatch_state.c
   chunk_index.c

src/chunk_dispatch_plan.c

@@ -15,7 +15,6 @@
 
 #include "chunk_dispatch_plan.h"
 #include "chunk_dispatch_state.h"
-#include "chunk_dispatch_info.h"
 
 /*
  * Create a ChunkDispatchState node from this plan. This is the full execution
@@ -25,7 +24,7 @@
 static Node *
 create_chunk_dispatch_state(CustomScan *cscan)
 {
-	return (Node *) chunk_dispatch_state_create(linitial(cscan->custom_private),
+	return (Node *) chunk_dispatch_state_create(linitial_oid(cscan->custom_private),
 												linitial(cscan->custom_plans));
 }
 
@@ -117,8 +116,8 @@ build_customscan_targetlist(Relation rel, List *targetlist)
  * in a hypertable.
  *
  * Note that CustomScan nodes cannot be extended (by struct embedding) because
- * they might be copied, therefore we pass any extra info as a ChunkDispatchInfo
- * in the custom_private field.
+ * they might be copied, therefore we pass hypertable_relid in the
+ * custom_private field.
  *
  * The chunk dispatch plan takes the original tuple-producing subplan, which was
  * part of a ModifyTable node, and imposes itself inbetween the ModifyTable plan
@@ -130,10 +129,9 @@ CustomScan *
 chunk_dispatch_plan_create(Plan *subplan, Index hypertable_rti, Oid hypertable_relid, Query *parse)
 {
 	CustomScan *cscan = makeNode(CustomScan);
-	ChunkDispatchInfo *info = chunk_dispatch_info_create(hypertable_relid, parse);
 	Relation	rel;
 
-	cscan->custom_private = list_make1(info);
+	cscan->custom_private = list_make1_oid(hypertable_relid);
 	cscan->methods = &chunk_dispatch_plan_methods;
 	cscan->custom_plans = list_make1(subplan);
 	cscan->scan.scanrelid = 0;	/* Indicate this is not a real relation we are

src/chunk_dispatch_state.c

@@ -12,7 +12,6 @@
 
 #include "chunk_dispatch_state.h"
 #include "chunk_dispatch_plan.h"
-#include "chunk_dispatch_info.h"
 #include "chunk_dispatch.h"
 #include "chunk_insert_state.h"
 #include "chunk.h"
@@ -147,12 +146,12 @@ static CustomExecMethods chunk_dispatch_state_methods = {
 };
 
 ChunkDispatchState *
-chunk_dispatch_state_create(ChunkDispatchInfo *info, Plan *subplan)
+chunk_dispatch_state_create(Oid hypertable_relid, Plan *subplan)
 {
 	ChunkDispatchState *state;
 
 	state = (ChunkDispatchState *) newNode(sizeof(ChunkDispatchState), T_CustomScanState);
-	state->hypertable_relid = info->hypertable_relid;
+	state->hypertable_relid = hypertable_relid;
 	state->subplan = subplan;
 	state->cscan_state.methods = &chunk_dispatch_state_methods;
 	return state;

src/chunk_dispatch_state.h

@@ -12,7 +12,6 @@
 #include <nodes/parsenodes.h>
 
 typedef struct ChunkDispatch ChunkDispatch;
-typedef struct ChunkDispatchInfo ChunkDispatchInfo;
 typedef struct Cache Cache;
 
 /* State used for every tuple in an insert statement */
@@ -39,7 +38,7 @@ typedef struct ChunkDispatchState
 
 #define CHUNK_DISPATCH_STATE_NAME "ChunkDispatchState"
 
-ChunkDispatchState *chunk_dispatch_state_create(ChunkDispatchInfo *, Plan *);
+ChunkDispatchState *chunk_dispatch_state_create(Oid, Plan *);
 void
 			chunk_dispatch_state_set_parent(ChunkDispatchState *state, ModifyTableState *parent);
 

src/hypertable_insert.c

@@ -14,7 +14,6 @@
 #include <catalog/pg_type.h>
 
 #include "hypertable_insert.h"
-#include "chunk_dispatch_info.h"
 #include "chunk_dispatch_state.h"
 
 /*

src/init.c

@@ -23,9 +23,6 @@
 PG_MODULE_MAGIC;
 #endif
 
-extern void _chunk_dispatch_info_init(void);
-extern void _chunk_dispatch_info_fini(void);
-
 extern void _hypertable_cache_init(void);
 extern void _hypertable_cache_fini(void);
 
@@ -71,7 +68,6 @@ _PG_init(void)
 	extension_check_server_version();
 	bgw_check_loader_api_version();
 
-	_chunk_dispatch_info_init();
 	_cache_init();
 	_hypertable_cache_init();
 	_cache_invalidate_init();
@@ -109,5 +105,4 @@ _PG_fini(void)
 	_cache_invalidate_fini();
 	_hypertable_cache_fini();
 	_cache_fini();
-	_chunk_dispatch_info_fini();
 }