make handle_const() check for 'for_insert' flag

funbringer · funbringer · commit 5f6fed0e6cd7 · 2016-07-18T17:47:27.000+03:00
diff --git a/src/hooks.c b/src/hooks.c
@@ -91,8 +91,8 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 		WrapperNode *wrap;
 
 		/* We aim to persist cached context->ranges */
-		InitWalkerContextCustomNode(&context, inner_prel,
-									NULL, CurrentMemoryContext,
+		InitWalkerContextCustomNode(&context, inner_prel, NULL,
+									CurrentMemoryContext, false,
 									&context_initialized);
 
 		wrap = walk_expr_tree((Expr *) lfirst(lc), &context);
@@ -225,7 +225,7 @@ pathman_rel_pathlist_hook(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTb
 		ranges = list_make1_irange(make_irange(0, prel->children_count - 1, false));
 
 		/* Make wrappers over restrictions and collect final rangeset */
-		InitWalkerContext(&context, prel, NULL, CurrentMemoryContext);
+		InitWalkerContext(&context, prel, NULL, CurrentMemoryContext, false);
 		wrappers = NIL;
 		foreach(lc, rel->baserestrictinfo)
 		{
diff --git a/src/nodes_common.c b/src/nodes_common.c
@@ -503,7 +503,7 @@ rescan_append_common(CustomScanState *node)
 	ranges = list_make1_irange(make_irange(0, prel->children_count - 1, false));
 
 	InitWalkerContextCustomNode(&scan_state->wcxt, scan_state->prel,
-								econtext, CurrentMemoryContext,
+								econtext, CurrentMemoryContext, false,
 								&scan_state->wcxt_cached);
 
 	foreach (lc, scan_state->custom_exprs)
diff --git a/src/partition_filter.c b/src/partition_filter.c
@@ -162,8 +162,8 @@ partition_filter_exec(CustomScanState *node)
 		CopyToTempConst(constlen,    attlen);
 		CopyToTempConst(constbyval,  attbyval);
 
-		InitWalkerContextCustomNode(&state->wcxt, state->prel,
-									econtext, CurrentMemoryContext,
+		InitWalkerContextCustomNode(&state->wcxt, state->prel, econtext,
+									CurrentMemoryContext, true,
 									&state->wcxt_cached);
 
 		/* Switch to per-tuple context */
diff --git a/src/pathman.h b/src/pathman.h
@@ -289,12 +289,14 @@ typedef struct
 							hasGreatest;
 	Datum					least,
 							greatest;
+
+	bool					for_insert;	/* are we in PartitionFilter now? */
 } WalkerContext;
 
 /*
  * Usual initialization procedure for WalkerContext
  */
-#define InitWalkerContext(context, prel_info, ecxt, mcxt) \
+#define InitWalkerContext(context, prel_info, ecxt, mcxt, for_ins) \
 	do { \
 		(context)->prel = (prel_info); \
 		(context)->econtext = (ecxt); \
@@ -303,14 +305,15 @@ typedef struct
 		(context)->hasLeast = false; \
 		(context)->hasGreatest = false; \
 		(context)->persistent_mcxt = (mcxt); \
+		(context)->for_insert = (for_ins); \
 	} while (0)
 
 /*
  * We'd like to persist RangeEntry (ranges) array
  * in case of range partitioning, so 'wcxt' is stored
  * inside of Custom Node
  */
-#define InitWalkerContextCustomNode(context, prel_info, ecxt, mcxt, isCached) \
+#define InitWalkerContextCustomNode(context, prel_info, ecxt, mcxt, for_ins, isCached) \
 	do { \
 		if (!*isCached) \
 		{ \
@@ -319,6 +322,7 @@ typedef struct
 			(context)->ranges = NULL; \
 			(context)->nranges = 0; \
 			(context)->persistent_mcxt = (mcxt); \
+			(context)->for_insert = (for_ins); \
 			*isCached = true; \
 		} \
 		(context)->hasLeast = false; \
diff --git a/src/pg_pathman.c b/src/pg_pathman.c
@@ -331,7 +331,7 @@ handle_modification_query(Query *parse)
 		return;
 
 	/* Parse syntax tree and extract partition ranges */
-	InitWalkerContext(&context, prel, NULL, CurrentMemoryContext);
+	InitWalkerContext(&context, prel, NULL, CurrentMemoryContext, false);
 	wrap = walk_expr_tree(expr, &context);
 	finish_least_greatest(wrap, &context);
 	clear_walker_context(&context);
@@ -1125,6 +1125,20 @@ handle_const(const Const *c, WalkerContext *context)
 	const PartRelationInfo *prel = context->prel;
 	WrapperNode			   *result = (WrapperNode *) palloc(sizeof(WrapperNode));
 
+	/*
+	 * Had to add this check for queries like:
+	 *   select * from test.hash_rel where txt = NULL;
+	 */
+	if (!context->for_insert)
+	{
+		result->rangeset = list_make1_irange(make_irange(0,
+														 prel->children_count - 1,
+														 true));
+		result->paramsel = 1.0;
+
+		return result;
+	}
+
 	switch (prel->parttype)
 	{
 		case PT_HASH:
@@ -1156,8 +1170,7 @@ handle_const(const Const *c, WalkerContext *context)
 			break;
 
 		default:
-			result->rangeset = list_make1_irange(make_irange(0, prel->children_count - 1, true));
-			result->paramsel = 1.0;
+			elog(ERROR, "Unknown partitioning type %u", prel->parttype);
 			break;
 	}
 
