Commit: master - pg_hint_plan (git)

firtst release

Commit MetaInfo

• Revisão: ae19f43d09e8bd15267ba57510440da7874c1575 (tree)
• Hora: 2016-04-22 13:38:42
• Autor: MasaoFujii <masao.fujii@gmai...>
• Commiter: MasaoFujii

Mensagem de Log

Use pg_reload_conf() to reload the configuration file in regression test.

Previously the regression test ran pg_ctl reload command for that purpose.
However in the environment where the path to PostgreSQL binaries is not set,
the regression test always failed because pg_ctl could not be found.
To reload the configuration file even in that environment, this commit
changes the regression test so that it uses pg_reload_conf function, instead.

Mudança Sumário

• modified: expected/init.out
• modified: expected/ut-S.out
• modified: sql/init.sql
• modified: sql/ut-S.sql

Diff

--- a/expected/init.out
+++ b/expected/init.out
@@ -154,8 +154,12 @@ CREATE VIEW v4 AS SELECT v_2.t1_id, t_3.id FROM v2 v_2, t3 t_3 WHERE v_2.t1_id =
  */
 /* Fix auto-tunable parameters */
 ALTER SYSTEM SET effective_cache_size TO 16384;
-\! pg_ctl reload
-server signaled
+SELECT pg_reload_conf();
+ pg_reload_conf 
+----------------
+ t
+(1 row)
+
 SET effective_cache_size TO 16384;
 CREATE VIEW settings AS
 SELECT name, setting, category

--- a/expected/ut-S.out
+++ b/expected/ut-S.out
@@ -3,8 +3,12 @@ LOAD 'pg_hint_plan';
 DELETE FROM pg_db_role_setting WHERE setrole = (SELECT oid FROM pg_roles WHERE rolname = current_user);
 INSERT INTO pg_db_role_setting (SELECT 0, (SELECT oid FROM pg_roles WHERE rolname = current_user), '{client_min_messages=log,pg_hint_plan.debug_print=on}');
 ALTER SYSTEM SET session_preload_libraries TO 'pg_hint_plan';
-\! pg_ctl reload
-server signaled
+SELECT pg_reload_conf();
+ pg_reload_conf 
+----------------
+ t
+(1 row)
+
 SET pg_hint_plan.enable_hint TO on;
 SET pg_hint_plan.debug_print TO on;
 SET client_min_messages TO LOG;
@@ -6193,5 +6197,9 @@ error hint:
 
 DELETE FROM pg_db_role_setting WHERE setrole = (SELECT oid FROM pg_roles WHERE rolname = current_user);
 ALTER SYSTEM SET session_preload_libraries TO DEFAULT;
-\! pg_ctl reload
-server signaled
+SELECT pg_reload_conf();
+ pg_reload_conf 
+----------------
+ t
+(1 row)
+

--- a/sql/init.sql
+++ b/sql/init.sql
@@ -121,7 +121,7 @@ CREATE VIEW v4 AS SELECT v_2.t1_id, t_3.id FROM v2 v_2, t3 t_3 WHERE v_2.t1_id =
 
 /* Fix auto-tunable parameters */
 ALTER SYSTEM SET effective_cache_size TO 16384;
-\! pg_ctl reload
+SELECT pg_reload_conf();
 SET effective_cache_size TO 16384;
 
 CREATE VIEW settings AS

--- a/sql/ut-S.sql
+++ b/sql/ut-S.sql
@@ -3,7 +3,7 @@ LOAD 'pg_hint_plan';
 DELETE FROM pg_db_role_setting WHERE setrole = (SELECT oid FROM pg_roles WHERE rolname = current_user);
 INSERT INTO pg_db_role_setting (SELECT 0, (SELECT oid FROM pg_roles WHERE rolname = current_user), '{client_min_messages=log,pg_hint_plan.debug_print=on}');
 ALTER SYSTEM SET session_preload_libraries TO 'pg_hint_plan';
-\! pg_ctl reload
+SELECT pg_reload_conf();
 SET pg_hint_plan.enable_hint TO on;
 SET pg_hint_plan.debug_print TO on;
 SET client_min_messages TO LOG;
@@ -1168,4 +1168,4 @@ EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c2 = 1;
 DELETE FROM pg_db_role_setting WHERE setrole = (SELECT oid FROM pg_roles WHERE rolname = current_user);
 
 ALTER SYSTEM SET session_preload_libraries TO DEFAULT;
-\! pg_ctl reload
+SELECT pg_reload_conf();