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

zilder · zilder · commit 67ff4a82317d · 2016-08-29T17:01:17.000+03:00
diff --git a/src/init.c b/src/init.c
@@ -623,6 +623,7 @@ pathman_config_contains_relation(Oid relid, Datum *values, bool *isnull,
 
 /*
  * Loads additional pathman parameters like 'enable_parent' or 'auto'
+ * from PATHMAN_CONFIG_PARAMS
  */
 bool
 read_pathman_params(Oid relid, Datum *values, bool *isnull)
@@ -632,7 +633,7 @@ read_pathman_params(Oid relid, Datum *values, bool *isnull)
 	ScanKeyData		key[1];
 	Snapshot		snapshot;
 	HeapTuple		htup;
-	bool			result = false;
+	bool			row_found = false;
 
 	ScanKeyInit(&key[0],
 				Anum_pathman_config_params_partrel,
@@ -643,19 +644,20 @@ read_pathman_params(Oid relid, Datum *values, bool *isnull)
 	snapshot = RegisterSnapshot(GetLatestSnapshot());
 	scan = heap_beginscan(rel, snapshot, 1, key);
 
+	/* There should be just 1 row */
 	if ((htup = heap_getnext(scan, ForwardScanDirection)) != NULL)
 	{
 		/* Extract data if necessary */
 		heap_deform_tuple(htup, RelationGetDescr(rel), values, isnull);
-		result = true;
+		row_found = true;
 	}
 
 	/* Clean resources */
 	heap_endscan(scan);
 	UnregisterSnapshot(snapshot);
 	heap_close(rel, AccessShareLock);
 
-	return result;
+	return row_found;
 }
 
 /*
diff --git a/src/relation_info.c b/src/relation_info.c
@@ -160,14 +160,18 @@ refresh_pathman_relation_info(Oid relid,
 
 	pfree(prel_children);
 
-	/*
-	 * Read additional parameters ('enable_parent' and 'auto' at the moment)
-	 */
+	/* Read additional parameters ('enable_parent' and 'auto' at the moment) */
 	if (read_pathman_params(relid, param_values, param_isnull))
 	{
 		prel->enable_parent = param_values[Anum_pathman_config_params_enable_parent - 1];
 		prel->auto_partition = param_values[Anum_pathman_config_params_auto - 1];
 	}
+	/* Else set default values if they cannot be found */
+	else
+	{
+		prel->enable_parent = false;
+		prel->auto_partition = true;
+	}
 
 	/* We've successfully built a cache entry */
 	prel->valid = true;
