提交: 52d9acd38b91e8fe6b1b76bde5f1d591780fe279 - amalsyah12 (git)

firtst release

Commit MetaInfo

• 修訂: 52d9acd38b91e8fe6b1b76bde5f1d591780fe279 (tree)
• 時間: 2020-02-17 14:55:03
• 作者: Kyotaro Horiguchi <horikyota.ntt@gmai...>
• Commiter: Kyotaro Horiguchi

Log Message

Fix Rows hint parsing

This is a long standing bug that Rows hint with no parameter causees a
crash. Fixed the Rows hint parser.

Change Summary

• modified: expected/pg_hint_plan.out
• modified: pg_hint_plan.c
• modified: sql/pg_hint_plan.sql

差異

--- a/expected/pg_hint_plan.out
+++ b/expected/pg_hint_plan.out
@@ -275,6 +275,21 @@ Set(work_mem TO 1MB)
    ->  Index Scan using t2_pkey on t2
 (4 rows)
 
+/*+SeqScan() */ SELECT 1;
+INFO:  pg_hint_plan: hint syntax error at or near " "
+DETAIL:  SeqScan hint requires a relation.
+LOG:  pg_hint_plan:
+used hint:
+not used hint:
+duplication hint:
+error hint:
+SeqScan()
+
+ ?column? 
+----------
+        1
+(1 row)
+
 /*+SeqScan(t1 t2)*/
 EXPLAIN (COSTS false) SELECT * FROM t1, t2 WHERE t1.id = t2.id;
 INFO:  pg_hint_plan: hint syntax error at or near ""
@@ -444,6 +459,36 @@ error hint:
          Index Cond: (id = t1.id)
 (5 rows)
 
+/*+ NestLoop() */ SELECT 1;
+INFO:  pg_hint_plan: hint syntax error at or near " "
+DETAIL:  NestLoop hint requires at least two relations.
+LOG:  pg_hint_plan:
+used hint:
+not used hint:
+duplication hint:
+error hint:
+NestLoop()
+
+ ?column? 
+----------
+        1
+(1 row)
+
+/*+ NestLoop(x) */ SELECT 1;
+INFO:  pg_hint_plan: hint syntax error at or near " "
+DETAIL:  NestLoop hint requires at least two relations.
+LOG:  pg_hint_plan:
+used hint:
+not used hint:
+duplication hint:
+error hint:
+NestLoop(x)
+
+ ?column? 
+----------
+        1
+(1 row)
+
 /*+HashJoin(t1 t2)*/
 EXPLAIN (COSTS false) SELECT * FROM t1, t2 WHERE t1.id = t2.id;
 LOG:  pg_hint_plan:
@@ -8751,6 +8796,37 @@ error hint:
 -- Explain result includes "Planning time" if COSTS is enabled, but
 -- this test needs it enabled for get rows count. So do tests via psql
 -- and grep -v the mutable line.
+-- Parse error check
+/*+ Rows() */ SELECT 1;
+INFO:  pg_hint_plan: hint syntax error at or near " "
+DETAIL:  Rows hint needs at least one relation followed by one correction term.
+LOG:  pg_hint_plan:
+used hint:
+not used hint:
+duplication hint:
+error hint:
+Rows()
+
+ ?column? 
+----------
+        1
+(1 row)
+
+/*+ Rows(x) */ SELECT 1;
+INFO:  pg_hint_plan: hint syntax error at or near " "
+DETAIL:  Rows hint needs at least one relation followed by one correction term.
+LOG:  pg_hint_plan:
+used hint:
+not used hint:
+duplication hint:
+error hint:
+Rows()
+
+ ?column? 
+----------
+        1
+(1 row)
+
 -- value types
 \o results/pg_hint_plan.tmpout
 EXPLAIN SELECT * FROM t1 JOIN t2 ON (t1.id = t2.id);

--- a/pg_hint_plan.c
+++ b/pg_hint_plan.c
@@ -1067,7 +1067,8 @@ RowsHintDesc(RowsHint *hint, StringInfo buf, bool nolf)
 			quote_value(buf, hint->relnames[i]);
 		}
 	}
-	appendStringInfo(buf, " %s", hint->rows_str);
+	if (hint->rows_str != NULL)
+		appendStringInfo(buf, " %s", hint->rows_str);
 	appendStringInfoString(buf, ")");
 	if (!nolf)
 		appendStringInfoChar(buf, '\n');
@@ -2241,6 +2242,8 @@ RowsHintParse(RowsHint *hint, HintState *hstate, Query *parse,
 	List		   *name_list = NIL;
 	char		   *rows_str;
 	char		   *end_ptr;
+	ListCell   *l;
+	int			i = 0;
 
 	if ((str = parse_parentheses(str, &name_list, hint_keyword)) == NULL)
 		return NULL;
@@ -2248,23 +2251,28 @@ RowsHintParse(RowsHint *hint, HintState *hstate, Query *parse,
 	/* Last element must be rows specification */
 	hint->nrels = list_length(name_list) - 1;
 
-	if (hint->nrels > 0)
+	if (hint->nrels < 1)
 	{
-		ListCell   *l;
-		int			i = 0;
+		hint_ereport(str,
+					 ("%s hint needs at least one relation followed by one correction term.",
+					  hint->base.keyword));
+		hint->base.state = HINT_STATE_ERROR;
 
-		/*
-		 * Transform relation names from list to array to sort them with qsort
-		 * after.
-		 */
-		hint->relnames = palloc(sizeof(char *) * hint->nrels);
-		foreach (l, name_list)
-		{
-			if (hint->nrels <= i)
-				break;
-			hint->relnames[i] = lfirst(l);
-			i++;
-		}
+		return str;
+	}
+	
+
+	/*
+	 * Transform relation names from list to array to sort them with qsort
+	 * after.
+	 */
+	hint->relnames = palloc(sizeof(char *) * hint->nrels);
+	foreach (l, name_list)
+	{
+		if (hint->nrels <= i)
+			break;
+		hint->relnames[i] = lfirst(l);
+		i++;
 	}
 
 	/* Retieve rows estimation */

--- a/sql/pg_hint_plan.sql
+++ b/sql/pg_hint_plan.sql
@@ -51,6 +51,7 @@ EXPLAIN (COSTS false) SELECT * FROM t1, t2 WHERE t1.id = t2.id;
 /*+Set(work_mem TO "1MB")*/
 EXPLAIN (COSTS false) SELECT * FROM t1, t2 WHERE t1.id = t2.id;
 
+/*+SeqScan() */ SELECT 1;
 /*+SeqScan(t1 t2)*/
 EXPLAIN (COSTS false) SELECT * FROM t1, t2 WHERE t1.id = t2.id;
 /*+SeqScan(t1)*/
@@ -71,6 +72,8 @@ EXPLAIN (COSTS false) SELECT * FROM t3, t4 WHERE t3.id = t4.id AND t4.ctid = '(1
 /*+NoTidScan(t1)*/
 EXPLAIN (COSTS false) SELECT * FROM t1, t2 WHERE t1.id = t2.id AND t1.ctid = '(1,1)';
 
+/*+ NestLoop() */ SELECT 1;
+/*+ NestLoop(x) */ SELECT 1;
 /*+HashJoin(t1 t2)*/
 EXPLAIN (COSTS false) SELECT * FROM t1, t2 WHERE t1.id = t2.id;
 /*+NestLoop(t1 t2)*/
@@ -1044,6 +1047,10 @@ SELECT val::int FROM p2 WHERE id < 1000;
 -- this test needs it enabled for get rows count. So do tests via psql
 -- and grep -v the mutable line.
 
+-- Parse error check
+/*+ Rows() */ SELECT 1;
+/*+ Rows(x) */ SELECT 1;
+
 -- value types
 \o results/pg_hint_plan.tmpout
 EXPLAIN SELECT * FROM t1 JOIN t2 ON (t1.id = t2.id);