From bf7997b65c7887d2acda95f5201d818a19d81711 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 9 Jun 1998 15:16:55 +0000 Subject: Update. 1998-06-09 Ulrich Drepper * sysdeps/unix/sysv/linux/netinet/ip.h (struct ip_options): Define __data member only for gcc. Reported by ak@muc.de. * misc/mntent.h: Undo last patch. * sysdeps/unix/sysv/linux/fstatvfs.c (fstatvfs): Undo last patch. * misc/tst/mntent.c: Adjust code for this change. * io/fts.c: Updated from a slightly more recent BSD version. * io/fts.h: Likewise. * libc.map: Add __libc_stack_end. * db2/Makefile (routines): Add lock_region. * db2/config.h: Update from db-2.4.14. * db2/db.h: Likewise. * db2/db_185.h: Likewise. * db2/db_int.h: Likewise. * db2/bt_close.c: Likewise. * db2/bt_compare.c: Likewise. * db2/bt_conv.c: Likewise. * db2/bt_cursor.c: Likewise. * db2/bt_delete.c: Likewise. * db2/bt_open.c: Likewise. * db2/bt_page.c: Likewise. * db2/bt_put.c: Likewise. * db2/bt_rec.c: Likewise. * db2/bt_recno.c: Likewise. * db2/bt_rsearch.c: Likewise. * db2/bt_search.c: Likewise. * db2/bt_split.c: Likewise. * db2/bt_stat.c: Likewise. * db2/btree.src: Likewise. * db2/btree_auto.c: Likewise. * db2/getlong.c: Likewise. * db2/db_appinit.c: Likewise. * db2/db_apprec.c: Likewise. * db2/db_byteorder.c: Likewise. * db2/db_err.c: Likewise. * db2/db_log2.c: Likewise. * db2/db_region.c: Likewise. * db2/db_salloc.c: Likewise. * db2/db_shash.c: Likewise. * db2/db.c: Likewise. * db2/db.src: Likewise. * db2/db_auto.c: Likewise. * db2/db_conv.c: Likewise. * db2/db_dispatch.c: Likewise. * db2/db_dup.c: Likewise. * db2/db_overflow.c: Likewise. * db2/db_pr.c: Likewise. * db2/db_rec.c: Likewise. * db2/db_ret.c: Likewise. * db2/db_thread.c: Likewise. * db2/db185.c: Likewise. * db2/db185_int.h: Likewise. * db2/dbm.c: Likewise. * db2/hash.c: Likewise. * db2/hash.src: Likewise. * db2/hash_auto.c: Likewise. * db2/hash_conv.c: Likewise. * db2/hash_debug.c: Likewise. * db2/hash_dup.c: Likewise. * db2/hash_func.c: Likewise. * db2/hash_page.c: Likewise. * db2/hash_rec.c: Likewise. * db2/hash_stat.c: Likewise. * db2/btree.h: Likewise. * db2/btree_ext.h: Likewise. * db2/clib_ext.h: Likewise. * db2/common_ext.h: Likewise. * db2/cxx_int.h: Likewise. * db2/db.h.src: Likewise. * db2/db_185.h.src: Likewise. * db2/db_am.h: Likewise. * db2/db_auto.h: Likewise. * db2/db_cxx.h: Likewise. * db2/db_dispatch.h: Likewise. * db2/db_ext.h: Likewise. * db2/db_int.h.src: Likewise. * db2/db_page.h: Likewise. * db2/db_shash.h: Likewise. * db2/db_swap.h: Likewise. * db2/hash.h: Likewise. * db2/hash_ext.h: Likewise. * db2/lock.h: Likewise. * db2/lock_ext.h: Likewise. * db2/log.h: Likewise. * db2/log_ext.h: Likewise. * db2/mp.h: Likewise. * db2/mp_ext.h: Likewise. * db2/mutex_ext.h: Likewise. * db2/os_ext.h: Likewise. * db2/os_func.h: Likewise. * db2/queue.h: Likewise. * db2/shqueue.h: Likewise. * db2/txn.h: Likewise. * db2/lock.c: Likewise. * db2/lock_conflict.c: Likewise. * db2/lock_deadlock.c: Likewise. * db2/lock_region.c: Likewise. * db2/lock_util.c: Likewise. * db2/log.c: Likewise. * db2/log.src: Likewise. * db2/log_archive.c: Likewise. * db2/log_auto.c: Likewise. * db2/log_compare.c: Likewise. * db2/log_findckp.c: Likewise. * db2/log_get.c: Likewise. * db2/log_put.c: Likewise. * db2/log_rec.c: Likewise. * db2/log_register.c: Likewise. * db2/mp_bh.c: Likewise. * db2/mp_fget.c: Likewise. * db2/mp_fopen.c: Likewise. * db2/mp_fput.c: Likewise. * db2/mp_fset.c: Likewise. * db2/mp_open.c: Likewise. * db2/mp_pr.c: Likewise. * db2/mp_region.c: Likewise. * db2/mp_sync.c: Likewise. * db2/68020.gcc: Likewise. * db2/mutex.c: Likewise. * db2/parisc.gcc: Likewise. * db2/parisc.hp: Likewise. * db2/sco.cc: Likewise. * db2/os_abs.c: Likewise. * db2/os_alloc.c: Likewise. * db2/os_config.c: Likewise. * db2/os_dir.c: Likewise. * db2/os_fid.c: Likewise. * db2/os_fsync.c: Likewise. * db2/os_map.c: Likewise. * db2/os_oflags.c: Likewise. * db2/os_open.c: Likewise. * db2/os_rpath.c: Likewise. * db2/os_rw.c: Likewise. * db2/os_seek.c: Likewise. * db2/os_sleep.c: Likewise. * db2/os_spin.c: Likewise. * db2/os_stat.c: Likewise. * db2/os_unlink.c: Likewise. * db2/db_archive.c: Likewise. * db2/db_checkpoint.c: Likewise. * db2/db_deadlock.c: Likewise. * db2/db_dump.c: Likewise. * db2/db_dump185.c: Likewise. * db2/db_load.c: Likewise. * db2/db_printlog.c: Likewise. * db2/db_recover.c: Likewise. * db2/db_stat.c: Likewise. * db2/txn.c: Likewise. * db2/txn.src: Likewise. * db2/txn_auto.c: Likewise. * db2/txn_rec.c: Likewise. * elf/rtld.c: Move definition of __libc_stack_end to ... * sysdeps/generic/dl-sysdep.h: ...here. * sysdeps/unix/sysv/linux/fstatvfs.c: Handle nodiratime option. * sysdeps/unix/sysv/linux/bits/statvfs.h: Define ST_NODIRATIME. * sysdeps/unix/sysv/linux/sys/mount.h: Define MS_NODIRATIME. 1998-06-08 21:44 Ulrich Drepper * sysdeps/unix/sysv/linux/fstatvfs.c: Handle constant option string from mntent correctly. 1998-06-06 Andreas Jaeger * sunrpc/Makefile (generated): Correct typo. 1998-06-04 Philip Blundell * elf/elf.h (EM_ARM, et al.): New definitions. * sysdeps/arm/dl-machine.h: Update for new draft ARM ELF ABI. --- db2/hash/hash_page.c | 120 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 85 insertions(+), 35 deletions(-) (limited to 'db2/hash/hash_page.c') diff --git a/db2/hash/hash_page.c b/db2/hash/hash_page.c index 09a4a0c374..ce692f2e41 100644 --- a/db2/hash/hash_page.c +++ b/db2/hash/hash_page.c @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1996, 1997 + * Copyright (c) 1996, 1997, 1998 * Sleepycat Software. All rights reserved. */ /* @@ -47,7 +47,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)hash_page.c 10.31 (Sleepycat) 1/8/98"; +static const char sccsid[] = "@(#)hash_page.c 10.40 (Sleepycat) 6/2/98"; #endif /* not lint */ /* @@ -70,15 +70,11 @@ static const char sccsid[] = "@(#)hash_page.c 10.31 (Sleepycat) 1/8/98"; #include #include -#include -#include #include -#include #endif #include "db_int.h" #include "db_page.h" -#include "db_swap.h" #include "hash.h" static int __ham_lock_bucket __P((DB *, HASH_CURSOR *, db_lockmode_t)); @@ -266,6 +262,7 @@ __ham_item_last(hashp, cursorp, mode) F_SET(cursorp, H_OK); return (__ham_item_prev(hashp, cursorp, mode)); } + /* * PUBLIC: int __ham_item_first __P((HTAB *, HASH_CURSOR *, db_lockmode_t)); */ @@ -285,8 +282,10 @@ __ham_item_first(hashp, cursorp, mode) } /* - * Returns a pointer to key/data pair on a page. In the case of bigkeys, - * just returns the page number and index of the bigkey pointer pair. + * __ham_item_prev -- + * Returns a pointer to key/data pair on a page. In the case of + * bigkeys, just returns the page number and index of the bigkey + * pointer pair. * * PUBLIC: int __ham_item_prev __P((HTAB *, HASH_CURSOR *, db_lockmode_t)); */ @@ -487,12 +486,61 @@ __ham_putitem(p, dbt, type) NUM_ENT(p) += 1; } +/* + * PUBLIC: void __ham_reputpair + * PUBLIC: __P((PAGE *p, u_int32_t, u_int32_t, const DBT *, const DBT *)); + * + * This is a special case to restore a key/data pair to its original + * location during recovery. We are guaranteed that the pair fits + * on the page and is not the last pair on the page (because if it's + * the last pair, the normal insert works). + */ +void +__ham_reputpair(p, psize, ndx, key, data) + PAGE *p; + u_int32_t psize, ndx; + const DBT *key, *data; +{ + db_indx_t i, movebytes, newbytes; + u_int8_t *from; + + /* First shuffle the existing items up on the page. */ + movebytes = + (ndx == 0 ? psize : p->inp[H_DATAINDEX(ndx - 1)]) - HOFFSET(p); + newbytes = key->size + data->size; + from = (u_int8_t *)p + HOFFSET(p); + memmove(from - newbytes, from, movebytes); + + /* + * Adjust the indices and move them up 2 spaces. Note that we + * have to check the exit condition inside the loop just in case + * we are dealing with index 0 (db_indx_t's are unsigned). + */ + for (i = NUM_ENT(p) - 1; ; i-- ) { + p->inp[i + 2] = p->inp[i] - newbytes; + if (i == H_KEYINDEX(ndx)) + break; + } + + /* Put the key and data on the page. */ + p->inp[H_KEYINDEX(ndx)] = + (ndx == 0 ? psize : p->inp[H_DATAINDEX(ndx - 1)]) - key->size; + p->inp[H_DATAINDEX(ndx)] = p->inp[H_KEYINDEX(ndx)] - data->size; + memcpy(P_ENTRY(p, H_KEYINDEX(ndx)), key->data, key->size); + memcpy(P_ENTRY(p, H_DATAINDEX(ndx)), data->data, data->size); + + /* Adjust page info. */ + HOFFSET(p) -= newbytes; + NUM_ENT(p) += 2; +} + /* * PUBLIC: int __ham_del_pair __P((HTAB *, HASH_CURSOR *, int)); - * XXX TODO: if the item is an offdup, delete the other pages and - * then remove the pair. If the offpage page is 0, then you can - * just remove the pair. + * + * XXX + * TODO: if the item is an offdup, delete the other pages and then remove + * the pair. If the offpage page is 0, then you can just remove the pair. */ int __ham_del_pair(hashp, cursorp, reclaim_page) @@ -648,8 +696,9 @@ __ham_del_pair(hashp, cursorp, reclaim_page) /* * Cursor is advanced to the beginning of the next page. */ - cursorp->bndx = NDX_INVALID; + cursorp->bndx = 0; cursorp->pgno = PGNO(p); + F_SET(cursorp, H_DELETED); chg_pgno = PGNO(p); if ((ret = __ham_dirty_page(hashp, p)) != 0 || (ret = __ham_del_page(hashp->dbp, n_pagep)) != 0) @@ -748,8 +797,8 @@ __ham_replpair(hashp, hcp, dbt, make_dup) { DBT old_dbt, tdata, tmp; DB_LSN new_lsn; + int32_t change; /* XXX: Possible overflow. */ u_int32_t len; - int32_t change; int is_big, ret, type; u_int8_t *beg, *dest, *end, *hk, *src; @@ -789,7 +838,7 @@ __ham_replpair(hashp, hcp, dbt, make_dup) change += dbt->doff + dbt->dlen - len; - if (change > (int)P_FREESPACE(hcp->pagep) || is_big) { + if (change > (int32_t)P_FREESPACE(hcp->pagep) || is_big) { /* * Case 3 -- two subcases. * A. This is not really a partial operation, but an overwrite. @@ -954,7 +1003,7 @@ __ham_split_page(hashp, obucket, nbucket) HTAB *hashp; u_int32_t obucket, nbucket; { - DBT key, val, page_dbt; + DBT key, page_dbt; DB_ENV *dbenv; DB_LSN new_lsn; PAGE **pp, *old_pagep, *temp_pagep, *new_pagep; @@ -995,7 +1044,7 @@ __ham_split_page(hashp, obucket, nbucket) big_len = 0; big_buf = NULL; - val.flags = key.flags = 0; + key.flags = 0; while (temp_pagep != NULL) { for (n = 0; n < (db_indx_t)H_NUMPAIRS(temp_pagep); n++) { if ((ret = @@ -1103,8 +1152,8 @@ __ham_split_page(hashp, obucket, nbucket) ret == 0) ret = tret; -err: if (0) { - if (old_pagep != NULL) + if (0) { +err: if (old_pagep != NULL) (void)__ham_put_page(hashp->dbp, old_pagep, 1); if (new_pagep != NULL) (void)__ham_put_page(hashp->dbp, new_pagep, 1); @@ -1121,8 +1170,8 @@ err: if (0) { * to which we just added something. This allows us to link overflow * pages and return the new page having correctly put the last page. * - * PUBLIC: int __ham_add_el __P((HTAB *, HASH_CURSOR *, const DBT *, const DBT *, - * PUBLIC: int)); + * PUBLIC: int __ham_add_el + * PUBLIC: __P((HTAB *, HASH_CURSOR *, const DBT *, const DBT *, int)); */ int __ham_add_el(hashp, hcp, key, val, type) @@ -1136,8 +1185,8 @@ __ham_add_el(hashp, hcp, key, val, type) DB_LSN new_lsn; HOFFPAGE doff, koff; db_pgno_t next_pgno; - u_int32_t data_size, key_size, pairsize; - int do_expand, is_keybig, is_databig, rectype, ret; + u_int32_t data_size, key_size, pairsize, rectype; + int do_expand, is_keybig, is_databig, ret; int key_type, data_type; do_expand = 0; @@ -1268,13 +1317,14 @@ __ham_add_el(hashp, hcp, key, val, type) * another. Works for all types of hash entries (H_OFFPAGE, H_KEYDATA, * H_DUPLICATE, H_OFFDUP). Since we log splits at a high level, we * do not need to do any logging here. - * PUBLIC: void __ham_copy_item __P((HTAB *, PAGE *, int, PAGE *)); + * + * PUBLIC: void __ham_copy_item __P((HTAB *, PAGE *, u_int32_t, PAGE *)); */ void __ham_copy_item(hashp, src_page, src_ndx, dest_page) HTAB *hashp; PAGE *src_page; - int src_ndx; + u_int32_t src_ndx; PAGE *dest_page; { u_int32_t len; @@ -1409,7 +1459,7 @@ __ham_del_page(dbp, pagep) LSN(pagep) = new_lsn; } -#ifdef DEBUG +#ifdef DIAGNOSTIC { db_pgno_t __pgno; DB_LSN __lsn; @@ -1563,13 +1613,13 @@ __ham_overflow_page(dbp, type, pp) #ifdef DEBUG /* * PUBLIC: #ifdef DEBUG - * PUBLIC: int __bucket_to_page __P((HTAB *, int)); + * PUBLIC: db_pgno_t __bucket_to_page __P((HTAB *, db_pgno_t)); * PUBLIC: #endif */ -int +db_pgno_t __bucket_to_page(hashp, n) HTAB *hashp; - int n; + db_pgno_t n; { int ret_val; @@ -1580,7 +1630,6 @@ __bucket_to_page(hashp, n) } #endif - /* * Create a bunch of overflow pages at the current split point. * PUBLIC: void __ham_init_ovflpages __P((HTAB *)); @@ -1660,8 +1709,9 @@ __ham_get_cpage(hashp, hcp, mode) * Get a new page at the cursor, putting the last page if necessary. * If the flag is set to H_ISDUP, then we are talking about the * duplicate page, not the main page. - * PUBLIC: int __ham_next_cpage __P((HTAB *, HASH_CURSOR *, db_pgno_t, - * PUBLIC: int, int)); + * + * PUBLIC: int __ham_next_cpage + * PUBLIC: __P((HTAB *, HASH_CURSOR *, db_pgno_t, int, u_int32_t)); */ int __ham_next_cpage(hashp, hcp, pgno, dirty, flags) @@ -1669,22 +1719,22 @@ __ham_next_cpage(hashp, hcp, pgno, dirty, flags) HASH_CURSOR *hcp; db_pgno_t pgno; int dirty; - int flags; + u_int32_t flags; { PAGE *p; int ret; - if (flags & H_ISDUP && hcp->dpagep != NULL && + if (LF_ISSET(H_ISDUP) && hcp->dpagep != NULL && (ret = __ham_put_page(hashp->dbp, hcp->dpagep, dirty)) != 0) return (ret); - else if (!(flags & H_ISDUP) && hcp->pagep != NULL && + else if (!LF_ISSET(H_ISDUP) && hcp->pagep != NULL && (ret = __ham_put_page(hashp->dbp, hcp->pagep, dirty)) != 0) return (ret); if ((ret = __ham_get_page(hashp->dbp, pgno, &p)) != 0) return (ret); - if (flags & H_ISDUP) { + if (LF_ISSET(H_ISDUP)) { hcp->dpagep = p; hcp->dpgno = pgno; hcp->dndx = 0; -- cgit 1.4.1