*** nbtinsert.c.orig Fri Aug 6 22:04:40 1999 --- nbtinsert.c Fri Aug 6 22:10:40 1999 *************** *** 392,408 **** bool is_root = lpageop->btpo_flags & BTP_ROOT; /* ! * If we have to split leaf page in the chain of duplicates by new ! * duplicate then we try to look at our right sibling first. */ if ((lpageop->btpo_flags & BTP_CHAIN) && (lpageop->btpo_flags & BTP_LEAF) && keys_equal) { - bool use_left = true; - rbuf = _bt_getbuf(rel, lpageop->btpo_next, BT_WRITE); rpage = BufferGetPage(rbuf); rpageop = (BTPageOpaque) PageGetSpecialPointer(rpage); if (!P_RIGHTMOST(rpageop)) /* non-rightmost page */ { /* If we have the same hikey here then * it's yet another page in chain. */ --- 392,409 ---- bool is_root = lpageop->btpo_flags & BTP_ROOT; /* ! * Instead of splitting leaf page in the chain of duplicates ! * by new duplicate, insert it into some right page. */ if ((lpageop->btpo_flags & BTP_CHAIN) && (lpageop->btpo_flags & BTP_LEAF) && keys_equal) { rbuf = _bt_getbuf(rel, lpageop->btpo_next, BT_WRITE); rpage = BufferGetPage(rbuf); rpageop = (BTPageOpaque) PageGetSpecialPointer(rpage); + /* + * some checks + */ if (!P_RIGHTMOST(rpageop)) /* non-rightmost page */ { /* If we have the same hikey here then * it's yet another page in chain. */ *************** *** 418,449 **** BTGreaterStrategyNumber)) elog(FATAL, "btree: hikey is out of order"); else if (rpageop->btpo_flags & BTP_CHAIN) - /* * If hikey > scankey then it's last page in chain and * BTP_CHAIN must be OFF */ elog(FATAL, "btree: lost last page in the chain of duplicates"); - - /* if there is room here then we use this page. */ - if (PageGetFreeSpace(rpage) > itemsz) - use_left = false; } else /* rightmost page */ { Assert(!(rpageop->btpo_flags & BTP_CHAIN)); - /* if there is room here then we use this page. */ - if (PageGetFreeSpace(rpage) > itemsz) - use_left = false; } ! if (!use_left) /* insert on the right page */ ! { ! _bt_relbuf(rel, buf, BT_WRITE); ! return (_bt_insertonpg(rel, rbuf, stack, keysz, ! scankey, btitem, afteritem)); ! } ! _bt_relbuf(rel, rbuf, BT_WRITE); } /* --- 419,438 ---- BTGreaterStrategyNumber)) elog(FATAL, "btree: hikey is out of order"); else if (rpageop->btpo_flags & BTP_CHAIN) /* * If hikey > scankey then it's last page in chain and * BTP_CHAIN must be OFF */ elog(FATAL, "btree: lost last page in the chain of duplicates"); } else /* rightmost page */ { Assert(!(rpageop->btpo_flags & BTP_CHAIN)); } ! _bt_relbuf(rel, buf, BT_WRITE); ! return (_bt_insertonpg(rel, rbuf, stack, keysz, ! scankey, btitem, afteritem)); } /*