headers added

Author: zilder

dsm_array.c

@@ -1,3 +1,14 @@
+/* ------------------------------------------------------------------------
+ *
+ * init.c
+ *		This module allocates large DSM segment to store arrays,
+ *		initializes it with block structure and provides functions to
+ *		allocate and free arrays
+ *
+ * Copyright (c) 2015-2016, Postgres Professional
+ *
+ * ------------------------------------------------------------------------
+ */
 #include "pathman.h"
 #include "storage/shmem.h"
 #include "storage/dsm.h"
@@ -69,7 +80,7 @@ init_dsm_segment(size_t blocks_count, size_t block_size)
 	bool ret;
 
 	/* lock here */
-	LWLockAcquire(dsm_init_lock, LW_EXCLUSIVE);
+	LWLockAcquire(pmstate->dsm_init_lock, LW_EXCLUSIVE);
 
 	/* if there is already an existing segment then attach to it */
 	if (dsm_cfg->segment_handle != 0)
@@ -99,9 +110,8 @@ init_dsm_segment(size_t blocks_count, size_t block_size)
 	 * destroyed by the end of transaction
 	 */
 	dsm_pin_mapping(segment);
-
 	/* unlock here */
-	LWLockRelease(dsm_init_lock);
+	LWLockRelease(pmstate->dsm_init_lock);
 
 	return ret;
 }

hash.sql

@@ -1,3 +1,13 @@
+/* ------------------------------------------------------------------------
+ *
+ * hash.sql
+ *      HASH partitioning functions
+ *
+ * Copyright (c) 2015-2016, Postgres Professional
+ *
+ * ------------------------------------------------------------------------
+ */
+
 /*
  * Creates hash partitions for specified relation
  */

init.c

@@ -1,3 +1,12 @@
+/* ------------------------------------------------------------------------
+ *
+ * init.c
+ *		Initialization functions
+ *
+ * Copyright (c) 2015-2016, Postgres Professional
+ *
+ * ------------------------------------------------------------------------
+ */
 #include "pathman.h"
 #include "miscadmin.h"
 #include "executor/spi.h"
@@ -28,6 +37,33 @@ static int cmp_range_entries(const void *p1, const void *p2);
 void
 init_shmem_config()
 {
+	bool found;
+
+	/* Check if module was initialized in postmaster */
+	pmstate = ShmemInitStruct("pathman state", sizeof(PathmanState), &found);
+	if (!found)
+	{
+		/*
+		 * Initialize locks in postmaster
+		 */
+		if (!IsUnderPostmaster)
+		{
+			/* Initialize locks */
+			pmstate->load_config_lock = LWLockAssign();
+			pmstate->dsm_init_lock    = LWLockAssign();
+			pmstate->edit_partitions_lock = LWLockAssign();
+		}
+#ifdef WIN32
+		else
+		{
+			elog(ERROR, "Pathman module must be initialized in postmaster. "
+						"Put the following line to configuration file: "
+						"shared_preload_libraries='pg_pathman'");
+			initialization_needed = false;
+		}
+#endif
+	}
+
 	create_relations_hashtable();
 	create_range_restrictions_hashtable();
 }
@@ -46,9 +82,9 @@ load_config(void)
 	/* if config is not loaded */
 	if (new_segment_created)
 	{
-		LWLockAcquire(load_config_lock, LW_EXCLUSIVE);
+		LWLockAcquire(pmstate->load_config_lock, LW_EXCLUSIVE);
 		load_relations_hashtable(new_segment_created);
-		LWLockRelease(load_config_lock);
+		LWLockRelease(pmstate->load_config_lock);
 	}
 }
 
@@ -195,8 +231,8 @@ create_relations_hashtable()
 void
 load_check_constraints(Oid parent_oid, Snapshot snapshot)
 {
-	PartRelationInfo *prel;
-	RangeRelation *rangerel;
+	PartRelationInfo *prel = NULL;
+	RangeRelation *rangerel = NULL;
 	SPIPlanPtr plan;
 	bool	found;
 	int		ret,
@@ -227,7 +263,7 @@ load_check_constraints(Oid parent_oid, Snapshot snapshot)
 	{
 		SPITupleTable *tuptable = SPI_tuptable;
 		Oid *children;
-		RangeEntry *ranges;
+		RangeEntry *ranges = NULL;
 		Datum min;
 		Datum max;
 		int hash;

init.sql

@@ -1,3 +1,13 @@
+/* ------------------------------------------------------------------------
+ *
+ * init.sql
+ *      Creates config table and provides common utility functions
+ *
+ * Copyright (c) 2015-2016, Postgres Professional
+ *
+ * ------------------------------------------------------------------------
+ */
+
 /*
  * Pathman config
  *  relname - schema qualified relation name

pathman.h

@@ -1,3 +1,12 @@
+/* ------------------------------------------------------------------------
+ *
+ * pathman.h
+ *		structures and prototypes for pathman functions
+ *
+ * Copyright (c) 2015-2016, Postgres Professional
+ *
+ * ------------------------------------------------------------------------
+ */
 #ifndef PATHMAN_H
 #define PATHMAN_H
 
@@ -98,6 +107,15 @@ typedef struct RangeRelation
 	DsmArray    ranges;
 } RangeRelation;
 
+typedef struct PathmanState
+{
+	LWLock   *load_config_lock;
+	LWLock   *dsm_init_lock;
+	LWLock   *edit_partitions_lock;
+} PathmanState;
+
+PathmanState *pmstate;
+
 #define PATHMAN_GET_DATUM(value, by_val) ( (by_val) ? (value) : PointerGetDatum(&value) )
 
 typedef int IndexRange;
@@ -132,12 +150,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;
-
-
 /* Dynamic shared memory functions */
 void init_dsm_config(void);
 bool init_dsm_segment(size_t blocks_count, size_t block_size);

pg_pathman.c

@@ -1,3 +1,13 @@
+/* ------------------------------------------------------------------------
+ *
+ * pg_pathman.c
+ *		This module sets planner hooks, handles SELECT queries and produces
+ *		paths for partitioned tables
+ *
+ * Copyright (c) 2015-2016, Postgres Professional
+ *
+ * ------------------------------------------------------------------------
+ */
 #include "pathman.h"
 #include "postgres.h"
 #include "fmgr.h"
@@ -103,13 +113,15 @@ static void set_pathkeys(PlannerInfo *root, RelOptInfo *childrel, Path *path);
 void
 _PG_init(void)
 {
+#ifndef WIN32
 	if (IsUnderPostmaster)
 	{
 		elog(ERROR, "Pathman module must be initialized in postmaster. "
 					"Put the following line to configuration file: "
 					"shared_preload_libraries='pg_pathman'");
-		initialization_needed = false;
+	        initialization_needed = false;
 	}
+#endif
 
 	set_rel_pathlist_hook_original = set_rel_pathlist_hook;
 	set_rel_pathlist_hook = pathman_set_rel_pathlist_hook;
@@ -246,16 +258,11 @@ pathman_shmem_startup(void)
 {
 	/* Initialize locks */
 	RequestAddinLWLocks(3);
-	load_config_lock = LWLockAssign();
-	dsm_init_lock    = LWLockAssign();
-	edit_partitions_lock = LWLockAssign();
-
-	LWLockAcquire(AddinShmemInitLock, LW_EXCLUSIVE);
 
 	/* Allocate shared memory objects */
+	LWLockAcquire(AddinShmemInitLock, LW_EXCLUSIVE);
 	init_dsm_config();
 	init_shmem_config();
-
 	LWLockRelease(AddinShmemInitLock);
 
 	/* Invoke original hook if needed */

pl_funcs.c

@@ -1,3 +1,12 @@
+/* ------------------------------------------------------------------------
+ *
+ * pl_funcs.c
+ *		Utility C functions for stored procedures
+ *
+ * Copyright (c) 2015-2016, Postgres Professional
+ *
+ * ------------------------------------------------------------------------
+ */
 #include "pathman.h"
 #include "utils/lsyscache.h"
 #include "utils/typcache.h"
@@ -29,13 +38,13 @@ PG_FUNCTION_INFO_V1( get_max_range_value );
 Datum
 on_partitions_created(PG_FUNCTION_ARGS)
 {
-	LWLockAcquire(load_config_lock, LW_EXCLUSIVE);
+	LWLockAcquire(pmstate->load_config_lock, LW_EXCLUSIVE);
 
 	/* Reload config */
 	/* TODO: reload just the specified relation */
 	load_relations_hashtable(false);
 
-	LWLockRelease(load_config_lock);
+	LWLockRelease(pmstate->load_config_lock);
 
 	PG_RETURN_NULL();
 }
@@ -51,10 +60,10 @@ on_partitions_updated(PG_FUNCTION_ARGS)
 	prel = get_pathman_relation_info(relid, NULL);
 	if (prel != NULL)
 	{
-		LWLockAcquire(load_config_lock, LW_EXCLUSIVE);
+		LWLockAcquire(pmstate->load_config_lock, LW_EXCLUSIVE);
 		remove_relation_info(relid);
 		load_relations_hashtable(false);
-		LWLockRelease(load_config_lock);
+		LWLockRelease(pmstate->load_config_lock);
 	}
 
 	PG_RETURN_NULL();
@@ -65,13 +74,13 @@ on_partitions_removed(PG_FUNCTION_ARGS)
 {
 	Oid		relid;
 
-	LWLockAcquire(load_config_lock, LW_EXCLUSIVE);
+	LWLockAcquire(pmstate->load_config_lock, LW_EXCLUSIVE);
 
 	/* parent relation oid */
 	relid = DatumGetInt32(PG_GETARG_DATUM(0));
 	remove_relation_info(relid);
 
-	LWLockRelease(load_config_lock);
+	LWLockRelease(pmstate->load_config_lock);
 
 	PG_RETURN_NULL();
 }
@@ -129,10 +138,10 @@ find_or_create_range_partition(PG_FUNCTION_ARGS)
 		Oid child_oid;
 
 		/* Lock config before appending new partitions */
-		LWLockAcquire(load_config_lock, LW_EXCLUSIVE);
+		LWLockAcquire(pmstate->load_config_lock, LW_EXCLUSIVE);
 
 		/* Restrict concurrent partition creation */
-		LWLockAcquire(edit_partitions_lock, LW_EXCLUSIVE);
+		LWLockAcquire(pmstate->edit_partitions_lock, LW_EXCLUSIVE);
 
 		/*
 		 * Check if someone else has already created partition.
@@ -141,8 +150,8 @@ find_or_create_range_partition(PG_FUNCTION_ARGS)
 		pos = range_binary_search(rangerel, &cmp_func, value, &found);
 		if (found)
 		{
-			LWLockRelease(edit_partitions_lock);
-			LWLockRelease(load_config_lock);
+			LWLockRelease(pmstate->edit_partitions_lock);
+			LWLockRelease(pmstate->load_config_lock);
 			PG_RETURN_OID(ranges[pos].child_oid);
 		}
 
@@ -155,8 +164,8 @@ find_or_create_range_partition(PG_FUNCTION_ARGS)
 		// elog(WARNING, "Worker finished");
 
 		/* Release locks */
-		LWLockRelease(edit_partitions_lock);
-		LWLockRelease(load_config_lock);
+		LWLockRelease(pmstate->edit_partitions_lock);
+		LWLockRelease(pmstate->load_config_lock);
 
 		/* Repeat binary search */
 		ranges = dsm_array_get_pointer(&rangerel->ranges);
@@ -361,17 +370,13 @@ check_overlap(PG_FUNCTION_ARGS)
 Datum
 acquire_partitions_lock(PG_FUNCTION_ARGS)
 {
-	// int relid = DatumGetInt32(PG_GETARG_DATUM(0));
-	// LockRelationOid(relid, AccessExclusiveLock);
-	LWLockAcquire(edit_partitions_lock, LW_EXCLUSIVE);
+	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(edit_partitions_lock);
+	LWLockRelease(pmstate->edit_partitions_lock);
 	PG_RETURN_NULL();
 }

range.sql

@@ -1,3 +1,13 @@
+/* ------------------------------------------------------------------------
+ *
+ * range.sql
+ *      RANGE partitioning functions
+ *
+ * Copyright (c) 2015-2016, Postgres Professional
+ *
+ * ------------------------------------------------------------------------
+ */
+
 /*
  * Creates RANGE partitions for specified relation based on datetime attribute
  */

rangeset.c

@@ -1,3 +1,12 @@
+/* ------------------------------------------------------------------------
+ *
+ * rangeset.c
+ *		Index range functions
+ *
+ * Copyright (c) 2015-2016, Postgres Professional
+ *
+ * ------------------------------------------------------------------------
+ */
 #include "pathman.h"
 
 /* Check if two ranges are intersecting */
@@ -213,7 +222,6 @@ irange_list_intersect(List *a, List *b)
 		if (irange_upper(ra) >= irange_upper(rb))
 			cb = lnext(cb);
 	}
-
 	return result;
 }