fix sigfault when inserting into area not covered with partitions and interval set to NULL

zilder · zilder · commit 588b292adf9b · 2017-01-12T15:57:35.000+03:00
diff --git a/init.sql b/init.sql
@@ -596,6 +596,40 @@ END
 $$ LANGUAGE plpgsql STRICT;
 
 
+/*
+ * Set new relname, schema and tablespace
+ */
+CREATE OR REPLACE FUNCTION @extschema@.alter_partition(relation REGCLASS,
+													   new_name TEXT,
+													   new_schema REGNAMESPACE,
+													   new_tablespace TEXT)
+RETURNS VOID AS
+$$
+DECLARE
+	orig_name TEXT;
+	orig_schema OID;
+BEGIN
+	SELECT relname, relnamespace FROM pg_class WHERE oid = relation
+	INTO orig_name, orig_schema;
+
+	/* Alter table name */
+	IF new_name != orig_name THEN
+		EXECUTE format('ALTER TABLE %s RENAME TO %s', relation, new_name);
+	END IF;
+
+	/* Alter table schema */
+	IF new_schema != orig_schema THEN
+		EXECUTE format('ALTER TABLE %s SET SCHEMA %s', relation, new_schema);
+	END IF;
+
+	/* Move to another tablespace */
+	IF NOT new_tablespace IS NULL THEN
+		EXECUTE format('ALTER TABLE %s SET TABLESPACE %s', relation, new_tablespace);
+	END IF;
+END
+$$ LANGUAGE plpgsql;
+
+
 /*
  * Partitioning key
  */
diff --git a/src/partition_creation.c b/src/partition_creation.c
@@ -363,43 +363,27 @@ create_partitions_for_value_internal(Oid relid, Datum value, Oid value_type)
 				RangeEntry *ranges = PrelGetRangesArray(prel);
 				Datum		bound_min,			/* absolute MIN */
 							bound_max;			/* absolute MAX */
-				// Infinitable	bound_min,		/* lower bound of all partitions */
-				// 			bound_max;		/* upper bound of all partitions */
-				// Infinitable	start,
-				// 			end; 
 
 				Oid			interval_type = InvalidOid;
 				Datum		interval_binary, /* assigned 'width' of one partition */
 							interval_text;
 
-				// bound_min = ranges[0].min;
-				// bound_max = ranges[PrelLastChild(prel)].max;
-
-				// start.value = !IsInfinite(&bound_min) ?
-				// 	datumCopy(InfinitableGetValue(&bound_min),
-				// 			  prel->attbyval,
-				// 			  prel->attlen) :
-				// 	(Datum) 0;
-				// start.is_infinite = IsInfinite(&bound_min);
-
-				// end.value = !IsInfinite(&bound_max) ?
-				// 	datumCopy(InfinitableGetValue(&bound_max),
-				// 			  prel->attbyval,
-				// 			  prel->attlen) :
-				// 	(Datum) 0;
-				// end.is_infinite = IsInfinite(&bound_max);
-
 				/* Read max & min range values from PartRelationInfo */
-				/* TODO */
-				// bound_min = PrelGetRangesArray(prel)[0].min;
-				// bound_max = PrelGetRangesArray(prel)[PrelLastChild(prel)].max;
 				bound_min = BoundGetValue(&ranges[0].min);
 				bound_max = BoundGetValue(&ranges[PrelLastChild(prel)].max);
 
 				/* Copy datums on order to protect them from cache invalidation */
 				bound_min = datumCopy(bound_min, prel->attbyval, prel->attlen);
 				bound_max = datumCopy(bound_max, prel->attbyval, prel->attlen);
 
+				/* Check if interval is set */
+				if (isnull[Anum_pathman_config_range_interval - 1])
+				{
+					elog(ERROR,
+						 "Could not find appropriate partition for key '%s'",
+						 datum_to_cstring(value, value_type));
+				}
+
 				/* Retrieve interval as TEXT from tuple */
 				interval_text = values[Anum_pathman_config_range_interval - 1];
 
