メッセージスタイルを統一した。

diff --git a/expected/pg_hint_plan.out b/expected/pg_hint_plan.out
index 26963b8..2f3d12b 100644 (file)
--- a/expected/pg_hint_plan.out
+++ b/expected/pg_hint_plan.out
@@ -43,7 +43,7 @@ EXPLAIN (COSTS false) SELECT * FROM t1, t2 WHERE t1.val = t2.val;
 /*+ Test (t1 t2) */
 EXPLAIN (COSTS false) SELECT * FROM t1, t2 WHERE t1.id = t2.id;
 INFO:  hint syntax error at or near "Test (t1 t2) "
-DETAIL:  Keyword "Test" does not exist.
+DETAIL:  Unrecognized hint keyword "Test".
               QUERY PLAN              
 --------------------------------------
  Merge Join
@@ -88,7 +88,7 @@ EXPLAIN (COSTS false) SELECT * FROM t1, t2 WHERE t1.id = t2.id;
 EXPLAIN (COSTS false) SELECT * FROM t1, t2 WHERE t1.id = t2.id;
 INFO:  hint syntax error at or near "/* nest comment */ */
 EXPLAIN (COSTS false) SELECT * FROM t1, t2 WHERE t1.id = t2.id;"
-DETAIL:  Block comments nest doesn't supported.
+DETAIL:  Nested block comments are not supported.
               QUERY PLAN              
 --------------------------------------
  Merge Join
@@ -241,7 +241,7 @@ error hint:
 /*+Set(work_mem TO "1MB")*/
 EXPLAIN (COSTS false) SELECT * FROM t1, t2 WHERE t1.id = t2.id;
 INFO:  hint syntax error at or near ""1MB")"
-DETAIL:  Closed parenthesis is necessary.
+DETAIL:  Closing parenthesis is necessary.
               QUERY PLAN              
 --------------------------------------
  Merge Join
@@ -253,7 +253,7 @@ DETAIL:  Closed parenthesis is necessary.
 /*+SeqScan(t1 t2)*/
 EXPLAIN (COSTS false) SELECT * FROM t1, t2 WHERE t1.id = t2.id;
 INFO:  hint syntax error at or near "t2)"
-DETAIL:  Closed parenthesis is necessary.
+DETAIL:  Closing parenthesis is necessary.
               QUERY PLAN              
 --------------------------------------
  Merge Join
@@ -643,7 +643,7 @@ DETAIL:  Relation name is necessary.
 /*+Leading( )*/
 EXPLAIN (COSTS false) SELECT * FROM t1, t2, t3, t4 WHERE t1.id = t2.id AND t1.id = t3.id AND t1.id = t4.id;
 INFO:  hint syntax error at or near "Leading( )"
-DETAIL:  In Leading hint, specified relation name 2 or more.
+DETAIL:  Leading hint requires at least two relations.
 LOG:  pg_hint_plan:
 used hint:
 not used hint:
@@ -670,7 +670,7 @@ Leading()
 /*+Leading( t3 )*/
 EXPLAIN (COSTS false) SELECT * FROM t1, t2, t3, t4 WHERE t1.id = t2.id AND t1.id = t3.id AND t1.id = t4.id;
 INFO:  hint syntax error at or near "Leading( t3 )"
-DETAIL:  In Leading hint, specified relation name 2 or more.
+DETAIL:  Leading hint requires at least two relations.
 LOG:  pg_hint_plan:
 used hint:
 not used hint:
@@ -797,7 +797,7 @@ error hint:
 /*+Leading(t3 t4 t4)*/
 EXPLAIN (COSTS false) SELECT * FROM t1, t2, t3, t4 WHERE t1.id = t2.id AND t1.id = t3.id AND t1.id = t4.id;
 INFO:  hint syntax error at or near "Leading(t3 t4 t4)"
-DETAIL:  Relation name "t4" is duplicate.
+DETAIL:  Relation name "t4" is duplicated.
 LOG:  pg_hint_plan:
 used hint:
 not used hint:

diff --git a/expected/ut-A.out b/expected/ut-A.out
index fb994f8..d6f98ec 100644 (file)
--- a/expected/ut-A.out
+++ b/expected/ut-A.out
@@ -72,7 +72,7 @@ EXPLAIN (COSTS false) SELECT * FROM s1.t1 WHERE t1.c1 = 1;
 EXPLAIN (COSTS false) SELECT * FROM s1.t1 WHERE t1.c1 = 1;
 INFO:  hint syntax error at or near "/* nest comment */ */
 EXPLAIN (COSTS false) SELECT * FROM s1.t1 WHERE t1.c1 = 1;"
-DETAIL:  Block comments nest doesn't supported.
+DETAIL:  Nested block comments are not supported.
           QUERY PLAN          
 ------------------------------
  Index Scan using t1_i1 on t1
@@ -1244,7 +1244,7 @@ error hint:
 EXPLAIN (COSTS false) SELECT * FROM s1.t1 "/**/" WHERE "/**/".c1 = 1;
 INFO:  hint syntax error at or near "/**/)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.t1 "/**/" WHERE "/**/".c1 = 1;"
-DETAIL:  Block comments nest doesn't supported.
+DETAIL:  Nested block comments are not supported.
              QUERY PLAN              
 -------------------------------------
  Index Scan using t1_i1 on t1 "/**/"
@@ -1255,7 +1255,7 @@ DETAIL:  Block comments nest doesn't supported.
 EXPLAIN (COSTS false) SELECT * FROM s1.t1 "/**//**//**/" WHERE "/**//**//**/".c1 = 1;
 INFO:  hint syntax error at or near "/**//**//**/)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.t1 "/**//**//**/" WHERE "/**//**//**/".c1 = 1;"
-DETAIL:  Block comments nest doesn't supported.
+DETAIL:  Nested block comments are not supported.
                  QUERY PLAN                  
 ---------------------------------------------
  Index Scan using t1_i1 on t1 "/**//**//**/"
@@ -1273,7 +1273,7 @@ INFO:  hint syntax error at or near "/**/あ")*/
 EXPLAIN (COSTS false) SELECT * FROM s1.t1 "tT()""      
 Set/**/あ" WHERE "tT()""      
 Set/**/あ".c1 = 1;"
-DETAIL:  Block comments nest doesn't supported.
+DETAIL:  Nested block comments are not supported.
                 QUERY PLAN                
 ------------------------------------------
  Index Scan using t1_i1 on t1 "tT()""    
@@ -1309,7 +1309,7 @@ error hint:
 /*+Set(enable_indexscan off)Set enable_tidscan off)Set(enable_bitmapscan off)SeqScan(t1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.t1 WHERE t1.c1 = 1;
 INFO:  hint syntax error at or near "enable_tidscan off)Set(enable_bitmapscan off)SeqScan(t1)"
-DETAIL:  Opened parenthesis is necessary.
+DETAIL:  Opening parenthesis is necessary.
 LOG:  pg_hint_plan:
 used hint:
 Set(enable_indexscan off)
@@ -1329,7 +1329,7 @@ error hint:
 /*+Set(enable_indexscan off)Set(enable_tidscan off Set(enable_bitmapscan off)SeqScan(t1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.t1 WHERE t1.c1 = 1;
 INFO:  hint syntax error at or near "Set(enable_bitmapscan off)SeqScan(t1)"
-DETAIL:  Closed parenthesis is necessary.
+DETAIL:  Closing parenthesis is necessary.
 LOG:  pg_hint_plan:
 used hint:
 Set(enable_indexscan off)
@@ -1389,7 +1389,7 @@ error hint:
 /*+Set(enable_indexscan off)NoSet(enable_tidscan off)Set(enable_bitmapscan off)SeqScan(t1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.t1 WHERE t1.c1 = 1;
 INFO:  hint syntax error at or near "NoSet(enable_tidscan off)Set(enable_bitmapscan off)SeqScan(t1)"
-DETAIL:  Keyword "NoSet" does not exist.
+DETAIL:  Unrecognized hint keyword "NoSet".
 LOG:  pg_hint_plan:
 used hint:
 Set(enable_indexscan off)
@@ -1409,7 +1409,7 @@ error hint:
 /*+Set(enable_indexscan off)"Set"(enable_tidscan off)Set(enable_bitmapscan off)SeqScan(t1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.t1 WHERE t1.c1 = 1;
 INFO:  hint syntax error at or near ""Set"(enable_tidscan off)Set(enable_bitmapscan off)SeqScan(t1)"
-DETAIL:  Keyword ""Set"" does not exist.
+DETAIL:  Unrecognized hint keyword ""Set"".
 LOG:  pg_hint_plan:
 used hint:
 Set(enable_indexscan off)
@@ -1430,7 +1430,7 @@ error hint:
 EXPLAIN (COSTS false) SELECT * FROM s1.t1 WHERE t1.c1 = 1;
 INFO:  hint syntax error at or near "/* value */off)Set(enable_bitmapscan off)SeqScan(t1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.t1 WHERE t1.c1 = 1;"
-DETAIL:  Block comments nest doesn't supported.
+DETAIL:  Nested block comments are not supported.
           QUERY PLAN          
 ------------------------------
  Index Scan using t1_i1 on t1
@@ -1737,7 +1737,7 @@ DEBUG:  StartTransactionCommand
 DEBUG:  StartTransaction
 DEBUG:  name: unnamed; blockState:       DEFAULT; state: INPROGR, xid/subid/cid: 0/1/0, nestlvl: 1, children: 
 DEBUG:  hint syntax error at or near ""
-DETAIL:  Opened parenthesis is necessary.
+DETAIL:  Opening parenthesis is necessary.
 DEBUG:  CommitTransactionCommand
 DEBUG:  CommitTransaction
 DEBUG:  name: unnamed; blockState:       STARTED; state: INPROGR, xid/subid/cid: 0/1/0, nestlvl: 1, children: 
@@ -1793,7 +1793,7 @@ DEBUG:  StartTransactionCommand
 DEBUG:  StartTransaction
 DEBUG:  name: unnamed; blockState:       DEFAULT; state: INPROGR, xid/subid/cid: 0/1/0, nestlvl: 1, children: 
 DEBUG:  hint syntax error at or near ""
-DETAIL:  Opened parenthesis is necessary.
+DETAIL:  Opening parenthesis is necessary.
 DEBUG:  CommitTransactionCommand
 DEBUG:  CommitTransaction
 DEBUG:  name: unnamed; blockState:       STARTED; state: INPROGR, xid/subid/cid: 0/1/0, nestlvl: 1, children: 
@@ -1849,7 +1849,7 @@ DEBUG:  StartTransactionCommand
 DEBUG:  StartTransaction
 DEBUG:  name: unnamed; blockState:       DEFAULT; state: INPROGR, xid/subid/cid: 0/1/0, nestlvl: 1, children: 
 DEBUG:  hint syntax error at or near ""
-DETAIL:  Opened parenthesis is necessary.
+DETAIL:  Opening parenthesis is necessary.
 DEBUG:  CommitTransactionCommand
 DEBUG:  CommitTransaction
 DEBUG:  name: unnamed; blockState:       STARTED; state: INPROGR, xid/subid/cid: 0/1/0, nestlvl: 1, children: 
@@ -1879,7 +1879,7 @@ SHOW pg_hint_plan.parse_messages;
 
 /*+Set*/SELECT 1;
 DEBUG:  hint syntax error at or near ""
-DETAIL:  Opened parenthesis is necessary.
+DETAIL:  Opening parenthesis is necessary.
  ?column? 
 ----------
         1
@@ -1902,7 +1902,7 @@ SHOW pg_hint_plan.parse_messages;
 
 /*+Set*/SELECT 1;
 DEBUG:  hint syntax error at or near ""
-DETAIL:  Opened parenthesis is necessary.
+DETAIL:  Opening parenthesis is necessary.
  ?column? 
 ----------
         1
@@ -1925,7 +1925,7 @@ SHOW pg_hint_plan.parse_messages;
 
 /*+Set*/SELECT 1;
 LOG:  hint syntax error at or near ""
-DETAIL:  Opened parenthesis is necessary.
+DETAIL:  Opening parenthesis is necessary.
  ?column? 
 ----------
         1
@@ -1948,7 +1948,7 @@ SHOW pg_hint_plan.parse_messages;
 
 /*+Set*/SELECT 1;
 INFO:  hint syntax error at or near ""
-DETAIL:  Opened parenthesis is necessary.
+DETAIL:  Opening parenthesis is necessary.
  ?column? 
 ----------
         1
@@ -1957,7 +1957,7 @@ DETAIL:  Opened parenthesis is necessary.
 SET client_min_messages TO notice;
 /*+Set*/SELECT 1;
 INFO:  hint syntax error at or near ""
-DETAIL:  Opened parenthesis is necessary.
+DETAIL:  Opening parenthesis is necessary.
  ?column? 
 ----------
         1
@@ -1973,7 +1973,7 @@ SHOW pg_hint_plan.parse_messages;
 
 /*+Set*/SELECT 1;
 NOTICE:  hint syntax error at or near ""
-DETAIL:  Opened parenthesis is necessary.
+DETAIL:  Opening parenthesis is necessary.
  ?column? 
 ----------
         1
@@ -1996,7 +1996,7 @@ SHOW pg_hint_plan.parse_messages;
 
 /*+Set*/SELECT 1;
 WARNING:  hint syntax error at or near ""
-DETAIL:  Opened parenthesis is necessary.
+DETAIL:  Opening parenthesis is necessary.
  ?column? 
 ----------
         1
@@ -2019,7 +2019,7 @@ SHOW pg_hint_plan.parse_messages;
 
 /*+Set*/SELECT 1;
 ERROR:  hint syntax error at or near ""
-DETAIL:  Opened parenthesis is necessary.
+DETAIL:  Opening parenthesis is necessary.
 SET client_min_messages TO fatal;
 /*+Set*/SELECT 1;
 -- No. A-6-4-11
@@ -2033,7 +2033,7 @@ SHOW pg_hint_plan.parse_messages;
 
 /*+Set*/SELECT 1;
 INFO:  hint syntax error at or near ""
-DETAIL:  Opened parenthesis is necessary.
+DETAIL:  Opening parenthesis is necessary.
  ?column? 
 ----------
         1
@@ -2075,7 +2075,7 @@ SHOW pg_hint_plan.parse_messages;
 -- No. A-7-1-1
 /*+"Set"(enable_indexscan on)*/SELECT 1;
 INFO:  hint syntax error at or near ""Set"(enable_indexscan on)"
-DETAIL:  Keyword ""Set"" does not exist.
+DETAIL:  Unrecognized hint keyword ""Set"".
  ?column? 
 ----------
         1
@@ -2091,7 +2091,7 @@ DETAIL:  Parameter name is necessary.
 
 /*+Set(enable_indexscan on*/SELECT 1;
 INFO:  hint syntax error at or near ""
-DETAIL:  Closed parenthesis is necessary.
+DETAIL:  Closing parenthesis is necessary.
  ?column? 
 ----------
         1
@@ -3272,7 +3272,7 @@ EXPLAIN (COSTS false) SELECT * FROM s1.t1, s1.t2 WHERE t1.c1 = t2.c1;
 /*+Set(enable_seqscan off)Set(geqo_threshold 100)SeqScan(t1)MergeJoin(t1 t2)NestLoop(t1 t1)*/
 PREPARE p1 AS SELECT * FROM s1.t1, s1.t2 WHERE t1.c1 = t2.c1;
 INFO:  hint syntax error at or near "NestLoop(t1 t1)"
-DETAIL:  Relation name "t1" is duplicate.
+DETAIL:  Relation name "t1" is duplicated.
 LOG:  pg_hint_plan:
 used hint:
 SeqScan(t1)
@@ -3335,7 +3335,7 @@ SET pg_hint_plan.parse_messages TO error;
 /*+Set(enable_seqscan off)Set(geqo_threshold 100)SeqScan(t1)MergeJoin(t1 t2)NestLoop(t1 t1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.t1, s1.t2 WHERE t1.c1 = t2.c1;
 ERROR:  hint syntax error at or near "NestLoop(t1 t1)"
-DETAIL:  Relation name "t1" is duplicate.
+DETAIL:  Relation name "t1" is duplicated.
 SELECT name, setting FROM settings;
            name            |  setting  
 ---------------------------+-----------
@@ -3432,7 +3432,7 @@ SET pg_hint_plan.parse_messages TO error;
 /*+Set(enable_seqscan off)Set(geqo_threshold 100)SeqScan(t1)MergeJoin(t1 t2)NestLoop(t1 t1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.t1, s1.t2 WHERE t1.c1 = t2.c1;
 ERROR:  hint syntax error at or near "NestLoop(t1 t1)"
-DETAIL:  Relation name "t1" is duplicate.
+DETAIL:  Relation name "t1" is duplicated.
 SELECT name, setting FROM settings;
            name            |  setting  
 ---------------------------+-----------

diff --git a/expected/ut-J.out b/expected/ut-J.out
index 252a0fd..9df3052 100644 (file)
--- a/expected/ut-J.out
+++ b/expected/ut-J.out
@@ -358,7 +358,7 @@ error hint:
 /*+HashJoin(t1 t1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.t1, s1.t2 WHERE t1.c1 = t2.c1;
 INFO:  hint syntax error at or near "HashJoin(t1 t1)"
-DETAIL:  Relation name "t1" is duplicate.
+DETAIL:  Relation name "t1" is duplicated.
 LOG:  pg_hint_plan:
 used hint:
 not used hint:
@@ -380,9 +380,9 @@ HashJoin(t1 t1)
 /*+HashJoin(t1 t1)HashJoin(t2 t2)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.t1, s1.t2 WHERE t1.c1 = t2.c1;
 INFO:  hint syntax error at or near "HashJoin(t1 t1)HashJoin(t2 t2)"
-DETAIL:  Relation name "t1" is duplicate.
+DETAIL:  Relation name "t1" is duplicated.
 INFO:  hint syntax error at or near "HashJoin(t2 t2)"
-DETAIL:  Relation name "t2" is duplicate.
+DETAIL:  Relation name "t2" is duplicated.
 LOG:  pg_hint_plan:
 used hint:
 not used hint:
@@ -418,7 +418,7 @@ EXPLAIN (COSTS false) SELECT * FROM s1.t1, s1.t2, s1.t3 WHERE t1.c1 = t2.c1 AND
 /*+HashJoin(t1 t2 t1 t2)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.t1, s1.t2, s1.t3, s1.t4 WHERE t1.c1 = t2.c1 AND t1.c1 = t3.c1 AND t1.c1 = t4.c1;
 INFO:  hint syntax error at or near "HashJoin(t1 t2 t1 t2)"
-DETAIL:  Relation name "t1" is duplicate.
+DETAIL:  Relation name "t1" is duplicated.
 LOG:  pg_hint_plan:
 used hint:
 not used hint:

diff --git a/expected/ut-L.out b/expected/ut-L.out
index f833cc6..b8f9901 100644 (file)
--- a/expected/ut-L.out
+++ b/expected/ut-L.out
@@ -541,7 +541,7 @@ error hint:
 /*+Leading(t4 t2 t3 t4)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.t1, s1.t2, s1.t3, s1.t4 WHERE t1.c1 = t2.c1 AND t1.c1 = t3.c1 AND t1.c1 = t4.c1;
 INFO:  hint syntax error at or near "Leading(t4 t2 t3 t4)"
-DETAIL:  Relation name "t4" is duplicate.
+DETAIL:  Relation name "t4" is duplicated.
 LOG:  pg_hint_plan:
 used hint:
 not used hint:
@@ -596,7 +596,7 @@ error hint:
 /*+Leading(t4 t2 t2 t4)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.t1, s1.t2, s1.t3, s1.t4 WHERE t1.c1 = t2.c1 AND t1.c1 = t3.c1 AND t1.c1 = t4.c1;
 INFO:  hint syntax error at or near "Leading(t4 t2 t2 t4)"
-DETAIL:  Relation name "t2" is duplicate.
+DETAIL:  Relation name "t2" is duplicated.
 LOG:  pg_hint_plan:
 used hint:
 not used hint:
@@ -3992,7 +3992,7 @@ EXPLAIN (COSTS false) SELECT * FROM s1.t1
   JOIN s1.t2 ON (t1.c1 = t2.c1)
   JOIN s1.t3 ON (t1.c1 = t3.c1);
 INFO:  hint syntax error at or near "Leading()"
-DETAIL:  In Leading hint, specified relation name 2 or more.
+DETAIL:  Leading hint requires at least two relations.
 INFO:  hint syntax error at or near "Leading(t2 t3 t1)Leading()"
 DETAIL:  Conflict leading hint.
 LOG:  pg_hint_plan:
@@ -4022,7 +4022,7 @@ EXPLAIN (COSTS false) SELECT * FROM s1.t1
   JOIN s1.t2 ON (t1.c1 = t2.c1)
   JOIN s1.t3 ON (t1.c1 = t3.c1);
 INFO:  hint syntax error at or near "Leading()"
-DETAIL:  In Leading hint, specified relation name 2 or more.
+DETAIL:  Leading hint requires at least two relations.
 INFO:  hint syntax error at or near "Leading(t3 t1 t2)Leading(t2 t3 t1)Leading()"
 DETAIL:  Conflict leading hint.
 INFO:  hint syntax error at or near "Leading(t2 t3 t1)Leading()"
@@ -4058,7 +4058,7 @@ EXPLAIN (COSTS false) SELECT * FROM s1.t1
   JOIN s1.t2 ON (t1.c1 = t2.c1)
   JOIN s1.t3 ON (t1.c1 = t3.c1);
 INFO:  hint syntax error at or near "Leading()"
-DETAIL:  In Leading hint, specified relation name 2 or more.
+DETAIL:  Leading hint requires at least two relations.
 LOG:  pg_hint_plan:
 used hint:
 not used hint:
@@ -4085,7 +4085,7 @@ EXPLAIN (COSTS false) SELECT * FROM s1.t1
   JOIN s1.t2 ON (t1.c1 = t2.c1)
   JOIN s1.t3 ON (t1.c1 = t3.c1);
 INFO:  hint syntax error at or near "Leading(t1)"
-DETAIL:  In Leading hint, specified relation name 2 or more.
+DETAIL:  Leading hint requires at least two relations.
 LOG:  pg_hint_plan:
 used hint:
 not used hint:

diff --git a/expected/ut-S.out b/expected/ut-S.out
index 63d2b47..f626837 100644 (file)
--- a/expected/ut-S.out
+++ b/expected/ut-S.out
@@ -2834,7 +2834,7 @@ EXPLAIN (COSTS false) SELECT * FROM (VALUES(1,1,1,'1')) AS t1 (c1, c2, c3, c4),
 /*+SeqScan(t1 t2)*/
 EXPLAIN (COSTS false) SELECT * FROM (VALUES(1,1,1,'1')) AS t1 (c1, c2, c3, c4), (VALUES(1,1,1,'1'), (2,2,2,'2')) AS t2 (c1, c2) WHERE t1.c1 = t2.c1;
 INFO:  hint syntax error at or near "t2)"
-DETAIL:  Closed parenthesis is necessary.
+DETAIL:  Closing parenthesis is necessary.
                         QUERY PLAN                        
 ----------------------------------------------------------
  Nested Loop
@@ -4585,7 +4585,7 @@ error hint:
 /*+SeqScan(ti1 ti1_pkey)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 INFO:  hint syntax error at or near "ti1_pkey)"
-DETAIL:  Closed parenthesis is necessary.
+DETAIL:  Closing parenthesis is necessary.
             QUERY PLAN             
 -----------------------------------
  Tid Scan on ti1
@@ -4597,7 +4597,7 @@ DETAIL:  Closed parenthesis is necessary.
 /*+SeqScan(ti1 ti1_pkey ti1_btree)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 INFO:  hint syntax error at or near "ti1_pkey ti1_btree)"
-DETAIL:  Closed parenthesis is necessary.
+DETAIL:  Closing parenthesis is necessary.
             QUERY PLAN             
 -----------------------------------
  Tid Scan on ti1
@@ -4734,7 +4734,7 @@ error hint:
 /*+TidScan(ti1 ti1_pkey)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 INFO:  hint syntax error at or near "ti1_pkey)"
-DETAIL:  Closed parenthesis is necessary.
+DETAIL:  Closing parenthesis is necessary.
             QUERY PLAN             
 -----------------------------------
  Tid Scan on ti1
@@ -4746,7 +4746,7 @@ DETAIL:  Closed parenthesis is necessary.
 /*+TidScan(ti1 ti1_pkey ti1_btree)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 INFO:  hint syntax error at or near "ti1_pkey ti1_btree)"
-DETAIL:  Closed parenthesis is necessary.
+DETAIL:  Closing parenthesis is necessary.
             QUERY PLAN             
 -----------------------------------
  Tid Scan on ti1
@@ -4775,7 +4775,7 @@ error hint:
 /*+NoSeqScan(ti1 ti1_pkey)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 INFO:  hint syntax error at or near "ti1_pkey)"
-DETAIL:  Closed parenthesis is necessary.
+DETAIL:  Closing parenthesis is necessary.
             QUERY PLAN             
 -----------------------------------
  Tid Scan on ti1
@@ -4787,7 +4787,7 @@ DETAIL:  Closed parenthesis is necessary.
 /*+NoSeqScan(ti1 ti1_pkey ti1_btree)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 INFO:  hint syntax error at or near "ti1_pkey ti1_btree)"
-DETAIL:  Closed parenthesis is necessary.
+DETAIL:  Closing parenthesis is necessary.
             QUERY PLAN             
 -----------------------------------
  Tid Scan on ti1
@@ -4816,7 +4816,7 @@ error hint:
 /*+NoIndexScan(ti1 ti1_pkey)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 INFO:  hint syntax error at or near "ti1_pkey)"
-DETAIL:  Closed parenthesis is necessary.
+DETAIL:  Closing parenthesis is necessary.
             QUERY PLAN             
 -----------------------------------
  Tid Scan on ti1
@@ -4828,7 +4828,7 @@ DETAIL:  Closed parenthesis is necessary.
 /*+NoIndexScan(ti1 ti1_pkey ti1_btree)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 INFO:  hint syntax error at or near "ti1_pkey ti1_btree)"
-DETAIL:  Closed parenthesis is necessary.
+DETAIL:  Closing parenthesis is necessary.
             QUERY PLAN             
 -----------------------------------
  Tid Scan on ti1
@@ -4857,7 +4857,7 @@ error hint:
 /*+NoBitmapScan(ti1 ti1_pkey)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 INFO:  hint syntax error at or near "ti1_pkey)"
-DETAIL:  Closed parenthesis is necessary.
+DETAIL:  Closing parenthesis is necessary.
             QUERY PLAN             
 -----------------------------------
  Tid Scan on ti1
@@ -4869,7 +4869,7 @@ DETAIL:  Closed parenthesis is necessary.
 /*+NoBitmapScan(ti1 ti1_pkey ti1_btree)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 INFO:  hint syntax error at or near "ti1_pkey ti1_btree)"
-DETAIL:  Closed parenthesis is necessary.
+DETAIL:  Closing parenthesis is necessary.
             QUERY PLAN             
 -----------------------------------
  Tid Scan on ti1
@@ -4898,7 +4898,7 @@ error hint:
 /*+NoTidScan(ti1 ti1_pkey)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 INFO:  hint syntax error at or near "ti1_pkey)"
-DETAIL:  Closed parenthesis is necessary.
+DETAIL:  Closing parenthesis is necessary.
             QUERY PLAN             
 -----------------------------------
  Tid Scan on ti1
@@ -4910,7 +4910,7 @@ DETAIL:  Closed parenthesis is necessary.
 /*+NoTidScan(ti1 ti1_pkey ti1_btree)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 INFO:  hint syntax error at or near "ti1_pkey ti1_btree)"
-DETAIL:  Closed parenthesis is necessary.
+DETAIL:  Closing parenthesis is necessary.
             QUERY PLAN             
 -----------------------------------
  Tid Scan on ti1

diff --git a/pg_hint_plan.c b/pg_hint_plan.c
index 8cdd7a1..9d891fc 100644 (file)
--- a/pg_hint_plan.c
+++ b/pg_hint_plan.c
@@ -345,7 +345,7 @@ _PG_init(void)
 {
        /* Define custom GUC variables. */
        DefineCustomBoolVariable("pg_hint_plan.enable",
-                        "Instructions or hints to the planner using block comments.",
+                        "Force planner to use plans specified in the hint comment preceding to the query.",
                                                         NULL,
                                                         &pg_hint_plan_enable,
                                                         true,
@@ -356,7 +356,7 @@ _PG_init(void)
                                                         NULL);
 
        DefineCustomBoolVariable("pg_hint_plan.debug_print",
-                                                        "Logs each query's parse results of the hint.",
+                                                        "Logs results of hint parsing.",
                                                         NULL,
                                                         &pg_hint_plan_debug_print,
                                                         false,
@@ -367,7 +367,7 @@ _PG_init(void)
                                                         NULL);
 
        DefineCustomEnumVariable("pg_hint_plan.parse_messages",
-                                                        "Messege level of the parse error.",
+                                                        "Messege level of parse errors.",
                                                         NULL,
                                                         &pg_hint_plan_parse_messages,
                                                         INFO,
@@ -812,7 +812,7 @@ skip_opened_parenthesis(const char *str)
 
        if (*str != '(')
        {
-               parse_ereport(str, ("Opened parenthesis is necessary."));
+               parse_ereport(str, ("Opening parenthesis is necessary."));
                return NULL;
        }
 
@@ -828,7 +828,7 @@ skip_closed_parenthesis(const char *str)
 
        if (*str != ')')
        {
-               parse_ereport(str, ("Closed parenthesis is necessary."));
+               parse_ereport(str, ("Closing parenthesis is necessary."));
                return NULL;
        }
 
@@ -981,7 +981,7 @@ parse_hints(PlanHint *plan, Query *parse, const char *str)
 
                if (parser->keyword == NULL)
                {
-                       parse_ereport(head, ("Keyword \"%s\" does not exist.", buf.data));
+                       parse_ereport(head, ("Unrecognized hint keyword \"%s\".", buf.data));
                        pfree(buf.data);
                        return;
                }
@@ -1037,7 +1037,7 @@ parse_head_comment(Query *parse)
        /* 入れ子にしたブロックコメントはサポートしない */
        if ((head = strstr(p, BLOCK_COMMENT_START)) != NULL && head < tail)
        {
-               parse_ereport(head, ("Block comments nest doesn't supported."));
+               parse_ereport(head, ("Nested block comments are not supported."));
                return NULL;
        }
 
@@ -1247,7 +1247,7 @@ LeadingHintParse(LeadingHint *hint, PlanHint *plan, Query *parse,
        if (list_length(hint->relations) < 2)
        {
                parse_ereport(hint->base.hint_str,
-                                         ("In %s hint, specified relation name 2 or more.",
+                                         ("%s hint requires at least two relations.",
                                           HINT_LEADING));
                hint->base.state = HINT_STATE_ERROR;
        }
@@ -1803,7 +1803,7 @@ transform_join_hints(PlanHint *plan, PlannerInfo *root, int nbaserel,
                        if (bms_is_member(relid, hint->joinrelids))
                        {
                                parse_ereport(hint->base.hint_str,
-                                                         ("Relation name \"%s\" is duplicate.", relname));
+                                                         ("Relation name \"%s\" is duplicated.", relname));
                                hint->base.state = HINT_STATE_ERROR;
                                break;
                        }
@@ -1852,7 +1852,7 @@ transform_join_hints(PlanHint *plan, PlannerInfo *root, int nbaserel,
                if (bms_is_member(relid, joinrelids))
                {
                        parse_ereport(lhint->base.hint_str,
-                                                 ("Relation name \"%s\" is duplicate.", relname));
+                                                 ("Relation name \"%s\" is duplicated.", relname));
                        lhint->base.state = HINT_STATE_ERROR;
                        bms_free(joinrelids);
                        return;
@@ -2037,7 +2037,7 @@ get_num_baserels(List *initial_rels)
                else
                {
                        /* other values not expected here */
-                       elog(ERROR, "unrecognized reloptkind type: %d", rel->reloptkind);
+                       elog(ERROR, "Unrecognized reloptkind type: %d", rel->reloptkind);
                }
        }
 
@@ -2132,10 +2132,10 @@ set_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
                                set_plain_rel_pathlist(root, rel, rte);
                        }
                        else
-                               elog(ERROR, "unexpected relkind: %c", rte->relkind);
+                               elog(ERROR, "Unexpected relkind: %c", rte->relkind);
                }
                else
-                       elog(ERROR, "unexpected rtekind: %d", (int) rel->rtekind);
+                       elog(ERROR, "Unexpected rtekind: %d", (int) rel->rtekind);
        }
 }