Commit48aae44

Artur Zakirov

committed

Fix comparison of ItemPointer in the comparetup_rum()

1 parent1469a92 commit48aae44Copy full SHA for 48aae44

File tree

+13

-12

lines changed

+13

-12

lines changed

Lines changed: 13 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -3868,20 +3868,21 @@ comparetup_rum(const SortTuple a, const SortTuple b, Tuplesortstate *state)`
`3868`	`3868`	`/*`
`3869`	`3869`	`* If key values are equal, we sort on ItemPointer.`
`3870`	`3870`	`*/`
`3871`		`-{`
`3872`		`-BlockNumberblk1=ItemPointerGetBlockNumber(&i1->iptr);`
`3873`		`-BlockNumberblk2=ItemPointerGetBlockNumber(&i2->iptr);`
	`3871`	`+if (i1->iptr.ip_blkid.bi_hi<i2->iptr.ip_blkid.bi_hi)`
	`3872`	`+return-1;`
	`3873`	`+elseif (i1->iptr.ip_blkid.bi_hi>i2->iptr.ip_blkid.bi_hi)`
	`3874`	`+return1;`
`3874`	`3875`
`3875`		`-if (blk1!=blk2)`
`3876`		`-return (blk1<blk2) ?-1 :1;`
`3877`		`-}`
`3878`		`-{`
`3879`		`-OffsetNumberpos1=ItemPointerGetOffsetNumber(&i1->iptr);`
`3880`		`-OffsetNumberpos2=ItemPointerGetOffsetNumber(&i2->iptr);`
	`3876`	`+if (i1->iptr.ip_blkid.bi_lo<i2->iptr.ip_blkid.bi_lo)`
	`3877`	`+return-1;`
	`3878`	`+elseif (i1->iptr.ip_blkid.bi_lo>i2->iptr.ip_blkid.bi_lo)`
	`3879`	`+return1;`
	`3880`	`+`
	`3881`	`+if (i1->iptr.ip_posid<i2->iptr.ip_posid)`
	`3882`	`+return-1;`
	`3883`	`+elseif (i1->iptr.ip_posid>i2->iptr.ip_posid)`
	`3884`	`+return1;`
`3881`	`3885`
`3882`		`-if (pos1!=pos2)`
`3883`		`-return (pos1<pos2) ?-1 :1;`
`3884`		`-}`
`3885`	`3886`	`return0;`
`3886`	`3887`	`}`
`3887`	`3888`

Comments

(0)