From c3701254b58d2323dfa399d3ed62551e2c738c48 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Mon, 17 Mar 2014 12:36:13 -0400 Subject: [PATCH] During index build, check and elog (not just Assert) for broken HOT chain. The recently-fixed bug in WAL replay could result in not finding a parent tuple for a heap-only tuple. The existing code would either Assert or generate an invalid index entry, neither of which is desirable. Throw a regular error instead. --- src/backend/catalog/index.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index d2a1eb26ac0..3dea690a1ae 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -2476,7 +2476,10 @@ IndexBuildHeapScan(Relation heapRelation, rootTuple = *heapTuple; offnum = ItemPointerGetOffsetNumber(&heapTuple->t_self); - Assert(OffsetNumberIsValid(root_offsets[offnum - 1])); + if (!OffsetNumberIsValid(root_offsets[offnum - 1])) + elog(ERROR, "failed to find parent tuple for heap-only tuple at (%u,%u) in table \"%s\"", + ItemPointerGetBlockNumber(&heapTuple->t_self), + offnum, RelationGetRelationName(heapRelation)); ItemPointerSetOffsetNumber(&rootTuple.t_self, root_offsets[offnum - 1]); @@ -2891,7 +2894,11 @@ validate_index_heapscan(Relation heapRelation, if (HeapTupleIsHeapOnly(heapTuple)) { root_offnum = root_offsets[root_offnum - 1]; - Assert(OffsetNumberIsValid(root_offnum)); + if (!OffsetNumberIsValid(root_offnum)) + elog(ERROR, "failed to find parent tuple for heap-only tuple at (%u,%u) in table \"%s\"", + ItemPointerGetBlockNumber(heapcursor), + ItemPointerGetOffsetNumber(heapcursor), + RelationGetRelationName(heapRelation)); ItemPointerSetOffsetNumber(&rootTuple, root_offnum); } -- 2.39.5