Merge branch 'merge_concurrent' of github.com:postgrespro/pg_pathman into merge_concurrent

zilder · zilder · commit a83af9ecccb6 · 2016-08-30T18:59:09.000+03:00
diff --git a/README.md b/README.md
@@ -35,6 +35,7 @@ More interesting features are yet to come. Stay tuned!
 
 ## Roadmap
 
+ * Provide a way to create user-defined partition creation\destruction callbacks (issue [#22](https://github.com/postgrespro/pg_pathman/issues/22))
  * Implement LIST partitioning scheme;
  * Optimize hash join (both tables are partitioned by join key).
 
@@ -63,7 +64,7 @@ Done! Now it's time to setup your partitioning schemes.
 create_hash_partitions(relation         REGCLASS,
                        attribute        TEXT,
                        partitions_count INTEGER,
-                       partition_name TEXT DEFAULT NULL)
+                       partition_name   TEXT DEFAULT NULL)
 ```
 Performs HASH partitioning for `relation` by integer key `attribute`. The `partitions_count` parameter specifies the number of partitions to create; it cannot be changed afterwards. If `partition_data` is `true` then all the data will be automatically copied from the parent table to partitions. Note that data migration may took a while to finish and the table will be locked until transaction commits. See `partition_table_concurrently()` for a lock-free way to migrate data.
 
@@ -75,7 +76,7 @@ create_range_partitions(relation       REGCLASS,
                         count          INTEGER DEFAULT NULL
                         partition_data BOOLEAN DEFAULT true)
 
-create_range_partitions(relation       TEXT,
+create_range_partitions(relation       REGCLASS,
                         attribute      TEXT,
                         start_value    ANYELEMENT,
                         interval       INTERVAL,
@@ -162,15 +163,15 @@ drop_range_partition(partition TEXT)
 Drop RANGE partition and all its data.
 
 ```plpgsql
-attach_range_partition(relation    TEXT,
-                       partition   TEXT,
+attach_range_partition(relation    REGCLASS,
+                       partition   REGCLASS,
                        start_value ANYELEMENT,
                        end_value   ANYELEMENT)
 ```
 Attach partition to the existing RANGE-partitioned relation. The attached table must have exactly the same structure as the parent table, including the dropped columns.
 
 ```plpgsql
-detach_range_partition(partition TEXT)
+detach_range_partition(partition REGCLASS)
 ```
 Detach partition from the existing RANGE-partitioned relation.
 
@@ -349,7 +350,7 @@ SELECT tableoid::regclass AS partition, * FROM partitioned_table;
 
 - All running concurrent partitioning tasks can be listed using the `pathman_concurrent_part_tasks` view:
 ```plpgsql
-postgres=# SELECT * FROM pathman_concurrent_part_tasks;
+SELECT * FROM pathman_concurrent_part_tasks;
  userid | pid  | dbid  | relid | processed | status  
 --------+------+-------+-------+-----------+---------
  dmitry | 7367 | 16384 | test  |    472000 | working
diff --git a/README.rus.md b/README.rus.md
@@ -38,6 +38,7 @@ More interesting features are yet to come. Stay tuned!
 
 ## Roadmap
 
+ * Предоставить возможность установки пользовательских колбеков на создание\уничтожение партиции (issue [#22](https://github.com/postgrespro/pg_pathman/issues/22))
  * LIST-секционирование;
  * Оптимизация hash join для случая, когда обе таблицы секционированы по ключу join’а.
 
@@ -65,7 +66,7 @@ CREATE EXTENSION pg_pathman;
 create_hash_partitions(relation         REGCLASS,
                        attribute        TEXT,
                        partitions_count INTEGER,
-                       partition_name TEXT DEFAULT NULL)
+                       partition_name   TEXT DEFAULT NULL)
 ```
 Выполняет HASH-секционирование таблицы `relation` по целочисленному полю `attribute`. Параметр `partitions_count` определяет, сколько секций будет создано. Если `partition_data` установлен в значение `true`, то данные из родительской таблицы будут автоматически распределены по секциям. Стоит иметь в виду, что миграция данных может занять некоторое время, а данные заблокированы. Для конкурентной миграции данных см. функцию `partition_table_concurrently()`.
 
@@ -77,7 +78,7 @@ create_range_partitions(relation       REGCLASS,
                         count          INTEGER DEFAULT NULL
                         partition_data BOOLEAN DEFAULT true)
 
-create_range_partitions(relation       TEXT,
+create_range_partitions(relation       REGCLASS,
                         attribute      TEXT,
                         start_value    ANYELEMENT,
                         interval       INTERVAL,
@@ -164,20 +165,20 @@ drop_range_partition(partition TEXT)
 Удаляет RANGE секцию вместе с содержащимися в ней данными.
 
 ```plpgsql
-attach_range_partition(relation    TEXT,
-                       partition   TEXT,
+attach_range_partition(relation    REGCLASS,
+                       partition   REGCLASS,
                        start_value ANYELEMENT,
                        end_value   ANYELEMENT)
 ```
 Присоединяет существующую таблицу `partition` в качестве секции к ранее секционированной таблице `relation`. Структура присоединяемой таблицы должна в точности повторять структуру родительской.
 
 ```plpgsql
-detach_range_partition(partition TEXT)
+detach_range_partition(partition REGCLASS)
 ```
 Отсоединяет секцию `partition`, после чего она становится независимой таблицей.
 
 ```plpgsql
-disable_pathman_for(relation TEXT)
+disable_pathman_for(relation REGCLASS)
 ```
 Отключает механизм секционирования `pg_pathman` для заданной таблицы. При этом созданные ранее секции остаются без изменений.
 
@@ -348,7 +349,7 @@ SELECT tableoid::regclass AS partition, * FROM partitioned_table;
 
 - Получить все текущие процессы конкурентного секционирования можно из представления `pathman_concurrent_part_tasks`:
 ```plpgsql
-postgres=# SELECT * FROM pathman_concurrent_part_tasks;
+SELECT * FROM pathman_concurrent_part_tasks;
  userid | pid  | dbid  | relid | processed | status  
 --------+------+-------+-------+-----------+---------
  dmitry | 7367 | 16384 | test  |    472000 | working
diff --git a/src/init.c b/src/init.c
@@ -384,7 +384,7 @@ fill_prel_with_partitions(const Oid *partitions,
 				DisablePathman(); /* disable pg_pathman since config is broken */
 				ereport(ERROR,
 						(errmsg("Unknown partitioning type for relation \"%s\"",
-								get_rel_name_or_relid(prel->key)),
+								get_rel_name_or_relid(PrelParentRelid(prel))),
 						 errhint(INIT_ERROR_HINT)));
 			}
 		}
@@ -430,7 +430,7 @@ fill_prel_with_partitions(const Oid *partitions,
 				DisablePathman(); /* disable pg_pathman since config is broken */
 				elog(ERROR, "pg_pathman's cache for relation \"%s\" "
 							"has not been properly initialized",
-					 get_rel_name_or_relid(prel->key));
+					 get_rel_name_or_relid(PrelParentRelid(prel)));
 			}
 		}
 #endif
diff --git a/src/nodes_common.c b/src/nodes_common.c
@@ -248,6 +248,12 @@ get_partition_oids(List *ranges, int *n, const PartRelationInfo *prel)
 	Oid		   *result = (Oid *) palloc(allocated * sizeof(Oid));
 	Oid		   *children = PrelGetChildrenArray(prel);
 
+	/* If required, add parent to result */
+	Assert(INITIAL_ALLOC_NUM >= 1);
+	if (prel->enable_parent)
+		result[used++] = PrelParentRelid(prel);
+
+	/* Deal with selected partitions */
 	foreach (range_cell, ranges)
 	{
 		uint32	i;
@@ -366,6 +372,10 @@ create_append_plan_common(PlannerInfo *root, RelOptInfo *rel,
 		{
 			Plan		   *child_plan = (Plan *) lfirst(lc2);
 			RelOptInfo 	   *child_rel = ((Path *) lfirst(lc1))->parent;
+			Oid				child_relid;
+
+			/* Fetch relid of the 'child_rel' */
+			child_relid = root->simple_rte_array[child_rel->relid]->relid;
 
 			/* Replace rel's  tlist with a matching one */
 			if (!cscan->scan.plan.targetlist)
@@ -380,6 +390,10 @@ create_append_plan_common(PlannerInfo *root, RelOptInfo *rel,
 			if (!cscan->custom_scan_tlist)
 				cscan->custom_scan_tlist = replace_tlist_varnos(child_plan->targetlist,
 																rel);
+
+			/* If this is a plan for parent table, fill it with quals */
+			if (PrelParentRelid(prel) == child_relid)
+				child_plan->qual = get_actual_clauses(clauses);
 		}
 	}
 
diff --git a/src/pg_pathman.c b/src/pg_pathman.c
@@ -916,13 +916,13 @@ create_partitions_internal(Oid relid, Datum value, Oid value_type)
 				elog(ERROR, "Could not connect using SPI");
 
 			/* while (value >= MAX) ... */
-			spawn_partitions(prel->key, value, max_rvalue, prel->atttype,
-							 &interval_type_cmp, interval_binary,
+			spawn_partitions(PrelParentRelid(prel), value, max_rvalue,
+							 prel->atttype, &interval_type_cmp, interval_binary,
 							 interval_type, true, &partid);
 
 			/* while (value < MIN) ... */
-			spawn_partitions(prel->key, value, min_rvalue, prel->atttype,
-							 &interval_type_cmp, interval_binary,
+			spawn_partitions(PrelParentRelid(prel), value, min_rvalue,
+							 prel->atttype, &interval_type_cmp, interval_binary,
 							 interval_type, false, &partid);
 
 			SPI_finish(); /* close SPI connection */
diff --git a/src/relation_info.h b/src/relation_info.h
@@ -96,6 +96,8 @@ typedef enum
  * PartRelationInfo field access macros.
  */
 
+#define PrelParentRelid(prel)		( (prel)->key )
+
 #define PrelGetChildrenArray(prel)	( (prel)->children )
 
 #define PrelGetRangesArray(prel)	( (prel)->ranges )
@@ -111,7 +113,7 @@ PrelLastChild(const PartRelationInfo *prel)
 
 	if (PrelChildrenCount(prel) == 0)
 		elog(ERROR, "pg_pathman's cache entry for relation %u has 0 children",
-			 prel->key);
+			 PrelParentRelid(prel));
 
 	return PrelChildrenCount(prel) - 1; /* last partition */
 }
@@ -161,7 +163,7 @@ FreeChildrenArray(PartRelationInfo *prel)
 			Oid child = (prel)->children[i];
 
 			/* If it's *always been* relid's partition, free cache */
-			if (prel->key == get_parent_of_partition(child, NULL))
+			if (PrelParentRelid(prel) == get_parent_of_partition(child, NULL))
 				forget_parent_of_partition(child, NULL);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -384,7 +384,7 @@ fill_prel_with_partitions(const Oid *partitions,`
`384`	`384`	`DisablePathman(); /* disable pg_pathman since config is broken */`
`385`	`385`	`ereport(ERROR,`
`386`	`386`	`(errmsg("Unknown partitioning type for relation \"%s\"",`
`387`		`- get_rel_name_or_relid(prel->key)),`
	`387`	`+ get_rel_name_or_relid(PrelParentRelid(prel))),`
`388`	`388`	`errhint(INIT_ERROR_HINT)));`
`389`	`389`	`}`
`390`	`390`	`}`
`@@ -430,7 +430,7 @@ fill_prel_with_partitions(const Oid *partitions,`
`430`	`430`	`DisablePathman(); /* disable pg_pathman since config is broken */`
`431`	`431`	`elog(ERROR, "pg_pathman's cache for relation \"%s\" "`
`432`	`432`	`"has not been properly initialized",`
`433`		`- get_rel_name_or_relid(prel->key));`
	`433`	`+ get_rel_name_or_relid(PrelParentRelid(prel)));`
`434`	`434`	`}`
`435`	`435`	`}`
`436`	`436`	`#endif`