Skip to content

Commit 88231ec

Browse files
committed
Fix bug in compressed GIN data leaf page splitting code.
The list of posting lists it's dealing with can contain placeholders for deleted posting lists. The placeholders are kept around so that they can be WAL-logged, but we must be careful to not try to access them. This fixes bug #11280, reported by Mårten Svantesson. Backpatch to 9.4, where the compressed data leaf page code was added.
1 parent 65c9dc2 commit 88231ec

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

src/backend/access/gin/gindatapage.c

+16-12
Original file line numberDiff line numberDiff line change
@@ -641,20 +641,24 @@ dataPlaceToPageLeaf(GinBtree btree, Buffer buf, GinBtreeStack *stack,
641641
{
642642
lastleftinfo = dlist_container(leafSegmentInfo, node, leaf->lastleft);
643643

644-
segsize = SizeOfGinPostingList(lastleftinfo->seg);
645-
if (append)
644+
/* ignore deleted segments */
645+
if (lastleftinfo->action != GIN_SEGMENT_DELETE)
646646
{
647-
if ((leaf->lsize - segsize) - (leaf->lsize - segsize) < BLCKSZ / 4)
648-
break;
647+
segsize = SizeOfGinPostingList(lastleftinfo->seg);
648+
if (append)
649+
{
650+
if ((leaf->lsize - segsize) - (leaf->lsize - segsize) < BLCKSZ / 4)
651+
break;
652+
}
653+
else
654+
{
655+
if ((leaf->lsize - segsize) - (leaf->rsize + segsize) < 0)
656+
break;
657+
}
658+
659+
leaf->lsize -= segsize;
660+
leaf->rsize += segsize;
649661
}
650-
else
651-
{
652-
if ((leaf->lsize - segsize) - (leaf->rsize + segsize) < 0)
653-
break;
654-
}
655-
656-
leaf->lsize -= segsize;
657-
leaf->rsize += segsize;
658662
leaf->lastleft = dlist_prev_node(&leaf->segments, leaf->lastleft);
659663
}
660664
}

0 commit comments

Comments
 (0)