* do instructions or hints to the planner using C-style block comments
* of the SQL.
*
- * Copyright (c) 2012, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
+ * Copyright (c) 2012-2013, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
+#include "catalog/pg_collation.h"
+#include "catalog/pg_index.h"
#include "commands/prepare.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "optimizer/restrictinfo.h"
#include "parser/scansup.h"
#include "tcop/utility.h"
+#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
+#include "utils/rel.h"
+#include "utils/syscache.h"
#if PG_VERSION_NUM >= 90200
#include "catalog/pg_class.h"
#endif
+#include "plpgsql.h"
+
#ifdef PG_MODULE_MAGIC
PG_MODULE_MAGIC;
#endif
/* hint keywords */
#define HINT_SEQSCAN "SeqScan"
#define HINT_INDEXSCAN "IndexScan"
+#define HINT_INDEXSCANREGEXP "IndexScanRegexp"
#define HINT_BITMAPSCAN "BitmapScan"
+#define HINT_BITMAPSCANREGEXP "BitmapScanRegexp"
#define HINT_TIDSCAN "TidScan"
#define HINT_NOSEQSCAN "NoSeqScan"
#define HINT_NOINDEXSCAN "NoIndexScan"
#define HINT_NOTIDSCAN "NoTidScan"
#if PG_VERSION_NUM >= 90200
#define HINT_INDEXONLYSCAN "IndexOnlyScan"
+#define HINT_INDEXONLYSCANREGEXP "IndexOnlyScanRegexp"
#define HINT_NOINDEXONLYSCAN "NoIndexOnlyScan"
#endif
#define HINT_NESTLOOP "NestLoop"
{
HINT_KEYWORD_SEQSCAN,
HINT_KEYWORD_INDEXSCAN,
+ HINT_KEYWORD_INDEXSCANREGEXP,
HINT_KEYWORD_BITMAPSCAN,
+ HINT_KEYWORD_BITMAPSCANREGEXP,
HINT_KEYWORD_TIDSCAN,
HINT_KEYWORD_NOSEQSCAN,
HINT_KEYWORD_NOINDEXSCAN,
HINT_KEYWORD_NOTIDSCAN,
#if PG_VERSION_NUM >= 90200
HINT_KEYWORD_INDEXONLYSCAN,
+ HINT_KEYWORD_INDEXONLYSCANREGEXP,
HINT_KEYWORD_NOINDEXONLYSCAN,
#endif
HINT_KEYWORD_NESTLOOP,
Hint base;
char *relname;
List *indexnames;
+ bool regexp;
unsigned char enforce_mask;
} ScanMethodHint;
+typedef struct ParentIndexInfo
+{
+ bool indisunique;
+ Oid method;
+ List *column_names;
+ char *expression_str;
+ Oid *indcollation;
+ Oid *opclass;
+ int16 *indoption;
+ char *indpred_str;
+} ParentIndexInfo;
+
/* join method hints */
typedef struct JoinMethodHint
{
ScanMethodHint **scan_hints; /* parsed scan hints */
int init_scan_mask; /* initial value scan parameter */
Index parent_relid; /* inherit parent table relid */
+ Oid parent_rel_oid; /* inherit parent table relid */
ScanMethodHint *parent_hint; /* inherit parent table scan hint */
+ List *parent_index_infos; /* infomation of inherit parent table's
+ * index */
/* for join method hints */
JoinMethodHint **join_hints; /* parsed join hints */
List **join_hint_level;
/* for Leading hint */
- LeadingHint **leading_hint; /* parsed Leading hint */
+ LeadingHint **leading_hint; /* parsed Leading hints */
/* for Set hints */
SetHint **set_hints; /* parsed Set hints */
RelOptInfo *pg_hint_plan_make_join_rel(PlannerInfo *root, RelOptInfo *rel1,
RelOptInfo *rel2);
+static void pg_hint_plan_plpgsql_func_setup(PLpgSQL_execstate *estate,
+ PLpgSQL_stmt *stmt);
+static void pg_hint_plan_plpgsql_stmt_beg(PLpgSQL_execstate *estate,
+ PLpgSQL_stmt *stmt);
+static void pg_hint_plan_plpgsql_stmt_end(PLpgSQL_execstate *estate,
+ PLpgSQL_stmt *stmt);
+
/* GUC variables */
static bool pg_hint_plan_enable_hint = true;
static bool pg_hint_plan_debug_print = false;
static const HintParser parsers[] = {
{HINT_SEQSCAN, ScanMethodHintCreate, HINT_KEYWORD_SEQSCAN},
{HINT_INDEXSCAN, ScanMethodHintCreate, HINT_KEYWORD_INDEXSCAN},
+ {HINT_INDEXSCANREGEXP, ScanMethodHintCreate, HINT_KEYWORD_INDEXSCANREGEXP},
{HINT_BITMAPSCAN, ScanMethodHintCreate, HINT_KEYWORD_BITMAPSCAN},
+ {HINT_BITMAPSCANREGEXP, ScanMethodHintCreate,
+ HINT_KEYWORD_BITMAPSCANREGEXP},
{HINT_TIDSCAN, ScanMethodHintCreate, HINT_KEYWORD_TIDSCAN},
{HINT_NOSEQSCAN, ScanMethodHintCreate, HINT_KEYWORD_NOSEQSCAN},
{HINT_NOINDEXSCAN, ScanMethodHintCreate, HINT_KEYWORD_NOINDEXSCAN},
{HINT_NOTIDSCAN, ScanMethodHintCreate, HINT_KEYWORD_NOTIDSCAN},
#if PG_VERSION_NUM >= 90200
{HINT_INDEXONLYSCAN, ScanMethodHintCreate, HINT_KEYWORD_INDEXONLYSCAN},
+ {HINT_INDEXONLYSCANREGEXP, ScanMethodHintCreate,
+ HINT_KEYWORD_INDEXONLYSCANREGEXP},
{HINT_NOINDEXONLYSCAN, ScanMethodHintCreate, HINT_KEYWORD_NOINDEXONLYSCAN},
#endif
{HINT_NESTLOOP, JoinMethodHintCreate, HINT_KEYWORD_NESTLOOP},
{NULL, NULL, HINT_KEYWORD_UNRECOGNIZED}
};
+const char *hint_query_string = NULL;
+PLpgSQL_plugin plugin_funcs = { };
/*
* Module load callbacks
*/
get_relation_info_hook = pg_hint_plan_get_relation_info;
prev_join_search = join_search_hook;
join_search_hook = pg_hint_plan_join_search;
+
+ /* PL/pgSQL plugin hook */
+ PLpgSQL_plugin **var_ptr = (PLpgSQL_plugin **) find_rendezvous_variable("PLpgSQL_plugin");
+ *var_ptr = &plugin_funcs;
+ (&plugin_funcs)->func_setup = (void *)pg_hint_plan_plpgsql_func_setup;
}
/*
hint->base.parse_func = (HintParseFunction) ScanMethodHintParse;
hint->relname = NULL;
hint->indexnames = NIL;
+ hint->regexp = false;
hint->enforce_mask = 0;
return (Hint *) hint;
hstate->scan_hints = NULL;
hstate->init_scan_mask = 0;
hstate->parent_relid = 0;
+ hstate->parent_rel_oid = InvalidOid;
hstate->parent_hint = NULL;
+ hstate->parent_index_infos = NIL;
hstate->join_hints = NULL;
hstate->init_join_mask = 0;
hstate->join_hint_level = NULL;
hstate->all_hints[i]->delete_func(hstate->all_hints[i]);
if (hstate->all_hints)
pfree(hstate->all_hints);
+ if (hstate->parent_index_infos)
+ list_free(hstate->parent_index_infos);
}
/*
static const char *
parse_parentheses_Leading_in(const char *str, OuterInnerRels **outer_inner)
{
- char *name;
- OuterInnerRels *outer_inner_rels;
+ List *outer_inner_pair = NIL;
- *outer_inner = OuterInnerRelsCreate(NULL, NIL);
+ if ((str = skip_parenthesis(str, '(')) == NULL)
+ return NULL;
skip_space(str);
/* Store words in parentheses into outer_inner_list. */
while(*str != ')' && *str != '\0')
{
+ OuterInnerRels *outer_inner_rels;
+
if (*str == '(')
{
- str++;
-
str = parse_parentheses_Leading_in(str, &outer_inner_rels);
+ if (str == NULL)
+ break;
}
else
{
+ char *name;
+
if ((str = parse_quoted_value(str, &name, true)) == NULL)
- {
- list_free((*outer_inner)->outer_inner_pair);
- return NULL;
- }
+ break;
else
outer_inner_rels = OuterInnerRelsCreate(name, NIL);
}
- (*outer_inner)->outer_inner_pair = lappend(
- (*outer_inner)->outer_inner_pair,
- outer_inner_rels);
+ outer_inner_pair = lappend(outer_inner_pair, outer_inner_rels);
skip_space(str);
}
- if ((str = skip_parenthesis(str, ')')) == NULL)
+ if (str == NULL ||
+ (str = skip_parenthesis(str, ')')) == NULL)
+ {
+ list_free(outer_inner_pair);
return NULL;
+ }
+
+ *outer_inner = OuterInnerRelsCreate(NULL, outer_inner_pair);
return str;
}
skip_space(str);
if (*str =='(')
{
- str++;
-
- str = parse_parentheses_Leading_in(str, outer_inner);
+ if ((str = parse_parentheses_Leading_in(str, outer_inner)) == NULL)
+ return NULL;
}
else
{
}
static const char *
-parse_parentheses(const char *str, List **name_list, HintType type)
+parse_parentheses(const char *str, List **name_list, HintKeyword keyword)
{
char *name;
bool truncate = true;
*name_list = lappend(*name_list, name);
skip_space(str);
- if (type == HINT_TYPE_SET)
+ if (keyword == HINT_KEYWORD_INDEXSCANREGEXP ||
+#if PG_VERSION_NUM >= 90200
+ keyword == HINT_KEYWORD_INDEXONLYSCANREGEXP ||
+#endif
+ keyword == HINT_KEYWORD_BITMAPSCANREGEXP ||
+ keyword == HINT_KEYWORD_SET)
{
truncate = false;
}
parse_head_comment(Query *parse)
{
const char *p;
+ const char *hint_head;
char *head;
char *tail;
int len;
entry = FetchPreparedStatement(stmt_name, true);
p = entry->plansource->query_string;
}
+ else if (hint_query_string)
+ p = hint_query_string;
else
p = debug_query_string;
return NULL;
/* extract query head comment. */
- len = strlen(HINT_START);
- skip_space(p);
- if (strncmp(p, HINT_START, len))
+ hint_head = strstr(p, HINT_START);
+ if (hint_head == NULL)
return NULL;
+ for (;p < hint_head; p++)
+ {
+ /*
+ * Allow these characters precedes hint comment:
+ * - digits
+ * - alphabets which are in ASCII range
+ * - space, tabs and new-lines
+ * - underscores, for identifier
+ * - commas, for SELECT clause, EXPLAIN and PREPARE
+ * - parentheses, for EXPLAIN and PREPARE
+ *
+ * Note that we don't use isalpha() nor isalnum() in ctype.h here to
+ * avoid behavior which depends on locale setting.
+ */
+ if (!(*p >= '0' && *p <= '9') &&
+ !(*p >= 'A' && *p <= 'Z') &&
+ !(*p >= 'a' && *p <= 'z') &&
+ !isspace(*p) &&
+ *p != '_' &&
+ *p != ',' &&
+ *p != '(' && *p != ')')
+ return NULL;
+ }
+ len = strlen(HINT_START);
head = (char *) p;
p += len;
skip_space(p);
List *name_list = NIL;
int length;
- if ((str = parse_parentheses(str, &name_list, hint->base.type)) == NULL)
+ if ((str = parse_parentheses(str, &name_list, hint_keyword)) == NULL)
return NULL;
/* Parse relation name and index name(s) if given hint accepts. */
hint->indexnames = list_delete_first(name_list);
/* check whether the hint accepts index name(s). */
- if (hint_keyword != HINT_KEYWORD_INDEXSCAN &&
+ if (length != 1 &&
+ hint_keyword != HINT_KEYWORD_INDEXSCAN &&
+ hint_keyword != HINT_KEYWORD_INDEXSCANREGEXP &&
#if PG_VERSION_NUM >= 90200
hint_keyword != HINT_KEYWORD_INDEXONLYSCAN &&
+ hint_keyword != HINT_KEYWORD_INDEXONLYSCANREGEXP &&
#endif
hint_keyword != HINT_KEYWORD_BITMAPSCAN &&
- length != 1)
+ hint_keyword != HINT_KEYWORD_BITMAPSCANREGEXP)
{
hint_ereport(str,
("%s hint accepts only one relation.",
case HINT_KEYWORD_INDEXSCAN:
hint->enforce_mask = ENABLE_INDEXSCAN;
break;
+ case HINT_KEYWORD_INDEXSCANREGEXP:
+ hint->enforce_mask = ENABLE_INDEXSCAN;
+ hint->regexp = true;
+ break;
case HINT_KEYWORD_BITMAPSCAN:
hint->enforce_mask = ENABLE_BITMAPSCAN;
break;
+ case HINT_KEYWORD_BITMAPSCANREGEXP:
+ hint->enforce_mask = ENABLE_BITMAPSCAN;
+ hint->regexp = true;
+ break;
case HINT_KEYWORD_TIDSCAN:
hint->enforce_mask = ENABLE_TIDSCAN;
break;
case HINT_KEYWORD_INDEXONLYSCAN:
hint->enforce_mask = ENABLE_INDEXSCAN | ENABLE_INDEXONLYSCAN;
break;
+ case HINT_KEYWORD_INDEXONLYSCANREGEXP:
+ hint->enforce_mask = ENABLE_INDEXSCAN | ENABLE_INDEXONLYSCAN;
+ hint->regexp = true;
+ break;
case HINT_KEYWORD_NOINDEXONLYSCAN:
hint->enforce_mask = ENABLE_ALL_SCAN ^ ENABLE_INDEXONLYSCAN;
break;
HintKeyword hint_keyword = hint->base.hint_keyword;
List *name_list = NIL;
- if ((str = parse_parentheses(str, &name_list, hint->base.type)) == NULL)
+ if ((str = parse_parentheses(str, &name_list, hint_keyword)) == NULL)
return NULL;
hint->nrels = list_length(name_list);
{
List *name_list = NIL;
- if ((str = parse_parentheses(str, &name_list, hint->base.type)) == NULL)
+ if ((str = parse_parentheses(str, &name_list, hint->base.hint_keyword))
+ == NULL)
return NULL;
hint->words = name_list;
return NULL;
}
+/*
+ * regexeq
+ *
+ * Returns TRUE on match, FALSE on no match.
+ *
+ * s1 --- the data to match against
+ * s2 --- the pattern
+ *
+ * Because we copy s1 to NameData, make the size of s1 less than NAMEDATALEN.
+ */
+static bool
+regexpeq(const char *s1, const char *s2)
+{
+ NameData name;
+ text *regexp;
+ Datum result;
+
+ strcpy(name.data, s1);
+ regexp = cstring_to_text(s2);
+
+ result = DirectFunctionCall2Coll(nameregexeq,
+ DEFAULT_COLLATION_OID,
+ NameGetDatum(&name),
+ PointerGetDatum(regexp));
+ return DatumGetBool(result);
+}
+
static void
delete_indexes(ScanMethodHint *hint, RelOptInfo *rel, Oid relationObjectId)
{
foreach(l, hint->indexnames)
{
- if (RelnameCmp(&indexname, &lfirst(l)) == 0)
+ char *hintname = (char *) lfirst(l);
+ bool result;
+
+ if (hint->regexp)
+ result = regexpeq(indexname, hintname);
+ else
+ result = RelnameCmp(&indexname, &hintname) == 0;
+
+ if (result)
+ {
+ use_index = true;
+ if (pg_hint_plan_debug_print)
+ {
+ appendStringInfoCharMacro(&buf, ' ');
+ quote_value(&buf, indexname);
+ }
+
+ break;
+ }
+ }
+
+ /*
+ * to make the index a candidate when definition of this index is
+ * matched with the index's definition of current_hint.
+ */
+ if (OidIsValid(relationObjectId) && !use_index)
+ {
+ foreach(l, current_hint->parent_index_infos)
{
+ int i;
+ HeapTuple ht_idx;
+ ParentIndexInfo *p_info = (ParentIndexInfo *)lfirst(l);
+
+ /* check to match the parameter of unique */
+ if (p_info->indisunique != info->unique)
+ continue;
+
+ /* check to match the parameter of index's method */
+ if (p_info->method != info->relam)
+ continue;
+
+ /* to check to match the indexkey's configuration */
+ if ((list_length(p_info->column_names)) !=
+ info->ncolumns)
+ continue;
+
+ /* check to match the indexkey's configuration */
+ for (i = 0; i < info->ncolumns; i++)
+ {
+ char *c_attname = NULL;
+ char *p_attname = NULL;
+
+ p_attname =
+ list_nth(p_info->column_names, i);
+
+ /* both are expressions */
+ if (info->indexkeys[i] == 0 && !p_attname)
+ continue;
+
+ /* one's column is expression, the other is not */
+ if (info->indexkeys[i] == 0 || !p_attname)
+ break;
+
+ c_attname = get_attname(relationObjectId,
+ info->indexkeys[i]);
+
+ if (strcmp(p_attname, c_attname) != 0)
+ break;
+
+ if (p_info->indcollation[i] != info->indexcollations[i])
+ break;
+
+ if (p_info->opclass[i] != info->opcintype[i])
+ break;
+
+ if (((p_info->indoption[i] & INDOPTION_DESC) != 0) !=
+ info->reverse_sort[i])
+ break;
+
+ if (((p_info->indoption[i] & INDOPTION_NULLS_FIRST) != 0) !=
+ info->nulls_first[i])
+ break;
+
+ }
+
+ if (i != info->ncolumns)
+ continue;
+
+ if ((p_info->expression_str && (info->indexprs != NIL)) ||
+ (p_info->indpred_str && (info->indpred != NIL)))
+ {
+ /*
+ * Fetch the pg_index tuple by the Oid of the index
+ */
+ ht_idx = SearchSysCache1(INDEXRELID,
+ ObjectIdGetDatum(info->indexoid));
+
+ /* check to match the expression's parameter of index */
+ if (p_info->expression_str &&
+ !heap_attisnull(ht_idx, Anum_pg_index_indexprs))
+ {
+ Datum exprsDatum;
+ bool isnull;
+ Datum result;
+
+ /*
+ * to change the expression's parameter of child's
+ * index to strings
+ */
+ exprsDatum = SysCacheGetAttr(INDEXRELID, ht_idx,
+ Anum_pg_index_indexprs,
+ &isnull);
+
+ result = DirectFunctionCall2(pg_get_expr,
+ exprsDatum,
+ ObjectIdGetDatum(
+ relationObjectId));
+
+ if (strcmp(p_info->expression_str,
+ text_to_cstring(DatumGetTextP(result))) != 0)
+ {
+ /* Clean up */
+ ReleaseSysCache(ht_idx);
+
+ continue;
+ }
+ }
+
+ /* Check to match the predicate's paraameter of index */
+ if (p_info->indpred_str &&
+ !heap_attisnull(ht_idx, Anum_pg_index_indpred))
+ {
+ Datum predDatum;
+ bool isnull;
+ Datum result;
+
+ /*
+ * to change the predicate's parabeter of child's
+ * index to strings
+ */
+ predDatum = SysCacheGetAttr(INDEXRELID, ht_idx,
+ Anum_pg_index_indpred,
+ &isnull);
+
+ result = DirectFunctionCall2(pg_get_expr,
+ predDatum,
+ ObjectIdGetDatum(
+ relationObjectId));
+
+ if (strcmp(p_info->indpred_str,
+ text_to_cstring(DatumGetTextP(result))) != 0)
+ {
+ /* Clean up */
+ ReleaseSysCache(ht_idx);
+
+ continue;
+ }
+ }
+
+ /* Clean up */
+ ReleaseSysCache(ht_idx);
+ }
+ else if (p_info->expression_str || (info->indexprs != NIL))
+ continue;
+ else if (p_info->indpred_str || (info->indpred != NIL))
+ continue;
+
use_index = true;
+
+ /* to log the candidate of index */
if (pg_hint_plan_debug_print)
{
appendStringInfoCharMacro(&buf, ' ');
}
}
+/*
+ * Return information of index definition.
+ */
+static ParentIndexInfo *
+get_parent_index_info(Oid indexoid, Oid relid)
+{
+ ParentIndexInfo *p_info = palloc(sizeof(ParentIndexInfo));
+ Relation indexRelation;
+ Form_pg_index index;
+ char *attname;
+ int i;
+
+ indexRelation = index_open(indexoid, RowExclusiveLock);
+
+ index = indexRelation->rd_index;
+
+ p_info->indisunique = index->indisunique;
+ p_info->method = indexRelation->rd_rel->relam;
+
+ p_info->column_names = NIL;
+ p_info->indcollation = (Oid *) palloc(sizeof(Oid) * index->indnatts);
+ p_info->opclass = (Oid *) palloc(sizeof(Oid) * index->indnatts);
+ p_info->indoption = (int16 *) palloc(sizeof(Oid) * index->indnatts);
+
+ for (i = 0; i < index->indnatts; i++)
+ {
+ attname = get_attname(relid, index->indkey.values[i]);
+ p_info->column_names = lappend(p_info->column_names, attname);
+
+ p_info->indcollation[i] = indexRelation->rd_indcollation[i];
+ p_info->opclass[i] = indexRelation->rd_opcintype[i];
+ p_info->indoption[i] = indexRelation->rd_indoption[i];
+ }
+
+ /*
+ * to check to match the expression's paraameter of index with child indexes
+ */
+ p_info->expression_str = NULL;
+ if(!heap_attisnull(indexRelation->rd_indextuple, Anum_pg_index_indexprs))
+ {
+ Datum exprsDatum;
+ bool isnull;
+ Datum result;
+
+ exprsDatum = SysCacheGetAttr(INDEXRELID, indexRelation->rd_indextuple,
+ Anum_pg_index_indexprs, &isnull);
+
+ result = DirectFunctionCall2(pg_get_expr,
+ exprsDatum,
+ ObjectIdGetDatum(relid));
+
+ p_info->expression_str = text_to_cstring(DatumGetTextP(result));
+ }
+
+ /*
+ * to check to match the predicate's paraameter of index with child indexes
+ */
+ p_info->indpred_str = NULL;
+ if(!heap_attisnull(indexRelation->rd_indextuple, Anum_pg_index_indpred))
+ {
+ Datum predDatum;
+ bool isnull;
+ Datum result;
+
+ predDatum = SysCacheGetAttr(INDEXRELID, indexRelation->rd_indextuple,
+ Anum_pg_index_indpred, &isnull);
+
+ result = DirectFunctionCall2(pg_get_expr,
+ predDatum,
+ ObjectIdGetDatum(relid));
+
+ p_info->indpred_str = text_to_cstring(DatumGetTextP(result));
+ }
+
+ index_close(indexRelation, NoLock);
+
+ return p_info;
+}
+
static void
pg_hint_plan_get_relation_info(PlannerInfo *root, Oid relationObjectId,
bool inhparent, RelOptInfo *rel)
{
/* store does relids of parent table. */
current_hint->parent_relid = rel->relid;
+ current_hint->parent_rel_oid = relationObjectId;
}
else if (current_hint->parent_relid != 0)
{
/* This rel is not inherit table. */
current_hint->parent_relid = 0;
+ current_hint->parent_rel_oid = InvalidOid;
current_hint->parent_hint = NULL;
}
}
set_scan_config_options(hint->enforce_mask, current_hint->context);
hint->base.state = HINT_STATE_USED;
+
if (inhparent)
+ {
+ Relation relation;
+ List *indexoidlist;
+ ListCell *l;
+
current_hint->parent_hint = hint;
+
+ relation = heap_open(relationObjectId, NoLock);
+ indexoidlist = RelationGetIndexList(relation);
+
+ foreach(l, indexoidlist)
+ {
+ Oid indexoid = lfirst_oid(l);
+ char *indexname = get_rel_name(indexoid);
+ bool use_index = false;
+ ListCell *lc;
+ ParentIndexInfo *parent_index_info;
+
+ foreach(lc, hint->indexnames)
+ {
+ if (RelnameCmp(&indexname, &lfirst(lc)) == 0)
+ {
+ use_index = true;
+ break;
+ }
+ }
+ if (!use_index)
+ continue;
+
+ parent_index_info = get_parent_index_info(indexoid,
+ relationObjectId);
+ current_hint->parent_index_infos =
+ lappend(current_hint->parent_index_infos, parent_index_info);
+ }
+ heap_close(relation, NoLock);
+ }
else
delete_indexes(hint, rel, InvalidOid);
}
static Relids
OuterInnerJoinCreate(OuterInnerRels *outer_inner, LeadingHint *leading_hint,
- PlannerInfo *root, List *initial_rels, HintState *hstate, int *njoinrels,
- int nbaserel)
+ PlannerInfo *root, List *initial_rels, HintState *hstate, int nbaserel)
{
OuterInnerRels *outer_rels;
OuterInnerRels *inner_rels;
if (outer_inner->relation != NULL)
{
- (*njoinrels)++;
return bms_make_singleton(
find_relid_aliasname(root, outer_inner->relation,
initial_rels,
root,
initial_rels,
hstate,
- njoinrels,
nbaserel);
inner_relids = OuterInnerJoinCreate(inner_rels,
leading_hint,
root,
initial_rels,
hstate,
- njoinrels,
nbaserel);
join_relids = bms_add_members(outer_relids, inner_relids);
- if (bms_num_members(join_relids) > nbaserel || *njoinrels > nbaserel)
+ if (bms_num_members(join_relids) > nbaserel)
return join_relids;
/*
*/
for (i = 0; i < hstate->num_hints[HINT_TYPE_LEADING]; i++)
{
- LeadingHint *leading_hint = (LeadingHint *)hstate->leading_hint[i];
-
- Relids relids;
+ LeadingHint *leading_hint = (LeadingHint *)hstate->leading_hint[i];
+ Relids relids;
if (leading_hint->base.state == HINT_STATE_ERROR)
continue;
relid = 0;
- relids = 0;
+ relids = NULL;
foreach(l, leading_hint->relations)
{
root,
initial_rels,
hstate,
- &njoinrels,
nbaserel);
njoinrels = bms_num_members(joinrelids);
-
- if (njoinrels < 2)
- return false;
+ Assert(njoinrels >= 2);
/*
* Delete all join hints which have different combination from Leading
}
}
+static void
+pg_hint_plan_plpgsql_func_setup(PLpgSQL_execstate *estate, PLpgSQL_stmt *stmt)
+{
+ (&plugin_funcs)->stmt_beg = pg_hint_plan_plpgsql_stmt_beg;
+ (&plugin_funcs)->stmt_end = pg_hint_plan_plpgsql_stmt_end;
+}
+
+static void
+pg_hint_plan_plpgsql_stmt_beg(PLpgSQL_execstate *estate, PLpgSQL_stmt *stmt)
+{
+ if ((enum PLpgSQL_stmt_types) stmt->cmd_type == PLPGSQL_STMT_EXECSQL)
+ {
+ PLpgSQL_expr *expr = ((PLpgSQL_stmt_execsql *) stmt)->sqlstmt;
+ hint_query_string = expr->query;
+ }
+}
+
+static void
+pg_hint_plan_plpgsql_stmt_end(PLpgSQL_execstate *estate, PLpgSQL_stmt *stmt)
+{
+ if ((enum PLpgSQL_stmt_types) stmt->cmd_type == PLPGSQL_STMT_EXECSQL)
+ hint_query_string = NULL;
+}
+
#define standard_join_search pg_hint_plan_standard_join_search
#define join_search_one_level pg_hint_plan_join_search_one_level
#define make_join_rel make_join_rel_wrapper