mirror of
https://github.com/postgres/postgres.git
synced 2025-04-20 00:42:27 +03:00
Fix planner to consider matches to boolean columns in extension indexes.
The planner has to special-case indexes on boolean columns, because what we need for an indexscan on such a column is a qual of the shape of "boolvar = pseudoconstant". For plain bool constants, previous simplification will have reduced this to "boolvar" or "NOT boolvar", and we have to reverse that if we want to make an indexqual. There is existing code to do so, but it only fires when the index's opfamily is BOOL_BTREE_FAM_OID or BOOL_HASH_FAM_OID. Thus extension AMs, or extension opclasses such as contrib/btree_gin, are out in the cold. The reason for hard-wiring the set of relevant opfamilies was mostly to avoid a catalog lookup in a hot code path. We can improve matters while not taking much of a performance hit by relying on the hard-wired set when the opfamily OID is visibly built-in, and only checking the catalogs when dealing with an extension opfamily. While here, rename IsBooleanOpfamily to IsBuiltinBooleanOpfamily to remind future users of that macro of its limitations. At some point we might want to make indxpath.c's improved version of the test globally accessible, but it's not presently needed elsewhere. Zongliang Quan and Tom Lane Discussion: https://postgr.es/m/f293b91d-1d46-d386-b6bb-4b06ff5c667b@yeah.net
This commit is contained in:
parent
d885a6b612
commit
ff720a597c
@ -87,13 +87,15 @@ EXPLAIN (COSTS OFF) SELECT * FROM test_bool WHERE i<=true ORDER BY i;
|
|||||||
(6 rows)
|
(6 rows)
|
||||||
|
|
||||||
EXPLAIN (COSTS OFF) SELECT * FROM test_bool WHERE i=true ORDER BY i;
|
EXPLAIN (COSTS OFF) SELECT * FROM test_bool WHERE i=true ORDER BY i;
|
||||||
QUERY PLAN
|
QUERY PLAN
|
||||||
-----------------------------
|
-------------------------------------------
|
||||||
Sort
|
Sort
|
||||||
Sort Key: i
|
Sort Key: i
|
||||||
-> Seq Scan on test_bool
|
-> Bitmap Heap Scan on test_bool
|
||||||
Filter: i
|
Filter: i
|
||||||
(4 rows)
|
-> Bitmap Index Scan on idx_bool
|
||||||
|
Index Cond: (i = true)
|
||||||
|
(6 rows)
|
||||||
|
|
||||||
EXPLAIN (COSTS OFF) SELECT * FROM test_bool WHERE i>=true ORDER BY i;
|
EXPLAIN (COSTS OFF) SELECT * FROM test_bool WHERE i>=true ORDER BY i;
|
||||||
QUERY PLAN
|
QUERY PLAN
|
||||||
|
@ -71,7 +71,7 @@ SELECT * FROM booltmp WHERE a;
|
|||||||
QUERY PLAN
|
QUERY PLAN
|
||||||
------------------------------------------
|
------------------------------------------
|
||||||
Index Only Scan using boolidx on booltmp
|
Index Only Scan using boolidx on booltmp
|
||||||
Filter: a
|
Index Cond: (a = true)
|
||||||
(2 rows)
|
(2 rows)
|
||||||
|
|
||||||
SELECT * FROM booltmp WHERE a;
|
SELECT * FROM booltmp WHERE a;
|
||||||
@ -85,7 +85,7 @@ SELECT * FROM booltmp WHERE NOT a;
|
|||||||
QUERY PLAN
|
QUERY PLAN
|
||||||
------------------------------------------
|
------------------------------------------
|
||||||
Index Only Scan using boolidx on booltmp
|
Index Only Scan using boolidx on booltmp
|
||||||
Filter: (NOT a)
|
Index Cond: (a = false)
|
||||||
(2 rows)
|
(2 rows)
|
||||||
|
|
||||||
SELECT * FROM booltmp WHERE NOT a;
|
SELECT * FROM booltmp WHERE NOT a;
|
||||||
|
@ -153,6 +153,7 @@ static IndexClause *match_clause_to_indexcol(PlannerInfo *root,
|
|||||||
RestrictInfo *rinfo,
|
RestrictInfo *rinfo,
|
||||||
int indexcol,
|
int indexcol,
|
||||||
IndexOptInfo *index);
|
IndexOptInfo *index);
|
||||||
|
static bool IsBooleanOpfamily(Oid opfamily);
|
||||||
static IndexClause *match_boolean_index_clause(PlannerInfo *root,
|
static IndexClause *match_boolean_index_clause(PlannerInfo *root,
|
||||||
RestrictInfo *rinfo,
|
RestrictInfo *rinfo,
|
||||||
int indexcol, IndexOptInfo *index);
|
int indexcol, IndexOptInfo *index);
|
||||||
@ -2342,6 +2343,23 @@ match_clause_to_indexcol(PlannerInfo *root,
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* IsBooleanOpfamily
|
||||||
|
* Detect whether an opfamily supports boolean equality as an operator.
|
||||||
|
*
|
||||||
|
* If the opfamily OID is in the range of built-in objects, we can rely
|
||||||
|
* on hard-wired knowledge of which built-in opfamilies support this.
|
||||||
|
* For extension opfamilies, there's no choice but to do a catcache lookup.
|
||||||
|
*/
|
||||||
|
static bool
|
||||||
|
IsBooleanOpfamily(Oid opfamily)
|
||||||
|
{
|
||||||
|
if (opfamily < FirstNormalObjectId)
|
||||||
|
return IsBuiltinBooleanOpfamily(opfamily);
|
||||||
|
else
|
||||||
|
return op_in_opfamily(BooleanEqualOperator, opfamily);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* match_boolean_index_clause
|
* match_boolean_index_clause
|
||||||
* Recognize restriction clauses that can be matched to a boolean index.
|
* Recognize restriction clauses that can be matched to a boolean index.
|
||||||
|
@ -1191,8 +1191,13 @@ partkey_is_bool_constant_for_query(RelOptInfo *partrel, int partkeycol)
|
|||||||
PartitionScheme partscheme = partrel->part_scheme;
|
PartitionScheme partscheme = partrel->part_scheme;
|
||||||
ListCell *lc;
|
ListCell *lc;
|
||||||
|
|
||||||
/* If the partkey isn't boolean, we can't possibly get a match */
|
/*
|
||||||
if (!IsBooleanOpfamily(partscheme->partopfamily[partkeycol]))
|
* If the partkey isn't boolean, we can't possibly get a match.
|
||||||
|
*
|
||||||
|
* Partitioning currently can only use built-in AMs, so checking for
|
||||||
|
* built-in boolean opfamilies is good enough.
|
||||||
|
*/
|
||||||
|
if (!IsBuiltinBooleanOpfamily(partscheme->partopfamily[partkeycol]))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
/* Check each restriction clause for the partitioned rel */
|
/* Check each restriction clause for the partitioned rel */
|
||||||
|
@ -3596,7 +3596,11 @@ match_boolean_partition_clause(Oid partopfamily, Expr *clause, Expr *partkey,
|
|||||||
|
|
||||||
*outconst = NULL;
|
*outconst = NULL;
|
||||||
|
|
||||||
if (!IsBooleanOpfamily(partopfamily))
|
/*
|
||||||
|
* Partitioning currently can only use built-in AMs, so checking for
|
||||||
|
* built-in boolean opfamilies is good enough.
|
||||||
|
*/
|
||||||
|
if (!IsBuiltinBooleanOpfamily(partopfamily))
|
||||||
return PARTCLAUSE_UNSUPPORTED;
|
return PARTCLAUSE_UNSUPPORTED;
|
||||||
|
|
||||||
if (IsA(clause, BooleanTest))
|
if (IsA(clause, BooleanTest))
|
||||||
|
@ -55,7 +55,8 @@ DECLARE_UNIQUE_INDEX_PKEY(pg_opfamily_oid_index, 2755, OpfamilyOidIndexId, on pg
|
|||||||
|
|
||||||
#ifdef EXPOSE_TO_CLIENT_CODE
|
#ifdef EXPOSE_TO_CLIENT_CODE
|
||||||
|
|
||||||
#define IsBooleanOpfamily(opfamily) \
|
/* This does not account for non-core opfamilies that might accept boolean */
|
||||||
|
#define IsBuiltinBooleanOpfamily(opfamily) \
|
||||||
((opfamily) == BOOL_BTREE_FAM_OID || (opfamily) == BOOL_HASH_FAM_OID)
|
((opfamily) == BOOL_BTREE_FAM_OID || (opfamily) == BOOL_HASH_FAM_OID)
|
||||||
|
|
||||||
#endif /* EXPOSE_TO_CLIENT_CODE */
|
#endif /* EXPOSE_TO_CLIENT_CODE */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user