BSD 4_4_Lite1 release

[unix-history] / usr / src / lib / libc / db / btree / bt_put.c

diff --git a/usr/src/lib/libc/db/btree/bt_put.c b/usr/src/lib/libc/db/btree/bt_put.c
index e8b36aa..11a211b 100644 (file)
--- a/usr/src/lib/libc/db/btree/bt_put.c
+++ b/usr/src/lib/libc/db/btree/bt_put.c
@@ -1,23 +1,51 @@
 /*-
 /*-

- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * This code is derived from software contributed to Berkeley by
  * Mike Olson.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * Mike Olson.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)bt_put.c   5.5 (Berkeley) %G%";
+static char sccsid[] = "@(#)bt_put.c   8.3 (Berkeley) 9/16/93";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>

+

 #include <errno.h>
 #include <errno.h>

-#include <db.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+
+#include <db.h>

 #include "btree.h"
 
 static EPG *bt_fast __P((BTREE *, const DBT *, const DBT *, int *));
 #include "btree.h"
 
 static EPG *bt_fast __P((BTREE *, const DBT *, const DBT *, int *));


@@ -38,36 +66,44 @@ static EPG *bt_fast __P((BTREE *, const DBT *, const DBT *, int *));
 int
 __bt_put(dbp, key, data, flags)
        const DB *dbp;
 int
 __bt_put(dbp, key, data, flags)
        const DB *dbp;

-       const DBT *key, *data;
+       DBT *key;
+       const DBT *data;

        u_int flags;
 {
        BTREE *t;
        DBT tkey, tdata;
        EPG *e;
        PAGE *h;
        u_int flags;
 {
        BTREE *t;
        DBT tkey, tdata;
        EPG *e;
        PAGE *h;

-       index_t index, nxtindex;
+       indx_t index, nxtindex;

        pgno_t pg;
        size_t nbytes;
        int dflags, exact, status;
        char *dest, db[NOVFLSIZE], kb[NOVFLSIZE];
 
        pgno_t pg;
        size_t nbytes;
        int dflags, exact, status;
        char *dest, db[NOVFLSIZE], kb[NOVFLSIZE];
 

+       t = dbp->internal;
+
+       /* Toss any page pinned across calls. */
+       if (t->bt_pinned != NULL) {
+               mpool_put(t->bt_mp, t->bt_pinned, 0);
+               t->bt_pinned = NULL;
+       }
+

        switch (flags) {
        case R_CURSOR:
        switch (flags) {
        case R_CURSOR:

-               if (ISSET(t, BTF_DELCRSR)) {
-                       errno = EINVAL;
-                       return (RET_ERROR);
-               }
+               if (!ISSET(t, B_SEQINIT))
+                       goto einval;
+               if (ISSET(t, B_DELCRSR))
+                       goto einval;

                break;
        case 0:
        case R_NOOVERWRITE:
                break;
        default:
                break;
        case 0:
        case R_NOOVERWRITE:
                break;
        default:

-               errno = EINVAL;
+einval:                errno = EINVAL;

                return (RET_ERROR);
        }
 
                return (RET_ERROR);
        }
 

-       t = dbp->internal;
-       if (ISSET(t, BTF_RDONLY)) {
+       if (ISSET(t, B_RDONLY)) {

                errno = EPERM;
                return (RET_ERROR);
        }
                errno = EPERM;
                return (RET_ERROR);
        }


@@ -87,8 +123,9 @@ storekey:            if (__ovfl_put(t, key, &pg) == RET_ERROR)
                                return (RET_ERROR);
                        tkey.data = kb;
                        tkey.size = NOVFLSIZE;
                                return (RET_ERROR);
                        tkey.data = kb;
                        tkey.size = NOVFLSIZE;

-                       *(pgno_t *)kb = pg;
-                       *(size_t *)(kb + sizeof(pgno_t)) = key->size;
+                       memmove(kb, &pg, sizeof(pgno_t));
+                       memmove(kb + sizeof(pgno_t),
+                           &key->size, sizeof(size_t));

                        dflags |= P_BIGKEY;
                        key = &tkey;
                }
                        dflags |= P_BIGKEY;
                        key = &tkey;
                }


@@ -97,8 +134,9 @@ storekey:            if (__ovfl_put(t, key, &pg) == RET_ERROR)
                                return (RET_ERROR);
                        tdata.data = db;
                        tdata.size = NOVFLSIZE;
                                return (RET_ERROR);
                        tdata.data = db;
                        tdata.size = NOVFLSIZE;

-                       *(pgno_t *)db = pg;
-                       *(size_t *)(db + sizeof(pgno_t)) = data->size;
+                       memmove(db, &pg, sizeof(pgno_t));
+                       memmove(db + sizeof(pgno_t),
+                           &data->size, sizeof(size_t));

                        dflags |= P_BIGDATA;
                        data = &tdata;
                }
                        dflags |= P_BIGDATA;
                        data = &tdata;
                }


@@ -142,19 +180,17 @@ storekey:         if (__ovfl_put(t, key, &pg) == RET_ERROR)
                 * leaving the cursor there -- this means that the inserted
                 * record will not be seen in a cursor scan.
                 */
                 * leaving the cursor there -- this means that the inserted
                 * record will not be seen in a cursor scan.
                 */

-               if (ISSET(t, BTF_DELCRSR) && t->bt_bcursor.pgno == h->pgno &&
+               if (ISSET(t, B_DELCRSR) && t->bt_bcursor.pgno == h->pgno &&

                    t->bt_bcursor.index == index) {
                    t->bt_bcursor.index == index) {

-                       UNSET(t, BTF_DELCRSR);
+                       CLR(t, B_DELCRSR);

                        goto delete;
                }
                        goto delete;
                }

-               BT_CLR(t);

                mpool_put(t->bt_mp, h, 0);
                return (RET_SPECIAL);
        default:
                mpool_put(t->bt_mp, h, 0);
                return (RET_SPECIAL);
        default:

-               if (!exact || NOTSET(t, BTF_NODUPS))
+               if (!exact || !ISSET(t, B_NODUPS))

                        break;
 delete:                if (__bt_dleaf(t, h, index) == RET_ERROR) {
                        break;
 delete:                if (__bt_dleaf(t, h, index) == RET_ERROR) {

-                       BT_CLR(t);

                        mpool_put(t->bt_mp, h, 0);
                        return (RET_ERROR);
                }
                        mpool_put(t->bt_mp, h, 0);
                        return (RET_ERROR);
                }


@@ -168,17 +204,17 @@ delete:           if (__bt_dleaf(t, h, index) == RET_ERROR) {
         * into the offset array, shift the pointers up.
         */
        nbytes = NBLEAFDBT(key->size, data->size);
         * into the offset array, shift the pointers up.
         */
        nbytes = NBLEAFDBT(key->size, data->size);

-       if (h->upper - h->lower < nbytes + sizeof(index_t)) {
-               status = __bt_split(t, h, key, data, dflags, nbytes, index);
-               if (status == RET_SUCCESS)
-                       SET(t, BTF_MODIFIED);
-               return (status);
+       if (h->upper - h->lower < nbytes + sizeof(indx_t)) {
+               if ((status = __bt_split(t, h, key,
+                   data, dflags, nbytes, index)) != RET_SUCCESS)
+                       return (status);
+               goto success;

        }
 
        if (index < (nxtindex = NEXTINDEX(h)))
        }
 
        if (index < (nxtindex = NEXTINDEX(h)))

-               bcopy(h->linp + index, h->linp + index + 1,
-                   (nxtindex - index) * sizeof(index_t));
-       h->lower += sizeof(index_t);
+               memmove(h->linp + index + 1, h->linp + index,
+                   (nxtindex - index) * sizeof(indx_t));
+       h->lower += sizeof(indx_t);

 
        h->linp[index] = h->upper -= nbytes;
        dest = (char *)h + h->upper;
 
        h->linp[index] = h->upper -= nbytes;
        dest = (char *)h + h->upper;


@@ -200,8 +236,13 @@ delete:            if (__bt_dleaf(t, h, index) == RET_ERROR) {
                }
 
        mpool_put(t->bt_mp, h, MPOOL_DIRTY);
                }
 
        mpool_put(t->bt_mp, h, MPOOL_DIRTY);

-       BT_CLR(t);
-       SET(t, BTF_MODIFIED);
+
+success:
+       if (flags == R_SETCURSOR) {
+               t->bt_bcursor.pgno = e->page->pgno;
+               t->bt_bcursor.index = e->index;
+       }
+       SET(t, B_MODIFIED);

        return (RET_SUCCESS);
 }
 
        return (RET_SUCCESS);
 }
 


@@ -225,7 +266,6 @@ bt_fast(t, key, data, exactp)
        const DBT *key, *data;
        int *exactp;
 {
        const DBT *key, *data;
        int *exactp;
 {

-       EPG e;

        PAGE *h;
        size_t nbytes;
        int cmp;
        PAGE *h;
        size_t nbytes;
        int cmp;


@@ -234,31 +274,31 @@ bt_fast(t, key, data, exactp)
                t->bt_order = NOT;
                return (NULL);
        }
                t->bt_order = NOT;
                return (NULL);
        }

-       e.page = h;
-       e.index = t->bt_last.index;
+       t->bt_cur.page = h;
+       t->bt_cur.index = t->bt_last.index;

 
        /*
         * If won't fit in this page or have too many keys in this page, have
         * to search to get split stack.
         */
        nbytes = NBLEAFDBT(key->size, data->size);
 
        /*
         * If won't fit in this page or have too many keys in this page, have
         * to search to get split stack.
         */
        nbytes = NBLEAFDBT(key->size, data->size);

-       if (h->upper - h->lower < nbytes + sizeof(index_t))
+       if (h->upper - h->lower < nbytes + sizeof(indx_t))

                goto miss;
 
        if (t->bt_order == FORWARD) {
                goto miss;
 
        if (t->bt_order == FORWARD) {

-               if (e.page->nextpg != P_INVALID)
+               if (t->bt_cur.page->nextpg != P_INVALID)

                        goto miss;
                        goto miss;

-               if (e.index != NEXTINDEX(h) - 1)
+               if (t->bt_cur.index != NEXTINDEX(h) - 1)

                        goto miss;
                        goto miss;

-               if ((cmp = __bt_cmp(t, key, &e)) < 0)
+               if ((cmp = __bt_cmp(t, key, &t->bt_cur)) < 0)

                        goto miss;
                        goto miss;

-               t->bt_last.index = ++e.index;
+               t->bt_last.index = cmp ? ++t->bt_cur.index : t->bt_cur.index;

        } else {
        } else {

-               if (e.page->prevpg != P_INVALID)
+               if (t->bt_cur.page->prevpg != P_INVALID)

                        goto miss;
                        goto miss;

-               if (e.index != 0)
+               if (t->bt_cur.index != 0)

                        goto miss;
                        goto miss;

-               if ((cmp = __bt_cmp(t, key, &e)) > 0)
+               if ((cmp = __bt_cmp(t, key, &t->bt_cur)) > 0)

                        goto miss;
                t->bt_last.index = 0;
        }
                        goto miss;
                t->bt_last.index = 0;
        }


@@ -266,7 +306,7 @@ bt_fast(t, key, data, exactp)
 #ifdef STATISTICS
        ++bt_cache_hit;
 #endif
 #ifdef STATISTICS
        ++bt_cache_hit;
 #endif

-       return (&e);
+       return (&t->bt_cur);

 
 miss:
 #ifdef STATISTICS
 
 miss:
 #ifdef STATISTICS