pathman: another 32bit systems issue fix

zilder · zilder · commit 60277759fe12 · 2016-02-18T10:29:33.000-05:00
diff --git a/contrib/pg_pathman/pl_funcs.c b/contrib/pg_pathman/pl_funcs.c
@@ -204,9 +204,11 @@ get_partition_range(PG_FUNCTION_ARGS)
 
 	if (found)
 	{
+		bool byVal = rangerel->by_val;
+
 		elems = palloc(nelems * sizeof(Datum));
-		elems[0] = ranges[i].min;
-		elems[1] = ranges[i].max;
+		elems[0] = PATHMAN_GET_DATUM(ranges[i].min, byVal);
+		elems[1] = PATHMAN_GET_DATUM(ranges[i].max, byVal);
 
 		arr = construct_array(elems, nelems, prel->atttype,
 							  tce->typlen, tce->typbyval, tce->typalign);
@@ -251,8 +253,8 @@ get_range_by_idx(PG_FUNCTION_ARGS)
 		re = &ranges[rangerel->ranges.length - 1];
 
 	elems = palloc(2 * sizeof(Datum));
-	elems[0] = re->min;
-	elems[1] = re->max;
+	elems[0] = PATHMAN_GET_DATUM(re->min, rangerel->by_val);
+	elems[1] = PATHMAN_GET_DATUM(re->max, rangerel->by_val);
 
 	PG_RETURN_ARRAYTYPE_P(
 		construct_array(elems, 2, prel->atttype,
@@ -277,7 +279,7 @@ get_min_range_value(PG_FUNCTION_ARGS)
 		PG_RETURN_NULL();
 
 	ranges = dsm_array_get_pointer(&rangerel->ranges);
-	PG_RETURN_DATUM(ranges[0].min);
+	PG_RETURN_DATUM(PATHMAN_GET_DATUM(ranges[0].min, rangerel->by_val));
 }
 
 /*
@@ -298,7 +300,7 @@ get_max_range_value(PG_FUNCTION_ARGS)
 		PG_RETURN_NULL();
 
 	ranges = dsm_array_get_pointer(&rangerel->ranges);
-	PG_RETURN_DATUM(ranges[rangerel->ranges.length-1].max);
+	PG_RETURN_DATUM(PATHMAN_GET_DATUM(ranges[rangerel->ranges.length-1].max, rangerel->by_val));
 }
 
 /*
diff --git a/contrib/pg_pathman/worker.c b/contrib/pg_pathman/worker.c
@@ -6,6 +6,7 @@
 #include "storage/dsm.h"
 #include "access/xact.h"
 #include "utils/snapmgr.h"
+#include "utils/typcache.h"
 
 /*-------------------------------------------------------------------------
  *
@@ -26,11 +27,17 @@ static void bg_worker_main(Datum main_arg);
 
 typedef struct PartitionArgs
 {
-	Oid dbid;
-	Oid relid;
-	Datum value;
-	Oid value_type;
-	Oid result;
+	Oid	dbid;
+	Oid	relid;
+	#ifdef HAVE_INT64_TIMESTAMP
+	int64	value;
+	#else
+	double	value;
+	#endif
+	//Datum value;
+	Oid	value_type;
+	bool	by_val;
+	Oid	result;
 } PartitionArgs;
 
 /*
@@ -46,17 +53,25 @@ create_partitions_bg_worker(Oid relid, Datum value, Oid value_type)
 	dsm_segment	   *segment;
 	dsm_handle		segment_handle;
 	pid_t 			pid;
-	PartitionArgs  *args;
+	PartitionArgs	   *args;
 	Oid 			child_oid;
+	TypeCacheEntry	   *tce;
 
 	/* Create a dsm segment for the worker to pass arguments */
 	segment = dsm_create(sizeof(PartitionArgs), 0);
 	segment_handle = dsm_segment_handle(segment);
 
+	tce = lookup_type_cache(value_type, 0);
+
+	/* Fill arguments structure */
 	args = (PartitionArgs *) dsm_segment_address(segment);
 	args->dbid = MyDatabaseId;
 	args->relid = relid;
-	args->value = value;
+	if (tce->typbyval)
+		args->value = value;
+	else
+		memcpy(&args->value, DatumGetPointer(value), sizeof(args->value));
+	args->by_val = tce->typbyval;
 	args->value_type = value_type;
 	args->result = 0;
 
@@ -121,7 +136,7 @@ bg_worker_main(Datum main_arg)
 	PushActiveSnapshot(GetTransactionSnapshot());
 
 	/* Create partitions */
-	args->result = create_partitions(args->relid, args->value, args->value_type);
+	args->result = create_partitions(args->relid, PATHMAN_GET_DATUM(args->value, args->by_val), args->value_type);
 
 	/* Cleanup */
 	SPI_finish();
