pathman: cleanup

zilder · zilder · commit 2f143bd83b0d · 2016-03-09T19:04:11.000+03:00
diff --git a/contrib/pg_pathman/README.md b/contrib/pg_pathman/README.md
@@ -32,9 +32,11 @@ Based on partitioning type and operator the `pg_pathman` searches corresponding
 
 ## Roadmap
 
-* Optimize the execution of the NestedLoop join method;
-* LIST-partitioning;
-* HASH-partitioning for non integer attributes.
+ * Execute time sections selections (useful for nested loops and prepared statements);
+ * Optimization of ordering output from patitioned tables (useful for merge join and order by);
+ * Optimization of hash join when both tables are patitioned by join key;
+ * LIST-patitioning;
+ * HASH-patitioning by non integer attribtes.
 
 ## Installation
 
diff --git a/contrib/pg_pathman/README.rus.md b/contrib/pg_pathman/README.rus.md
@@ -34,9 +34,11 @@ WHERE id = 150
 
 ## Roadmap
 
-* Оптимизация поиска секции для соединения (join) таблиц методом NestedLoop;
-* LIST-секционирование;
-* HASH-секционирование по ключевому аттрибуту с типом, отличным от INTEGER.
+ * Выбор секций на этапе выполнения запроса (полезно для nested loop join, prepared statements);
+ * Оптимизация выдачи упорядоченных результатов из секционированных таблиц (полезно для merge join, order by);
+ * Оптимизация hash join для случая, когда обе таблицы секционированы по ключу join’а;
+ * LIST-секционирование;
+ * HASH-секционирование по ключевому атрибуту с типом, отличным от INTEGER.
 
 ## Установка
 
diff --git a/contrib/pg_pathman/init.c b/contrib/pg_pathman/init.c
@@ -13,8 +13,6 @@
 #include "utils/bytea.h"
 #include "utils/snapmgr.h"
 
-#include "miscadmin.h"
-
 
 HTAB   *relations = NULL;
 HTAB   *range_restrictions = NULL;
diff --git a/contrib/pg_pathman/pathman.h b/contrib/pg_pathman/pathman.h
@@ -105,6 +105,8 @@ typedef struct PathmanState
 	LWLock   *edit_partitions_lock;
 } PathmanState;
 
+PathmanState *pmstate;
+
 #define PATHMAN_GET_DATUM(value, by_val) ( (by_val) ? (value) : PointerGetDatum(&value) )
 
 typedef int IndexRange;
@@ -139,12 +141,6 @@ List *irange_list_intersect(List *a, List *b);
 int irange_list_length(List *rangeset);
 bool irange_list_find(List *rangeset, int index, bool *lossy);
 
-
-// LWLock *load_config_lock;
-// LWLock *dsm_init_lock;
-// LWLock *edit_partitions_lock;
-PathmanState *pmstate;
-
 /* Dynamic shared memory functions */
 void init_dsm_config(void);
 bool init_dsm_segment(size_t blocks_count, size_t block_size);
diff --git a/contrib/pg_pathman/pl_funcs.c b/contrib/pg_pathman/pl_funcs.c
@@ -361,17 +361,13 @@ check_overlap(PG_FUNCTION_ARGS)
 Datum
 acquire_partitions_lock(PG_FUNCTION_ARGS)
 {
-	// int relid = DatumGetInt32(PG_GETARG_DATUM(0));
-	// LockRelationOid(relid, AccessExclusiveLock);
 	LWLockAcquire(pmstate->edit_partitions_lock, LW_EXCLUSIVE);
 	PG_RETURN_NULL();
 }
 
 Datum
 release_partitions_lock(PG_FUNCTION_ARGS)
 {
-	// int relid = DatumGetInt32(PG_GETARG_DATUM(0));
-	// UnlockRelationOid(relid, AccessExclusiveLock);
 	LWLockRelease(pmstate->edit_partitions_lock);
 	PG_RETURN_NULL();
 }

Original file line number	Diff line number	Diff line change
`@@ -361,17 +361,13 @@ check_overlap(PG_FUNCTION_ARGS)`
`361`	`361`	`Datum`
`362`	`362`	`acquire_partitions_lock(PG_FUNCTION_ARGS)`
`363`	`363`	`{`
`364`		`- // int relid = DatumGetInt32(PG_GETARG_DATUM(0));`
`365`		`- // LockRelationOid(relid, AccessExclusiveLock);`
`366`	`364`	`LWLockAcquire(pmstate->edit_partitions_lock, LW_EXCLUSIVE);`
`367`	`365`	`PG_RETURN_NULL();`
`368`	`366`	`}`
`369`	`367`
`370`	`368`	`Datum`
`371`	`369`	`release_partitions_lock(PG_FUNCTION_ARGS)`
`372`	`370`	`{`
`373`		`- // int relid = DatumGetInt32(PG_GETARG_DATUM(0));`
`374`		`- // UnlockRelationOid(relid, AccessExclusiveLock);`
`375`	`371`	`LWLockRelease(pmstate->edit_partitions_lock);`
`376`	`372`	`PG_RETURN_NULL();`
`377`	`373`	`}`