Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit59371f1

Browse files
committed
Fix checking of index expressions in CompareIndexInfo().
This code was sloppy about comparison of index columns thatare expressions. It didn't reliably reject cases where oneindex has an expression where the other has a plain column,and it could index off the start of the attmap array, leadingto a Valgrind complaint (though an actual crash seems unlikely).I'm not sure that the expression-vs-column sloppiness leadsto any visible problem in practice, because the subsequentcomparison of the two expression lists would reject caseswhere the indexes have different numbers of expressionsoverall. Maybe we could falsely match indexes having thesame expressions in different column positions, but it'drequire unlucky contents of the word before the attmap array.It's not too surprising that no problem has been reportedfrom the field. Nonetheless, this code is clearly wrong.Per bug #18135 from Alexander Lakhin. Back-patch to allsupported branches.Discussion:https://postgr.es/m/18135-532f4a755e71e4d2@postgresql.org
1 parenta0bfd65 commit59371f1

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

‎src/backend/catalog/index.c

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2553,7 +2553,7 @@ CompareIndexInfo(IndexInfo *info1, IndexInfo *info2,
25532553

25542554
/*
25552555
* and columns match through the attribute map (actual attribute numbers
2556-
* might differ!) Note that thisimplies that index columns that are
2556+
* might differ!) Note that thischecks that index columns that are
25572557
* expressions appear in the same positions. We will next compare the
25582558
* expressions themselves.
25592559
*/
@@ -2562,13 +2562,22 @@ CompareIndexInfo(IndexInfo *info1, IndexInfo *info2,
25622562
if (attmap->maplen<info2->ii_IndexAttrNumbers[i])
25632563
elog(ERROR,"incorrect attribute map");
25642564

2565-
/* ignore expressions at this stage */
2566-
if ((info1->ii_IndexAttrNumbers[i]!=InvalidAttrNumber)&&
2567-
(attmap->attnums[info2->ii_IndexAttrNumbers[i]-1]!=
2568-
info1->ii_IndexAttrNumbers[i]))
2569-
return false;
2565+
/* ignore expressions for now (but check their collation/opfamily) */
2566+
if (!(info1->ii_IndexAttrNumbers[i]==InvalidAttrNumber&&
2567+
info2->ii_IndexAttrNumbers[i]==InvalidAttrNumber))
2568+
{
2569+
/* fail if just one index has an expression in this column */
2570+
if (info1->ii_IndexAttrNumbers[i]==InvalidAttrNumber||
2571+
info2->ii_IndexAttrNumbers[i]==InvalidAttrNumber)
2572+
return false;
2573+
2574+
/* both are columns, so check for match after mapping */
2575+
if (attmap->attnums[info2->ii_IndexAttrNumbers[i]-1]!=
2576+
info1->ii_IndexAttrNumbers[i])
2577+
return false;
2578+
}
25702579

2571-
/* collation and opfamilyis not valid forincluding columns */
2580+
/* collation and opfamilyare not valid forincluded columns */
25722581
if (i >=info1->ii_NumIndexKeyAttrs)
25732582
continue;
25742583

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp