Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only squeeze a short key/value pair onto a page with other complete key/value 

pairs, not onto a page containing the end of a big pair.
This commit is contained in:
mycroft 1999-07-29 08:58:46 +00:00
parent 5d4686cb63
commit 648d6d9529
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/libc/db/hash/hash_page.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hash_page.c,v 1.14 1999/07/29 00:19:43 mycroft Exp $ */
/* $NetBSD: hash_page.c,v 1.15 1999/07/29 08:58:46 mycroft Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)hash_page.c 8.7 (Berkeley) 8/16/94";
#else
__RCSID("$NetBSD: hash_page.c,v 1.14 1999/07/29 00:19:43 mycroft Exp $");
__RCSID("$NetBSD: hash_page.c,v 1.15 1999/07/29 08:58:46 mycroft Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -426,11 +426,15 @@ __addel(hashp, bufp, key, val)
if (!bufp)
return (-1);
bp = (u_int16_t *)(void *)bufp->page;
} else
} else if (bp[bp[0]] != OVFLPAGE) {
/* Short key/data pairs, no more pages */
break;
} else {
/* Try to squeeze key on this page */
if (FREESPACE(bp) > PAIRSIZE(key, val)) {
if (bp[2] >= REAL_KEY &&
FREESPACE(bp) >= PAIRSIZE(key, val)) {
squeeze_key(bp, key, val);
return (0);
goto stats;
} else {
bufp = __get_buf(hashp,
(u_int32_t)bp[bp[0] - 1], bufp, 0);
@ -438,6 +442,7 @@ __addel(hashp, bufp, key, val)
return (-1);
bp = (u_int16_t *)(void *)bufp->page;
}
}
if (PAIRFITS(bp, key, val))
putpair(bufp->page, key, val);
@ -454,6 +459,7 @@ __addel(hashp, bufp, key, val)
if (__big_insert(hashp, bufp, key, val))
return (-1);
}
stats:
bufp->flags |= BUF_MOD;
/*
* If the average number of keys per bucket exceeds the fill factor,