mirror of
https://git.postgresql.org/git/postgresql.git
synced 2025-02-17 19:30:00 +08:00
Dissociate btequalimage() from interval_ops, ending its deduplication.
Under interval_ops, some equal values are distinguishable. One such pair is '24:00:00' and '1 day'. With that being so, btequalimage() breaches the documented contract for the "equalimage" btree support function. This can cause incorrect results from index-only scans. Users should REINDEX any btree indexes having interval-type columns. After updating, pg_amcheck will report an error for almost all such indexes. This fix makes interval_ops simply omit the support function, like numeric_ops does. Back-pack to v13, where btequalimage() first appeared. In back branches, for the benefit of old catalog content, btequalimage() code will return false for type "interval". Going forward, back-branch initdb will include the catalog change. Reviewed by Peter Geoghegan. Discussion: https://postgr.es/m/20231011013317.22.nmisch@google.com
This commit is contained in:
parent
3895e9153e
commit
6fd1dbdb21
@ -31,6 +31,7 @@
|
|||||||
#include "access/xact.h"
|
#include "access/xact.h"
|
||||||
#include "catalog/index.h"
|
#include "catalog/index.h"
|
||||||
#include "catalog/pg_am.h"
|
#include "catalog/pg_am.h"
|
||||||
|
#include "catalog/pg_opfamily_d.h"
|
||||||
#include "commands/tablecmds.h"
|
#include "commands/tablecmds.h"
|
||||||
#include "lib/bloomfilter.h"
|
#include "lib/bloomfilter.h"
|
||||||
#include "miscadmin.h"
|
#include "miscadmin.h"
|
||||||
@ -333,10 +334,20 @@ bt_index_check_internal(Oid indrelid, bool parentcheck, bool heapallindexed,
|
|||||||
errmsg("index \"%s\" metapage has equalimage field set on unsupported nbtree version",
|
errmsg("index \"%s\" metapage has equalimage field set on unsupported nbtree version",
|
||||||
RelationGetRelationName(indrel))));
|
RelationGetRelationName(indrel))));
|
||||||
if (allequalimage && !_bt_allequalimage(indrel, false))
|
if (allequalimage && !_bt_allequalimage(indrel, false))
|
||||||
|
{
|
||||||
|
bool has_interval_ops = false;
|
||||||
|
|
||||||
|
for (int i = 0; i < IndexRelationGetNumberOfKeyAttributes(indrel); i++)
|
||||||
|
if (indrel->rd_opfamily[i] == INTERVAL_BTREE_FAM_OID)
|
||||||
|
has_interval_ops = true;
|
||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode(ERRCODE_INDEX_CORRUPTED),
|
(errcode(ERRCODE_INDEX_CORRUPTED),
|
||||||
errmsg("index \"%s\" metapage incorrectly indicates that deduplication is safe",
|
errmsg("index \"%s\" metapage incorrectly indicates that deduplication is safe",
|
||||||
RelationGetRelationName(indrel))));
|
RelationGetRelationName(indrel)),
|
||||||
|
has_interval_ops
|
||||||
|
? errhint("This is known of \"interval\" indexes last built on a version predating 2023-11.")
|
||||||
|
: 0));
|
||||||
|
}
|
||||||
|
|
||||||
/* Check index, possibly against table it is an index on */
|
/* Check index, possibly against table it is an index on */
|
||||||
bt_check_every_level(indrel, heaprel, heapkeyspace, parentcheck,
|
bt_check_every_level(indrel, heaprel, heapkeyspace, parentcheck,
|
||||||
|
@ -43,6 +43,7 @@
|
|||||||
#include "postgres.h"
|
#include "postgres.h"
|
||||||
|
|
||||||
#include "access/detoast.h"
|
#include "access/detoast.h"
|
||||||
|
#include "catalog/pg_type_d.h"
|
||||||
#include "fmgr.h"
|
#include "fmgr.h"
|
||||||
#include "utils/builtins.h"
|
#include "utils/builtins.h"
|
||||||
#include "utils/datum.h"
|
#include "utils/datum.h"
|
||||||
@ -333,20 +334,17 @@ datum_image_eq(Datum value1, Datum value2, bool typByVal, int typLen)
|
|||||||
* datum_image_eq() in all cases can use this as their "equalimage" support
|
* datum_image_eq() in all cases can use this as their "equalimage" support
|
||||||
* function.
|
* function.
|
||||||
*
|
*
|
||||||
* Currently, we unconditionally assume that any B-Tree operator class that
|
* Earlier minor releases erroneously associated this function with
|
||||||
* registers btequalimage as its support function 4 must be able to safely use
|
* interval_ops. Detect that case to rescind deduplication support, without
|
||||||
* optimizations like deduplication (i.e. we return true unconditionally). If
|
* requiring initdb.
|
||||||
* it ever proved necessary to rescind support for an operator class, we could
|
|
||||||
* do that in a targeted fashion by doing something with the opcintype
|
|
||||||
* argument.
|
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
Datum
|
Datum
|
||||||
btequalimage(PG_FUNCTION_ARGS)
|
btequalimage(PG_FUNCTION_ARGS)
|
||||||
{
|
{
|
||||||
/* Oid opcintype = PG_GETARG_OID(0); */
|
Oid opcintype = PG_GETARG_OID(0);
|
||||||
|
|
||||||
PG_RETURN_BOOL(true);
|
PG_RETURN_BOOL(opcintype != INTERVALOID);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*-------------------------------------------------------------------------
|
/*-------------------------------------------------------------------------
|
||||||
|
@ -172,8 +172,6 @@
|
|||||||
{ amprocfamily => 'btree/interval_ops', amproclefttype => 'interval',
|
{ amprocfamily => 'btree/interval_ops', amproclefttype => 'interval',
|
||||||
amprocrighttype => 'interval', amprocnum => '3',
|
amprocrighttype => 'interval', amprocnum => '3',
|
||||||
amproc => 'in_range(interval,interval,interval,bool,bool)' },
|
amproc => 'in_range(interval,interval,interval,bool,bool)' },
|
||||||
{ amprocfamily => 'btree/interval_ops', amproclefttype => 'interval',
|
|
||||||
amprocrighttype => 'interval', amprocnum => '4', amproc => 'btequalimage' },
|
|
||||||
{ amprocfamily => 'btree/macaddr_ops', amproclefttype => 'macaddr',
|
{ amprocfamily => 'btree/macaddr_ops', amproclefttype => 'macaddr',
|
||||||
amprocrighttype => 'macaddr', amprocnum => '1', amproc => 'macaddr_cmp' },
|
amprocrighttype => 'macaddr', amprocnum => '1', amproc => 'macaddr_cmp' },
|
||||||
{ amprocfamily => 'btree/macaddr_ops', amproclefttype => 'macaddr',
|
{ amprocfamily => 'btree/macaddr_ops', amproclefttype => 'macaddr',
|
||||||
|
@ -50,7 +50,7 @@
|
|||||||
opfmethod => 'btree', opfname => 'integer_ops' },
|
opfmethod => 'btree', opfname => 'integer_ops' },
|
||||||
{ oid => '1977',
|
{ oid => '1977',
|
||||||
opfmethod => 'hash', opfname => 'integer_ops' },
|
opfmethod => 'hash', opfname => 'integer_ops' },
|
||||||
{ oid => '1982',
|
{ oid => '1982', oid_symbol => 'INTERVAL_BTREE_FAM_OID',
|
||||||
opfmethod => 'btree', opfname => 'interval_ops' },
|
opfmethod => 'btree', opfname => 'interval_ops' },
|
||||||
{ oid => '1983',
|
{ oid => '1983',
|
||||||
opfmethod => 'hash', opfname => 'interval_ops' },
|
opfmethod => 'hash', opfname => 'interval_ops' },
|
||||||
|
@ -2192,6 +2192,7 @@ ORDER BY 1, 2, 3;
|
|||||||
| array_ops | array_ops | anyarray
|
| array_ops | array_ops | anyarray
|
||||||
| float_ops | float4_ops | real
|
| float_ops | float4_ops | real
|
||||||
| float_ops | float8_ops | double precision
|
| float_ops | float8_ops | double precision
|
||||||
|
| interval_ops | interval_ops | interval
|
||||||
| jsonb_ops | jsonb_ops | jsonb
|
| jsonb_ops | jsonb_ops | jsonb
|
||||||
| numeric_ops | numeric_ops | numeric
|
| numeric_ops | numeric_ops | numeric
|
||||||
| range_ops | range_ops | anyrange
|
| range_ops | range_ops | anyrange
|
||||||
@ -2199,7 +2200,7 @@ ORDER BY 1, 2, 3;
|
|||||||
| record_ops | record_ops | record
|
| record_ops | record_ops | record
|
||||||
| tsquery_ops | tsquery_ops | tsquery
|
| tsquery_ops | tsquery_ops | tsquery
|
||||||
| tsvector_ops | tsvector_ops | tsvector
|
| tsvector_ops | tsvector_ops | tsvector
|
||||||
(14 rows)
|
(15 rows)
|
||||||
|
|
||||||
-- **************** pg_index ****************
|
-- **************** pg_index ****************
|
||||||
-- Look for illegal values in pg_index fields.
|
-- Look for illegal values in pg_index fields.
|
||||||
|
Loading…
Reference in New Issue
Block a user