Use heap_getattr and copy slot before using

ildus · ildus · commit 70c064d6fe71 · 2017-03-22T14:52:30.000+03:00
diff --git a/src/debug_print.c b/src/debug_print.c
@@ -11,9 +11,11 @@
 #include "rangeset.h"
 
 #include "postgres.h"
+#include "fmgr.h"
 #include "nodes/bitmapset.h"
 #include "nodes/pg_list.h"
 #include "lib/stringinfo.h"
+#include "utils/lsyscache.h"
 
 
 /*
@@ -99,3 +101,32 @@ irange_print(IndexRange irange)
 
 	return str.data;
 }
+
+/*
+ * Print Datum as cstring
+ */
+#ifdef __GNUC__
+__attribute__((unused))
+#endif
+static char *
+datum_print(Datum origval, Oid typid)
+{
+	Oid typoutput;
+	bool typisvarlena;
+	Datum val;
+
+	/* Query output function */
+    getTypeOutputInfo(typid, &typoutput, &typisvarlena);
+
+    if (typisvarlena && VARATT_IS_EXTERNAL_ONDISK(origval))
+        return NULL; //unchanged-toast-datum
+    else if (!typisvarlena)
+        val = origval;
+    else
+    {
+        /* Definitely detoasted Datum */
+        val = PointerGetDatum(PG_DETOAST_DATUM(origval));
+    }
+
+    return OidOutputFunctionCall(typoutput, val);
+}
diff --git a/src/partition_filter.c b/src/partition_filter.c
@@ -532,6 +532,7 @@ struct expr_walker_context
 {
 	const PartRelationInfo	*prel;
 	TupleTableSlot			*slot;
+	HeapTuple				 tup;
 	bool					 clear;
 };
 
@@ -564,7 +565,8 @@ adapt_values (Node *node, struct expr_walker_context *context)
 			/* check that type is still same */
 			Assert(context->slot->tts_tupleDescriptor->
 						attrs[attnum - 1]->atttypid == cst->consttype);
-			cst->constvalue = slot_getattr(context->slot, attnum, &isNull);
+			cst->constvalue = heap_getattr(context->tup, attnum,
+				context->slot->tts_tupleDescriptor, &isNull);
 			cst->constisnull = isNull;
 		}
 		return false;
@@ -633,22 +635,18 @@ partition_filter_exec(CustomScanState *node)
 		/* Prepare walker context */
 		expr_walker_context.prel = prel; /* maybe slot will be enough */
 		expr_walker_context.slot = slot;
-		expr_walker_context.clear = true;
-
-		/* Clear values from slot for expression */
-		adapt_values((Node *)prel->expr, (void *) &expr_walker_context);
-
-		/* Prepare state before execution */
-		expr_state = ExecPrepareExpr(prel->expr, estate);
+		expr_walker_context.tup = ExecCopySlotTuple(slot);
+		expr_walker_context.clear = false;
 
 		/* Switch to per-tuple context */
 		old_cxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(estate));
 
-		expr_walker_context.clear = false;
-
 		/* Fetch values from slot for expression */
 		adapt_values((Node *)prel->expr, (void *) &expr_walker_context);
 
+		/* Prepare state before execution */
+		expr_state = ExecPrepareExpr(prel->expr, estate);
+
 		/* Execute expression */
 		value = ExecEvalExpr(expr_state, econtext, &isnull, &itemIsDone);
 
