Fix possible sorting error when aborting use of abbreviated keys.

robertmhaas · robertmhaas · commit da9659f87c86 · 2016-08-22T15:30:37.000-04:00
Due to an error in the abbreviated key abort logic, the most recently
processed SortTuple could be incorrectly marked NULL, resulting in an
incorrect final sort order.

In the worst case, this could result in a corrupt btree index, which
would need to be rebuild using REINDEX.  However, abbrevation doesn't
abort very often, not all data types use it, and only one tuple would
end up in the wrong place, so the practical impact of this mistake may
be somewhat limited.

Report and patch by Peter Geoghegan.
diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c
@@ -1314,7 +1314,7 @@ tuplesort_putindextuplevalues(Tuplesortstate *state, Relation rel,
 			mtup->datum1 = index_getattr(tuple,
 										 1,
 										 RelationGetDescr(state->indexRel),
-										 &stup.isnull1);
+										 &mtup->isnull1);
 		}
 	}
 
@@ -3440,7 +3440,7 @@ copytup_cluster(Tuplesortstate *state, SortTuple *stup, void *tup)
 			mtup->datum1 = heap_getattr(tuple,
 									  state->indexInfo->ii_KeyAttrNumbers[0],
 										state->tupDesc,
-										&stup->isnull1);
+										&mtup->isnull1);
 		}
 	}
 }
@@ -3744,7 +3744,7 @@ copytup_index(Tuplesortstate *state, SortTuple *stup, void *tup)
 			mtup->datum1 = index_getattr(tuple,
 										 1,
 										 RelationGetDescr(state->indexRel),
-										 &stup->isnull1);
+										 &mtup->isnull1);
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -1314,7 +1314,7 @@ tuplesort_putindextuplevalues(Tuplesortstate *state, Relation rel,`
`1314`	`1314`	`mtup->datum1 = index_getattr(tuple,`
`1315`	`1315`	`1,`
`1316`	`1316`	`RelationGetDescr(state->indexRel),`
`1317`		`- &stup.isnull1);`
	`1317`	`+ &mtup->isnull1);`
`1318`	`1318`	`}`
`1319`	`1319`	`}`
`1320`	`1320`
`@@ -3440,7 +3440,7 @@ copytup_cluster(Tuplesortstate state, SortTuple stup, void *tup)`
`3440`	`3440`	`mtup->datum1 = heap_getattr(tuple,`
`3441`	`3441`	`state->indexInfo->ii_KeyAttrNumbers[0],`
`3442`	`3442`	`state->tupDesc,`
`3443`		`- &stup->isnull1);`
	`3443`	`+ &mtup->isnull1);`
`3444`	`3444`	`}`
`3445`	`3445`	`}`
`3446`	`3446`	`}`
`@@ -3744,7 +3744,7 @@ copytup_index(Tuplesortstate state, SortTuple stup, void *tup)`
`3744`	`3744`	`mtup->datum1 = index_getattr(tuple,`
`3745`	`3745`	`1,`
`3746`	`3746`	`RelationGetDescr(state->indexRel),`
`3747`		`- &stup->isnull1);`
	`3747`	`+ &mtup->isnull1);`
`3748`	`3748`	`}`
`3749`	`3749`	`}`
`3750`	`3750`	`}`