fix formatting, make use of WrongPartType()

funbringer · funbringer · commit f6e97fcf8435 · 2017-05-10T17:01:34.000+03:00
diff --git a/init.sql b/init.sql
@@ -380,11 +380,10 @@ BEGIN
 	USING p_min, p_max
 	INTO ctids;
 
-	EXECUTE format('
-		WITH data AS (
-			DELETE FROM ONLY %1$s WHERE ctid = ANY($1) RETURNING *)
-		INSERT INTO %1$s SELECT * FROM data',
-		relation)
+	EXECUTE format('WITH data AS (
+					DELETE FROM ONLY %1$s WHERE ctid = ANY($1) RETURNING *)
+					INSERT INTO %1$s SELECT * FROM data',
+				   relation)
 	USING ctids;
 
 	/* Get number of inserted rows */
diff --git a/range.sql b/range.sql
@@ -150,7 +150,7 @@ BEGIN
 			   end_value,
 			   v_atttype::TEXT)
 		USING
-				expression;
+			expression;
 	END IF;
 
 	/* Insert new entry to pathman config */
diff --git a/src/include/relation_info.h b/src/include/relation_info.h
@@ -348,8 +348,6 @@ PartTypeToCString(PartType parttype)
 }
 
 
-
-
 /* PartRelationInfo checker */
 void shout_if_prel_is_invalid(const Oid parent_oid,
 							  const PartRelationInfo *prel,
diff --git a/src/pathman_workers.c b/src/pathman_workers.c
@@ -513,7 +513,7 @@ bgw_main_concurrent_part(Datum main_arg)
 			{
 				failures_count = PART_WORKER_MAX_ATTEMPTS;
 
-				elog(LOG, "relation %u is not partitioned (or does not exist)",
+				elog(LOG, "relation \"%u\" is not partitioned (or does not exist)",
 						  part_slot->relid);
 			}
 		}
diff --git a/src/relation_info.c b/src/relation_info.c
@@ -1293,9 +1293,7 @@ shout_if_prel_is_invalid(const Oid parent_oid,
 				break;
 
 			default:
-				elog(ERROR,
-					 "expected_str selection not implemented for type %d",
-					 expected_part_type);
+				WrongPartType(expected_part_type);
 		}
 
 		elog(ERROR, "relation \"%s\" is not partitioned by %s",

Original file line number	Diff line number	Diff line change
`@@ -348,8 +348,6 @@ PartTypeToCString(PartType parttype)`
`348`	`348`	`}`
`349`	`349`
`350`	`350`
`351`		`-`
`352`		`-`
`353`	`351`	`/* PartRelationInfo checker */`
`354`	`352`	`void shout_if_prel_is_invalid(const Oid parent_oid,`
`355`	`353`	`const PartRelationInfo *prel,`
Original file line number	Diff line number	Diff line change
`@@ -513,7 +513,7 @@ bgw_main_concurrent_part(Datum main_arg)`
`513`	`513`	`{`
`514`	`514`	`failures_count = PART_WORKER_MAX_ATTEMPTS;`
`515`	`515`
`516`		`- elog(LOG, "relation %u is not partitioned (or does not exist)",`
	`516`	`+ elog(LOG, "relation \"%u\" is not partitioned (or does not exist)",`
`517`	`517`	`part_slot->relid);`
`518`	`518`	`}`
`519`	`519`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1293,9 +1293,7 @@ shout_if_prel_is_invalid(const Oid parent_oid,`
`1293`	`1293`	`break;`
`1294`	`1294`
`1295`	`1295`	`default:`
`1296`		`- elog(ERROR,`
`1297`		`- "expected_str selection not implemented for type %d",`
`1298`		`- expected_part_type);`
	`1296`	`+ WrongPartType(expected_part_type);`
`1299`	`1297`	`}`
`1300`	`1298`
`1301`	`1299`	`elog(ERROR, "relation \"%s\" is not partitioned by %s",`