mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
BDB 4.1.24
BitKeeper/deleted/.del-ex_access.wpj~3df6ae8c99bf7c5f: Delete: bdb/build_vxworks/ex_access/ex_access.wpj BitKeeper/deleted/.del-ex_btrec.wpj~a7622f1c6f432dc6: Delete: bdb/build_vxworks/ex_btrec/ex_btrec.wpj BitKeeper/deleted/.del-ex_dbclient.wpj~7345440f3b204cdd: Delete: bdb/build_vxworks/ex_dbclient/ex_dbclient.wpj BitKeeper/deleted/.del-ex_env.wpj~fbe1ab10b04e8b74: Delete: bdb/build_vxworks/ex_env/ex_env.wpj BitKeeper/deleted/.del-ex_mpool.wpj~4479cfd5c45f327d: Delete: bdb/build_vxworks/ex_mpool/ex_mpool.wpj BitKeeper/deleted/.del-ex_tpcb.wpj~f78093006e14bf41: Delete: bdb/build_vxworks/ex_tpcb/ex_tpcb.wpj BitKeeper/deleted/.del-db_buildall.dsp~bd749ff6da11682: Delete: bdb/build_win32/db_buildall.dsp BitKeeper/deleted/.del-cxx_app.cpp~ad8df8e0791011ed: Delete: bdb/cxx/cxx_app.cpp BitKeeper/deleted/.del-cxx_log.cpp~a50ff3118fe06952: Delete: bdb/cxx/cxx_log.cpp BitKeeper/deleted/.del-cxx_table.cpp~ecd751e79b055556: Delete: bdb/cxx/cxx_table.cpp BitKeeper/deleted/.del-namemap.txt~796a3acd3885d8fd: Delete: bdb/cxx/namemap.txt BitKeeper/deleted/.del-Design.fileop~3ca4da68f1727373: Delete: bdb/db/Design.fileop BitKeeper/deleted/.del-db185_int.h~61bee3736e7959ef: Delete: bdb/db185/db185_int.h BitKeeper/deleted/.del-acconfig.h~411e8854d67ad8b5: Delete: bdb/dist/acconfig.h BitKeeper/deleted/.del-mutex.m4~a13383cde18a64e1: Delete: bdb/dist/aclocal/mutex.m4 BitKeeper/deleted/.del-options.m4~b9d0ca637213750a: Delete: bdb/dist/aclocal/options.m4 BitKeeper/deleted/.del-programs.m4~3ce7890b47732b30: Delete: bdb/dist/aclocal/programs.m4 BitKeeper/deleted/.del-tcl.m4~f944e2db93c3b6db: Delete: bdb/dist/aclocal/tcl.m4 BitKeeper/deleted/.del-types.m4~59cae158c9a32cff: Delete: bdb/dist/aclocal/types.m4 BitKeeper/deleted/.del-script~d38f6d3a4f159cb4: Delete: bdb/dist/build/script BitKeeper/deleted/.del-configure.in~ac795a92c8fe049c: Delete: bdb/dist/configure.in BitKeeper/deleted/.del-ltconfig~66bbd007d8024af: Delete: bdb/dist/ltconfig BitKeeper/deleted/.del-rec_ctemp~a28554362534f00a: Delete: bdb/dist/rec_ctemp BitKeeper/deleted/.del-s_tcl~2ffe4326459fcd9f: Delete: bdb/dist/s_tcl BitKeeper/deleted/.del-.IGNORE_ME~d8148b08fa7d5d15: Delete: bdb/dist/template/.IGNORE_ME BitKeeper/deleted/.del-btree.h~179f2aefec1753d: Delete: bdb/include/btree.h BitKeeper/deleted/.del-cxx_int.h~6b649c04766508f8: Delete: bdb/include/cxx_int.h BitKeeper/deleted/.del-db.src~6b433ae615b16a8d: Delete: bdb/include/db.src BitKeeper/deleted/.del-db_185.h~ad8b373d9391d35c: Delete: bdb/include/db_185.h BitKeeper/deleted/.del-db_am.h~a714912b6b75932f: Delete: bdb/include/db_am.h BitKeeper/deleted/.del-db_cxx.h~fcafadf45f5d19e9: Delete: bdb/include/db_cxx.h BitKeeper/deleted/.del-db_dispatch.h~6844f20f7eb46904: Delete: bdb/include/db_dispatch.h BitKeeper/deleted/.del-db_int.src~419a3f48b6a01da7: Delete: bdb/include/db_int.src BitKeeper/deleted/.del-db_join.h~76f9747a42c3399a: Delete: bdb/include/db_join.h BitKeeper/deleted/.del-db_page.h~e302ca3a4db3abdc: Delete: bdb/include/db_page.h BitKeeper/deleted/.del-db_server_int.h~e1d20b6ba3bca1ab: Delete: bdb/include/db_server_int.h BitKeeper/deleted/.del-db_shash.h~5fbf2d696fac90f3: Delete: bdb/include/db_shash.h BitKeeper/deleted/.del-db_swap.h~1e60887550864a59: Delete: bdb/include/db_swap.h BitKeeper/deleted/.del-db_upgrade.h~c644eee73701fc8d: Delete: bdb/include/db_upgrade.h BitKeeper/deleted/.del-db_verify.h~b8d6c297c61f342e: Delete: bdb/include/db_verify.h BitKeeper/deleted/.del-debug.h~dc2b4f2cf27ccebc: Delete: bdb/include/debug.h BitKeeper/deleted/.del-hash.h~2aaa548b28882dfb: Delete: bdb/include/hash.h BitKeeper/deleted/.del-lock.h~a761c1b7de57b77f: Delete: bdb/include/lock.h BitKeeper/deleted/.del-log.h~ff20184238e35e4d: Delete: bdb/include/log.h BitKeeper/deleted/.del-mp.h~7e317597622f3411: Delete: bdb/include/mp.h BitKeeper/deleted/.del-mutex.h~d3ae7a2977a68137: Delete: bdb/include/mutex.h BitKeeper/deleted/.del-os.h~91867cc8757cd0e3: Delete: bdb/include/os.h BitKeeper/deleted/.del-os_jump.h~e1b939fa5151d4be: Delete: bdb/include/os_jump.h BitKeeper/deleted/.del-qam.h~6fad0c1b5723d597: Delete: bdb/include/qam.h BitKeeper/deleted/.del-queue.h~4c72c0826c123d5: Delete: bdb/include/queue.h BitKeeper/deleted/.del-region.h~513fe04d977ca0fc: Delete: bdb/include/region.h BitKeeper/deleted/.del-shqueue.h~525fc3e6c2025c36: Delete: bdb/include/shqueue.h BitKeeper/deleted/.del-tcl_db.h~c536fd61a844f23f: Delete: bdb/include/tcl_db.h BitKeeper/deleted/.del-txn.h~c8d94b221ec147e4: Delete: bdb/include/txn.h BitKeeper/deleted/.del-xa.h~ecc466493aae9d9a: Delete: bdb/include/xa.h BitKeeper/deleted/.del-DbRecoveryInit.java~756b52601a0b9023: Delete: bdb/java/src/com/sleepycat/db/DbRecoveryInit.java BitKeeper/deleted/.del-DbTxnRecover.java~74607cba7ab89d6d: Delete: bdb/java/src/com/sleepycat/db/DbTxnRecover.java BitKeeper/deleted/.del-lock_conflict.c~fc5e0f14cf597a2b: Delete: bdb/lock/lock_conflict.c BitKeeper/deleted/.del-log.src~53ac9e7b5cb023f2: Delete: bdb/log/log.src BitKeeper/deleted/.del-log_findckp.c~24287f008916e81f: Delete: bdb/log/log_findckp.c BitKeeper/deleted/.del-log_rec.c~d51711f2cac09297: Delete: bdb/log/log_rec.c BitKeeper/deleted/.del-log_register.c~b40bb4efac75ca15: Delete: bdb/log/log_register.c BitKeeper/deleted/.del-Design~b3d0f179f2767b: Delete: bdb/mp/Design BitKeeper/deleted/.del-os_finit.c~95dbefc6fe79b26c: Delete: bdb/os/os_finit.c BitKeeper/deleted/.del-os_abs.c~df95d1e7db81924: Delete: bdb/os_vxworks/os_abs.c BitKeeper/deleted/.del-os_finit.c~803b484bdb9d0122: Delete: bdb/os_vxworks/os_finit.c BitKeeper/deleted/.del-os_map.c~3a6d7926398b76d3: Delete: bdb/os_vxworks/os_map.c BitKeeper/deleted/.del-os_finit.c~19a227c6d3c78ad: Delete: bdb/os_win32/os_finit.c BitKeeper/deleted/.del-log-corruption.patch~1cf2ecc7c6408d5d: Delete: bdb/patches/log-corruption.patch BitKeeper/deleted/.del-Btree.pm~af6d0c5eaed4a98e: Delete: bdb/perl.BerkeleyDB/BerkeleyDB/Btree.pm BitKeeper/deleted/.del-BerkeleyDB.pm~7244036d4482643: Delete: bdb/perl.BerkeleyDB/BerkeleyDB.pm BitKeeper/deleted/.del-BerkeleyDB.pod~e7b18fd6132448e3: Delete: bdb/perl.BerkeleyDB/BerkeleyDB.pod BitKeeper/deleted/.del-Hash.pm~10292a26c06a5c95: Delete: bdb/perl.BerkeleyDB/BerkeleyDB/Hash.pm BitKeeper/deleted/.del-BerkeleyDB.pod.P~79f76a1495eda203: Delete: bdb/perl.BerkeleyDB/BerkeleyDB.pod.P BitKeeper/deleted/.del-BerkeleyDB.xs~80c99afbd98e392c: Delete: bdb/perl.BerkeleyDB/BerkeleyDB.xs BitKeeper/deleted/.del-Changes~729c1891efa60de9: Delete: bdb/perl.BerkeleyDB/Changes BitKeeper/deleted/.del-MANIFEST~63a1e34aecf157a0: Delete: bdb/perl.BerkeleyDB/MANIFEST BitKeeper/deleted/.del-Makefile.PL~c68797707d8df87a: Delete: bdb/perl.BerkeleyDB/Makefile.PL BitKeeper/deleted/.del-README~5f2f579b1a241407: Delete: bdb/perl.BerkeleyDB/README BitKeeper/deleted/.del-Todo~dca3c66c193adda9: Delete: bdb/perl.BerkeleyDB/Todo BitKeeper/deleted/.del-config.in~ae81681e450e0999: Delete: bdb/perl.BerkeleyDB/config.in BitKeeper/deleted/.del-dbinfo~28ad67d83be4f68e: Delete: bdb/perl.BerkeleyDB/dbinfo BitKeeper/deleted/.del-mkconsts~543ab60669c7a04e: Delete: bdb/perl.BerkeleyDB/mkconsts BitKeeper/deleted/.del-mkpod~182c0ca54e439afb: Delete: bdb/perl.BerkeleyDB/mkpod BitKeeper/deleted/.del-5.004~e008cb5a48805543: Delete: bdb/perl.BerkeleyDB/patches/5.004 BitKeeper/deleted/.del-irix_6_5.pl~61662bb08afcdec8: Delete: bdb/perl.BerkeleyDB/hints/irix_6_5.pl BitKeeper/deleted/.del-solaris.pl~6771e7182394e152: Delete: bdb/perl.BerkeleyDB/hints/solaris.pl BitKeeper/deleted/.del-typemap~783b8f5295b05f3d: Delete: bdb/perl.BerkeleyDB/typemap BitKeeper/deleted/.del-5.004_01~6081ce2fff7b0bc: Delete: bdb/perl.BerkeleyDB/patches/5.004_01 BitKeeper/deleted/.del-5.004_02~87214eac35ad9e6: Delete: bdb/perl.BerkeleyDB/patches/5.004_02 BitKeeper/deleted/.del-5.004_03~9a672becec7cb40f: Delete: bdb/perl.BerkeleyDB/patches/5.004_03 BitKeeper/deleted/.del-5.004_04~e326cb51af09d154: Delete: bdb/perl.BerkeleyDB/patches/5.004_04 BitKeeper/deleted/.del-5.004_05~7ab457a1e41a92fe: Delete: bdb/perl.BerkeleyDB/patches/5.004_05 BitKeeper/deleted/.del-5.005~f9e2d59b5964cd4b: Delete: bdb/perl.BerkeleyDB/patches/5.005 BitKeeper/deleted/.del-5.005_01~3eb9fb7b5842ea8e: Delete: bdb/perl.BerkeleyDB/patches/5.005_01 BitKeeper/deleted/.del-5.005_02~67477ce0bef717cb: Delete: bdb/perl.BerkeleyDB/patches/5.005_02 BitKeeper/deleted/.del-5.005_03~c4c29a1fb21e290a: Delete: bdb/perl.BerkeleyDB/patches/5.005_03 BitKeeper/deleted/.del-5.6.0~e1fb9897d124ee22: Delete: bdb/perl.BerkeleyDB/patches/5.6.0 BitKeeper/deleted/.del-btree.t~e4a1a3c675ddc406: Delete: bdb/perl.BerkeleyDB/t/btree.t BitKeeper/deleted/.del-db-3.0.t~d2c60991d84558f2: Delete: bdb/perl.BerkeleyDB/t/db-3.0.t BitKeeper/deleted/.del-db-3.1.t~6ee88cd13f55e018: Delete: bdb/perl.BerkeleyDB/t/db-3.1.t BitKeeper/deleted/.del-db-3.2.t~f73b6461f98fd1cf: Delete: bdb/perl.BerkeleyDB/t/db-3.2.t BitKeeper/deleted/.del-destroy.t~cc6a2ae1980a2ecd: Delete: bdb/perl.BerkeleyDB/t/destroy.t BitKeeper/deleted/.del-env.t~a8604a4499c4bd07: Delete: bdb/perl.BerkeleyDB/t/env.t BitKeeper/deleted/.del-examples.t~2571b77c3cc75574: Delete: bdb/perl.BerkeleyDB/t/examples.t BitKeeper/deleted/.del-examples.t.T~8228bdd75ac78b88: Delete: bdb/perl.BerkeleyDB/t/examples.t.T BitKeeper/deleted/.del-examples3.t.T~66a186897a87026d: Delete: bdb/perl.BerkeleyDB/t/examples3.t.T BitKeeper/deleted/.del-examples3.t~fe3822ba2f2d7f83: Delete: bdb/perl.BerkeleyDB/t/examples3.t BitKeeper/deleted/.del-filter.t~f87b045c1b708637: Delete: bdb/perl.BerkeleyDB/t/filter.t BitKeeper/deleted/.del-hash.t~616bfb4d644de3a3: Delete: bdb/perl.BerkeleyDB/t/hash.t BitKeeper/deleted/.del-join.t~29fc39f74a83ca22: Delete: bdb/perl.BerkeleyDB/t/join.t BitKeeper/deleted/.del-mldbm.t~31f5015341eea040: Delete: bdb/perl.BerkeleyDB/t/mldbm.t BitKeeper/deleted/.del-queue.t~8f338034ce44a641: Delete: bdb/perl.BerkeleyDB/t/queue.t BitKeeper/deleted/.del-recno.t~d4ddbd3743add63e: Delete: bdb/perl.BerkeleyDB/t/recno.t BitKeeper/deleted/.del-strict.t~6885cdd2ea71ca2d: Delete: bdb/perl.BerkeleyDB/t/strict.t BitKeeper/deleted/.del-subdb.t~aab62a5d5864c603: Delete: bdb/perl.BerkeleyDB/t/subdb.t BitKeeper/deleted/.del-txn.t~65033b8558ae1216: Delete: bdb/perl.BerkeleyDB/t/txn.t BitKeeper/deleted/.del-unknown.t~f3710458682665e1: Delete: bdb/perl.BerkeleyDB/t/unknown.t BitKeeper/deleted/.del-Changes~436f74a5c414c65b: Delete: bdb/perl.DB_File/Changes BitKeeper/deleted/.del-DB_File.pm~ae0951c6c7665a82: Delete: bdb/perl.DB_File/DB_File.pm BitKeeper/deleted/.del-DB_File.xs~89e49a0b5556f1d8: Delete: bdb/perl.DB_File/DB_File.xs BitKeeper/deleted/.del-DB_File_BS~290fad5dbbb87069: Delete: bdb/perl.DB_File/DB_File_BS BitKeeper/deleted/.del-MANIFEST~90ee581572bdd4ac: Delete: bdb/perl.DB_File/MANIFEST BitKeeper/deleted/.del-Makefile.PL~ac0567bb5a377e38: Delete: bdb/perl.DB_File/Makefile.PL BitKeeper/deleted/.del-README~77e924a5a9bae6b3: Delete: bdb/perl.DB_File/README BitKeeper/deleted/.del-config.in~ab4c2792b86a810b: Delete: bdb/perl.DB_File/config.in BitKeeper/deleted/.del-dbinfo~461c43b30fab2cb: Delete: bdb/perl.DB_File/dbinfo BitKeeper/deleted/.del-dynixptx.pl~50dcddfae25d17e9: Delete: bdb/perl.DB_File/hints/dynixptx.pl BitKeeper/deleted/.del-typemap~55cffb3288a9e587: Delete: bdb/perl.DB_File/typemap BitKeeper/deleted/.del-version.c~a4df0e646f8b3975: Delete: bdb/perl.DB_File/version.c BitKeeper/deleted/.del-5.004_01~d6830d0082702af7: Delete: bdb/perl.DB_File/patches/5.004_01 BitKeeper/deleted/.del-5.004_02~78b082dc80c91031: Delete: bdb/perl.DB_File/patches/5.004_02 BitKeeper/deleted/.del-5.004~4411ec2e3c9e008b: Delete: bdb/perl.DB_File/patches/5.004 BitKeeper/deleted/.del-sco.pl~1e795fe14fe4dcfe: Delete: bdb/perl.DB_File/hints/sco.pl BitKeeper/deleted/.del-5.004_03~33f274648b160d95: Delete: bdb/perl.DB_File/patches/5.004_03 BitKeeper/deleted/.del-5.004_04~8f3d1b3cf18bb20a: Delete: bdb/perl.DB_File/patches/5.004_04 BitKeeper/deleted/.del-5.004_05~9c0f02e7331e142: Delete: bdb/perl.DB_File/patches/5.004_05 BitKeeper/deleted/.del-5.005~c2108cb2e3c8d951: Delete: bdb/perl.DB_File/patches/5.005 BitKeeper/deleted/.del-5.005_01~3b45e9673afc4cfa: Delete: bdb/perl.DB_File/patches/5.005_01 BitKeeper/deleted/.del-5.005_02~9fe5766bb02a4522: Delete: bdb/perl.DB_File/patches/5.005_02 BitKeeper/deleted/.del-5.005_03~ffa1c38c19ae72ea: Delete: bdb/perl.DB_File/patches/5.005_03 BitKeeper/deleted/.del-5.6.0~373be3a5ce47be85: Delete: bdb/perl.DB_File/patches/5.6.0 BitKeeper/deleted/.del-db-btree.t~3231595a1c241eb3: Delete: bdb/perl.DB_File/t/db-btree.t BitKeeper/deleted/.del-db-hash.t~7c4ad0c795c7fad2: Delete: bdb/perl.DB_File/t/db-hash.t BitKeeper/deleted/.del-db-recno.t~6c2d3d80b9ba4a50: Delete: bdb/perl.DB_File/t/db-recno.t BitKeeper/deleted/.del-db_server.sed~cdb00ebcd48a64e2: Delete: bdb/rpc_server/db_server.sed BitKeeper/deleted/.del-db_server_proc.c~d46c8f409c3747f4: Delete: bdb/rpc_server/db_server_proc.c BitKeeper/deleted/.del-db_server_svc.sed~3f5e59f334fa4607: Delete: bdb/rpc_server/db_server_svc.sed BitKeeper/deleted/.del-db_server_util.c~a809f3a4629acda: Delete: bdb/rpc_server/db_server_util.c BitKeeper/deleted/.del-log.tcl~ff1b41f1355b97d7: Delete: bdb/test/log.tcl BitKeeper/deleted/.del-mpool.tcl~b0df4dc1b04db26c: Delete: bdb/test/mpool.tcl BitKeeper/deleted/.del-mutex.tcl~52fd5c73a150565: Delete: bdb/test/mutex.tcl BitKeeper/deleted/.del-txn.tcl~c4ff071550b5446e: Delete: bdb/test/txn.tcl BitKeeper/deleted/.del-README~e800a12a5392010a: Delete: bdb/test/upgrade/README BitKeeper/deleted/.del-pack-2.6.6.pl~89d5076d758d3e98: Delete: bdb/test/upgrade/generate-2.X/pack-2.6.6.pl BitKeeper/deleted/.del-test-2.6.patch~4a52dc83d447547b: Delete: bdb/test/upgrade/generate-2.X/test-2.6.patch
This commit is contained in:
unknown
@ -1,7 +1,7 @@
|
||||
/*-
|
||||
* See the file LICENSE for redistribution information.
|
||||
*
|
||||
* Copyright (c) 1996, 1997, 1998, 1999, 2000
|
||||
* Copyright (c) 1996-2002
|
||||
* Sleepycat Software. All rights reserved.
|
||||
*/
|
||||
/*
|
||||
@ -43,7 +43,7 @@
|
||||
#include "db_config.h"
|
||||
|
||||
#ifndef lint
|
||||
static const char revid[] = "$Id: db_overflow.c,v 11.21 2000/11/30 00:58:32 ubell Exp $";
|
||||
static const char revid[] = "$Id: db_overflow.c,v 11.46 2002/08/08 03:57:48 bostic Exp $";
|
||||
#endif /* not lint */
|
||||
|
||||
#ifndef NO_SYSTEM_INCLUDES
|
||||
@ -53,9 +53,9 @@ static const char revid[] = "$Id: db_overflow.c,v 11.21 2000/11/30 00:58:32 ubel
|
||||
#endif
|
||||
|
||||
#include "db_int.h"
|
||||
#include "db_page.h"
|
||||
#include "db_am.h"
|
||||
#include "db_verify.h"
|
||||
#include "dbinc/db_page.h"
|
||||
#include "dbinc/db_am.h"
|
||||
#include "dbinc/db_verify.h"
|
||||
|
||||
/*
|
||||
* Big key/data code.
|
||||
@ -83,6 +83,7 @@ __db_goff(dbp, dbt, tlen, pgno, bpp, bpsz)
|
||||
u_int32_t *bpsz;
|
||||
{
|
||||
DB_ENV *dbenv;
|
||||
DB_MPOOLFILE *mpf;
|
||||
PAGE *h;
|
||||
db_indx_t bytes;
|
||||
u_int32_t curoff, needed, start;
|
||||
@ -90,6 +91,7 @@ __db_goff(dbp, dbt, tlen, pgno, bpp, bpsz)
|
||||
int ret;
|
||||
|
||||
dbenv = dbp->dbenv;
|
||||
mpf = dbp->mpf;
|
||||
|
||||
/*
|
||||
* Check if the buffer is big enough; if it is not and we are
|
||||
@ -99,7 +101,12 @@ __db_goff(dbp, dbt, tlen, pgno, bpp, bpsz)
|
||||
*/
|
||||
if (F_ISSET(dbt, DB_DBT_PARTIAL)) {
|
||||
start = dbt->doff;
|
||||
needed = dbt->dlen;
|
||||
if (start > tlen)
|
||||
needed = 0;
|
||||
else if (dbt->dlen > tlen - start)
|
||||
needed = tlen - start;
|
||||
else
|
||||
needed = dbt->dlen;
|
||||
} else {
|
||||
start = 0;
|
||||
needed = tlen;
|
||||
@ -112,15 +119,13 @@ __db_goff(dbp, dbt, tlen, pgno, bpp, bpsz)
|
||||
return (ENOMEM);
|
||||
}
|
||||
} else if (F_ISSET(dbt, DB_DBT_MALLOC)) {
|
||||
if ((ret = __os_malloc(dbenv,
|
||||
needed, dbp->db_malloc, &dbt->data)) != 0)
|
||||
if ((ret = __os_umalloc(dbenv, needed, &dbt->data)) != 0)
|
||||
return (ret);
|
||||
} else if (F_ISSET(dbt, DB_DBT_REALLOC)) {
|
||||
if ((ret = __os_realloc(dbenv,
|
||||
needed, dbp->db_realloc, &dbt->data)) != 0)
|
||||
if ((ret = __os_urealloc(dbenv, needed, &dbt->data)) != 0)
|
||||
return (ret);
|
||||
} else if (*bpsz == 0 || *bpsz < needed) {
|
||||
if ((ret = __os_realloc(dbenv, needed, NULL, bpp)) != 0)
|
||||
if ((ret = __os_realloc(dbenv, needed, bpp)) != 0)
|
||||
return (ret);
|
||||
*bpsz = needed;
|
||||
dbt->data = *bpp;
|
||||
@ -133,13 +138,12 @@ __db_goff(dbp, dbt, tlen, pgno, bpp, bpsz)
|
||||
*/
|
||||
dbt->size = needed;
|
||||
for (curoff = 0, p = dbt->data; pgno != PGNO_INVALID && needed > 0;) {
|
||||
if ((ret = memp_fget(dbp->mpf, &pgno, 0, &h)) != 0) {
|
||||
(void)__db_pgerr(dbp, pgno);
|
||||
if ((ret = mpf->get(mpf, &pgno, 0, &h)) != 0)
|
||||
return (ret);
|
||||
}
|
||||
|
||||
/* Check if we need any bytes from this page. */
|
||||
if (curoff + OV_LEN(h) >= start) {
|
||||
src = (u_int8_t *)h + P_OVERHEAD;
|
||||
src = (u_int8_t *)h + P_OVERHEAD(dbp);
|
||||
bytes = OV_LEN(h);
|
||||
if (start > curoff) {
|
||||
src += start - curoff;
|
||||
@ -153,7 +157,7 @@ __db_goff(dbp, dbt, tlen, pgno, bpp, bpsz)
|
||||
}
|
||||
curoff += OV_LEN(h);
|
||||
pgno = h->next_pgno;
|
||||
memp_fput(dbp->mpf, h, 0);
|
||||
(void)mpf->put(mpf, h, 0);
|
||||
}
|
||||
return (0);
|
||||
}
|
||||
@ -171,13 +175,14 @@ __db_poff(dbc, dbt, pgnop)
|
||||
db_pgno_t *pgnop;
|
||||
{
|
||||
DB *dbp;
|
||||
PAGE *pagep, *lastp;
|
||||
DB_LSN new_lsn, null_lsn;
|
||||
DBT tmp_dbt;
|
||||
DB_LSN new_lsn, null_lsn;
|
||||
DB_MPOOLFILE *mpf;
|
||||
PAGE *pagep, *lastp;
|
||||
db_indx_t pagespace;
|
||||
u_int32_t sz;
|
||||
u_int8_t *p;
|
||||
int ret;
|
||||
int ret, t_ret;
|
||||
|
||||
/*
|
||||
* Allocate pages and copy the key/data item into them. Calculate the
|
||||
@ -185,8 +190,10 @@ __db_poff(dbc, dbt, pgnop)
|
||||
* item.
|
||||
*/
|
||||
dbp = dbc->dbp;
|
||||
pagespace = P_MAXSPACE(dbp->pgsize);
|
||||
mpf = dbp->mpf;
|
||||
pagespace = P_MAXSPACE(dbp, dbp->pgsize);
|
||||
|
||||
ret = 0;
|
||||
lastp = NULL;
|
||||
for (p = dbt->data,
|
||||
sz = dbt->size; sz > 0; p += pagespace, sz -= pagespace) {
|
||||
@ -203,30 +210,36 @@ __db_poff(dbc, dbt, pgnop)
|
||||
* have a partial record.
|
||||
*/
|
||||
if ((ret = __db_new(dbc, P_OVERFLOW, &pagep)) != 0)
|
||||
return (ret);
|
||||
if (DB_LOGGING(dbc)) {
|
||||
break;
|
||||
if (DBC_LOGGING(dbc)) {
|
||||
tmp_dbt.data = p;
|
||||
tmp_dbt.size = pagespace;
|
||||
ZERO_LSN(null_lsn);
|
||||
if ((ret = __db_big_log(dbp->dbenv, dbc->txn,
|
||||
&new_lsn, 0, DB_ADD_BIG, dbp->log_fileid,
|
||||
PGNO(pagep), lastp ? PGNO(lastp) : PGNO_INVALID,
|
||||
if ((ret = __db_big_log(dbp, dbc->txn,
|
||||
&new_lsn, 0, DB_ADD_BIG, PGNO(pagep),
|
||||
lastp ? PGNO(lastp) : PGNO_INVALID,
|
||||
PGNO_INVALID, &tmp_dbt, &LSN(pagep),
|
||||
lastp == NULL ? &null_lsn : &LSN(lastp),
|
||||
&null_lsn)) != 0)
|
||||
return (ret);
|
||||
&null_lsn)) != 0) {
|
||||
if (lastp != NULL)
|
||||
(void)mpf->put(mpf,
|
||||
lastp, DB_MPOOL_DIRTY);
|
||||
lastp = pagep;
|
||||
break;
|
||||
}
|
||||
} else
|
||||
LSN_NOT_LOGGED(new_lsn);
|
||||
|
||||
/* Move lsn onto page. */
|
||||
if (lastp)
|
||||
LSN(lastp) = new_lsn;
|
||||
LSN(pagep) = new_lsn;
|
||||
}
|
||||
/* Move LSN onto page. */
|
||||
if (lastp != NULL)
|
||||
LSN(lastp) = new_lsn;
|
||||
LSN(pagep) = new_lsn;
|
||||
|
||||
P_INIT(pagep, dbp->pgsize,
|
||||
PGNO(pagep), PGNO_INVALID, PGNO_INVALID, 0, P_OVERFLOW);
|
||||
OV_LEN(pagep) = pagespace;
|
||||
OV_REF(pagep) = 1;
|
||||
memcpy((u_int8_t *)pagep + P_OVERHEAD, p, pagespace);
|
||||
memcpy((u_int8_t *)pagep + P_OVERHEAD(dbp), p, pagespace);
|
||||
|
||||
/*
|
||||
* If this is the first entry, update the user's info.
|
||||
@ -238,12 +251,14 @@ __db_poff(dbc, dbt, pgnop)
|
||||
else {
|
||||
lastp->next_pgno = PGNO(pagep);
|
||||
pagep->prev_pgno = PGNO(lastp);
|
||||
(void)memp_fput(dbp->mpf, lastp, DB_MPOOL_DIRTY);
|
||||
(void)mpf->put(mpf, lastp, DB_MPOOL_DIRTY);
|
||||
}
|
||||
lastp = pagep;
|
||||
}
|
||||
(void)memp_fput(dbp->mpf, lastp, DB_MPOOL_DIRTY);
|
||||
return (0);
|
||||
if (lastp != NULL &&
|
||||
(t_ret = mpf->put(mpf, lastp, DB_MPOOL_DIRTY)) != 0 && ret == 0)
|
||||
ret = t_ret;
|
||||
return (ret);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -259,23 +274,29 @@ __db_ovref(dbc, pgno, adjust)
|
||||
int32_t adjust;
|
||||
{
|
||||
DB *dbp;
|
||||
DB_MPOOLFILE *mpf;
|
||||
PAGE *h;
|
||||
int ret;
|
||||
|
||||
dbp = dbc->dbp;
|
||||
if ((ret = memp_fget(dbp->mpf, &pgno, 0, &h)) != 0) {
|
||||
(void)__db_pgerr(dbp, pgno);
|
||||
mpf = dbp->mpf;
|
||||
|
||||
if ((ret = mpf->get(mpf, &pgno, 0, &h)) != 0) {
|
||||
__db_pgerr(dbp, pgno, ret);
|
||||
return (ret);
|
||||
}
|
||||
|
||||
if (DB_LOGGING(dbc))
|
||||
if ((ret = __db_ovref_log(dbp->dbenv, dbc->txn,
|
||||
&LSN(h), 0, dbp->log_fileid, h->pgno, adjust,
|
||||
&LSN(h))) != 0)
|
||||
if (DBC_LOGGING(dbc)) {
|
||||
if ((ret = __db_ovref_log(dbp,
|
||||
dbc->txn, &LSN(h), 0, h->pgno, adjust, &LSN(h))) != 0) {
|
||||
(void)mpf->put(mpf, h, 0);
|
||||
return (ret);
|
||||
}
|
||||
} else
|
||||
LSN_NOT_LOGGED(LSN(h));
|
||||
OV_REF(h) += adjust;
|
||||
|
||||
(void)memp_fput(dbp->mpf, h, DB_MPOOL_DIRTY);
|
||||
(void)mpf->put(mpf, h, DB_MPOOL_DIRTY);
|
||||
return (0);
|
||||
}
|
||||
|
||||
@ -293,13 +314,16 @@ __db_doff(dbc, pgno)
|
||||
DB *dbp;
|
||||
PAGE *pagep;
|
||||
DB_LSN null_lsn;
|
||||
DB_MPOOLFILE *mpf;
|
||||
DBT tmp_dbt;
|
||||
int ret;
|
||||
|
||||
dbp = dbc->dbp;
|
||||
mpf = dbp->mpf;
|
||||
|
||||
do {
|
||||
if ((ret = memp_fget(dbp->mpf, &pgno, 0, &pagep)) != 0) {
|
||||
(void)__db_pgerr(dbp, pgno);
|
||||
if ((ret = mpf->get(mpf, &pgno, 0, &pagep)) != 0) {
|
||||
__db_pgerr(dbp, pgno, ret);
|
||||
return (ret);
|
||||
}
|
||||
|
||||
@ -309,20 +333,24 @@ __db_doff(dbc, pgno)
|
||||
* decrement the reference count and return.
|
||||
*/
|
||||
if (OV_REF(pagep) > 1) {
|
||||
(void)memp_fput(dbp->mpf, pagep, 0);
|
||||
(void)mpf->put(mpf, pagep, 0);
|
||||
return (__db_ovref(dbc, pgno, -1));
|
||||
}
|
||||
|
||||
if (DB_LOGGING(dbc)) {
|
||||
tmp_dbt.data = (u_int8_t *)pagep + P_OVERHEAD;
|
||||
if (DBC_LOGGING(dbc)) {
|
||||
tmp_dbt.data = (u_int8_t *)pagep + P_OVERHEAD(dbp);
|
||||
tmp_dbt.size = OV_LEN(pagep);
|
||||
ZERO_LSN(null_lsn);
|
||||
if ((ret = __db_big_log(dbp->dbenv, dbc->txn,
|
||||
&LSN(pagep), 0, DB_REM_BIG, dbp->log_fileid,
|
||||
PGNO(pagep), PREV_PGNO(pagep), NEXT_PGNO(pagep),
|
||||
&tmp_dbt, &LSN(pagep), &null_lsn, &null_lsn)) != 0)
|
||||
if ((ret = __db_big_log(dbp, dbc->txn,
|
||||
&LSN(pagep), 0, DB_REM_BIG,
|
||||
PGNO(pagep), PREV_PGNO(pagep),
|
||||
NEXT_PGNO(pagep), &tmp_dbt,
|
||||
&LSN(pagep), &null_lsn, &null_lsn)) != 0) {
|
||||
(void)mpf->put(mpf, pagep, 0);
|
||||
return (ret);
|
||||
}
|
||||
}
|
||||
} else
|
||||
LSN_NOT_LOGGED(LSN(pagep));
|
||||
pgno = pagep->next_pgno;
|
||||
if ((ret = __db_free(dbc, pagep)) != 0)
|
||||
return (ret);
|
||||
@ -352,13 +380,16 @@ __db_moff(dbp, dbt, pgno, tlen, cmpfunc, cmpp)
|
||||
u_int32_t tlen;
|
||||
int (*cmpfunc) __P((DB *, const DBT *, const DBT *)), *cmpp;
|
||||
{
|
||||
PAGE *pagep;
|
||||
DBT local_dbt;
|
||||
DB_MPOOLFILE *mpf;
|
||||
PAGE *pagep;
|
||||
void *buf;
|
||||
u_int32_t bufsize, cmp_bytes, key_left;
|
||||
u_int8_t *p1, *p2;
|
||||
int ret;
|
||||
|
||||
mpf = dbp->mpf;
|
||||
|
||||
/*
|
||||
* If there is a user-specified comparison function, build a
|
||||
* contiguous copy of the key, and call it.
|
||||
@ -373,27 +404,27 @@ __db_moff(dbp, dbt, pgno, tlen, cmpfunc, cmpp)
|
||||
return (ret);
|
||||
/* Pass the key as the first argument */
|
||||
*cmpp = cmpfunc(dbp, dbt, &local_dbt);
|
||||
__os_free(buf, bufsize);
|
||||
__os_free(dbp->dbenv, buf);
|
||||
return (0);
|
||||
}
|
||||
|
||||
/* While there are both keys to compare. */
|
||||
for (*cmpp = 0, p1 = dbt->data,
|
||||
key_left = dbt->size; key_left > 0 && pgno != PGNO_INVALID;) {
|
||||
if ((ret = memp_fget(dbp->mpf, &pgno, 0, &pagep)) != 0)
|
||||
if ((ret = mpf->get(mpf, &pgno, 0, &pagep)) != 0)
|
||||
return (ret);
|
||||
|
||||
cmp_bytes = OV_LEN(pagep) < key_left ? OV_LEN(pagep) : key_left;
|
||||
tlen -= cmp_bytes;
|
||||
key_left -= cmp_bytes;
|
||||
for (p2 =
|
||||
(u_int8_t *)pagep + P_OVERHEAD; cmp_bytes-- > 0; ++p1, ++p2)
|
||||
for (p2 = (u_int8_t *)pagep + P_OVERHEAD(dbp);
|
||||
cmp_bytes-- > 0; ++p1, ++p2)
|
||||
if (*p1 != *p2) {
|
||||
*cmpp = (long)*p1 - (long)*p2;
|
||||
break;
|
||||
}
|
||||
pgno = NEXT_PGNO(pagep);
|
||||
if ((ret = memp_fput(dbp->mpf, pagep, 0)) != 0)
|
||||
if ((ret = mpf->put(mpf, pagep, 0)) != 0)
|
||||
return (ret);
|
||||
if (*cmpp != 0)
|
||||
return (0);
|
||||
@ -440,7 +471,7 @@ __db_vrfy_overflow(dbp, vdp, h, pgno, flags)
|
||||
pip->refcount = OV_REF(h);
|
||||
if (pip->refcount < 1) {
|
||||
EPRINT((dbp->dbenv,
|
||||
"Overflow page %lu has zero reference count",
|
||||
"Page %lu: overflow page has zero reference count",
|
||||
(u_long)pgno));
|
||||
isbad = 1;
|
||||
}
|
||||
@ -448,7 +479,7 @@ __db_vrfy_overflow(dbp, vdp, h, pgno, flags)
|
||||
/* Just store for now. */
|
||||
pip->olen = HOFFSET(h);
|
||||
|
||||
err: if ((t_ret = __db_vrfy_putpageinfo(vdp, pip)) != 0)
|
||||
err: if ((t_ret = __db_vrfy_putpageinfo(dbp->dbenv, vdp, pip)) != 0)
|
||||
ret = t_ret;
|
||||
return ((ret == 0 && isbad == 1) ? DB_VERIFY_BAD : ret);
|
||||
}
|
||||
@ -495,7 +526,7 @@ __db_vrfy_ovfl_structure(dbp, vdp, pgno, tlen, flags)
|
||||
|
||||
if (pip->type != P_OVERFLOW) {
|
||||
EPRINT((dbp->dbenv,
|
||||
"Overflow page %lu of invalid type",
|
||||
"Page %lu: overflow page of invalid type %lu",
|
||||
(u_long)pgno, (u_long)pip->type));
|
||||
ret = DB_VERIFY_BAD;
|
||||
goto err; /* Unsafe to continue. */
|
||||
@ -504,7 +535,8 @@ __db_vrfy_ovfl_structure(dbp, vdp, pgno, tlen, flags)
|
||||
prev = pip->prev_pgno;
|
||||
if (prev != PGNO_INVALID) {
|
||||
EPRINT((dbp->dbenv,
|
||||
"First overflow page %lu has a prev_pgno", (u_long)pgno));
|
||||
"Page %lu: first page in overflow chain has a prev_pgno %lu",
|
||||
(u_long)pgno, (u_long)prev));
|
||||
isbad = 1;
|
||||
}
|
||||
|
||||
@ -543,7 +575,7 @@ __db_vrfy_ovfl_structure(dbp, vdp, pgno, tlen, flags)
|
||||
*/
|
||||
if ((u_int32_t)p > refcount) {
|
||||
EPRINT((dbp->dbenv,
|
||||
"Page %lu encountered twice in overflow traversal",
|
||||
"Page %lu: encountered twice in overflow traversal",
|
||||
(u_long)pgno));
|
||||
ret = DB_VERIFY_BAD;
|
||||
goto err;
|
||||
@ -571,19 +603,20 @@ __db_vrfy_ovfl_structure(dbp, vdp, pgno, tlen, flags)
|
||||
if (!IS_VALID_PGNO(next)) {
|
||||
DB_ASSERT(0);
|
||||
EPRINT((dbp->dbenv,
|
||||
"Overflow page %lu has bad next_pgno",
|
||||
(u_long)pgno));
|
||||
"Page %lu: bad next_pgno %lu on overflow page",
|
||||
(u_long)pgno, (u_long)next));
|
||||
ret = DB_VERIFY_BAD;
|
||||
goto err;
|
||||
}
|
||||
|
||||
if ((ret = __db_vrfy_putpageinfo(vdp, pip)) != 0 ||
|
||||
if ((ret = __db_vrfy_putpageinfo(dbp->dbenv, vdp, pip)) != 0 ||
|
||||
(ret = __db_vrfy_getpageinfo(vdp, next, &pip)) != 0)
|
||||
return (ret);
|
||||
if (pip->prev_pgno != pgno) {
|
||||
EPRINT((dbp->dbenv,
|
||||
"Overflow page %lu has bogus prev_pgno value",
|
||||
(u_long)next));
|
||||
"Page %lu: bad prev_pgno %lu on overflow page (should be %lu)",
|
||||
(u_long)next, (u_long)pip->prev_pgno,
|
||||
(u_long)pgno));
|
||||
isbad = 1;
|
||||
/*
|
||||
* It's safe to continue because we have separate
|
||||
@ -597,10 +630,11 @@ __db_vrfy_ovfl_structure(dbp, vdp, pgno, tlen, flags)
|
||||
if (tlen > 0) {
|
||||
isbad = 1;
|
||||
EPRINT((dbp->dbenv,
|
||||
"Overflow item incomplete on page %lu", (u_long)pgno));
|
||||
"Page %lu: overflow item incomplete", (u_long)pgno));
|
||||
}
|
||||
|
||||
err: if ((t_ret = __db_vrfy_putpageinfo(vdp, pip)) != 0 && ret == 0)
|
||||
err: if ((t_ret =
|
||||
__db_vrfy_putpageinfo(dbp->dbenv, vdp, pip)) != 0 && ret == 0)
|
||||
ret = t_ret;
|
||||
return ((ret == 0 && isbad == 1) ? DB_VERIFY_BAD : ret);
|
||||
}
|
||||
@ -622,13 +656,15 @@ __db_safe_goff(dbp, vdp, pgno, dbt, buf, flags)
|
||||
void **buf;
|
||||
u_int32_t flags;
|
||||
{
|
||||
DB_MPOOLFILE *mpf;
|
||||
PAGE *h;
|
||||
int ret, err_ret;
|
||||
int ret, t_ret;
|
||||
u_int32_t bytesgot, bytes;
|
||||
u_int8_t *src, *dest;
|
||||
|
||||
ret = DB_VERIFY_BAD;
|
||||
err_ret = 0;
|
||||
mpf = dbp->mpf;
|
||||
h = NULL;
|
||||
ret = t_ret = 0;
|
||||
bytesgot = bytes = 0;
|
||||
|
||||
while ((pgno != PGNO_INVALID) && (IS_VALID_PGNO(pgno))) {
|
||||
@ -639,7 +675,7 @@ __db_safe_goff(dbp, vdp, pgno, dbt, buf, flags)
|
||||
if ((ret = __db_salvage_markdone(vdp, pgno)) != 0)
|
||||
break;
|
||||
|
||||
if ((ret = memp_fget(dbp->mpf, &pgno, 0, &h)) != 0)
|
||||
if ((ret = mpf->get(mpf, &pgno, 0, &h)) != 0)
|
||||
break;
|
||||
|
||||
/*
|
||||
@ -651,14 +687,14 @@ __db_safe_goff(dbp, vdp, pgno, dbt, buf, flags)
|
||||
break;
|
||||
}
|
||||
|
||||
src = (u_int8_t *)h + P_OVERHEAD;
|
||||
src = (u_int8_t *)h + P_OVERHEAD(dbp);
|
||||
bytes = OV_LEN(h);
|
||||
|
||||
if (bytes + P_OVERHEAD > dbp->pgsize)
|
||||
bytes = dbp->pgsize - P_OVERHEAD;
|
||||
if (bytes + P_OVERHEAD(dbp) > dbp->pgsize)
|
||||
bytes = dbp->pgsize - P_OVERHEAD(dbp);
|
||||
|
||||
if ((ret = __os_realloc(dbp->dbenv,
|
||||
bytesgot + bytes, 0, buf)) != 0)
|
||||
bytesgot + bytes, buf)) != 0)
|
||||
break;
|
||||
|
||||
dest = (u_int8_t *)*buf + bytesgot;
|
||||
@ -667,15 +703,24 @@ __db_safe_goff(dbp, vdp, pgno, dbt, buf, flags)
|
||||
memcpy(dest, src, bytes);
|
||||
|
||||
pgno = NEXT_PGNO(h);
|
||||
/* Not much we can do here--we don't want to quit. */
|
||||
if ((ret = memp_fput(dbp->mpf, h, 0)) != 0)
|
||||
err_ret = ret;
|
||||
|
||||
if ((ret = mpf->put(mpf, h, 0)) != 0)
|
||||
break;
|
||||
h = NULL;
|
||||
}
|
||||
|
||||
if (ret == 0) {
|
||||
/*
|
||||
* If we're being aggressive, salvage a partial datum if there
|
||||
* was an error somewhere along the way.
|
||||
*/
|
||||
if (ret == 0 || LF_ISSET(DB_AGGRESSIVE)) {
|
||||
dbt->size = bytesgot;
|
||||
dbt->data = *buf;
|
||||
}
|
||||
|
||||
return ((err_ret != 0 && ret == 0) ? err_ret : ret);
|
||||
/* If we broke out on error, don't leave pages pinned. */
|
||||
if (h != NULL && (t_ret = mpf->put(mpf, h, 0)) != 0 && ret == 0)
|
||||
ret = t_ret;
|
||||
|
||||
return (ret);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user