database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-22 02:52:08 +03:00
Code Activity

Damage control for yesterday's CheckIndexCompatible changes.

Browse Source 
Rip out a regression test that doesn't play well with settings put in
place by the build farm, and rewrite the code in CheckIndexCompatible
in a hopefully more transparent style.
This commit is contained in:
Robert Haas
2012-01-26 08:21:31 -05:00
parent 9f9135d129
commit 9d35116611
3 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/backend/commands/indexcmds.c
View File

@ -214,11 +214,20 @@ CheckIndexCompatible(Oid oldId,
ReleaseSysCache(tuple);
if (!ret)
return false;
/* For polymorphic opcintype, column type changes break compatibility. */
irel = index_open(oldId, AccessShareLock); /* caller probably has a lock */
for (i = 0; i < old_natts && ret; i++)
ret = (!IsPolymorphicType(get_opclass_input_type(classObjectId[i])) ||
irel->rd_att->attrs[i]->atttypid == typeObjectId[i]);
for (i = 0; i < old_natts; i++)
{
if (IsPolymorphicType(get_opclass_input_type(classObjectId[i])) &&
irel->rd_att->attrs[i]->atttypid != typeObjectId[i])
{
ret = false;
break;
}
}
/* Any change in exclusion operator selections breaks compatibility. */
if (ret && indexInfo->ii_ExclusionOps != NULL)
@ -231,14 +240,21 @@ CheckIndexCompatible(Oid oldId,
old_natts * sizeof(Oid)) == 0;
/* Require an exact input type match for polymorphic operators. */
for (i = 0; i < old_natts && ret; i++)
if (ret)
{
Oid left,
right;
for (i = 0; i < old_natts && ret; i++)
{
Oid left,
right;
op_input_types(indexInfo->ii_ExclusionOps[i], &left, &right);
ret = (!(IsPolymorphicType(left) || IsPolymorphicType(right)) ||
irel->rd_att->attrs[i]->atttypid == typeObjectId[i]);
op_input_types(indexInfo->ii_ExclusionOps[i], &left, &right);
if ((IsPolymorphicType(left) || IsPolymorphicType(right)) &&
irel->rd_att->attrs[i]->atttypid != typeObjectId[i])
{
ret = false;
break;
}
}
}
}