fix #76: pass parent and partition schemas into callbacks params

zilder · zilder · commit 2b0bfaba014f · 2017-01-20T15:18:02.000+03:00
diff --git a/expected/pathman_callbacks.out b/expected/pathman_callbacks.out
@@ -27,7 +27,7 @@ SELECT set_init_callback('callbacks.abc',
 
 INSERT INTO callbacks.abc VALUES (123, 1);
 INSERT INTO callbacks.abc VALUES (223, 1); /* show warning */
-WARNING:  callback arg: {"parent": "abc", "parttype": "2", "partition": "abc_3", "range_max": "301", "range_min": "201"}
+WARNING:  callback arg: {"parent": "abc", "parttype": "2", "partition": "abc_3", "range_max": "301", "range_min": "201", "parent_schema": "callbacks", "partition_schema": "callbacks"}
 SELECT set_spawn_using_bgw('callbacks.abc', true);
  set_spawn_using_bgw 
 ---------------------
@@ -54,21 +54,21 @@ SELECT set_spawn_using_bgw('callbacks.abc', false);
 (1 row)
 
 SELECT append_range_partition('callbacks.abc');
-WARNING:  callback arg: {"parent": "abc", "parttype": "2", "partition": "abc_5", "range_max": "501", "range_min": "401"}
+WARNING:  callback arg: {"parent": "abc", "parttype": "2", "partition": "abc_5", "range_max": "501", "range_min": "401", "parent_schema": "callbacks", "partition_schema": "callbacks"}
  append_range_partition 
 ------------------------
  callbacks.abc_5
 (1 row)
 
 SELECT prepend_range_partition('callbacks.abc');
-WARNING:  callback arg: {"parent": "abc", "parttype": "2", "partition": "abc_6", "range_max": "1", "range_min": "-99"}
+WARNING:  callback arg: {"parent": "abc", "parttype": "2", "partition": "abc_6", "range_max": "1", "range_min": "-99", "parent_schema": "callbacks", "partition_schema": "callbacks"}
  prepend_range_partition 
 -------------------------
  callbacks.abc_6
 (1 row)
 
 SELECT add_range_partition('callbacks.abc', 501, 602);
-WARNING:  callback arg: {"parent": "abc", "parttype": "2", "partition": "abc_7", "range_max": "602", "range_min": "501"}
+WARNING:  callback arg: {"parent": "abc", "parttype": "2", "partition": "abc_7", "range_max": "602", "range_min": "501", "parent_schema": "callbacks", "partition_schema": "callbacks"}
  add_range_partition 
 ---------------------
  callbacks.abc_7
@@ -97,11 +97,11 @@ SELECT set_init_callback('callbacks.abc',
 (1 row)
 
 SELECT create_hash_partitions('callbacks.abc', 'a', 5);
-WARNING:  callback arg: {"parent": "abc", "parttype": "1", "partition": "abc_0"}
-WARNING:  callback arg: {"parent": "abc", "parttype": "1", "partition": "abc_1"}
-WARNING:  callback arg: {"parent": "abc", "parttype": "1", "partition": "abc_2"}
-WARNING:  callback arg: {"parent": "abc", "parttype": "1", "partition": "abc_3"}
-WARNING:  callback arg: {"parent": "abc", "parttype": "1", "partition": "abc_4"}
+WARNING:  callback arg: {"parent": "abc", "parttype": "1", "partition": "abc_0", "parent_schema": "callbacks", "partition_schema": "callbacks"}
+WARNING:  callback arg: {"parent": "abc", "parttype": "1", "partition": "abc_1", "parent_schema": "callbacks", "partition_schema": "callbacks"}
+WARNING:  callback arg: {"parent": "abc", "parttype": "1", "partition": "abc_2", "parent_schema": "callbacks", "partition_schema": "callbacks"}
+WARNING:  callback arg: {"parent": "abc", "parttype": "1", "partition": "abc_3", "parent_schema": "callbacks", "partition_schema": "callbacks"}
+WARNING:  callback arg: {"parent": "abc", "parttype": "1", "partition": "abc_4", "parent_schema": "callbacks", "partition_schema": "callbacks"}
  create_hash_partitions 
 ------------------------
                       5
diff --git a/src/partition_creation.c b/src/partition_creation.c
@@ -1444,8 +1444,12 @@ invoke_init_callback_internal(init_callback_params *cb_params)
 
 				JSB_INIT_VAL(&key, WJB_KEY, "parent");
 				JSB_INIT_VAL(&val, WJB_VALUE, get_rel_name_or_relid(parent_oid));
+				JSB_INIT_VAL(&key, WJB_KEY, "parent_schema");
+				JSB_INIT_VAL(&val, WJB_VALUE, get_namespace_name(get_rel_namespace(parent_oid)));
 				JSB_INIT_VAL(&key, WJB_KEY, "partition");
 				JSB_INIT_VAL(&val, WJB_VALUE, get_rel_name_or_relid(partition_oid));
+				JSB_INIT_VAL(&key, WJB_KEY, "partition_schema");
+				JSB_INIT_VAL(&val, WJB_VALUE, get_namespace_name(get_rel_namespace(partition_oid)));
 				JSB_INIT_VAL(&key, WJB_KEY, "parttype");
 				JSB_INIT_VAL(&val, WJB_VALUE, PartTypeToCString(PT_HASH));
 
@@ -1469,8 +1473,12 @@ invoke_init_callback_internal(init_callback_params *cb_params)
 
 				JSB_INIT_VAL(&key, WJB_KEY, "parent");
 				JSB_INIT_VAL(&val, WJB_VALUE, get_rel_name_or_relid(parent_oid));
+				JSB_INIT_VAL(&key, WJB_KEY, "parent_schema");
+				JSB_INIT_VAL(&val, WJB_VALUE, get_namespace_name(get_rel_namespace(parent_oid)));
 				JSB_INIT_VAL(&key, WJB_KEY, "partition");
 				JSB_INIT_VAL(&val, WJB_VALUE, get_rel_name_or_relid(partition_oid));
+				JSB_INIT_VAL(&key, WJB_KEY, "partition_schema");
+				JSB_INIT_VAL(&val, WJB_VALUE, get_namespace_name(get_rel_namespace(partition_oid)));
 				JSB_INIT_VAL(&key, WJB_KEY, "parttype");
 				JSB_INIT_VAL(&val, WJB_VALUE, PartTypeToCString(PT_RANGE));
 				JSB_INIT_VAL(&key, WJB_KEY, "range_min");
diff --git a/src/utils.c b/src/utils.c
@@ -234,6 +234,18 @@ get_rel_name_or_relid(Oid relid)
 	return relname;
 }
 
+char *
+get_qualified_rel_name_or_relid(Oid relid)
+{
+	char *relname = get_rel_name(relid);
+	char *namespace = get_namespace_name(get_rel_namespace(relid));
+
+	if (!relname)
+		return DatumGetCString(DirectFunctionCall1(oidout,
+												   ObjectIdGetDatum(relid)));
+	return psprintf("%s.%s", namespace, relname);
+}
+
 
 #if PG_VERSION_NUM < 90600
 /*
diff --git a/src/utils.h b/src/utils.h
@@ -39,6 +39,7 @@ List * list_reverse(List *l);
  */
 Oid get_rel_owner(Oid relid);
 char * get_rel_name_or_relid(Oid relid);
+char * get_qualified_rel_name_or_relid(Oid relid);
 Oid get_attribute_type(Oid relid, const char *attname, bool missing_ok);
 #if PG_VERSION_NUM < 90600
 char get_rel_persistence(Oid relid);
