bugfix for PARTITION BY HASH with no relnames and tablespaces specified

zilder · zilder · commit 25a6fa715cf4 · 2017-01-26T14:32:42.000+03:00
diff --git a/contrib/test_partitioning/expected/partition.out b/contrib/test_partitioning/expected/partition.out
@@ -24,15 +24,14 @@ SELECT * FROM pathman_partition_list;
  abc    | abc_200   |        2 | id       | 200       | 400
 (3 rows)
 
-/* Check that we can omit optional INTO parameter */
-ALTER TABLE abc SPLIT PARTITION abc_200 AT (300);
-ALTER TABLE abc MERGE PARTITIONS abc_200, abc_1;
+ALTER TABLE abc ADD PARTITION abc_400 VALUES LESS THAN (500);
+ALTER TABLE abc DROP PARTITION abc_200;
 SELECT * FROM pathman_partition_list;
  parent | partition | parttype | partattr | range_min | range_max 
 --------+-----------+----------+----------+-----------+-----------
  abc    | abc_inf   |        2 | id       | NULL      | 100
  abc    | abc_100   |        2 | id       | 100       | 200
- abc    | abc_200   |        2 | id       | 200       | 400
+ abc    | abc_400   |        2 | id       | 200       | 500
 (3 rows)
 
 /* Inserting values into area not covered by partitions should create new partition */
@@ -42,12 +41,11 @@ SELECT * FROM pathman_partition_list;
 --------+-----------+----------+----------+-----------+-----------
  abc    | abc_inf   |        2 | id       | NULL      | 100
  abc    | abc_100   |        2 | id       | 100       | 200
- abc    | abc_200   |        2 | id       | 200       | 400
- abc    | abc_2     |        2 | id       | 400       | 500
-(4 rows)
+ abc    | abc_400   |        2 | id       | 200       | 500
+(3 rows)
 
 DROP TABLE abc CASCADE;
-NOTICE:  drop cascades to 4 other objects
+NOTICE:  drop cascades to 3 other objects
 /*
  * Create range partitioned table (in contrast to interval-partitioned in terms
  * of Oracle)
@@ -58,7 +56,7 @@ PARTITION BY RANGE(id)
     PARTITION abc_inf VALUES LESS THAN (100),
     PARTITION abc_100 VALUES LESS THAN (200)
 );
-/* Inserting should produce an error */
+/* Inserting should produce an error because interval hasn't been set */
 INSERT INTO abc VALUES (250);
 ERROR:  could not create new partitions for relation "abc"
 DROP TABLE abc CASCADE;
diff --git a/contrib/test_partitioning/sql/partition.sql b/contrib/test_partitioning/sql/partition.sql
@@ -20,9 +20,8 @@ ALTER TABLE abc SPLIT PARTITION abc_200 AT (300) INTO (PARTITION abc_200, PARTIT
 ALTER TABLE abc MERGE PARTITIONS abc_200, abc_300 INTO PARTITION abc_200;
 SELECT * FROM pathman_partition_list;
 
-/* Check that we can omit optional INTO parameter */
-ALTER TABLE abc SPLIT PARTITION abc_200 AT (300);
-ALTER TABLE abc MERGE PARTITIONS abc_200, abc_1;
+ALTER TABLE abc ADD PARTITION abc_400 VALUES LESS THAN (500);
+ALTER TABLE abc DROP PARTITION abc_200;
 SELECT * FROM pathman_partition_list;
 
 /* Inserting values into area not covered by partitions should create new partition */
@@ -42,7 +41,7 @@ PARTITION BY RANGE(id)
     PARTITION abc_100 VALUES LESS THAN (200)
 );
 
-/* Inserting should produce an error */
+/* Inserting should produce an error because interval hasn't been set */
 INSERT INTO abc VALUES (250);
 DROP TABLE abc CASCADE;
 
diff --git a/src/backend/commands/partition.c b/src/backend/commands/partition.c
@@ -34,7 +34,6 @@ static void create_range_partitions(CreateStmt *stmt, Oid relid, const char *att
 static Node *cookPartitionKeyValue(Oid relid, const char *raw, Node *raw_value);
 static char *RangeVarGetString(const RangeVar *rangevar);
 static Oid RangeVarGetNamespaceId(const RangeVar *rangevar);
-static List* makeNameListFromRangeVar(const RangeVar *rangevar);
 
 #define equalstr(a, b)	\
 	(((a) != NULL && (b) != NULL) ? (strcmp(a, b) == 0) : (a) == (b))
@@ -74,7 +73,7 @@ create_hash_partitions(CreateStmt *stmt, Oid relid, const char* attname)
 	char		 **relnames = NULL;
 	char		 **tablespaces = NULL;
 
-	if (pinfo->partitions_count > 0)
+	if (list_length(pinfo->partitions) > 0)
 	{
 		ListCell   *lc;
 		int			i = 0;
@@ -100,7 +99,11 @@ create_hash_partitions(CreateStmt *stmt, Oid relid, const char* attname)
 							  relnames,
 							  tablespaces);
 
-	pfree(relnames);
+	/* Free allocated resources */
+	if (relnames)
+		pfree(relnames);
+	if (tablespaces)
+		pfree(tablespaces);
 }
 
 
@@ -519,16 +522,3 @@ RangeVarGetNamespaceId(const RangeVar *rangevar)
 
 	return namespace_id;
 }
-
-
-/*
- * This is the inverse function for makeRangeVarFromNameList()
- */
-static List*
-makeNameListFromRangeVar(const RangeVar *rangevar)
-{
-	Oid		namespace_id = RangeVarGetNamespaceId(rangevar);
-
-	return list_make2(makeString(get_namespace_name(namespace_id)),
-					  makeString(rangevar->relname));
-}
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -3030,6 +3030,7 @@ partitionType:	HASH '(' a_expr ')' PARTITIONS '(' Iconst ')'
 						PartitionInfo *n = (PartitionInfo *) palloc(sizeof(PartitionInfo));
 						n->partition_type = P_HASH;
 						n->key = $3;
+						n->partitions = NIL;
 						n->partitions_count = $7;
 						$$ = (PartitionInfo *)n;
 					}

Original file line number	Diff line number	Diff line change
`@@ -3030,6 +3030,7 @@ partitionType: HASH '(' a_expr ')' PARTITIONS '(' Iconst ')'`
`3030`	`3030`	`PartitionInfo n = (PartitionInfo ) palloc(sizeof(PartitionInfo));`
`3031`	`3031`	`n->partition_type = P_HASH;`
`3032`	`3032`	`n->key = $3;`
	`3033`	`+ n->partitions = NIL;`
`3033`	`3034`	`n->partitions_count = $7;`
`3034`	`3035`	`$$ = (PartitionInfo *)n;`
`3035`	`3036`	`}`