diff options
| author | Peter Geoghegan <pg@bowt.ie> | 2020-03-02 21:40:11 -0800 |
|---|---|---|
| committer | Peter Geoghegan <pg@bowt.ie> | 2020-03-02 21:40:11 -0800 |
| commit | 1e07f5e0a1cf56f8cbc121dbb86c128a0f711c94 (patch) | |
| tree | 83fce88e21bd0cb1d55d212a6bce7895c5e9cb80 /src | |
| parent | 0b48f1335dddb7141160e392cccac98edfb3fa85 (diff) | |
| download | postgresql-1e07f5e0a1cf56f8cbc121dbb86c128a0f711c94.tar.gz postgresql-1e07f5e0a1cf56f8cbc121dbb86c128a0f711c94.zip | |
Remove overzealous _bt_split() assertions.
_bt_split() is passed NULL as its insertion scankey for internal page
splits. Two recently added Assert() statements failed to consider this,
leading to a crash with pg_upgrade'd BREE_VERSION < 4 indexes. Remove
the assertions.
The assertions in question were added by commit 0d861bbb, which added
nbtree deduplication. It would be possible to fix the assertions
directly instead, but they weren't adding much anyway.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/access/nbtree/nbtinsert.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c index f3f3d971aa4..03b7e45293a 100644 --- a/src/backend/access/nbtree/nbtinsert.c +++ b/src/backend/access/nbtree/nbtinsert.c @@ -1632,7 +1632,6 @@ _bt_split(Relation rel, BTScanInsert itup_key, Buffer buf, Buffer cbuf, */ leftoff = P_HIKEY; - Assert(BTreeTupleIsPivot(lefthikey) || !itup_key->heapkeyspace); Assert(BTreeTupleGetNAtts(lefthikey, rel) > 0); Assert(BTreeTupleGetNAtts(lefthikey, rel) <= indnkeyatts); if (PageAddItem(leftpage, (Item) lefthikey, itemsz, leftoff, @@ -1697,7 +1696,6 @@ _bt_split(Relation rel, BTScanInsert itup_key, Buffer buf, Buffer cbuf, itemid = PageGetItemId(origpage, P_HIKEY); itemsz = ItemIdGetLength(itemid); item = (IndexTuple) PageGetItem(origpage, itemid); - Assert(BTreeTupleIsPivot(item) || !itup_key->heapkeyspace); Assert(BTreeTupleGetNAtts(item, rel) > 0); Assert(BTreeTupleGetNAtts(item, rel) <= indnkeyatts); if (PageAddItem(rightpage, (Item) item, itemsz, rightoff, |