コミット: d56ce3df2b4198e6e0fd4c6e6865caead9d48ca9 - pg_hint_plan (git)

firtst release

コミットメタ情報

• リビジョン: d56ce3df2b4198e6e0fd4c6e6865caead9d48ca9 (tree)
• 日時: 2013-12-09 16:35:24
• 作者: Shigeru HANADA <shigeru.hanada@gmai...>
• コミッター: Shigeru HANADA

ログメッセージ

PG92との差分から生成したパッチを適用。

ただし、PG9.3対応として加えた修正はそのまま残した。

変更サマリ

• modified: core.c
• modified: doc/hint_list-ja.html
• modified: doc/pg_hint_plan-ja.html
• modified: make_join_rel.c
• modified: pg_hint_plan.c
• modified: sql/pg_hint_plan.sql
• modified: sql/ut-A.sql
• modified: sql/ut-J.sql
• modified: sql/ut-S.sql

差分

--- a/core.c
+++ b/core.c
@@ -6,7 +6,6 @@
  * src/backend/optimizer/path/allpaths.c
  *     set_append_rel_pathlist()
  *     generate_mergeappend_paths()
- *     get_cheapest_parameterized_child_path()
  *     accumulate_append_subpath()
  *     standard_join_search()
  *
@@ -37,7 +36,6 @@ set_append_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
 	int			parentRTindex = rti;
 	List	   *live_childrels = NIL;
 	List	   *subpaths = NIL;
-	bool		subpaths_valid = true;
 	List	   *all_child_pathkeys = NIL;
 	List	   *all_child_outers = NIL;
 	ListCell   *l;
@@ -77,20 +75,14 @@ set_append_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
 			continue;
 
 		/*
-		 * Child is live, so add it to the live_childrels list for use below.
+		 * Child is live, so add its cheapest access path to the Append path
+		 * we are constructing for the parent.
 		 */
-		live_childrels = lappend(live_childrels, childrel);
+		subpaths = accumulate_append_subpath(subpaths,
+											 childrel->cheapest_total_path);
 
-		/*
-		 * If child has an unparameterized cheapest-total path, add that to
-		 * the unparameterized Append path we are constructing for the parent.
-		 * If not, there's no workable unparameterized path.
-		 */
-		if (childrel->cheapest_total_path->param_info == NULL)
-			subpaths = accumulate_append_subpath(subpaths,
-											  childrel->cheapest_total_path);
-		else
-			subpaths_valid = false;
+		/* Remember which childrels are live, for logic below */
+		live_childrels = lappend(live_childrels, childrel);
 
 		/*
 		 * Collect lists of all the available path orderings and
@@ -158,20 +150,17 @@ set_append_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
 	}
 
 	/*
-	 * If we found unparameterized paths for all children, build an unordered,
-	 * unparameterized Append path for the rel.  (Note: this is correct even
-	 * if we have zero or one live subpath due to constraint exclusion.)
+	 * Next, build an unordered, unparameterized Append path for the rel.
+	 * (Note: this is correct even if we have zero or one live subpath due to
+	 * constraint exclusion.)
 	 */
-	if (subpaths_valid)
-		add_path(rel, (Path *) create_append_path(rel, subpaths, NULL));
+	add_path(rel, (Path *) create_append_path(rel, subpaths, NULL));
 
 	/*
-	 * Also build unparameterized MergeAppend paths based on the collected
-	 * list of child pathkeys.
+	 * Build unparameterized MergeAppend paths based on the collected list of
+	 * child pathkeys.
 	 */
-	if (subpaths_valid)
-		generate_mergeappend_paths(root, rel, live_childrels,
-								   all_child_pathkeys);
+	generate_mergeappend_paths(root, rel, live_childrels, all_child_pathkeys);
 
 	/*
 	 * Build Append paths for each parameterization seen among the child rels.
@@ -189,29 +178,39 @@ set_append_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
 	foreach(l, all_child_outers)
 	{
 		Relids		required_outer = (Relids) lfirst(l);
+		bool		ok = true;
 		ListCell   *lcr;
 
 		/* Select the child paths for an Append with this parameterization */
 		subpaths = NIL;
-		subpaths_valid = true;
 		foreach(lcr, live_childrels)
 		{
 			RelOptInfo *childrel = (RelOptInfo *) lfirst(lcr);
-			Path	   *subpath;
+			Path	   *cheapest_total;
+
+			cheapest_total =
+				get_cheapest_path_for_pathkeys(childrel->pathlist,
+											   NIL,
+											   required_outer,
+											   TOTAL_COST);
+			Assert(cheapest_total != NULL);
 
-			subpath = get_cheapest_parameterized_child_path(root,
-															childrel,
-															required_outer);
-			if (subpath == NULL)
+			/* Children must have exactly the desired parameterization */
+			if (!bms_equal(PATH_REQ_OUTER(cheapest_total), required_outer))
 			{
-				/* failed to make a suitable path for this child */
-				subpaths_valid = false;
-				break;
+				cheapest_total = reparameterize_path(root, cheapest_total,
+													 required_outer, 1.0);
+				if (cheapest_total == NULL)
+				{
+					ok = false;
+					break;
+				}
 			}
-			subpaths = accumulate_append_subpath(subpaths, subpath);
+
+			subpaths = accumulate_append_subpath(subpaths, cheapest_total);
 		}
 
-		if (subpaths_valid)
+		if (ok)
 			add_path(rel, (Path *)
 					 create_append_path(rel, subpaths, required_outer));
 	}
@@ -285,8 +284,7 @@ generate_mergeappend_paths(PlannerInfo *root, RelOptInfo *rel,
 			{
 				cheapest_startup = cheapest_total =
 					childrel->cheapest_total_path;
-				/* Assert we do have an unparameterized path for this child */
-				Assert(cheapest_total->param_info == NULL);
+				Assert(cheapest_total != NULL);
 			}
 
 			/*
@@ -319,79 +317,6 @@ generate_mergeappend_paths(PlannerInfo *root, RelOptInfo *rel,
 }
 
 /*
- * get_cheapest_parameterized_child_path
- *		Get cheapest path for this relation that has exactly the requested
- *		parameterization.
- *
- * Returns NULL if unable to create such a path.
- */
-static Path *
-get_cheapest_parameterized_child_path(PlannerInfo *root, RelOptInfo *rel,
-									  Relids required_outer)
-{
-	Path	   *cheapest;
-	ListCell   *lc;
-
-	/*
-	 * Look up the cheapest existing path with no more than the needed
-	 * parameterization.  If it has exactly the needed parameterization, we're
-	 * done.
-	 */
-	cheapest = get_cheapest_path_for_pathkeys(rel->pathlist,
-											  NIL,
-											  required_outer,
-											  TOTAL_COST);
-	Assert(cheapest != NULL);
-	if (bms_equal(PATH_REQ_OUTER(cheapest), required_outer))
-		return cheapest;
-
-	/*
-	 * Otherwise, we can "reparameterize" an existing path to match the given
-	 * parameterization, which effectively means pushing down additional
-	 * joinquals to be checked within the path's scan.  However, some existing
-	 * paths might check the available joinquals already while others don't;
-	 * therefore, it's not clear which existing path will be cheapest after
-	 * reparameterization.	We have to go through them all and find out.
-	 */
-	cheapest = NULL;
-	foreach(lc, rel->pathlist)
-	{
-		Path	   *path = (Path *) lfirst(lc);
-
-		/* Can't use it if it needs more than requested parameterization */
-		if (!bms_is_subset(PATH_REQ_OUTER(path), required_outer))
-			continue;
-
-		/*
-		 * Reparameterization can only increase the path's cost, so if it's
-		 * already more expensive than the current cheapest, forget it.
-		 */
-		if (cheapest != NULL &&
-			compare_path_costs(cheapest, path, TOTAL_COST) <= 0)
-			continue;
-
-		/* Reparameterize if needed, then recheck cost */
-		if (!bms_equal(PATH_REQ_OUTER(path), required_outer))
-		{
-			path = reparameterize_path(root, path, required_outer, 1.0);
-			if (path == NULL)
-				continue;		/* failed to reparameterize this one */
-			Assert(bms_equal(PATH_REQ_OUTER(path), required_outer));
-
-			if (cheapest != NULL &&
-				compare_path_costs(cheapest, path, TOTAL_COST) <= 0)
-				continue;
-		}
-
-		/* We have a new best path */
-		cheapest = path;
-	}
-
-	/* Return the best path, or NULL if we found no suitable candidate */
-	return cheapest;
-}
-
-/*
  * accumulate_append_subpath
  *		Add a subpath to the list being built for an Append or MergeAppend
  *
@@ -701,14 +626,11 @@ join_search_one_level(PlannerInfo *root, int level)
 		 * to accept failure at level 4 and go on to discover a workable
 		 * bushy plan at level 5.
 		 *
-		 * However, if there are no special joins and no lateral references
-		 * then join_is_legal() should never fail, and so the following sanity
-		 * check is useful.
+		 * However, if there are no special joins then join_is_legal() should
+		 * never fail, and so the following sanity check is useful.
 		 *----------
 		 */
-		if (joinrels[level] == NIL &&
-			root->join_info_list == NIL &&
-			root->lateral_info_list == NIL)
+		if (joinrels[level] == NIL && root->join_info_list == NIL)
 			elog(ERROR, "failed to build any %d-way joins", level);
 	}
 }
@@ -808,8 +730,6 @@ join_is_legal(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2,
 	bool		reversed;
 	bool		unique_ified;
 	bool		is_valid_inner;
-	bool		lateral_fwd;
-	bool		lateral_rev;
 	ListCell   *l;
 
 	/*
@@ -989,47 +909,6 @@ join_is_legal(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2,
 		(match_sjinfo == NULL || unique_ified))
 		return false;			/* invalid join path */
 
-	/*
-	 * We also have to check for constraints imposed by LATERAL references.
-	 * The proposed rels could each contain lateral references to the other,
-	 * in which case the join is impossible.  If there are lateral references
-	 * in just one direction, then the join has to be done with a nestloop
-	 * with the lateral referencer on the inside.  If the join matches an SJ
-	 * that cannot be implemented by such a nestloop, the join is impossible.
-	 */
-	lateral_fwd = lateral_rev = false;
-	foreach(l, root->lateral_info_list)
-	{
-		LateralJoinInfo *ljinfo = (LateralJoinInfo *) lfirst(l);
-
-		if (bms_is_subset(ljinfo->lateral_rhs, rel2->relids) &&
-			bms_overlap(ljinfo->lateral_lhs, rel1->relids))
-		{
-			/* has to be implemented as nestloop with rel1 on left */
-			if (lateral_rev)
-				return false;	/* have lateral refs in both directions */
-			lateral_fwd = true;
-			if (!bms_is_subset(ljinfo->lateral_lhs, rel1->relids))
-				return false;	/* rel1 can't compute the required parameter */
-			if (match_sjinfo &&
-				(reversed || match_sjinfo->jointype == JOIN_FULL))
-				return false;	/* not implementable as nestloop */
-		}
-		if (bms_is_subset(ljinfo->lateral_rhs, rel1->relids) &&
-			bms_overlap(ljinfo->lateral_lhs, rel2->relids))
-		{
-			/* has to be implemented as nestloop with rel2 on left */
-			if (lateral_fwd)
-				return false;	/* have lateral refs in both directions */
-			lateral_rev = true;
-			if (!bms_is_subset(ljinfo->lateral_lhs, rel2->relids))
-				return false;	/* rel2 can't compute the required parameter */
-			if (match_sjinfo &&
-				(!reversed || match_sjinfo->jointype == JOIN_FULL))
-				return false;	/* not implementable as nestloop */
-		}
-	}
-
 	/* Otherwise, it's a valid join */
 	*sjinfo_p = match_sjinfo;
 	*reversed_p = reversed;
@@ -1038,9 +917,8 @@ join_is_legal(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2,
 
 /*
  * has_join_restriction
- *		Detect whether the specified relation has join-order restrictions,
- *		due to being inside an outer join or an IN (sub-SELECT),
- *		or participating in any LATERAL references.
+ *		Detect whether the specified relation has join-order restrictions
+ *		due to being inside an outer join or an IN (sub-SELECT).
  *
  * Essentially, this tests whether have_join_order_restriction() could
  * succeed with this rel and some other one.  It's OK if we sometimes
@@ -1052,15 +930,6 @@ has_join_restriction(PlannerInfo *root, RelOptInfo *rel)
 {
 	ListCell   *l;
 
-	foreach(l, root->lateral_info_list)
-	{
-		LateralJoinInfo *ljinfo = (LateralJoinInfo *) lfirst(l);
-
-		if (bms_is_subset(ljinfo->lateral_rhs, rel->relids) ||
-			bms_overlap(ljinfo->lateral_lhs, rel->relids))
-			return true;
-	}
-
 	foreach(l, root->join_info_list)
 	{
 		SpecialJoinInfo *sjinfo = (SpecialJoinInfo *) lfirst(l);

--- a/doc/hint_list-ja.html
+++ b/doc/hint_list-ja.html
@@ -74,6 +74,17 @@ PostgreSQL 9.2以降で動作します。</td></tr>
 <tr><td nowrap>Leading((テーブル集合<Sup>注1</Sup> テーブル集合<Sup>注1</Sup>))</td>
   <td>1つ目に指定したテーブル集合を外部表として、2つ目に指定したテーブル集合を内部表として結合します。</td></tr>
 
+<tr><td>見積もり件数補正</td>
+  <td nowrap>Rows(テーブル テーブル[ テーブル...] 件数補正)</td>
+  <td>指定したテーブル間の結合結果の見積もり件数を補正します。件数補正として指定できるのは以下の4パターンです。
+      <p><dl>
+        <dt>#件数</dt><dd>指定した件数で本来の見積もり件を上書きします。</dd>
+        <dt>+件数</dt><dd>指定した件数を本来の見積もり件数に加算します。</dd>
+        <dt>-件数</dt><dd>指定した件数を本来の見積もり件数から減算します。</dd>
+        <dt>*倍率</dt><dd>本来の見積もり件数を指定した倍率に補正します。「*2」とすると見積もり件数が2倍になり、「*0.01」とすると見積もり件数が1/100になります。</dd>
+      </dl></p>
+</td></tr>
+
 <tr><td>GUCパラメータ</td>
   <td nowrap>Set(GUCパラメータ 値)</td>
   <td>そのクエリの実行計画を作成している間だけ、指定したGUCパラメータを指定した値に変更します。</td></tr>

--- a/doc/pg_hint_plan-ja.html
+++ b/doc/pg_hint_plan-ja.html
@@ -240,7 +240,7 @@ postgres-#  ORDER BY a.aid;
 </div>
 
 <h3 id="hint-group">ヒント句のグループ</h3>
-<p>pg_hint_planで使えるヒント句の種類は、スキャン方式と結合方式、結合順序、GUCパラメータの4グループです。各グループの具体的なヒント句は、<a href="hint_list-ja.html">ヒント句一覧</a>を参照してください。</p>
+<p>pg_hint_planで使えるヒント句の種類は、スキャン方式と結合方式、結合順序、見積もり件数補正、GUCパラメータの5グループです。各グループの具体的なヒント句は、<a href="hint_list-ja.html">ヒント句一覧</a>を参照してください。</p>
 
 <h4>スキャン方式</h4>
 <p>あるオブジェクトでどのスキャン方式を選択するかを指定できるヒント句のグループです。「SeqScan」や「IndexScan」などを含みます。</p>
@@ -273,6 +273,10 @@ postgres-#     JOIN table table3 t3 ON (t2.key = t3.key);
 </pre>
 </div>
 
+<h4>見積もり件数補正</h4>
+<p>あるオブジェクトの結合結果の件数を補正できるヒント句のグループです。「Rows」のみを含みます。</p>
+<p>見積もり件数補正対象として指定できるオブジェクトは結合方式と同じです。補正できるのは結合結果の見積もり件数だけで、スキャンの見積もり件数を補正することはできません。</p>
+
 <h4>GUCパラメータ</h4>
 <p>そのクエリの実行計画を作成している間だけGUCパラメータを変更できるヒント句のグループです。「Set」のみを含みます。</p>
 <p>設定したいGUCパラメータとそのパラメータの値を指定します。指定できるGUCパラメータは<a href="http://www.postgresql.jp/document/current/html/runtime-config-query.html">問い合わせ計画</a>のGUCパラメータのみです。同じGUCパラメータのヒント句を2回以上指定した場合は、最後に指定したヒント句が適用されます。</p>

--- a/make_join_rel.c
+++ b/make_join_rel.c
@@ -6,7 +6,8 @@
  * src/backend/optimizer/path/joinrels.c
  *     make_join_rel()
  *
- * Portions Copyright (c) 1996-2013, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2013, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
+ * Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *-------------------------------------------------------------------------
@@ -24,6 +25,29 @@
  * when working with outer joins, or with IN or EXISTS clauses that have been
  * turned into joins.
  */
+static double
+adjust_rows(double rows, RowsHint *hint)
+{
+	double		result = 0.0;	/* keep compiler quiet */
+
+	if (hint->value_type == RVT_ABSOLUTE)
+		result = hint->rows;
+	else if (hint->value_type == RVT_ADD)
+		result = rows + hint->rows;
+	else if (hint->value_type == RVT_SUB)
+		result =  rows - hint->rows;
+	else if (hint->value_type == RVT_MULTI)
+		result = rows * hint->rows;
+	else
+		Assert(false);	/* unrecognized rows value type */
+
+	hint->base.state = HINT_STATE_USED;
+	result = clamp_row_est(result);
+	elog(DEBUG1, "adjusted rows %d to %d", (int) rows, (int) result);
+
+	return result;
+}
+
 RelOptInfo *
 make_join_rel(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2)
 {
@@ -34,6 +58,9 @@ make_join_rel(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2)
 	RelOptInfo *joinrel;
 	List	   *restrictlist;
 
+	RowsHint   *rows_hint = NULL;
+	int			i;
+
 	/* We should never try to join two overlapping sets of rels. */
 	Assert(!bms_overlap(rel1->relids, rel2->relids));
 
@@ -85,6 +112,54 @@ make_join_rel(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2)
 	joinrel = build_join_rel(root, joinrelids, rel1, rel2, sjinfo,
 							 &restrictlist);
 
+	/* Apply appropriate Rows hint to the join node, if any. */
+	for (i = 0; i < current_hint->num_hints[HINT_TYPE_ROWS]; i++)
+	{
+		rows_hint = current_hint->rows_hints[i];
+
+		if (bms_equal(joinrelids, rows_hint->joinrelids))
+		{
+			/*
+			 * This join RelOptInfo is exactly a Rows hint specifies, so adjust
+			 * rows estimateion with the hint's content.  Here we never have
+			 * another hint which has same relation combination, so we can skip
+			 * rest of hints.
+			 */
+			if (rows_hint->base.state == HINT_STATE_NOTUSED)
+				joinrel->rows = adjust_rows(joinrel->rows, rows_hint);
+		}
+		else if (bms_is_subset(rows_hint->joinrelids, rel1->relids) ||
+				 bms_is_subset(rows_hint->joinrelids, rel2->relids))
+		{
+			/*
+			 * Otherwise if the relation combination specified in thee Rows
+			 * hint is subset of the set of join elements, re-estimate rows and
+			 * costs again to reflect the adjustment done in down.  This is
+			 * necessary for the first permutation of the combination the
+			 * relations, but it's difficult to determine that this is the
+			 * first, so do this everytime.
+			 */
+			set_joinrel_size_estimates(root, joinrel, rel1, rel2, sjinfo,
+									   restrictlist);
+		}
+		else if (bms_is_subset(rows_hint->joinrelids, joinrelids))
+		{
+			/*
+			 * If the combination specifed in the Rows hints is subset of the
+			 * join relation and spreads over both children, 
+			 *
+			 * We do adjust rows estimation only when the value type was
+			 * multiplication, because other value types are meanless.
+			 */
+			if (rows_hint->value_type == RVT_MULTI)
+			{
+				set_joinrel_size_estimates(root, joinrel, rel1, rel2, sjinfo,
+										   restrictlist);
+				joinrel->rows = adjust_rows(joinrel->rows, rows_hint);
+			}
+		}
+	}
+
 	/*
 	 * If we've already proven this join is empty, we needn't consider any
 	 * more paths for it.

--- a/pg_hint_plan.c
+++ b/pg_hint_plan.c
@@ -37,6 +37,7 @@
 
 #include "executor/spi.h"
 #include "catalog/pg_type.h"
+
 /*
  * We have our own header file "plpgsql-9.1", which is necessary to support
  * hints for queries in PL/pgSQL blocks, in pg_hint_plan source package,
@@ -87,6 +88,7 @@ PG_MODULE_MAGIC;
 #define HINT_NOHASHJOIN			"NoHashJoin"
 #define HINT_LEADING			"Leading"
 #define HINT_SET				"Set"
+#define HINT_ROWS				"Rows"
 
 #define HINT_ARRAY_DEFAULT_INITSIZE 8
 
@@ -146,6 +148,7 @@ typedef enum HintKeyword
 	HINT_KEYWORD_NOHASHJOIN,
 	HINT_KEYWORD_LEADING,
 	HINT_KEYWORD_SET,
+	HINT_KEYWORD_ROWS,
 	HINT_KEYWORD_UNRECOGNIZED
 } HintKeyword;
 
@@ -162,20 +165,22 @@ typedef const char *(*HintParseFunction) (Hint *hint, HintState *hstate,
 										  Query *parse, const char *str);
 
 /* hint types */
-#define NUM_HINT_TYPE	4
+#define NUM_HINT_TYPE	5
 typedef enum HintType
 {
 	HINT_TYPE_SCAN_METHOD,
 	HINT_TYPE_JOIN_METHOD,
 	HINT_TYPE_LEADING,
-	HINT_TYPE_SET
+	HINT_TYPE_SET,
+	HINT_TYPE_ROWS,
 } HintType;
 
 static const char *HintTypeName[] = {
 	"scan method",
 	"join method",
 	"leading",
-	"set"
+	"set",
+	"rows",
 };
 
 /* hint status */
@@ -262,6 +267,26 @@ typedef struct SetHint
 	List   *words;
 } SetHint;
 
+/* rows hints */
+typedef enum RowsValueType {
+	RVT_ABSOLUTE,		/* Rows(... #1000) */
+	RVT_ADD,			/* Rows(... +1000) */
+	RVT_SUB,			/* Rows(... -1000) */
+	RVT_MULTI,			/* Rows(... *1.2) */
+} RowsValueType;
+typedef struct RowsHint
+{
+	Hint			base;
+	int				nrels;
+	int				inner_nrels;
+	char		  **relnames;
+	Relids			joinrelids;
+	Relids			inner_joinrelids;
+	char		   *rows_str;
+	RowsValueType	value_type;
+	double			rows;
+} RowsHint;
+
 /*
  * Describes a context of hint processing.
  */
@@ -297,6 +322,9 @@ struct HintState
 	/* for Set hints */
 	SetHint		  **set_hints;			/* parsed Set hints */
 	GucContext		context;			/* which GUC parameters can we set? */
+
+	/* for Rows hints */
+	RowsHint	  **rows_hints;			/* parsed Rows hints */
 };
 
 /*
@@ -358,6 +386,15 @@ static void SetHintDesc(SetHint *hint, StringInfo buf);
 static int SetHintCmp(const SetHint *a, const SetHint *b);
 static const char *SetHintParse(SetHint *hint, HintState *hstate, Query *parse,
 								const char *str);
+static Hint *RowsHintCreate(const char *hint_str, const char *keyword,
+							HintKeyword hint_keyword);
+static void RowsHintDelete(RowsHint *hint);
+static void RowsHintDesc(RowsHint *hint, StringInfo buf);
+static int RowsHintCmp(const RowsHint *a, const RowsHint *b);
+static const char *RowsHintParse(RowsHint *hint, HintState *hstate,
+								 Query *parse, const char *str);
+static Hint *LeadingHintCreate(const char *hint_str, const char *keyword,
+							   HintKeyword hint_keyword);
 
 static void quote_value(StringInfo buf, const char *value);
 
@@ -379,9 +416,6 @@ static void set_append_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
 static void generate_mergeappend_paths(PlannerInfo *root, RelOptInfo *rel,
 						   List *live_childrels,
 						   List *all_child_pathkeys);
-static Path *get_cheapest_parameterized_child_path(PlannerInfo *root,
-									  RelOptInfo *rel,
-									  Relids required_outer);
 static List *accumulate_append_subpath(List *subpaths, Path *path);
 RelOptInfo *pg_hint_plan_make_join_rel(PlannerInfo *root, RelOptInfo *rel1,
 									   RelOptInfo *rel2);
@@ -462,6 +496,7 @@ static const HintParser parsers[] = {
 	{HINT_NOHASHJOIN, JoinMethodHintCreate, HINT_KEYWORD_NOHASHJOIN},
 	{HINT_LEADING, LeadingHintCreate, HINT_KEYWORD_LEADING},
 	{HINT_SET, SetHintCreate, HINT_KEYWORD_SET},
+	{HINT_ROWS, RowsHintCreate, HINT_KEYWORD_ROWS},
 	{NULL, NULL, HINT_KEYWORD_UNRECOGNIZED}
 };
 
@@ -730,6 +765,54 @@ SetHintDelete(SetHint *hint)
 	pfree(hint);
 }
 
+static Hint *
+RowsHintCreate(const char *hint_str, const char *keyword,
+			   HintKeyword hint_keyword)
+{
+	RowsHint *hint;
+
+	hint = palloc(sizeof(RowsHint));
+	hint->base.hint_str = hint_str;
+	hint->base.keyword = keyword;
+	hint->base.hint_keyword = hint_keyword;
+	hint->base.type = HINT_TYPE_ROWS;
+	hint->base.state = HINT_STATE_NOTUSED;
+	hint->base.delete_func = (HintDeleteFunction) RowsHintDelete;
+	hint->base.desc_func = (HintDescFunction) RowsHintDesc;
+	hint->base.cmp_func = (HintCmpFunction) RowsHintCmp;
+	hint->base.parse_func = (HintParseFunction) RowsHintParse;
+	hint->nrels = 0;
+	hint->inner_nrels = 0;
+	hint->relnames = NULL;
+	hint->joinrelids = NULL;
+	hint->inner_joinrelids = NULL;
+	hint->rows_str = NULL;
+	hint->value_type = RVT_ABSOLUTE;
+	hint->rows = 0;
+
+	return (Hint *) hint;
+}
+
+static void
+RowsHintDelete(RowsHint *hint)
+{
+	if (!hint)
+		return;
+
+	if (hint->relnames)
+	{
+		int	i;
+
+		for (i = 0; i < hint->nrels; i++)
+			pfree(hint->relnames[i]);
+		pfree(hint->relnames);
+	}
+
+	bms_free(hint->joinrelids);
+	bms_free(hint->inner_joinrelids);
+	pfree(hint);
+}
+
 static HintState *
 HintStateCreate(void)
 {
@@ -753,6 +836,7 @@ HintStateCreate(void)
 	hstate->leading_hint = NULL;
 	hstate->context = superuser() ? PGC_SUSET : PGC_USERSET;
 	hstate->set_hints = NULL;
+	hstate->rows_hints = NULL;
 
 	return hstate;
 }
@@ -917,6 +1001,26 @@ SetHintDesc(SetHint *hint, StringInfo buf)
 	appendStringInfo(buf, ")\n");
 }
 
+static void
+RowsHintDesc(RowsHint *hint, StringInfo buf)
+{
+	int	i;
+
+	appendStringInfo(buf, "%s(", hint->base.keyword);
+	if (hint->relnames != NULL)
+	{
+		quote_value(buf, hint->relnames[0]);
+		for (i = 1; i < hint->nrels; i++)
+		{
+			appendStringInfoCharMacro(buf, ' ');
+			quote_value(buf, hint->relnames[i]);
+		}
+	}
+	appendStringInfo(buf, " %s", hint->rows_str);
+	appendStringInfoString(buf, ")\n");
+
+}
+
 /*
  * Append string which represents all hints in a given state to buf, with
  * preceding title with them.
@@ -1014,6 +1118,24 @@ SetHintCmp(const SetHint *a, const SetHint *b)
 }
 
 static int
+RowsHintCmp(const RowsHint *a, const RowsHint *b)
+{
+	int	i;
+
+	if (a->nrels != b->nrels)
+		return a->nrels - b->nrels;
+
+	for (i = 0; i < a->nrels; i++)
+	{
+		int	result;
+		if ((result = RelnameCmp(&a->relnames[i], &b->relnames[i])) != 0)
+			return result;
+	}
+
+	return 0;
+}
+
+static int
 HintCmp(const void *a, const void *b)
 {
 	const Hint *hinta = *((const Hint **) a);
@@ -1612,6 +1734,8 @@ create_hintstate(Query *parse, const char *hints)
 		hstate->num_hints[HINT_TYPE_JOIN_METHOD]);
 	hstate->set_hints = (SetHint **) (hstate->leading_hint +
 		hstate->num_hints[HINT_TYPE_LEADING]);
+	hstate->rows_hints = (RowsHint **) (hstate->set_hints +
+		hstate->num_hints[HINT_TYPE_SET]);
 
 	return hstate;
 }
@@ -1903,6 +2027,97 @@ SetHintParse(SetHint *hint, HintState *hstate, Query *parse, const char *str)
 	return str;
 }
 
+static const char *
+RowsHintParse(RowsHint *hint, HintState *hstate, Query *parse,
+			  const char *str)
+{
+	HintKeyword		hint_keyword = hint->base.hint_keyword;
+	List		   *name_list = NIL;
+	char		   *rows_str;
+	char		   *end_ptr;
+
+	if ((str = parse_parentheses(str, &name_list, hint_keyword)) == NULL)
+		return NULL;
+
+	/* Last element must be rows specification */
+	hint->nrels = list_length(name_list) - 1;
+
+	if (hint->nrels > 0)
+	{
+		ListCell   *l;
+		int			i = 0;
+
+		/*
+		 * 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 */
+	rows_str = list_nth(name_list, hint->nrels);
+	hint->rows_str = rows_str;		/* store as-is for error logging */
+	if (rows_str[0] == '#')
+	{
+		hint->value_type = RVT_ABSOLUTE;
+		rows_str++;
+	}
+	else if (rows_str[0] == '+')
+	{
+		hint->value_type = RVT_ADD;
+		rows_str++;
+	}
+	else if (rows_str[0] == '-')
+	{
+		hint->value_type = RVT_SUB;
+		rows_str++;
+	}
+	else if (rows_str[0] == '*')
+	{
+		hint->value_type = RVT_MULTI;
+		rows_str++;
+	}
+	else
+	{
+		hint_ereport(rows_str, ("unrecognized rows value type notation."));
+		hint->base.state = HINT_STATE_ERROR;
+		return str;
+	}
+	hint->rows = strtod(rows_str, &end_ptr);
+	if (*end_ptr)
+	{
+		hint_ereport(rows_str,
+					 ("%s hint requires valid number as rows estimation.",
+					  hint->base.keyword));
+		hint->base.state = HINT_STATE_ERROR;
+		return str;
+	}
+
+	/* A join hint requires at least two relations */
+	if (hint->nrels < 2)
+	{
+		hint_ereport(str,
+					 ("%s hint requires at least two relations.",
+					  hint->base.keyword));
+		hint->base.state = HINT_STATE_ERROR;
+		return str;
+	}
+
+	list_free(name_list);
+
+	/* Sort relnames in alphabetical order. */
+	qsort(hint->relnames, hint->nrels, sizeof(char *), RelnameCmp);
+
+	return str;
+}
+
 /*
  * set GUC parameter functions
  */
@@ -2973,6 +3188,40 @@ OuterInnerJoinCreate(OuterInnerRels *outer_inner, LeadingHint *leading_hint,
 	return join_relids;
 }
 
+static Relids
+create_bms_of_relids(Hint *base, PlannerInfo *root, List *initial_rels,
+		int nrels, char **relnames)
+{
+	int		relid;
+	Relids	relids = NULL;
+	int		j;
+	char   *relname;
+
+	for (j = 0; j < nrels; j++)
+	{
+		relname = relnames[j];
+
+		relid = find_relid_aliasname(root, relname, initial_rels,
+									 base->hint_str);
+
+		if (relid == -1)
+			base->state = HINT_STATE_ERROR;
+
+		if (relid <= 0)
+			break;
+
+		if (bms_is_member(relid, relids))
+		{
+			hint_ereport(base->hint_str,
+						 ("Relation name \"%s\" is duplicated.", relname));
+			base->state = HINT_STATE_ERROR;
+			break;
+		}
+
+		relids = bms_add_member(relids, relid);
+	}
+	return relids;
+}
 /*
  * Transform join method hint into handy form.
  *
@@ -3000,43 +3249,36 @@ transform_join_hints(HintState *hstate, PlannerInfo *root, int nbaserel,
 	for (i = 0; i < hstate->num_hints[HINT_TYPE_JOIN_METHOD]; i++)
 	{
 		JoinMethodHint *hint = hstate->join_hints[i];
-		int	j;
 
 		if (!hint_state_enabled(hint) || hint->nrels > nbaserel)
 			continue;
 
-		bms_free(hint->joinrelids);
-		hint->joinrelids = NULL;
-		relid = 0;
-		for (j = 0; j < hint->nrels; j++)
-		{
-			relname = hint->relnames[j];
+		hint->joinrelids = create_bms_of_relids(&(hint->base), root,
+									 initial_rels, hint->nrels, hint->relnames);
 
-			relid = find_relid_aliasname(root, relname, initial_rels,
-										 hint->base.hint_str);
+		if (hint->joinrelids == NULL || hint->base.state == HINT_STATE_ERROR)
+			continue;
 
-			if (relid == -1)
-				hint->base.state = HINT_STATE_ERROR;
+		hstate->join_hint_level[hint->nrels] =
+			lappend(hstate->join_hint_level[hint->nrels], hint);
+	}
 
-			if (relid <= 0)
-				break;
+	/*
+	 * Create bitmap of relids from alias names for each rows hint.
+	 * Bitmaps are more handy than strings in join searching.
+	 */
+	for (i = 0; i < hstate->num_hints[HINT_TYPE_ROWS]; i++)
+	{
+		RowsHint *hint = hstate->rows_hints[i];
 
-			if (bms_is_member(relid, hint->joinrelids))
-			{
-				hint_ereport(hint->base.hint_str,
-							 ("Relation name \"%s\" is duplicated.", relname));
-				hint->base.state = HINT_STATE_ERROR;
-				break;
-			}
+		if (!hint_state_enabled(hint) || hint->nrels > nbaserel)
+			continue;
 
-			hint->joinrelids = bms_add_member(hint->joinrelids, relid);
-		}
+		hint->joinrelids = create_bms_of_relids(&(hint->base), root,
+									 initial_rels, hint->nrels, hint->relnames);
 
-		if (relid <= 0 || hint->base.state == HINT_STATE_ERROR)
+		if (hint->joinrelids == NULL || hint->base.state == HINT_STATE_ERROR)
 			continue;
-
-		hstate->join_hint_level[hint->nrels] =
-			lappend(hstate->join_hint_level[hint->nrels], hint);
 	}
 
 	/* Do nothing if no Leading hint was supplied. */
@@ -3242,17 +3484,7 @@ static void
 set_plain_rel_pathlist(PlannerInfo *root, RelOptInfo *rel, RangeTblEntry *rte)
 {
 	/* Consider sequential scan */
-	Relids		required_outer;
-
-	/*
-	 * We don't support pushing join clauses into the quals of a seqscan, but
-	 * it could still have required parameterization due to LATERAL refs in
-	 * its tlist.
-	 */
-	required_outer = rel->lateral_relids;
-
-	/* Consider sequential scan */
-	add_path(rel, create_seqscan_path(root, rel, required_outer));
+	add_path(rel, create_seqscan_path(root, rel, NULL));
 
 	/* Consider index scans */
 	create_index_paths(root, rel);

--- a/sql/pg_hint_plan.sql
+++ b/sql/pg_hint_plan.sql
@@ -845,3 +845,32 @@ BEGIN
 END;
 $$;
 DROP EXTENSION pg_hint_plan;
+
+--
+-- Rows hint tests
+--
+-- value types
+EXPLAIN SELECT * FROM t1 JOIN t2 ON (t1.id = t2.id);
+/*+ Rows(t1 t2 #99) */
+EXPLAIN SELECT * FROM t1 JOIN t2 ON (t1.id = t2.id);
+/*+ Rows(t1 t2 +99) */
+EXPLAIN SELECT * FROM t1 JOIN t2 ON (t1.id = t2.id);
+/*+ Rows(t1 t2 -99) */
+EXPLAIN SELECT * FROM t1 JOIN t2 ON (t1.id = t2.id);
+/*+ Rows(t1 t2 *99) */
+EXPLAIN SELECT * FROM t1 JOIN t2 ON (t1.id = t2.id);
+/*+ Rows(t1 t2 *0.01) */
+EXPLAIN SELECT * FROM t1 JOIN t2 ON (t1.id = t2.id);
+/*+ Rows(t1 t2 #aa) */
+EXPLAIN SELECT * FROM t1 JOIN t2 ON (t1.id = t2.id);    -- ERROR
+/*+ Rows(t1 t2 /99) */
+EXPLAIN SELECT * FROM t1 JOIN t2 ON (t1.id = t2.id);    -- ERROR
+-- round up to 1
+/*+ Rows(t1 t2 -99999) */
+EXPLAIN SELECT * FROM t1 JOIN t2 ON (t1.id = t2.id);
+-- complex join tree
+EXPLAIN SELECT * FROM t1 JOIN t2 ON (t1.id = t2.id) JOIN t3 ON (t3.id = t2.id);
+/*+ Rows(t1 t2 #22) */
+EXPLAIN SELECT * FROM t1 JOIN t2 ON (t1.id = t2.id) JOIN t3 ON (t3.id = t2.id);
+/*+ Rows(t1 t3 *10) */
+EXPLAIN SELECT * FROM t1 JOIN t2 ON (t1.id = t2.id) JOIN t3 ON (t3.id = t2.id);

--- a/sql/ut-A.sql
+++ b/sql/ut-A.sql
@@ -1107,6 +1107,9 @@ EXPLAIN (COSTS false) SELECT nested_planner(2) FROM s1.t1 t_1 ORDER BY t_1.c1;
 EXPLAIN (COSTS false) SELECT nested_planner(2) FROM s1.t1 t_1 ORDER BY t_1.c1;
 
 --No.13-3-3
+--
+-- Redefine not to use cached plan
+--
 CREATE OR REPLACE FUNCTION nested_planner(cnt int) RETURNS int AS $$
 DECLARE
     new_cnt int;

--- a/sql/ut-J.sql
+++ b/sql/ut-J.sql
@@ -152,6 +152,10 @@ EXPLAIN (COSTS false) SELECT * FROM s1.v1 t1, s1.v1_ t2 WHERE t1.c1 = t2.c1;
 EXPLAIN (COSTS false) SELECT * FROM s1.t1, s1.t2 WHERE t1.c1 = t2.c1 AND t1.c1 = (SELECT max(st1.c1) FROM s1.t1 st1, s1.t2 st2 WHERE st1.c1 = st2.c1);
 /*+MergeJoin(t1 t2)NestLoop(st1 st2)*/
 EXPLAIN (COSTS true) SELECT * FROM s1.t1, s1.t2 WHERE t1.c1 = t2.c1 AND t1.c1 = (SELECT max(st1.c1) FROM s1.t1 st1, s1.t2 st2 WHERE st1.c1 = st2.c1);
+--
+-- There are cases where difference in the measured value and predicted value
+-- depending upon the version of PostgreSQL
+--
 
 EXPLAIN (COSTS false) SELECT * FROM s1.t1, (SELECT t2.c1 FROM s1.t2) st2 WHERE t1.c1 = st2.c1;
 /*+HashJoin(t1 st2)*/

--- a/sql/ut-S.sql
+++ b/sql/ut-S.sql
@@ -614,7 +614,7 @@ EXPLAIN (COSTS false) SELECT c2 FROM s1.ti1 WHERE ti1.c2 >= 1;
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE ti1.c2 = 1 AND ctid = '(1,1)';
 
 -- No. S-3-3-2
-/*+IndexScan(ti1 ti1_i3 ti1_i4)*/
+/*+IndexScan(ti1 ti1_i3 ti1_i2)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE ti1.c2 = 1 AND ctid = '(1,1)';
 
 -- No. S-3-3-3
@@ -626,7 +626,7 @@ EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE ti1.c2 = 1 AND ctid = '(1,1)';
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE ti1.c2 = 1 AND ctid = '(1,1)';
 
 -- No. S-3-3-5
-/*+BitmapScan(ti1 ti1_i3 ti1_i4)*/
+/*+BitmapScan(ti1 ti1_i3 ti1_i2)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE ti1.c2 = 1 AND ctid = '(1,1)';
 
 -- No. S-3-3-6
@@ -638,7 +638,7 @@ EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE ti1.c2 = 1 AND ctid = '(1,1)';
 EXPLAIN (COSTS false) SELECT c2 FROM s1.ti1 WHERE ti1.c2 >= 1;
 
 -- No. S-3-3-8
-/*+IndexOnlyScan(ti1 ti1_i3 ti1_i4)*/
+/*+IndexOnlyScan(ti1 ti1_i3 ti1_i2)*/
 EXPLAIN (COSTS false) SELECT c2 FROM s1.ti1 WHERE ti1.c2 >= 1;
 
 -- No. S-3-3-9
@@ -962,195 +962,195 @@ EXPLAIN SELECT c2 FROM s1.p1 WHERE c2 = 1;
 EXPLAIN (COSTS true) SELECT * FROM s1.p2 WHERE c1 = 1;
 
 ----
----- No. S-3-12 specified same table
+---- No. S-3-11 specified same table
 ----
 
--- No. S-3-12-1
+-- No. S-3-11-1
 /*+IndexScan(ti1) BitmapScan(ti1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 
--- No. S-3-12-2
+-- No. S-3-11-2
 /*+IndexScan(ti1 ti1_pkey) BitmapScan(ti1 ti1_btree)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 
--- No. S-3-12-3
+-- No. S-3-11-3
 /*+BitmapScan(ti1) IndexScan(ti1) BitmapScan(ti1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 
--- No. S-3-12-4
+-- No. S-3-11-4
 /*+BitmapScan(ti1 ti1_hash) IndexScan(ti1 ti1_pkey) BitmapScan(ti1 ti1_btree)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 
 ----
----- No. S-3-13 message output
+---- No. S-3-12 message output
 ----
 
--- No. S-3-13-1
+-- No. S-3-12-1
 /*+SeqScan(ti1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 
--- No. S-3-13-2
+-- No. S-3-12-2
 /*+SeqScan(ti1 ti1_pkey)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 
--- No. S-3-13-3
+-- No. S-3-12-3
 /*+SeqScan(ti1 ti1_pkey ti1_btree)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 
--- No. S-3-13-4
+-- No. S-3-12-4
 /*+IndexScan(ti1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 
--- No. S-3-13-5
+-- No. S-3-12-5
 /*+IndexScan(ti1 ti1_pkey)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 
--- No. S-3-13-6
+-- No. S-3-12-6
 /*+IndexScan(ti1 ti1_pkey ti1_btree)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 
--- No. S-3-13-7
+-- No. S-3-12-7
 /*+BitmapScan(ti1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 
--- No. S-3-13-8
+-- No. S-3-12-8
 /*+BitmapScan(ti1 ti1_pkey)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 
--- No. S-3-13-9
+-- No. S-3-12-9
 /*+BitmapScan(ti1 ti1_pkey ti1_btree)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 
--- No. S-3-13-10
+-- No. S-3-12-10
 /*+TidScan(ti1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 
--- No. S-3-13-11
+-- No. S-3-12-11
 /*+TidScan(ti1 ti1_pkey)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 
--- No. S-3-13-12
+-- No. S-3-12-12
 /*+TidScan(ti1 ti1_pkey ti1_btree)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 
--- No. S-3-13-13
+-- No. S-3-12-13
 /*+NoSeqScan(ti1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 
--- No. S-3-13-14
+-- No. S-3-12-14
 /*+NoSeqScan(ti1 ti1_pkey)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 
--- No. S-3-13-15
+-- No. S-3-12-15
 /*+NoSeqScan(ti1 ti1_pkey ti1_btree)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 
--- No. S-3-13-16
+-- No. S-3-12-16
 /*+NoIndexScan(ti1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 
--- No. S-3-13-17
+-- No. S-3-12-17
 /*+NoIndexScan(ti1 ti1_pkey)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 
--- No. S-3-13-18
+-- No. S-3-12-18
 /*+NoIndexScan(ti1 ti1_pkey ti1_btree)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 
--- No. S-3-13-19
+-- No. S-3-12-19
 /*+NoBitmapScan(ti1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 
--- No. S-3-13-20
+-- No. S-3-12-20
 /*+NoBitmapScan(ti1 ti1_pkey)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 
--- No. S-3-13-21
+-- No. S-3-12-21
 /*+NoBitmapScan(ti1 ti1_pkey ti1_btree)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 
--- No. S-3-13-22
+-- No. S-3-12-22
 /*+NoTidScan(ti1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 
--- No. S-3-13-23
+-- No. S-3-12-23
 /*+NoTidScan(ti1 ti1_pkey)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 
--- No. S-3-13-24
+-- No. S-3-12-24
 /*+NoTidScan(ti1 ti1_pkey ti1_btree)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c1 = 1 AND ctid = '(1,1)';
 
--- No. S-3-13-25
+-- No. S-3-12-25
 /*+IndexOnlyScan(ti1)*/
 EXPLAIN (COSTS false) SELECT c1 FROM s1.ti1 WHERE c1 >= 1;
 
--- No. S-3-13-26
+-- No. S-3-12-26
 /*+IndexOnlyScan(ti1 ti1_pkey)*/
 EXPLAIN (COSTS false) SELECT c1 FROM s1.ti1 WHERE c1 >= 1;
 
--- No. S-3-13-27
+-- No. S-3-12-27
 /*+IndexOnlyScan(ti1 ti1_pkey ti1_btree)*/
 EXPLAIN (COSTS false) SELECT c1 FROM s1.ti1 WHERE c1 >= 1;
 
--- No. S-3-13-28
+-- No. S-3-12-28
 /*+NoIndexOnlyScan(ti1)*/
 EXPLAIN (COSTS false) SELECT c1 FROM s1.ti1 WHERE c1 = 1;
 
--- No. S-3-13-29
+-- No. S-3-12-29
 /*+NoIndexOnlyScan(ti1 ti1_pkey)*/
 EXPLAIN (COSTS false) SELECT c1 FROM s1.ti1 WHERE c1 = 1;
 
--- No. S-3-13-30
+-- No. S-3-12-30
 /*+NoIndexOnlyScan(ti1 ti1_pkey ti1_btree)*/
 EXPLAIN (COSTS false) SELECT c1 FROM s1.ti1 WHERE c1 = 1;
 
 
 ----
----- No. S-3-14 regular expression
+---- No. S-3-13 message output
 ----
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c2 = 1;
 
--- No. S-3-14-1
+-- No. S-3-13-1
 /*+IndexScanRegexp(ti1 ti1_.*_key)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c2 = 1;
 
--- No. S-3-14-2
+-- No. S-3-13-2
 /*+IndexScanRegexp(ti1 ti1_i.)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c2 = 1;
 
--- No. S-3-14-3
+-- No. S-3-13-3
 /*+IndexScanRegexp(ti1 no.*_exist)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c2 = 1;
 
--- No. S-3-14-4
+-- No. S-3-13-4
 /*+IndexScanRegexp(p1 .*pkey)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.p1 WHERE c1 = 1;
 
--- No. S-3-14-5
+-- No. S-3-13-5
 /*+IndexScanRegexp(p1 p1.*i)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.p1 WHERE c1 = 1;
 
--- No. S-3-14-6
+-- No. S-3-13-6
 /*+IndexScanRegexp(p1 no.*_exist)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.p1 WHERE c1 = 1;
 
 ----
----- No. S-3-15 message output of candidate for index
+---- No. S-3-14 message output
 ----
 
--- No. S-3-15-1
+-- No. S-3-14-1
 /*+IndexScan(ti1 ti1_i1)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c2 = 1;
--- No. S-3-15-2
+-- No. S-3-14-2
 /*+IndexScan(ti1 not_exist)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c2 = 1;
--- No. S-3-15-3
+-- No. S-3-14-3
 /*+IndexScan(ti1 ti1_i1 ti1_i2)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c2 = 1;
--- No. S-3-15-4
+-- No. S-3-14-4
 /*+IndexScan(ti1 ti1_i1 not_exist)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c2 = 1;
--- No. S-3-15-5
+-- No. S-3-14-5
 /*+IndexScan(ti1 not_exist1 not_exist2)*/
 EXPLAIN (COSTS false) SELECT * FROM s1.ti1 WHERE c2 = 1;